diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e5708fba168f..2405f7d4efa9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,18 +10,19 @@ # This file /.github/CODEOWNERS @edolstra -# Boostraping and core infra -/pkgs/stdenv @edolstra -/pkgs/build-support/cc-wrapper @edolstra - # Libraries /lib @edolstra @nbp +/lib/systems @edolstra @nbp @ericson2314 # Nixpkgs Internals -/default.nix @nbp -/pkgs/top-level/default.nix @nbp -/pkgs/top-level/impure.nix @nbp -/pkgs/top-level/stage.nix @nbp +/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 @edolstra +/pkgs/build-support/cc-wrapper @edolstra @Ericson2314 +/pkgs/build-support/bintools-wrapper @edolstra @Ericson2314 +/pkgs/build-support/setup-hooks @edolstra @Ericson2314 # NixOS Internals /nixos/default.nix @nbp @@ -84,3 +85,9 @@ # https://github.com/NixOS/nixpkgs/issues/31401 /lib/maintainers.nix @ghost /lib/licenses.nix @ghost + +# Qt / KDE +/pkgs/applications/kde @ttuegel +/pkgs/desktops/plasma-5 @ttuegel +/pkgs/development/libraries/kde-frameworks @ttuegel +/pkgs/development/libraries/qt-5 @ttuegel diff --git a/COPYING b/COPYING index afc460fff5cb..198597a1b410 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 765fc56c3bb3..d556c7ebe1ed 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -18,9 +18,9 @@ tab settings so it’s asking for trouble. Use lowerCamelCase for variable - names, not UpperCamelCase. TODO: naming of - attributes in - all-packages.nix? + names, not UpperCamelCase. Note, this rule does + not apply to package attribute names, which instead follow the rules + in . Function calls with attribute set arguments are written as @@ -220,9 +220,10 @@ args.stdenv.mkDerivation (args // { The variable name used for the instantiated package in all-packages.nix, and when passing it as a - dependency to other functions. This is what Nix expression authors - see. It can also be used when installing using nix-env - -iA. + dependency to other functions. Typically this is called the + package attribute name. This is what Nix + expression authors see. It can also be used when installing using + nix-env -iA. The filename for (the directory containing) the Nix expression. @@ -259,12 +260,12 @@ bound to the variable name e2fsprogs in 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, rather than converted to underscores - (which was convention up to around 2013 and most names - still have underscores instead of dashes) — e.g., - http-parser instead of - http_parser. + 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 all three package + names. If there are multiple versions of a package, this should be reflected in the variable names in diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 4b35b72feae0..118a82bf0b06 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -187,7 +187,7 @@ 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 four attributes used for specifying dependencies as documented in . + 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. @@ -200,6 +200,45 @@ +
+ Cross packagaing 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. + Feel free to add to this list! + + + + + What if my package's build system needs to build a C program to be run under the build environment? + + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + Add it to your mkDerivation invocation. + + + + + My package fails to find ar. + + + Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. + It only provides a prefixed one, just as it only does for all the other binutils programs. + It may be necessary to patch the package to fix the build system to use a prefixed `ar`. + + + + + My package's testsuite needs to run host platform code. + + + doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; + Add it to your mkDerivation invocation. + + + +
diff --git a/doc/default.nix b/doc/default.nix index cfd51fba257e..60c613878c72 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -23,11 +23,12 @@ pkgs.stdenv.mkDerivation { buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }: let - extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" ''; + extraHeader = lib.optionalString (!useChapters) + ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" ''; in '' { - pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--top-level-division=chapter"} \ - --smart \ + pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \ + -f markdown+smart \ | sed -e 's|||' \ -e 's| - Some libraries require OCaml and sometimes also Camlp5. The exact - versions that were used to build Coq are saved in the + 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 - attributes. + and coq.findlib attributes. + + + Coq libraries may be compatible with some specific versions of Coq only. + The compatibleCoqVersions attribute is used to + precisely select those versions of Coq that are compatible with this + derivation. Here is a simple package example. It is a pure Coq library, thus it - only depends on Coq. Its makefile has been - generated using coq_makefile so we only have to + depends on Coq. It builds on the Mathematical Components library, thus it + also takes mathcomp as buildInputs. + Its Makefile has been generated using + coq_makefile so we only have to set the $COQLIB variable at install time. -{stdenv, fetchurl, coq}: -stdenv.mkDerivation { - src = fetchurl { - url = http://coq.inria.fr/pylons/contribs/files/Karatsuba/v8.4/Karatsuba.tar.gz; - sha256 = "0ymfpv4v49k4fm63nq6gcl1hbnnxrvjjp7yzc4973n49b853c5b1"; +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-multinomials-${version}"; + version = "1.0"; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "multinomials"; + rev = version; + sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - name = "coq-karatsuba"; - buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.cecill-b; + inherit (coq.meta) platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; } - diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index afcba13488be..629db289ab1d 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -581,8 +581,8 @@ nix-shell "" -A haskellPackages.bar.env Every Haskell package set takes a function called `overrides` that you can use to manipulate the package as much as you please. One useful application of this feature is to replace the default `mkDerivation` function with one that enables -library profiling for all packages. To accomplish that, add configure the -following snippet in your `~/.config/nixpkgs/config.nix` file: +library profiling for all packages. To accomplish that add the following +snippet to your `~/.config/nixpkgs/config.nix` file: ```nix { packageOverrides = super: let self = super.pkgs; in @@ -777,14 +777,14 @@ to find out the store path of the system's zlib library. Now, you can stack --extra-lib-dirs=/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8/lib build ``` - Typically, you'll need `--extra-include-dirs` as well. It's possible - to add those flag to the project's `stack.yaml` or your user's - global `~/.stack/global/stack.yaml` file so that you don't have to - specify them manually every time. But again, you're likely better off - using Stack's Nix support instead. +Typically, you'll need `--extra-include-dirs` as well. It's possible +to add those flag to the project's `stack.yaml` or your user's +global `~/.stack/global/stack.yaml` file so that you don't have to +specify them manually every time. But again, you're likely better off +using Stack's Nix support instead. - The same thing applies to `cabal configure`, of course, if you're - building with `cabal-install` instead of Stack. +The same thing applies to `cabal configure`, of course, if you're +building with `cabal-install` instead of Stack. ### Creating statically linked binaries diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 9172d7122139..3700d2e57d47 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -134,7 +134,7 @@ with ```nix with import {}; -python35.withPackages (ps: [ps.numpy ps.toolz]) +(python35.withPackages (ps: [ps.numpy ps.toolz])).env ``` Executing `nix-shell` gives you again a Nix shell from which you can run Python. diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index bedda76a3066..aa6a7d654108 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -20,7 +20,7 @@ For daily builds (beta and nightly) use either rustup from nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). -## Packaging Rust applications +## Compiling Rust applications with Cargo Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: @@ -56,6 +56,167 @@ checksum can be then take from the failed build. To install crates with nix there is also an experimental project called [nixcrates](https://github.com/fractalide/nixcrates). +## Compiling Rust crates using Nix instead of Cargo + +When run, `cargo build` produces a file called `Cargo.lock`, +containing pinned versions of all dependencies. Nixpkgs contains a +tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used +to turn a `Cargo.lock` into a Nix expression. + +That Nix expression calls `rustc` directly (hence bypassing Cargo), +and can be used to compile a crate and all its dependencies. Here is +an example for a minimal `hello` crate: + + + $ cargo new hello + $ cd hello + $ cargo build + Compiling hello v0.1.0 (file:///tmp/hello) + Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs + $ carnix -o hello.nix --src ./. Cargo.lock --standalone + $ nix-build hello.nix + +Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: + +``` +with import {}; +let kernel = buildPlatform.parsed.kernel.name; + # ... (content skipped) + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "Authorname " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; +in +rec { + hello_0_1_0 = hello_0_1_0_ rec {}; +} +``` + +In particular, note that the argument given as `--src` is copied +verbatim to the source. If we look at a more complicated +dependencies, for instance by adding a single line `libc="*"` to our +`Cargo.toml`, we first need to run `cargo build` to update the +`Cargo.lock`. Then, `carnix` needs to be run again, and produces the +following nix file: + +``` +with import {}; +let kernel = buildPlatform.parsed.kernel.name; + # ... (content skipped) + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "Jörg Thalheim " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s"; + inherit dependencies buildDependencies features; + }; +in +rec { + hello_0_1_0 = hello_0_1_0_ rec { + dependencies = [ libc_0_2_34 ]; + }; + libc_0_2_34_features."default".from_hello_0_1_0__default = true; + libc_0_2_34 = libc_0_2_34_ rec { + features = mkFeatures libc_0_2_34_features; + }; + libc_0_2_34_features."use_std".self_default = hasDefault libc_0_2_34_features; +} +``` + +Here, the `libc` crate has no `src` attribute, so `buildRustCrate` +will fetch it from [crates.io](https://crates.io). A `sha256` +attribute is still needed for Nix purity. + +Some crates require external libraries. For crates from +[crates.io](https://crates.io), such libraries can be specified in +`defaultCrateOverrides` package in nixpkgs itself. + +Starting from that file, one can add more overrides, to add features +or build inputs by overriding the hello crate in a seperate file. + +``` +with import {}; +(import ./hello.nix).hello_0_1_0.override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: { buildInputs = [ openssl ]; }; + }; +} +``` + +Here, `crateOverrides` is expected to be a attribute set, where the +key is the crate name without version number and the value a function. +The function gets all attributes passed to `buildRustCrate` as first +argument and returns a set that contains all attribute that should be +overwritten. + +For more complicated cases, such as when parts of the crate's +derivation depend on the the crate's version, the `attrs` argument of +the override above can be read, as in the following example, which +patches the derivation: + +``` +with import {}; +(import ./hello.nix).hello_0_1_0.override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { + postPatch = '' + substituteInPlace lib/zoneinfo.rs \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + }; + }; +} +``` + +Another situation is when we want to override a nested +dependency. This actually works in the exact same way, since the +`crateOverrides` parameter is forwarded to the crate's +dependencies. For instance, to override the build inputs for crate +`libc` in the example above, where `libc` is a dependency of the main +crate, we could do: + +``` +with import {}; +(import hello.nix).hello_0_1_0.override { + crateOverrides = defaultCrateOverrides // { + libc = attrs: { buildInputs = []; }; + }; +} +``` + +Three more parameters can be overridden: + +- The version of rustc used to compile the crate: + + ``` + hello_0_1_0.override { rust = pkgs.rust; }; + ``` + +- Whether to build in release mode or debug mode (release mode by + default): + + ``` + hello_0_1_0.override { release = false; }; + ``` + +- Whether to print the commands sent to rustc when building + (equivalent to `--verbose` in cargo: + + ``` + hello_0_1_0.override { verbose = false; }; + ``` + + ## Using the Rust nightlies overlay Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 0813e0968e86..c4bd6c57ffdb 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -7,123 +7,123 @@ Reviewing contributions - The following section is a draft and reviewing policy is still being + The following section is a draft and reviewing policy is still being discussed. -The nixpkgs projects receives a fairly high number of contributions via - GitHub pull-requests. Reviewing and approving these is an important task and a +The nixpkgs projects 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 make any pull request that is open for - long enough 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 +The high change rate of nixpkgs make any pull request that is open for + long enough 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. -When reviewing a pull request, please always be nice and polite. - Controversial changes can lead to controversial opinions, but it is important +When reviewing a pull request, please always be nice and polite. + Controversial changes can lead to controversial opinions, but it is important to respect every community members and their work. -GitHub provides reactions, they are a simple and quick way to provide - feedback to pull-requests or any comments. The thumb-down reaction should be - used with care and if possible accompanied with some explanations so the +GitHub provides reactions, they are a simple and quick way to provide + feedback to pull-requests or any comments. The thumb-down reaction should be + used with care and if possible accompanied with some explanations so the submitter has directions to improve his contribution. -Pull-requests reviews should include a list of what has been reviewed in a - comment, so other reviewers and mergers can know the state of the +Pull-requests 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. -All the review template samples provided in this section are generic and - meant as examples. Their usage is optional and the reviewer is free to adapt +All the review template samples provided in this section are generic and + meant as examples. Their usage is optional and the reviewer is free to adapt them to his liking.
Package updates -A package update is the most trivial and common type of pull-request. - These pull-requests mainly consist in 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 in updating the version part of the package name and the source hash. -It can happen that non trivial updates include patches or more complex +It can happen that non trivial updates include patches or more complex changes. Reviewing process: - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: package (update) and any topic + 8.has: package (update) and any topic label that fit the updated package. - Ensure that the package versioning is fitting the + Ensure that the package versioning is fitting the guidelines. - Ensure that the commit text is fitting the + Ensure that the commit text is fitting the guidelines. Ensure that the package maintainers are notified. - mention-bot usually notify GitHub users based on the - submitted changes, but it can happen that it misses some of the + mention-bot usually notify GitHub users based on the + submitted changes, but it can happen that it misses some of the package maintainers. - Ensure that the meta field contains correct + Ensure that the meta field contains correct information. - License can change with version updates, so it should be + License can change with version updates, so it should be checked to be fitting upstream license. - If the package has no maintainer, a maintainer must be - set. This can be the update submitter or a community member that + If the package has no maintainer, a maintainer must be + set. This can be the update submitter or a community member that accepts to take maintainership of the package. Ensure that the code contains no typos. Building the package locally. - Pull-requests are often targeted to the master or staging - branch so building the pull-request locally as it is submitted can + Pull-requests are often targeted to the master or staging + branch so building the pull-request locally as it is submitted can trigger a large amount of source builds. - It is possible to rebase the changes on nixos-unstable or - nixpkgs-unstable for easier review by running the following commands + It is possible to rebase the changes on nixos-unstable or + nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. -$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git $ git fetch channels nixos-unstable $ git fetch origin pull/PRNUMBER/head -$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD - This should be done only once to be able to fetch channel + This should be done only once to be able to fetch channel branches from the nixpkgs-channels repository. Fetching the nixos-unstable branch. - Fetching the pull-request changes, PRNUMBER - is the number at the end of the pull-request title and - BASEBRANCH the base branch of the + 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 + Rebasing the pull-request changes to the nixos-unstable branch. - The nox - tool can 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 + The nox + tool can 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. $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" @@ -153,42 +153,42 @@ $ 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. Reviewing process: - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: package (new) and any topic + 8.has: package (new) and any topic label that fit the new package. - Ensure that the package versioning is fitting the + Ensure that the package versioning is fitting the guidelines. - Ensure that the commit name is fitting the + Ensure that the commit name is fitting the guidelines. - Ensure that the meta field contains correct + Ensure that the meta field contains correct information. - License must be checked to be fitting upstream + License must be checked to be fitting upstream license. - Platforms should be set or the package will not get binary + Platforms should be set or the package will not get binary substitutes. - A maintainer must be set, this can be the package - submitter or a community member that accepts to take maintainership of + A maintainer must be set, this can be the package + submitter or a community member that accepts to take maintainership of the package. Ensure that the code contains no typos. Ensure the package source. - Mirrors urls should be used when + Mirrors urls should be used when available. - The most appropriate function should be used (e.g. - packages from GitHub should use + The most appropriate function should be used (e.g. + packages from GitHub should use fetchFromGitHub). @@ -223,49 +223,49 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
Module updates -Module updates are submissions changing modules in some ways. These often +Module updates are submissions changing modules in some ways. These often contains changes to the options or introduce new options. Reviewing process - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: module (update) and any topic + 8.has: module (update) and any topic label that fit the module. Ensure that the module maintainers are notified. - Mention-bot notify GitHub users based on the submitted - changes, but it can happen that it miss some of the package + Mention-bot notify GitHub users based on the submitted + changes, but it can happen that it miss some of the package maintainers. - Ensure that the module tests, if any, are + Ensure that the module tests, if any, are succeeding. Ensure that the introduced options are correct. - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and string types are deprecated). - Description, default and example should be + Description, default and example should be provided. Ensure that option changes are backward compatible. - mkRenamedOptionModule and - mkAliasOptionModule functions provide way to make + mkRenamedOptionModule and + mkAliasOptionModule functions provide way to make option changes backward compatible. - Ensure that removed options are declared with + Ensure that removed options are declared with mkRemovedOptionModule - Ensure that changes that are not backward compatible are + Ensure that changes that are not backward compatible are mentioned in release notes. - Ensure that documentations affected by the change is + Ensure that documentations affected by the change is updated. @@ -294,37 +294,37 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" New modules submissions introduce a new module to NixOS. - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: module (new) and any topic label + 8.has: module (new) and any topic label that fit the module. - Ensure that the module tests, if any, are + Ensure that the module tests, if any, are succeeding. Ensure that the introduced options are correct. - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and string types are deprecated). - Description, default and example should be + Description, default and example should be provided. - Ensure that module meta field is + Ensure that module meta field is present - Maintainers should be declared in + Maintainers should be declared in meta.maintainers. - Module documentation should be declared with + Module documentation should be declared with meta.doc. - Ensure that the module respect other modules + Ensure that the module respect other modules functionality. - For example, enabling a module should not open firewall + For example, enabling a module should not open firewall ports by default. @@ -340,7 +340,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" - [ ] options have default - [ ] options have example - [ ] options have descriptions -- [ ] No unneeded package is added to system.environmentPackages +- [ ] No unneeded package is added to environment.systemPackages - [ ] meta.maintainers is set - [ ] module documentation is declared in meta.doc @@ -355,22 +355,22 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" Other type of submissions requires different reviewing steps. -If you consider having enough knowledge and experience in a topic and - would 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 +If you consider having enough knowledge and experience in a topic and + would 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 git-blaming the code to see +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 git-blaming the code to see who committed to that topic can give some hints. -Container system, boot system and library changes are some examples of the +Container system, boot system and library changes are some examples of the pull requests fitting this category.
Merging pull-requests -It is possible for community members that have enough knowledge and +It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests. TODO: add the procedure to request merging rights. @@ -380,13 +380,13 @@ The following paragraph about how to deal with unactive contributors is just a proposition and should be modified to what the community agrees to be the right policy. -Please note that contributors with commit rights unactive for more than +Please note that contributors with commit rights unactive for more than three months will have their commit rights revoked. --> -In a case a contributor leaves definitively the Nix community, he should - create an issue or notify the mailing list with references of packages and - modules he maintains so the maintainership can be taken over by other +In a case a contributor leaves definitively the Nix community, he should + create an issue or notify the mailing list with references of packages and + modules he maintains so the maintainership can be taken over by other contributors.
diff --git a/doc/shell.md b/doc/shell.md new file mode 100644 index 000000000000..079574d4ae86 --- /dev/null +++ b/doc/shell.md @@ -0,0 +1,20 @@ +--- +title: pkgs.mkShell +author: zimbatm +date: 2017-10-30 +--- + +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 46b562a794f0..3a7b23baaa7e 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -179,6 +179,269 @@ genericBuild
+
Specifying dependencies + + + As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation. + mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package. + This is done both for structure and consistency, but also so that certain other setup can take place. + For example, certain dependencies need their bin directories added to the PATH. + That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. + See for details. + + + Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. + The platform distinctions are motivated by cross compilation; see for exactly what each platform means. + + The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: + As a general programming principle, dependencies are always specified as interfaces, not concrete implementation. + + But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. + For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced. + + + 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. + + 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 PATH. + + For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable. + + + 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. + + + It is important to note dependencies are not necessary 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. + + + We can define the process precisely with Natural Deduction using the inference rules. + This probably seems a bit obtuse, but so is the bash code that actually implements it! + + The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the 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! + +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +propagated-dep(h0, t0, A, B) +propagated-dep(h1, t1, B, C) +h0 + h1 in {-1, 0, 1} +h0 + t1 in {-1, 0, 1} +-------------------------------------- Transitive property +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) + +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +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 +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) + +propagated-dep(h, t, A, B) +-------------------------------------- Propagated deps count as deps +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: t = h + 1. + That means that: + +let f(h, t, i) = i + (if i <= 0 then h else t - 1) +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 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. + 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 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 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 cannot be relevant. +From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. + + + + Variables specifying dependencies + + + depsBuildBuild + + + 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. + + + Since these packages are able to be run at build time, that 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. + + + + + + nativeBuildInputs + + + 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 depsBuildBuild or depsBuildTarget. + This would be called depsBuildHost but 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. + + + + + + depsBuildTarget + + + 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 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. + + + + + + depsHostHost + + 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. + + + + + buildInputs + + + A list of dependencies whose host platform and target platform match the new derivation's. + This means a 0 host offset and 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. + + + These often are programs/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. + + + + + + depsTargetTarget + + A list of dependencies whose host platform matches the new derivation's target platform. + This means a 1 offset from the new derivation's platforms. + These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. + It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. + Do not use this attribute unless you are packaging a compiler and are sure it is needed. + + + + + depsBuildBuildPropagated + + The propagated equivalent of depsBuildBuild. + This perhaps never ought to be used, but it is included for consistency [see below for the others]. + + + + + propagatedNativeBuildInputs + + The propagated equivalent of nativeBuildInputs. + This would be called depsBuildHostPropagated but for historical continuity. + For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs. + If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets. + + + + + depsBuildTargetPropagated + + The propagated equivalent of depsBuildTarget. + This is prefixed for the same reason of alerting potential users. + + + + + depsHostHostPropagated + + The propagated equivalent of depsHostHost. + + + + + propagatedBuildInputs + + The propagated equivalent of buildInputs. + This would be called depsHostTargetPropagated but for historical continuity. + + + + + depsTargetTarget + + The propagated equivalent of depsTargetTarget. + This is prefixed for the same reason of alerting potential users. + + + + + +
+ +
Attributes @@ -198,63 +461,22 @@ genericBuild - - Variables specifying dependencies - - - nativeBuildInputs - - A list of dependencies used by the new derivation at build-time. - I.e. these dependencies should not make it into the package's runtime-closure, though this is currently not checked. - For each dependency dir, the directory dir/bin, if it exists, is added to the PATH environment variable. - Other environment variables are also set up via a pluggable mechanism. - For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. - See for details. - - - - - buildInputs - - A list of dependencies used by the new derivation at run-time. - Currently, the build-time environment is modified in the exact same way as with nativeBuildInputs. - This is problematic in that when cross-compiling, foreign executables can clobber native ones on the PATH. - Even more confusing is static-linking. - A statically-linked library should be listed here because ultimately that generated machine code will be used at run-time, even though a derivation containing the object files or static archives will only be used at build-time. - A less confusing solution to this would be nice. - - - - - - propagatedNativeBuildInputs - - Like nativeBuildInputs, but these dependencies are propagated: - that is, the dependencies listed here are added to the nativeBuildInputs of any package that uses this package as a dependency. - So if package Y has propagatedNativeBuildInputs = [X], and package Z has nativeBuildInputs = [Y], - then package X will appear in Z’s build environment automatically. - - - - - propagatedBuildInputs - - Like buildInputs, but propagated just like propagatedNativeBuildInputs. - This inherits buildInputs's flaws of clobbering native executables when cross-compiling and being confusing for static linking. - - - - - Variables affecting build properties enableParallelBuilding - If set, stdenv will pass specific - flags to make and other build tools to enable - parallel building with up to build-cores - workers. + + If set to true, stdenv will + pass specific flags to make and other build tools to + enable parallel building with up to build-cores + workers. + + Unless set to false, some build systems with good + support for parallel building including cmake, + meson, and qmake will set it to + true. + @@ -649,7 +871,7 @@ script) if it exists. 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. - Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. + Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. @@ -773,13 +995,14 @@ but only if the doCheck variable is enabled. doCheck - If set to a non-empty string, the check phase is - executed, otherwise it is skipped (default). Thus you should set - - -doCheck = true; - - in the derivation to enable checks. + + Controls whether the check phase is executed. + By default it is skipped, but if doCheck is set to true, the check phase is usually executed. + Thus you should set doCheck = true; in the derivation to enable checks. + The exception is cross compilation. + Cross compiled builds never run tests, no matter how doCheck is set, + as the newly-built program won't run on the platform used to build it. + @@ -916,6 +1139,20 @@ following: If set, libraries and executables are not stripped. By default, they are. + + dontStripHost + + Like dontStripHost, but only affects the strip command targetting the package's host platform. + Useful when supporting cross compilation, but otherwise feel free to ignore. + + + + dontStripTarget + + Like dontStripHost, but only affects the strip command targetting the packages' target platform. + Useful when supporting cross compilation, but otherwise feel free to ignore. + + dontMoveSbin @@ -1044,12 +1281,14 @@ installcheck. doInstallCheck - If set to a non-empty string, the installCheck phase is - executed, otherwise it is skipped (default). Thus you should set - - doInstallCheck = true; - - in the derivation to enable install checks. + + Controls whether the installCheck phase is executed. + By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed. + Thus you should set doInstallCheck = true; in the derivation to enable install checks. + The exception is cross compilation. + Cross compiled builds never run tests, no matter how doInstallCheck is set, + as the newly-built program won't run on the platform used to build it. + @@ -1346,46 +1585,127 @@ someVar=$(stripHash $name)
Package setup hooks -The following packages provide a setup hook: - + + Nix itself considers a build-time dependency 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 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 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. + + + 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 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. + + + 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 defining a bash function, and appending its name to one of + envBuildBuildHooks`, + envBuildHostHooks`, + envBuildTargetHooks`, + envHostHostHooks`, + envHostTargetHooks`, or + envTargetTargetHooks`. + These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). + + + 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 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 + +addEnvHooks "$hostOffset" myBashFunction + + + + The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use these 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. - CC Wrapper + Bintools Wrapper - CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. - Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper. - Packages typically depend on only CC Wrapper, instead of those 3 inputs directly. + 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. - Dependency finding is undoubtedly the main task of CC wrapper. + 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 linux). + Dependency finding however is a task both wrappers will continue 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. - CC wrapper's setup hook causes any include subdirectory of such a dependency to be added to NIX_CFLAGS_COMPILE, and any lib and lib64 subdirectories to NIX_LDFLAGS. - The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. + 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. A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose. - They are defined to just be the base name of the tools, under the assumption that CC Wrapper's binaries will be on the path. + They are defined to just be the base name of the tools, under the assumption that 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 CC wrappers may be simultaneous in use (targeting different platforms). - BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional CC Wrappers, properly disambiguating them. + Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. + + Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. + As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms. + + BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional Bintools Wrappers, properly disambiguating them. - A problem with this final task is that CC Wrapper is honest and defines LD as ld. + A problem with this final task is that 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 CC Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use. + 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". + + CC Wrapper + + + 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. + + + Dependency finding is undoubtedly the main task of CC Wrapper. + This works just like 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. + + + + Perl - Adds the lib/site_perl subdirectory - of each build input to the PERL5LIB - environment variable. + + + Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable. + For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. + + diff --git a/lib/default.nix b/lib/default.nix index 9dc4fea99fc2..f729a36249af 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -93,7 +93,7 @@ let hiPrioSet; inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices - commitIdFromGitRepo; + commitIdFromGitRepo cleanSourceWith; inherit (modules) evalModules closeModules unifyModuleSyntax applyIfFunction unpackSubmodule packSubmodule mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions diff --git a/lib/generators.nix b/lib/generators.nix index b27ab485f41e..f207033c9554 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -130,6 +130,6 @@ rec { (name: value: "${toPretty args name} = ${toPretty args value};") v) + " }" - else "toPretty: should never happen (v = ${v})"; + else abort "toPretty: should never happen (v = ${v})"; } diff --git a/lib/licenses.nix b/lib/licenses.nix index 1f2c448470b3..1fdcc15fd725 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + inria-icesl = { + fullName = "INRIA Non-Commercial License Agreement for IceSL"; + url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; + free = false; + }; + ipa = spdx { spdxId = "IPA"; fullName = "IPA Font License"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index de8627b0804a..a5ab074a3131 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -28,6 +28,8 @@ afranchuk = "Alex Franchuk "; aherrmann = "Andreas Herrmann "; ahmedtd = "Taahir Ahmed "; + aij = "Ivan Jager "; + ajgrf = "Alex Griffin "; ak = "Alexander Kjeldaas "; akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; @@ -80,6 +82,7 @@ benley = "Benjamin Staffin "; bennofs = "Benno Fünfstück "; benwbooth = "Ben Booth "; + berce = "Bert Moens "; berdario = "Dario Bertini "; bergey = "Daniel Bergey "; bhipple = "Benjamin Hipple "; @@ -95,6 +98,7 @@ bradediger = "Brad Ediger "; bramd = "Bram Duvigneau "; bstrik = "Berno Strik "; + bugworm = "Roman Gerasimenko "; bzizou = "Bruno Bzeznik "; c0bw3b = "Renaud "; c0dehero = "CodeHero "; @@ -115,6 +119,7 @@ ChengCat = "Yucheng Zhang "; choochootrain = "Hurshal Patel "; chpatrick = "Patrick Chilton "; + chreekat = "Bryan Richter "; chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; chrisrosset = "Christopher Rosset "; @@ -122,7 +127,7 @@ ciil = "Simon Lackerbauer "; ck3d = "Christian Kögler "; ckampka = "Christian Kampka "; - ckauhaus = "Christian Kauhaus "; + ckauhaus = "Christian Kauhaus "; cko = "Christine Koppelt "; cleverca22 = "Michael Bishop "; cmcdragonkai = "Roger Qiu "; @@ -186,6 +191,7 @@ dtzWill = "Will Dietz "; dupgit = "Olivier Delhomme "; dywedir = "Vladyslav M. "; + dzabraev = "Maksim Dzabraev "; e-user = "Alexander Kahl "; earldouglas = "James Earl Douglas "; ebzzry = "Rommel Martinez "; @@ -204,6 +210,7 @@ elijahcaine = "Elijah Caine "; elitak = "Eric Litak "; ellis = "Ellis Whitehead "; + enzime = "Michael Hoang "; eperuffo = "Emanuele Peruffo "; epitrochoid = "Mabry Cervin "; eqyiel = "Ruben Maher "; @@ -279,15 +286,18 @@ hodapp = "Chris Hodapp "; hrdinka = "Christoph Hrdinka "; htr = "Hugo Tavares Reis "; + hyphon81 = "Masato Yonekawa "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; iblech = "Ingo Blechschmidt "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; + ilya-kolpakov = "Ilya Kolpakov "; infinisil = "Silvan Mosberger "; ironpinguin = "Michele Catalano "; ivan-tkatchev = "Ivan Tkatchev "; ixmatus = "Parnell Springmeyer "; + izorkin = "Yurii Izorkin "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; jammerful = "jammerful "; @@ -319,6 +329,7 @@ joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; joncojonathan = "Jonathan Haddock "; + jpdoyle = "Joe Doyle "; jpierre03 = "Jean-Pierre PRUNARET "; jpotier = "Martin Potier "; jraygauthier = "Raymond Gauthier "; @@ -354,6 +365,7 @@ ldesgoui = "Lucas Desgouilles "; league = "Christopher League "; lebastr = "Alexander Lebedev "; + ledif = "Adam Fidel "; leemachin = "Lee Machin "; leenaars = "Michiel Leenaars "; leonardoce = "Leonardo Cecchi "; @@ -389,6 +401,7 @@ manveru = "Michael Fellinger "; marcweber = "Marc Weber "; markus1189 = "Markus Hauck "; + markuskowa = "Markus Kowalewski "; markWot = "Markus Wotringer "; martijnvermaat = "Martijn Vermaat "; martingms = "Martin Gammelsæter "; @@ -400,6 +413,7 @@ mbakke = "Marius Bakke "; mbbx6spp = "Susan Potter "; mbe = "Brandon Edens "; + mbode = "Maximilian Bode "; mboes = "Mathieu Boespflug "; mbrgm = "Marius Bergmann "; mcmtroffaes = "Matthias C. M. Troffaes "; @@ -409,6 +423,7 @@ meisternu = "Matt Miemiec "; metabar = "Celine Mercier "; mgdelacroix = "Miguel de la Cruz "; + mgttlinger = "Merlin Göttlinger "\"hello\\\${}\\n\"" + */ + escapeNixString = s: escape ["$"] (builtins.toJSON s); + /* Obsolete - use replaceStrings instead. */ replaceChars = builtins.replaceStrings or ( del: new: s: diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ff2273febcb0..90d7e956d2ba 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -18,7 +18,6 @@ rec { libc = "glibc"; platform = platforms.sheevaplug; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; raspberryPi = rec { @@ -31,7 +30,6 @@ rec { libc = "glibc"; platform = platforms.raspberrypi; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; armv7l-hf-multiplatform = rec { @@ -44,7 +42,6 @@ rec { libc = "glibc"; platform = platforms.armv7l-hf-multiplatform; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; aarch64-multiplatform = rec { @@ -54,23 +51,20 @@ rec { withTLS = true; libc = "glibc"; platform = platforms.aarch64-multiplatform; - inherit (platform) gcc; }; scaleway-c1 = armv7l-hf-multiplatform // rec { platform = platforms.scaleway-c1; - inherit (platform) gcc; - inherit (gcc) fpu; + inherit (platform.gcc) fpu; }; pogoplug4 = rec { arch = "armv5tel"; - config = "armv5tel-softfloat-linux-gnueabi"; + config = "armv5tel-unknown-linux-gnueabi"; float = "soft"; platform = platforms.pogoplug4; - inherit (platform) gcc; libc = "glibc"; withTLS = true; @@ -86,7 +80,6 @@ rec { libc = "glibc"; platform = platforms.fuloong2f_n32; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; # diff --git a/lib/types.nix b/lib/types.nix index 46ed05d288f2..88fc90d05970 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -174,6 +174,13 @@ rec { merge = mergeOneOption; }; + strMatching = pattern: mkOptionType { + name = "strMatching ${escapeNixString pattern}"; + description = "string matching the pattern ${pattern}"; + check = x: str.check x && builtins.match pattern x != null; + inherit (str) merge; + }; + # Merge multiple definitions by concatenating them (with the given # separator between the values). separatedString = sep: mkOptionType rec { diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 178dcfb38da4..f3fe7236760b 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 +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when @@ -59,6 +59,7 @@ my $s3 = Net::Amazon::S3->new( { aws_access_key_id => $aws_access_key_id, aws_secret_access_key => $aws_secret_access_key, retry => 1, + host => "s3-eu-west-1.amazonaws.com", }); my $bucket = $s3->bucket("nixpkgs-tarballs") or die; diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 3ddc8c23a79b..ec2691ff617c 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests toolz ])' +#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ packaging requests toolz ])' -p git """ Update a Python package expression by passing in the `.nix` file, or the directory containing it. @@ -18,7 +18,12 @@ import os import re import requests import toolz -from concurrent.futures import ThreadPoolExecutor as pool +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""" @@ -26,10 +31,30 @@ INDEX = "https://pypi.io/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. @@ -82,13 +107,59 @@ def _fetch_page(url): else: raise ValueError("request for {} failed".format(url)) -def _get_latest_version_pypi(package, extension): + +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) - version = json['info']['version'] - for release in json['releases'][version]: + 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'] @@ -98,7 +169,7 @@ def _get_latest_version_pypi(package, extension): return version, sha256 -def _get_latest_version_github(package, extension): +def _get_latest_version_github(package, extension, current_version, target): raise ValueError("updating from GitHub is not yet supported.") @@ -141,9 +212,9 @@ def _determine_extension(text, fetcher): """ if fetcher == 'fetchPypi': try: - format = _get_unique_value('format', text) + src_format = _get_unique_value('format', text) except ValueError as e: - format = None # format was not given + src_format = None # format was not given try: extension = _get_unique_value('extension', text) @@ -151,9 +222,11 @@ def _determine_extension(text, fetcher): extension = None # extension was not given if extension is None: - if format is None: - format = 'setuptools' - extension = FORMATS[format] + 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) @@ -167,9 +240,7 @@ def _determine_extension(text, fetcher): return extension -def _update_package(path): - - +def _update_package(path, target): # Read the expression with open(path, 'r') as f: @@ -186,11 +257,13 @@ def _update_package(path): extension = _determine_extension(text, fetcher) - new_version, new_sha256 = _get_latest_version_pypi(pname, extension) + 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 new_version <= version: + raise ValueError("downgrade for {}.".format(pname)) if not new_sha256: raise ValueError("no file available for {}.".format(pname)) @@ -202,10 +275,19 @@ def _update_package(path): logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version)) - return True + result = { + 'path' : path, + 'target': target, + 'pname': pname, + 'old_version' : version, + 'new_version' : new_version, + #'fetcher' : fetcher, + } + + return result -def _update(path): +def _update(path, target): # We need to read and modify a Nix expression. if os.path.isdir(path): @@ -222,24 +304,58 @@ def _update(path): return False try: - return _update_package(path) + 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 = map(os.path.abspath, args.package) + 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)) - with pool() as p: - count = list(p.map(_update, packages)) - logging.info("{} package(s) updated".format(sum(count))) if __name__ == '__main__': main() \ No newline at end of file diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index 87406c28c2f7..75cccef95b38 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -23,10 +23,23 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP +is enabled (). UDP ports can be opened through -. Also of -interest is +. + +To open ranges of TCP ports: + + +networking.firewall.allowedTCPPortRanges = [ + { from = 4000; to = 4007; } + { from = 8000; to = 8010; } +]; + + +Similarly, UDP port ranges can be opened through +. + +Also of interest is networking.firewall.allowPing = true; diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index fc6082ce3afd..9c2c59006f15 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -115,13 +115,14 @@ hardware.opengl.driSupport32Bit = true; Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: -services.xserver.synaptics.enable = true; +services.xserver.libinput.enable = true; The driver has many options (see ). For -instance, the following enables two-finger scrolling: +instance, the following disables tap-to-click behavior: -services.xserver.synaptics.twoFingerScroll = true; +services.xserver.libinput.tapping = false; +Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. @@ -129,7 +130,7 @@ services.xserver.synaptics.twoFingerScroll = true; GTK/Qt themes GTK themes can be installed either to user profile or system-wide (via -system.environmentPackages). To make Qt 5 applications look similar +environment.systemPackages). To make Qt 5 applications look similar to GTK2 ones, you can install qt5.qtbase.gtk package into your system environment. It should work for all Qt 5 library versions. diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index be793152f9ef..ed718c89eb77 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -22,6 +22,15 @@ options = { }; +The attribute names within the name +attribute path must be camel cased in general but should, as an +exception, match the + +package attribute name when referencing a Nixpkgs package. For +example, the option services.nix-serve.bindAddress +references the nix-serve Nixpkgs package. + The function mkOption accepts the following arguments. diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 83dcf0232d9d..ec940d5d2b86 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -110,6 +110,12 @@ A string. Multiple definitions are concatenated with a collon ":". + + types.strMatching + A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is processed using + builtins.match. +
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 7b25a39e83b8..a8f6aa00858e 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -272,8 +272,37 @@ startAll; + + systemctl + + Runs systemctl commands with optional support for + systemctl --user + + + $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager` + $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` + + + + + + + To test user units declared by systemd.user.services the optional $user + argument can be used: + + + $machine->start; + $machine->waitForX; + $machine->waitForUnit("xautolock.service", "x-session-user"); + + + This applies to systemctl, getUnitInfo, + waitForUnit, startJob + and stopJob. + +
diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml deleted file mode 100644 index 0d3eaa8bb1fb..000000000000 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ /dev/null @@ -1,48 +0,0 @@ -
- -UEFI Installation - -NixOS can also be installed on UEFI systems. The procedure -is by and large the same as a BIOS installation, with the following -changes: - - - - 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. - - - Instead of fdisk, you should use - gdisk to partition your disks. You will need to - have a separate partition for /boot with - partition code EF00, and it should be formatted as a - vfat filesystem. - - - Instead of , - you must set to - true. nixos-generate-config - should do this automatically for new configurations when booted in - UEFI mode. - - - After having mounted your installation partition to - /mnt, you must mount the boot partition - to /mnt/boot. - - - You may want to look at the options starting with - and - as well. - - - - -
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 31d51816e39b..122a4745f194 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -11,10 +11,24 @@ 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 the correct drive; you can use the lsblk command to get a list of -block devices. If you're on macOS you can run diskutil list -to see the list of devices; the device you'll use for the USB must be ejected -before writing the image. +block devices. +On macOS: + +$ diskutil list +[..] +/dev/diskN (external, physical): + #: TYPE NAME SIZE IDENTIFIER +[..] +$ diskutil unmountDisk diskN +Unmount of all volumes on diskN was successful +$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN + +Using the 'raw' rdiskN device instead of diskN +completes in minutes instead of hours. After dd completes, a GUI +dialog "The disk you inserted was not readable by this computer" will pop up, which +can be ignored. + 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 diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index b0674307a563..ab9108c30a71 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -6,9 +6,18 @@ 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. + 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). @@ -50,7 +59,31 @@ For partitioning: - fdisk. + 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) For initialising Ext4 partitions: mkfs.ext4. It is recommended that you assign a @@ -67,7 +100,25 @@ For creating swap partitions: mkswap. Again it’s recommended to assign a label to the swap partition: . + label. For example: + + +# mkswap -L swap /dev/sda2 + + + + + + UEFI systems + For creating boot partitions: + mkfs.fat. Again it’s recommended to assign a + label to the boot partition: . For example: + + +# mkfs.fat -F 32 -L boot /dev/sda3 + + For creating LVM volumes, the LVM commands, e.g., @@ -95,11 +146,27 @@ + + + UEFI systems + Mount the boot file system on /mnt/boot, e.g. + + +# 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. + RAM, depending on your configuration. + + +# swapon /dev/sda2 + + @@ -135,10 +202,25 @@ install Emacs by running nix-env -i emacs. - You must set the option + + + 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. + 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 @@ -247,10 +329,34 @@ drive (here /dev/sda). 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) # mkfs.ext4 -L nixos /dev/sda1 # mkswap -L swap /dev/sda2 # swapon /dev/sda2 +# mkfs.fat -F 32 -L boot /dev/sda3 # (for UEFI systems only) # mount /dev/disk/by-label/nixos /mnt +# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) # nixos-generate-config --root /mnt # nano /mnt/etc/nixos/configuration.nix # nixos-install @@ -267,7 +373,8 @@ drive (here /dev/sda). (for BIOS systems only) + boot.loader.systemd-boot.enable = true; # (for UEFI systems only) # Note: setting fileSystems is generally not # necessary, since nixos-generate-config figures them out @@ -279,7 +386,6 @@ drive (here /dev/sda). - diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 20a4838be880..9b2b474c60ce 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -12,11 +12,10 @@ download page. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. -Unetbootin is recommended and the process is described in brief below. -Note that systems which use UEFI require some additional manual steps. -If you run into difficulty a number of alternative methods are presented -in the NixOS + describes the preferred method +to prepare a USB stick. +A number of alternative methods are presented in the NixOS Wiki. As an alternative to installing NixOS yourself, you can get a diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml index 36f67ed88b0b..137caf14cba2 100644 --- a/nixos/doc/manual/release-notes/rl-1404.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -13,7 +13,7 @@ the following highlights: Installation on UEFI systems is now supported. See - for + for details. Systemd has been updated to version 212, which has diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index b0e29182127e..12ff2e39a1bf 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -20,6 +20,22 @@ has the following highlights: + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes + have been made to the infrastructure involved: + + + + libmysql has been deprecated, please use mysql.connector-c + instead, a compatibility passthru has been added to the MySQL packages. + + + + + The mysql57 package has a new static output containing + the static libraries including libmysqld.a + + + @@ -95,6 +111,34 @@ following incompatible changes: here. + + + cc-wrapperhas been split in two; there is now also a bintools-wrapper. + The most commonly used files in nix-support are now split between the two wrappers. + Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper. + Other more obscure ones are just moved. + + + + + The propagation logic has been changed. + The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. + + The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. + In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs. + Thankfully, that was and is the least used type of dependency. + Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated. + Other types dependencies should be unaffected. + + + + + The memcached service no longer accept dynamic socket + paths via . Unix sockets can be + still enabled by and + will be accessible at /run/memcached/memcached.sock. + +
@@ -131,6 +175,72 @@ following incompatible changes: must be set to true. + + + The option is now 127.0.0.1 by default. + Previously the default behaviour was to listen on all interfaces. + + + + + services.btrfs.autoScrub has been added, to + periodically check btrfs filesystems for data corruption. + If there's a correct copy available, it will automatically repair + corrupted blocks. + + + + + displayManager.lightdm.greeters.gtk.clock-format. + has been added, the clock format string (as expected by + strftime, e.g. %H:%M) to use with the lightdm + gtk greeter panel. + + + If set to null the default clock format is used. + + + + + displayManager.lightdm.greeters.gtk.indicators + has been added, a list of allowed indicator modules to use with + the lightdm gtk greeter panel. + + + Built-in indicators include ~a11y, + ~language, ~session, + ~power, ~clock, + ~host, ~spacer. Unity + indicators can be represented by short name + (e.g. sound, power), + service file name, or absolute path. + + + If set to null the default indicators are + used. + + + In order to have the previous default configuration add + + services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ + "~host" "~spacer" + "~clock" "~spacer" + "~session" + "~language" + "~a11y" + "~power" + ]; + + to your configuration.nix. + + + + + The NixOS test driver supports user services declared by systemd.user.services. + The methods waitForUnit, getUnitInfo, startJob + and stopJob provide an optional $user argument for that purpose. + + diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index bf25e0cab259..636d0223fb77 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -129,6 +129,9 @@ let format' = format; in let # TODO: Nix really likes to chown things it creates to its current user... fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure + # fakeroot seems to always give the owner write permissions, which we do not want + find $root/nix/store -mindepth 1 -maxdepth 1 -type f -o -type d | xargs chmod -R a-w + echo "copying staging root to image..." cptofs ${optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* / ''; @@ -150,8 +153,6 @@ in pkgs.vmTools.runInLinuxVM ( } '' ${if partitioned then '' - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR rootDisk=/dev/vda1 '' else '' rootDisk=/dev/vda diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index f06649e1991a..21c69ed560a3 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -10,7 +10,7 @@ pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - buildInputs = with pkgs; [e2fsprogs libfaketime perl]; + nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; # For obtaining the closure of `storePaths'. exportReferencesGraph = diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 4100af27becb..9d47a3222cc2 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "squashfs.img"; - buildInputs = [perl squashfsTools]; + nativeBuildInputs = [perl squashfsTools]; # For obtaining the closure of `storeContents'. exportReferencesGraph = @@ -19,6 +19,33 @@ stdenv.mkDerivation { # Add the closures of the top-level store objects. storePaths=$(perl ${pathsFromGraph} closure-*) + # If a Hydra slave happens to have store paths with bad permissions/mtime, + # abort now so that they don't end up in ISO images in the channel. + # https://github.com/NixOS/nixpkgs/issues/32242 + hasBadPaths="" + for path in $storePaths; do + if [ -h "$path" ]; then + continue + fi + + mtime=$(stat -c %Y "$path") + mode=$(stat -c %a "$path") + + if [ "$mtime" != 1 ]; then + echo "Store path '$path' has an invalid mtime." + hasBadPaths=1 + fi + if [ "$mode" != 444 ] && [ "$mode" != 555 ]; then + echo "Store path '$path' has invalid permissions ($mode)." + hasBadPaths=1 + fi + done + + if [ -n "$hasBadPaths" ]; then + echo "You have bad paths in your store, please fix them." + exit 1 + fi + # Also include a manifest of the closures in a format suitable # for nix-store --load-db. printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index a01c3c336a1b..78598b3efb4b 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -362,8 +362,8 @@ sub mustFail { sub getUnitInfo { - my ($self, $unit) = @_; - my ($status, $lines) = $self->execute("systemctl --no-pager show '$unit'"); + my ($self, $unit, $user) = @_; + my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user); return undef if $status != 0; my $info = {}; foreach my $line (split '\n', $lines) { @@ -373,6 +373,16 @@ sub getUnitInfo { return $info; } +sub systemctl { + my ($self, $q, $user) = @_; + if ($user) { + $q =~ s/'/\\'/g; + return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'"); + } + + return $self->execute("systemctl $q"); +} + # Fail if the given systemd unit is not in the "active" state. sub requireActiveUnit { my ($self, $unit) = @_; @@ -387,16 +397,16 @@ sub requireActiveUnit { # Wait for a systemd unit to reach the "active" state. sub waitForUnit { - my ($self, $unit) = @_; + my ($self, $unit, $user) = @_; $self->nest("waiting for unit ‘$unit’", sub { retry sub { - my $info = $self->getUnitInfo($unit); + my $info = $self->getUnitInfo($unit, $user); my $state = $info->{ActiveState}; die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed"; if ($state eq "inactive") { # If there are no pending jobs, then assume this unit # will never reach active state. - my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1"); + my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user); if ($jobs =~ /No jobs/) { # FIXME: fragile # Handle the case where the unit may have started # between the previous getUnitInfo() and @@ -430,14 +440,14 @@ sub waitForFile { } sub startJob { - my ($self, $jobName) = @_; - $self->execute("systemctl start $jobName"); + my ($self, $jobName, $user) = @_; + $self->systemctl("start $jobName", $user); # FIXME: check result } sub stopJob { - my ($self, $jobName) = @_; - $self->execute("systemctl stop $jobName"); + my ($self, $jobName, $user) = @_; + $self->systemctl("stop $jobName", $user); } diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index dfc0f8d11465..347e6b9c6e0d 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -18,7 +18,7 @@ rm -f ec2-amis.nix types="hvm" stores="ebs" -regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" +regions="eu-west-1 eu-west-2 eu-west-3 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" for type in $types; do link=$stateDir/$type diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 619f36cd5150..4101ef82f3e1 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -290,8 +290,8 @@ in ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd ''} - # Make sure resolv.conf is up to date if not managed by systemd - ${optionalString (!config.services.resolved.enable) '' + # Make sure resolv.conf is up to date if not managed manually or by systemd + ${optionalString (!config.environment.etc?"resolv.conf") '' ${pkgs.openresolv}/bin/resolvconf -u ''} ''; diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index ae3e17ac27b6..e1c4d0d602af 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -35,7 +35,7 @@ with lib; networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; - pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; }; + pinentry = pkgs.pinentry_ncurses; }; }; } diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 0f6046339b37..52239b619126 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -18,17 +18,17 @@ with lib; }; - config = { - - boot.loader.grub.version = 2; - + config = rec { # Don't build the GRUB menu builder script, since we don't need it # 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_efi ] + ++ (if pkgs.stdenv.system == "aarch64-linux" + then [] + else [ pkgs.grub2 pkgs.syslinux ]); + system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget; fileSystems."/" = { fsType = "tmpfs"; @@ -84,7 +84,12 @@ with lib; ]; }; - system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" "#!ipxe\nkernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}\ninitrd initrd\nboot"; + system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" '' + #!ipxe + kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + initrd initrd + boot + ''; boot.loader.timeout = 10; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 321fb9a2030a..131c779b1ab1 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,6 @@ { - x86_64-linux = "/nix/store/b4s1gxiis1ryvybnjhdjvgc5sr1nq0ys-nix-1.11.15"; - i686-linux = "/nix/store/kgb5hs7qw13bvb6icramv1ry9dard3h9-nix-1.11.15"; - x86_64-darwin = "/nix/store/dgwz3dxdzs2wwd7pg7cdhvl8rv0qpnbj-nix-1.11.15"; + x86_64-linux = "/nix/store/gy4yv67gv3j6in0lalw37j353zdmfcwm-nix-1.11.16"; + i686-linux = "/nix/store/ifmyq5ryfxhhrzh62hiq65xyz1fwffga-nix-1.11.16"; + aarch64-linux = "/nix/store/y9mfv3sx75mbfibf1zna1kq9v98fk2nb-nix-1.11.16"; + x86_64-darwin = "/nix/store/hwpp7kia2f0in5ns2hiw41q38k30jpj2-nix-1.11.16"; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c10b5a0ec932..c6440dd906fd 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -65,7 +65,7 @@ foldingathome = 37; sabnzbd = 38; #kdm = 39; # dropped in 17.03 - ghostone = 40; + #ghostone = 40; # dropped in 18.03 git = 41; fourstore = 42; fourstorehttp = 43; @@ -197,10 +197,10 @@ #input = 174; # unused sddm = 175; tss = 176; - memcached = 177; + #memcached = 177; removed 2018-01-03 ntp = 179; zabbix = 180; - redis = 181; + #redis = 181; removed 2018-01-03 unifi = 183; uptimed = 184; zope2 = 185; @@ -281,8 +281,8 @@ stanchion = 262; riak-cs = 263; infinoted = 264; - keystone = 265; - glance = 266; + # keystone = 265; # unused, removed 2017-12-13 + # glance = 266; # unused, removed 2017-12-13 couchpotato = 267; gogs = 268; pdns-recursor = 269; @@ -348,7 +348,7 @@ #foldingathome = 37; # unused #sabnzd = 38; # unused #kdm = 39; # unused, even before 17.03 - ghostone = 40; + #ghostone = 40; # dropped in 18.03 git = 41; fourstore = 42; fourstorehttp = 43; @@ -475,10 +475,10 @@ input = 174; sddm = 175; tss = 176; - #memcached = 177; # unused + #memcached = 177; # unused, removed 2018-01-03 #ntp = 179; # unused #zabbix = 180; # unused - #redis = 181; # unused + #redis = 181; # unused, removed 2018-01-03 #unifi = 183; # unused #uptimed = 184; # unused #zope2 = 185; # unused @@ -551,8 +551,8 @@ stanchion = 262; riak-cs = 263; infinoted = 264; - keystone = 265; - glance = 266; + # keystone = 265; # unused, removed 2017-12-13 + # glance = 266; # unused, removed 2017-12-13 couchpotato = 267; gogs = 268; kresd = 270; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5e2161aacb66..8d329b5b4b25 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -71,6 +71,7 @@ ./programs/bcc.nix ./programs/blcr.nix ./programs/browserpass.nix + ./programs/ccache.nix ./programs/cdemu.nix ./programs/chromium.nix ./programs/command-not-found/command-not-found.nix @@ -91,6 +92,7 @@ ./programs/npm.nix ./programs/oblogout.nix ./programs/qt5ct.nix + ./programs/rootston.nix ./programs/screen.nix ./programs/slock.nix ./programs/shadow.nix @@ -104,6 +106,7 @@ ./programs/tmux.nix ./programs/venus.nix ./programs/vim.nix + ./programs/way-cooler.nix ./programs/wireshark.nix ./programs/xfs_quota.nix ./programs/xonsh.nix @@ -217,7 +220,6 @@ ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix - ./services/games/ghost-one.nix ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/games/terraria.nix @@ -239,9 +241,11 @@ ./services/hardware/tlp.nix ./services/hardware/thinkfan.nix ./services/hardware/trezord.nix + ./services/hardware/u2f.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix ./services/hardware/upower.nix + ./services/hardware/usbmuxd.nix ./services/hardware/thermald.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix @@ -257,6 +261,8 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix + ./services/mail/clamsmtp.nix + ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix @@ -328,6 +334,7 @@ ./services/misc/nix-ssh-serve.nix ./services/misc/nzbget.nix ./services/misc/octoprint.nix + ./services/misc/osrm.nix ./services/misc/packagekit.nix ./services/misc/parsoid.nix ./services/misc/phd.nix @@ -352,6 +359,7 @@ ./services/misc/taskserver ./services/misc/tzupdate.nix ./services/misc/uhub.nix + ./services/misc/xmr-stak.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix ./services/monitoring/arbtt.nix @@ -398,7 +406,9 @@ ./services/monitoring/vnstat.nix ./services/monitoring/zabbix-agent.nix ./services/monitoring/zabbix-server.nix + ./services/network-filesystems/beegfs.nix ./services/network-filesystems/cachefilesd.nix + ./services/network-filesystems/davfs2.nix ./services/network-filesystems/drbd.nix ./services/network-filesystems/glusterfs.nix ./services/network-filesystems/kbfs.nix @@ -588,6 +598,7 @@ ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix + ./services/system/localtime.nix ./services/system/kerberos.nix ./services/system/nscd.nix ./services/system/saslauthd.nix @@ -671,6 +682,7 @@ ./system/activation/top-level.nix ./system/boot/coredump.nix ./system/boot/emergency-mode.nix + ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix ./system/boot/initrd-ssh.nix ./system/boot/kernel.nix @@ -737,6 +749,7 @@ ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix + ./virtualisation/hyperv-guest.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/rkt.nix @@ -745,6 +758,4 @@ ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix - ./virtualisation/openstack/keystone.nix - ./virtualisation/openstack/glance.nix ] diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 3c7e516c497f..f56640f19782 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -19,13 +19,12 @@ "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4" "sata_uli" "sata_via" "sata_vsc" - "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" - "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar" + "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar" "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3" "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell" "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix" "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000" - "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis" + "pata_serverworks" "pata_sil680" "pata_sis" "pata_sl82c105" "pata_triflex" "pata_via" "pata_winbond" diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index ef1acdfe66e6..1abdb4973a44 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -14,13 +14,16 @@ let bashCompletion = optionalString cfg.enableCompletion '' # Check whether we're running a version of Bash that has support for # programmable completion. If we do, enable all modules installed in - # the system (and user profile). + # the system and user profile in obsolete /etc/bash_completion.d/ + # directories. Bash loads completions in all + # $XDG_DATA_DIRS/share/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" nullglobStatus=$(shopt -p nullglob) shopt -s nullglob for p in $NIX_PROFILES; do - for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do + for m in "$p/etc/bash_completion.d/"*; do . $m done done diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix new file mode 100644 index 000000000000..874774c72b47 --- /dev/null +++ b/nixos/modules/programs/ccache.nix @@ -0,0 +1,83 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.programs.ccache; +in { + options.programs.ccache = { + # host configuration + enable = mkEnableOption "CCache"; + cacheDir = mkOption { + type = types.path; + description = "CCache directory"; + default = "/var/cache/ccache"; + }; + # target configuration + packageNames = mkOption { + type = types.listOf types.str; + description = "Nix top-level packages to be compiled using CCache"; + default = []; + example = [ "wxGTK30" "qt48" "ffmpeg_3_3" "libav_all" ]; + }; + }; + + config = mkMerge [ + # host configuration + (mkIf cfg.enable { + systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 root nixbld -" ]; + + # "nix-ccache --show-stats" and "nix-ccache --clear" + security.wrappers.nix-ccache = { + group = "nixbld"; + setgid = true; + source = pkgs.writeScript "nix-ccache.pl" '' + #!${pkgs.perl}/bin/perl + + %ENV=( CCACHE_DIR => '${cfg.cacheDir}' ); + sub untaint { + my $v = shift; + return '-C' if $v eq '-C' || $v eq '--clear'; + return '-V' if $v eq '-V' || $v eq '--version'; + return '-s' if $v eq '-s' || $v eq '--show-stats'; + return '-z' if $v eq '-z' || $v eq '--zero-stats'; + exec('${pkgs.ccache}/bin/ccache', '-h'); + } + exec('${pkgs.ccache}/bin/ccache', map { untaint $_ } @ARGV); + ''; + }; + }) + + # target configuration + (mkIf (cfg.packageNames != []) { + nixpkgs.overlays = [ + (self: super: genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; })) + + (self: super: { + ccacheWrapper = super.ccacheWrapper.override { + extraConfig = '' + export CCACHE_COMPRESS=1 + export CCACHE_DIR="${cfg.cacheDir}" + export CCACHE_UMASK=007 + if [ ! -d "$CCACHE_DIR" ]; then + echo "=====" + echo "Directory '$CCACHE_DIR' does not exist" + echo "Please create it with:" + echo " sudo mkdir -m0770 '$CCACHE_DIR'" + echo " sudo chown root:nixbld '$CCACHE_DIR'" + echo "=====" + exit 1 + fi + if [ ! -w "$CCACHE_DIR" ]; then + echo "=====" + echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)" + echo "Please verify its access permissions" + echo "=====" + exit 1 + fi + ''; + }; + }) + ]; + }) + ]; +} \ No newline at end of file diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 1b7e20799819..27bfdf022e7d 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -1,7 +1,8 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: + +with lib; let - inherit (lib) mkOption mkIf types mapAttrsToList; cfg = config.programs.dconf; mkDconfProfile = name: path: @@ -13,6 +14,7 @@ in options = { programs.dconf = { + enable = mkEnableOption "dconf"; profiles = mkOption { type = types.attrsOf types.path; @@ -26,9 +28,15 @@ in ###### implementation - config = mkIf (cfg.profiles != {}) { - environment.etc = + config = mkIf (cfg.profiles != {} || cfg.enable) { + environment.etc = optionals (cfg.profiles != {}) (mapAttrsToList mkDconfProfile cfg.profiles); + + environment.variables.GIO_EXTRA_MODULES = optional cfg.enable + "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; + # https://github.com/NixOS/nixpkgs/pull/31891 + #environment.variables.XDG_DATA_DIRS = optional cfg.enable + # "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; }; } diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix new file mode 100644 index 000000000000..1946b1db657b --- /dev/null +++ b/nixos/modules/programs/rootston.nix @@ -0,0 +1,103 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.rootston; + + rootstonWrapped = pkgs.writeScriptBin "rootston" '' + #! ${pkgs.stdenv.shell} + 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/sway.nix b/nixos/modules/programs/sway.nix index 5d13b90daace..d9503d6004ff 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -4,36 +4,42 @@ with lib; let cfg = config.programs.sway; - sway = pkgs.sway; + swayPackage = pkgs.sway; - swayWrapped = pkgs.writeScriptBin "sway" '' - #! ${pkgs.stdenv.shell} - if [ "$1" != "" ]; then - sway-setcap "$@" - exit + swayWrapped = pkgs.writeShellScriptBin "sway" '' + if [[ "$#" -ge 1 ]]; then + exec sway-setcap "$@" + else + ${cfg.extraSessionCommands} + exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap fi - ${cfg.extraSessionCommands} - exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap ''; swayJoined = pkgs.symlinkJoin { - name = "sway-wrapped"; - paths = [ swayWrapped sway ]; + name = "sway-joined"; + paths = [ swayWrapped swayPackage ]; }; -in -{ +in { options.programs.sway = { - enable = mkEnableOption "sway"; + enable = mkEnableOption '' + the tiling Wayland compositor Sway. After adding yourself to the "sway" + group you can manually launch Sway by executing "sway" from a terminal. + If you call "sway" with any parameters the extraSessionCommands won't be + executed and Sway won't be launched with dbus-launch''; extraSessionCommands = mkOption { - default = ""; - type = types.lines; + type = types.lines; + default = ""; example = '' - export XKB_DEFAULT_LAYOUT=us,de - export XKB_DEFAULT_VARIANT=,nodeadkeys - export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle, + # 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 + # Change the Keyboard repeat delay and rate + export WLC_REPEAT_DELAY=660 + export WLC_REPEAT_RATE=25 ''; description = '' - Shell commands executed just before sway is started. + Shell commands executed just before Sway is started. ''; }; @@ -42,9 +48,12 @@ in default = with pkgs; [ i3status xwayland rxvt_unicode dmenu ]; + defaultText = literalExample '' + with pkgs; [ i3status xwayland rxvt_unicode dmenu ]; + ''; example = literalExample '' with pkgs; [ - i3status xwayland rxvt_unicode dmenu + i3lock light termite ] ''; description = '' @@ -57,7 +66,7 @@ in environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; security.wrappers.sway = { program = "sway-setcap"; - source = "${sway}/bin/sway"; + source = "${swayPackage}/bin/sway"; capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; owner = "root"; group = "sway"; @@ -65,8 +74,12 @@ in }; users.extraGroups.sway = {}; + 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 ]; } diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index ed1d88a420a2..1eb6fa6bf2fa 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -151,6 +151,15 @@ in { type = types.str; description = "Set the $TERM variable."; }; + + secureSocket = mkOption { + default = true; + type = types.bool; + description = '' + Store tmux socket under /run, which is more secure than /tmp, but as a + downside it doesn't survive user logout. + ''; + }; }; }; @@ -163,7 +172,7 @@ in { systemPackages = [ pkgs.tmux ]; variables = { - TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}''; + TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}''; }; }; }; diff --git a/nixos/modules/programs/way-cooler.nix b/nixos/modules/programs/way-cooler.nix new file mode 100644 index 000000000000..633e959be9f3 --- /dev/null +++ b/nixos/modules/programs/way-cooler.nix @@ -0,0 +1,78 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.way-cooler; + way-cooler = pkgs.way-cooler; + + wcWrapped = pkgs.writeShellScriptBin "way-cooler" '' + ${cfg.extraSessionCommands} + exec ${pkgs.dbus.dbus-launch} --exit-with-session ${way-cooler}/bin/way-cooler + ''; + wcJoined = pkgs.symlinkJoin { + name = "way-cooler-wrapped"; + paths = [ wcWrapped way-cooler ]; + }; + configFile = readFile "${way-cooler}/etc/way-cooler/init.lua"; + spawnBar = '' + util.program.spawn_at_startup("lemonbar"); + ''; +in +{ + options.programs.way-cooler = { + enable = mkEnableOption "way-cooler"; + + extraSessionCommands = mkOption { + default = ""; + type = types.lines; + example = '' + export XKB_DEFAULT_LAYOUT=us,de + export XKB_DEFAULT_VARIANT=,nodeadkeys + export XKB_DEFAULT_OPTIONS=grp:caps_toggle, + ''; + description = '' + Shell commands executed just before way-cooler is started. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ + westonLite xwayland dmenu + ]; + example = literalExample '' + with pkgs; [ + westonLite xwayland dmenu + ] + ''; + description = '' + Extra packages to be installed system wide. + ''; + }; + + enableBar = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable an unofficial bar. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ wcJoined ] ++ cfg.extraPackages; + + security.pam.services.wc-lock = {}; + environment.etc."way-cooler/init.lua".text = '' + ${configFile} + ${optionalString cfg.enableBar spawnBar} + ''; + + hardware.opengl.enable = mkDefault true; + fonts.enableDefaultFonts = mkDefault true; + programs.dconf.enable = mkDefault true; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index eb10d4f428be..562be13a3f64 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -82,6 +82,10 @@ with lib; (mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]) (mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]) + # libvirtd + (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ] + "Set the option `virtualisation.libvirtd.qemuPackage' instead.") + # Tarsnap (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]) @@ -182,6 +186,9 @@ with lib; (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ]) (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + # Profile splitting + (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 2d6713311a45..3fff9e78aa19 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -223,6 +223,17 @@ let ''; }; + enableGnomeKeyring = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, pam_gnome_keyring will attempt to automatically unlock the + user's default Gnome keyring upon login. If the user login password does + not match their keyring password, Gnome Keyring will prompt separately + after login. + ''; + }; + text = mkOption { type = types.nullOr types.lines; description = "Contents of the PAM service file."; @@ -273,7 +284,7 @@ let # prompts the user for password so we run it once with 'required' at an # earlier point and it will run again with 'sufficient' further down. # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) '' + (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet || cfg.enableGnomeKeyring)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -282,6 +293,8 @@ let ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + ${optionalString cfg.enableGnomeKeyring + ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} @@ -351,6 +364,10 @@ let ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + ${optionalString (cfg.enableGnomeKeyring) + "session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"} + ${optionalString (config.virtualisation.lxc.lxcfs.enable) + "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} ''); }; @@ -519,7 +536,6 @@ in ftp = {}; i3lock = {}; i3lock-color = {}; - swaylock = {}; screen = {}; vlock = {}; xlock = {}; diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 1f64213accd4..77e4b2a616d8 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -17,7 +17,7 @@ let hardeningEnable = [ "pie" ]; installPhase = '' mkdir -p $out/bin - gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ + $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper ''; }; @@ -79,7 +79,7 @@ let ({ owner = "root"; group = "root"; } // s) - else if + else if (s ? "setuid" && s.setuid) || (s ? "setgid" && s.setgid) || (s ? "permissions") diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index c0a0f0374294..52613d450b51 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -4,17 +4,22 @@ with pkgs; with lib; let - uid = config.ids.uids.mopidy; gid = config.ids.gids.mopidy; cfg = config.services.mopidy; mopidyConf = writeText "mopidy.conf" cfg.configuration; - mopidyEnv = python.buildEnv.override { - extraLibs = [ mopidy ] ++ cfg.extensionPackages; + mopidyEnv = buildEnv { + name = "mopidy-with-extensions-${mopidy.version}"; + paths = closePropagation cfg.extensionPackages; + pathsToLink = [ "/${python.sitePackages}" ]; + buildInputs = [ makeWrapper ]; + postBuild = '' + makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \ + --prefix PYTHONPATH : $out/${python.sitePackages} + ''; }; - in { options = { @@ -61,7 +66,6 @@ in { }; - ###### implementation config = mkIf cfg.enable { diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 7c9dedb67ad2..59e9d122fb50 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -115,7 +115,7 @@ in description = '' Print global archive statistics upon completion. The output is available via - systemctl status tarsnap@archive-name. + systemctl status tarsnap-archive-name. ''; }; diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index baf99930e3eb..762bb4b38675 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -1,39 +1,372 @@ { config, lib, pkgs, ... }: with lib; +with types; let + + # Converts a plan like + # { "1d" = "1h"; "1w" = "1d"; } + # into + # "1d=>1h,1w=>1d" + attrToPlan = attrs: concatStringsSep "," (builtins.attrValues ( + mapAttrs (n: v: "${n}=>${v}") attrs)); + + planDescription = '' + The znapzend backup plan to use for the source. + + + The plan specifies how often to backup and for how long to keep the + backups. It consists of a series of retention periodes to interval + associations: + + + + retA=>intA,retB=>intB,... + + + + Both intervals and retention periods are expressed in standard units + of time or multiples of them. You can use both the full name or a + shortcut according to the following listing: + + + + second|sec|s, minute|min, hour|h, day|d, week|w, month|mon|m, year|y + + + + See znapzendzetup1 for more info. + ''; + planExample = "1h=>10min,1d=>1h,1w=>1d,1m=>1w,1y=>1m"; + + # A type for a string of the form number{b|k|M|G} + mbufferSizeType = str // { + check = x: str.check x && builtins.isList (builtins.match "^[0-9]+[bkMG]$" x); + description = "string of the form number{b|k|M|G}"; + }; + + # Type for a string that must contain certain other strings (the list parameter). + # Note that these would need regex escaping. + stringContainingStrings = list: let + matching = s: map (str: builtins.match ".*${str}.*" s) list; + in str // { + check = x: str.check x && all isList (matching x); + description = "string containing all of the characters ${concatStringsSep ", " list}"; + }; + + timestampType = stringContainingStrings [ "%Y" "%m" "%d" "%H" "%M" "%S" ]; + + destType = srcConfig: submodule ({ name, ... }: { + options = { + + label = mkOption { + type = str; + description = "Label for this destination. Defaults to the attribute name."; + }; + + plan = mkOption { + type = str; + description = planDescription; + example = planExample; + }; + + dataset = mkOption { + type = str; + description = "Dataset name to send snapshots to."; + example = "tank/main"; + }; + + host = mkOption { + type = nullOr str; + description = '' + Host to use for the destination dataset. Can be prefixed with + user@ to specify the ssh user. + ''; + default = null; + example = "john@example.com"; + }; + + presend = mkOption { + type = nullOr str; + description = '' + Command to run before sending the snapshot to the destination. + Intended to run a remote script via ssh on the + destination, e.g. to bring up a backup disk or server or to put a + zpool online/offline. See also . + ''; + default = null; + example = "ssh root@bserv zpool import -Nf tank"; + }; + + postsend = mkOption { + type = nullOr str; + description = '' + Command to run after sending the snapshot to the destination. + Intended to run a remote script via ssh on the + destination, e.g. to bring up a backup disk or server or to put a + zpool online/offline. See also . + ''; + default = null; + example = "ssh root@bserv zpool export tank"; + }; + }; + + config = { + label = mkDefault name; + plan = mkDefault srcConfig.plan; + }; + }); + + + + srcType = submodule ({ name, config, ... }: { + options = { + + enable = mkOption { + type = bool; + description = "Whether to enable this source."; + default = true; + }; + + recursive = mkOption { + type = bool; + description = "Whether to do recursive snapshots."; + default = false; + }; + + mbuffer = { + enable = mkOption { + type = bool; + description = "Whether to use mbuffer."; + default = false; + }; + + port = mkOption { + type = nullOr ints.u16; + description = '' + Port to use for mbuffer. + + + If this is null, it will run mbuffer through + ssh. + + + If this is not null, it will run mbuffer + directly through TCP, which is not encrypted but faster. In that + case the given port needs to be open on the destination host. + ''; + default = null; + }; + + size = mkOption { + type = mbufferSizeType; + description = '' + The size for mbuffer. + Supports the units b, k, M, G. + ''; + default = "1G"; + example = "128M"; + }; + }; + + presnap = mkOption { + type = nullOr str; + description = '' + Command to run before snapshots are taken on the source dataset, + e.g. for database locking/flushing. See also + . + ''; + default = null; + example = literalExample '' + ''${pkgs.mariadb}/bin/mysql -e "set autocommit=0;flush tables with read lock;\\! ''${pkgs.coreutils}/bin/sleep 600" & ''${pkgs.coreutils}/bin/echo $! > /tmp/mariadblock.pid ; sleep 10 + ''; + }; + + postsnap = mkOption { + type = nullOr str; + description = '' + Command to run after snapshots are taken on the source dataset, + e.g. for database unlocking. See also . + ''; + default = null; + example = literalExample '' + ''${pkgs.coreutils}/bin/kill `''${pkgs.coreutils}/bin/cat /tmp/mariadblock.pid`;''${pkgs.coreutils}/bin/rm /tmp/mariadblock.pid + ''; + }; + + timestampFormat = mkOption { + type = timestampType; + description = '' + The timestamp format to use for constructing snapshot names. + The syntax is strftime-like. The string must + consist of the mandatory %Y %m %d %H %M %S. + Optionally - _ . : characters as well as any + alphanumeric character are allowed. If suffixed by a + Z, times will be in UTC. + ''; + default = "%Y-%m-%d-%H%M%S"; + example = "znapzend-%m.%d.%Y-%H%M%SZ"; + }; + + sendDelay = mkOption { + type = int; + description = '' + Specify delay (in seconds) before sending snaps to the destination. + May be useful if you want to control sending time. + ''; + default = 0; + example = 60; + }; + + plan = mkOption { + type = str; + description = planDescription; + example = planExample; + }; + + dataset = mkOption { + type = str; + description = "The dataset to use for this source."; + example = "tank/home"; + }; + + destinations = mkOption { + type = loaOf (destType config); + description = "Additional destinations."; + default = {}; + example = literalExample '' + { + local = { + dataset = "btank/backup"; + presend = "zpool import -N btank"; + postsend = "zpool export btank"; + }; + remote = { + host = "john@example.com"; + dataset = "tank/john"; + }; + }; + ''; + }; + }; + + config = { + dataset = mkDefault name; + }; + + }); + + ### Generating the configuration from here + cfg = config.services.znapzend; + + onOff = b: if b then "on" else "off"; + nullOff = b: if isNull b then "off" else toString b; + stripSlashes = replaceStrings [ "/" ] [ "." ]; + + attrsToFile = config: concatStringsSep "\n" (builtins.attrValues ( + mapAttrs (n: v: "${n}=${v}") config)); + + mkDestAttrs = dst: with dst; + mapAttrs' (n: v: nameValuePair "dst_${label}${n}" v) ({ + "" = optionalString (! isNull host) "${host}:" + dataset; + _plan = plan; + } // optionalAttrs (presend != null) { + _precmd = presend; + } // optionalAttrs (postsend != null) { + _pstcmd = postsend; + }); + + mkSrcAttrs = srcCfg: with srcCfg; { + enabled = onOff enable; + mbuffer = with mbuffer; if enable then "${pkgs.mbuffer}/bin/mbuffer" + + optionalString (port != null) ":${toString port}" else "off"; + mbuffer_size = mbuffer.size; + post_znap_cmd = nullOff postsnap; + pre_znap_cmd = nullOff presnap; + recursive = onOff recursive; + src = dataset; + src_plan = plan; + tsformat = timestampFormat; + zend_delay = toString sendDelay; + } // fold (a: b: a // b) {} ( + map mkDestAttrs (builtins.attrValues destinations) + ); + + files = mapAttrs' (n: srcCfg: let + fileText = attrsToFile (mkSrcAttrs srcCfg); + in { + name = srcCfg.dataset; + value = pkgs.writeText (stripSlashes srcCfg.dataset) fileText; + }) cfg.zetup; + in { options = { services.znapzend = { - enable = mkEnableOption "ZnapZend daemon"; + enable = mkEnableOption "ZnapZend ZFS backup daemon"; logLevel = mkOption { default = "debug"; example = "warning"; - type = lib.types.enum ["debug" "info" "warning" "err" "alert"]; - description = "The log level when logging to file. Any of debug, info, warning, err, alert. Default in daemonized form is debug."; + type = enum ["debug" "info" "warning" "err" "alert"]; + description = '' + The log level when logging to file. Any of debug, info, warning, err, + alert. Default in daemonized form is debug. + ''; }; logTo = mkOption { - type = types.str; + type = str; default = "syslog::daemon"; example = "/var/log/znapzend.log"; - description = "Where to log to (syslog::<facility> or <filepath>)."; + description = '' + Where to log to (syslog::<facility> or <filepath>). + ''; }; noDestroy = mkOption { - type = types.bool; + type = bool; default = false; description = "Does all changes to the filesystem except destroy."; }; autoCreation = mkOption { - type = types.bool; + type = bool; + default = false; + description = "Automatically create the destination dataset if it does not exists."; + }; + + zetup = mkOption { + type = loaOf srcType; + description = "Znapzend configuration."; + default = {}; + example = literalExample '' + { + "tank/home" = { + # Make snapshots of tank/home every hour, keep those for 1 day, + # keep every days snapshot for 1 month, etc. + plan = "1d=>1h,1m=>1d,1y=>1m"; + recursive = true; + # Send all those snapshots to john@example.com:rtank/john as well + destinations.remote = { + host = "john@example.com"; + dataset = "rtank/john"; + }; + }; + }; + ''; + }; + + pure = mkOption { + type = bool; + description = '' + Do not persist any stateful znapzend setups. If this option is + enabled, your previously set znapzend setups will be cleared and only + the ones defined with this module will be applied. + ''; default = false; - description = "Automatically create the dataset on dest if it does not exists."; }; }; }; @@ -49,12 +382,30 @@ in path = with pkgs; [ zfs mbuffer openssh ]; + preStart = optionalString cfg.pure '' + echo Resetting znapzend zetups + ${pkgs.znapzend}/bin/znapzendzetup list \ + | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \ + | xargs ${pkgs.znapzend}/bin/znapzendzetup delete + '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: '' + echo Importing znapzend zetup ${config} for dataset ${dataset} + ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config} + '') files); + serviceConfig = { - ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"} ${optionalString cfg.autoCreation "--autoCreation"}"; + ExecStart = let + args = concatStringsSep " " [ + "--logto=${cfg.logTo}" + "--loglevel=${cfg.logLevel}" + (optionalString cfg.noDestroy "--nodestroy") + (optionalString cfg.autoCreation "--autoCreation") + ]; in "${pkgs.znapzend}/bin/znapzend ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; }; }; }; }; + + meta.maintainers = with maintainers; [ infinisil ]; } diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index dcc5e7174601..1b0198ac93fe 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -48,6 +48,15 @@ in ''; }; + hooksPath = mkOption { + type = types.path; + default = "${pkgs.buildkite-agent}/share/hooks"; + defaultText = "${pkgs.buildkite-agent}/share/hooks"; + description = '' + Path to the directory storing the hooks. + ''; + }; + meta-data = mkOption { type = types.str; default = ""; @@ -114,8 +123,8 @@ in token="$(cat ${toString cfg.tokenPath})" name="${cfg.name}" meta-data="${cfg.meta-data}" - hooks-path="${pkgs.buildkite-agent}/share/hooks" build-path="${cfg.dataDir}/builds" + hooks-path="${cfg.hooksPath}" bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh" EOF ''; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index c6875af506d3..46bc6fc5c132 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -40,11 +40,7 @@ in description = "The port to bind to"; }; - socket = mkOption { - default = ""; - description = "Unix socket path to listen on. Setting this will disable network support"; - example = "/var/run/memcached"; - }; + enableUnixSocket = mkEnableOption "unix socket at /run/memcached/memcached.sock"; maxMemory = mkOption { default = 64; @@ -68,31 +64,40 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers.memcached = - { name = cfg.user; - uid = config.ids.uids.memcached; - description = "Memcached server user"; - }; + users.extraUsers = optional (cfg.user == "memcached") { + name = "memcached"; + description = "Memcached server user"; + }; environment.systemPackages = [ memcached ]; - systemd.services.memcached = - { description = "Memcached server"; + systemd.services.memcached = { + description = "Memcached server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - serviceConfig = { - ExecStart = - let - networking = if cfg.socket != "" - then "-s ${cfg.socket}" - else "-l ${cfg.listen} -p ${toString cfg.port}"; - in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; + serviceConfig = { + PermissionsStartOnly = true; + ExecStartPre = optionals cfg.enableUnixSocket [ + "${pkgs.coreutils}/bin/install -d -o ${cfg.user} /run/memcached/" + "${pkgs.coreutils}/bin/chown -R ${cfg.user} /run/memcached/" + ]; + ExecStart = + let + networking = if cfg.enableUnixSocket + then "-s /run/memcached/memcached.sock" + else "-l ${cfg.listen} -p ${toString cfg.port}"; + in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; - User = cfg.user; - }; + User = cfg.user; }; + }; }; + imports = [ + (mkRemovedOptionModule ["services" "memcached" "socket"] '' + This option was replaced by a fixed unix socket path at /run/memcached/memcached.sock enabled using services.memached.enableUnixSocket. + '') + ]; } diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index a3bf4f9ba925..36d5340a306f 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -7,14 +7,12 @@ let cfg = config.services.mysql; mysql = cfg.package; - - isMariaDB = + + isMariaDB = let pName = _p: (builtins.parseDrvName (_p.name)).name; in pName mysql == pName pkgs.mariadb; - atLeast55 = versionAtLeast mysql.mysqlVersion "5.5"; - pidFile = "${cfg.pidDir}/mysqld.pid"; mysqldOptions = @@ -28,13 +26,6 @@ let ${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.replication.role == "slave" && !atLeast55) - '' - master-host = ${cfg.replication.masterHost} - master-user = ${cfg.replication.masterUser} - master-password = ${cfg.replication.masterPassword} - master-port = ${toString cfg.replication.masterPort} - ''} ${optionalString (cfg.ensureUsers != []) '' plugin-load-add = auth_socket.so @@ -315,7 +306,7 @@ in fi '') cfg.initialDatabases} - ${optionalString (cfg.replication.role == "master" && atLeast55) + ${optionalString (cfg.replication.role == "master") '' # Set up the replication master @@ -326,7 +317,7 @@ in ) | ${mysql}/bin/mysql -u root -N ''} - ${optionalString (cfg.replication.role == "slave" && atLeast55) + ${optionalString (cfg.replication.role == "slave") '' # Set up the replication slave diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index a039ad138f6f..e4e38a4364a0 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -219,7 +219,6 @@ in users.extraUsers.redis = { name = cfg.user; - uid = config.ids.uids.redis; description = "Redis database user"; }; diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 55ed2d9ee21b..9e382241348b 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -28,14 +28,15 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.at-spi2-core.enable { - - environment.systemPackages = [ pkgs.at_spi2_core ]; - - services.dbus.packages = [ pkgs.at_spi2_core ]; - - systemd.packages = [ pkgs.at_spi2_core ]; - - }; + config = mkMerge [ + (mkIf config.services.gnome3.at-spi2-core.enable { + environment.systemPackages = [ pkgs.at_spi2_core ]; + services.dbus.packages = [ pkgs.at_spi2_core ]; + systemd.packages = [ pkgs.at_spi2_core ]; + }) + (mkIf (!config.services.gnome3.at-spi2-core.enable) { + environment.variables.NO_AT_BRIDGE = "1"; + }) + ]; } diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix deleted file mode 100644 index 71ff6bb2f3f0..000000000000 --- a/nixos/modules/services/games/ghost-one.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -let - - cfg = config.services.ghostOne; - ghostUser = "ghostone"; - stateDir = "/var/lib/ghost-one"; - -in -{ - - ###### interface - - options = { - services.ghostOne = { - - enable = mkOption { - default = false; - description = "Enable Ghost-One Warcraft3 game hosting server."; - }; - - language = mkOption { - default = "English"; - type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]; - description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish."; - }; - - war3path = mkOption { - default = ""; - description = '' - The path to your local Warcraft III directory, which must contain war3.exe, storm.dll, and game.dll. - ''; - }; - - mappath = mkOption { - default = ""; - description = '' - The path to the directory where you keep your map files. GHost One doesn't require - map files but if it has access to them it can send them to players and automatically - calculate most map config values. GHost One will search [bot_mappath + map_localpath] - for the map file (map_localpath is set in each map's config file). - ''; - }; - - config = mkOption { - default = ""; - description = "Extra configuration options."; - }; - - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - - users.extraUsers = singleton - { name = ghostUser; - uid = config.ids.uids.ghostone; - description = "Ghost One game server user"; - home = stateDir; - }; - - users.extraGroups = singleton - { name = ghostUser; - gid = config.ids.gids.ghostone; - }; - - services.ghostOne.config = '' -# bot_log = /dev/stderr - bot_language = ${pkgs.ghostOne}/share/ghost-one/languages/${cfg.language}.cfg - bot_war3path = ${cfg.war3path} - - bot_mapcfgpath = mapcfgs - bot_savegamepath = savegames - bot_mappath = ${cfg.mappath} - bot_replaypath = replays - ''; - - systemd.services."ghost-one" = { - wantedBy = [ "multi-user.target" ]; - script = '' - mkdir -p ${stateDir} - cd ${stateDir} - chown ${ghostUser}:${ghostUser} . - - mkdir -p mapcfgs - chown ${ghostUser}:${ghostUser} mapcfgs - - mkdir -p replays - chown ${ghostUser}:${ghostUser} replays - - mkdir -p savegames - chown ${ghostUser}:${ghostUser} savegames - - ln -sf ${pkgs.writeText "ghost.cfg" cfg.config} ghost.cfg - ln -sf ${pkgs.ghostOne}/share/ghost-one/ip-to-country.csv - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${ghostUser} \ - -c "LANG=C ${pkgs.ghostOne}/bin/ghost++" - ''; - }; - - }; - -} diff --git a/nixos/modules/services/hardware/80-net-setup-link.rules b/nixos/modules/services/hardware/80-net-setup-link.rules deleted file mode 100644 index 18547f170a3f..000000000000 --- a/nixos/modules/services/hardware/80-net-setup-link.rules +++ /dev/null @@ -1,13 +0,0 @@ -# Copied from systemd 203. -ACTION=="remove", GOTO="net_name_slot_end" -SUBSYSTEM!="net", GOTO="net_name_slot_end" -NAME!="", GOTO="net_name_slot_end" - -IMPORT{cmdline}="net.ifnames" -ENV{net.ifnames}=="0", GOTO="net_name_slot_end" - -NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}" -NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}" -NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}" - -LABEL="net_name_slot_end" diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 018e82e58a3d..5a898631e090 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -55,7 +55,7 @@ in { enable = mkOption { default = false; description = '' - Whether to enable thinkfan, fan controller for ibm/lenovo thinkpads. + Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads. ''; }; diff --git a/nixos/modules/services/hardware/u2f.nix b/nixos/modules/services/hardware/u2f.nix new file mode 100644 index 000000000000..bb4b2f05f890 --- /dev/null +++ b/nixos/modules/services/hardware/u2f.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.u2f; +in { + options = { + hardware.u2f = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable U2F hardware support. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.libu2f-host ]; + }; +} + diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 9f42f9e59ad5..730e538e72f6 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -119,7 +119,7 @@ let fi ${optionalString config.networking.usePredictableInterfaceNames '' - cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules + cp ${udev}/lib/udev/rules.d/80-net-setup-link.rules $out/80-net-setup-link.rules ''} # If auto-configuration is disabled, then remove diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix new file mode 100644 index 000000000000..7ebd49fa01c2 --- /dev/null +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + defaultUserGroup = "usbmux"; + apple = "05ac"; + + cfg = config.services.usbmuxd; + +in + +{ + options.services.usbmuxd = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the usbmuxd ("USB multiplexing daemon") service. This daemon is + in charge of multiplexing connections over USB to an iOS device. This is + needed for transferring data from and to iOS devices (see ifuse). Also + this may enable plug-n-play tethering for iPhones. + ''; + }; + + user = mkOption { + type = types.str; + default = defaultUserGroup; + description = '' + The user usbmuxd should use to run after startup. + ''; + }; + + group = mkOption { + type = types.str; + default = defaultUserGroup; + description = '' + The group usbmuxd should use to run after startup. + ''; + }; + }; + + config = mkIf cfg.enable { + + users.extraUsers = optional (cfg.user == defaultUserGroup) { + name = cfg.user; + description = "usbmuxd user"; + group = cfg.group; + }; + + users.extraGroups = optional (cfg.group == defaultUserGroup) { + name = cfg.group; + }; + + # Give usbmuxd permission for Apple devices + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTR{idVendor}=="${apple}", GROUP="${cfg.group}" + ''; + + systemd.services.usbmuxd = { + description = "usbmuxd"; + wantedBy = [ "multi-user.target" ]; + unitConfig.Documentation = "man:usbmuxd(8)"; + serviceConfig = { + # Trigger the udev rule manually. This doesn't require replugging the + # device when first enabling the option to get it to work + ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; + ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f"; + }; + }; + + }; +} diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 2a8ac414720b..a4cab0c94cdc 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -8,7 +8,7 @@ let defaultRules = pkgs.runCommand "logcheck-default-rules" {} '' cp -prd ${pkgs.logcheck}/etc/logcheck $out chmod u+w $out - rm $out/logcheck.* + rm -r $out/logcheck.* ''; rulesDir = pkgs.symlinkJoin diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index b4abd2cd7e5e..28d89a7463ab 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -103,7 +103,7 @@ in listenAddress = mkOption { type = types.str; - default = "0.0.0.0"; + default = "127.0.0.1"; description = "Address on which to start webserver."; }; diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix new file mode 100644 index 000000000000..8f4f39aa7288 --- /dev/null +++ b/nixos/modules/services/mail/clamsmtp.nix @@ -0,0 +1,179 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.clamsmtp; + clamdSocket = "/run/clamav/clamd.ctl"; # See services/security/clamav.nix +in +{ + ##### interface + options = { + services.clamsmtp = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable clamsmtp."; + }; + + instances = mkOption { + description = "Instances of clamsmtp to run."; + type = types.listOf (types.submodule { options = { + action = mkOption { + type = types.enum [ "bounce" "drop" "pass" ]; + default = "drop"; + description = + '' + Action to take when a virus is detected. + + Note that viruses often spoof sender addresses, so bouncing is + in most cases not a good idea. + ''; + }; + + header = mkOption { + type = types.str; + default = ""; + example = "X-Virus-Scanned: ClamAV using ClamSMTP"; + description = + '' + A header to add to scanned messages. See clamsmtpd.conf(5) for + more details. Empty means no header. + ''; + }; + + keepAlives = mkOption { + type = types.int; + default = 0; + description = + '' + Number of seconds to wait between each NOOP sent to the sending + server. 0 to disable. + + This is meant for slow servers where the sending MTA times out + waiting for clamd to scan the file. + ''; + }; + + listen = mkOption { + type = types.str; + example = "127.0.0.1:10025"; + description = + '' + Address to wait for incoming SMTP connections on. See + clamsmtpd.conf(5) for more details. + ''; + }; + + quarantine = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to quarantine files that contain viruses by leaving them + in the temporary directory. + ''; + }; + + maxConnections = mkOption { + type = types.int; + default = 64; + description = "Maximum number of connections to accept at once."; + }; + + outAddress = mkOption { + type = types.str; + description = + '' + Address of the SMTP server to send email to once it has been + scanned. + ''; + }; + + tempDirectory = mkOption { + type = types.str; + default = "/tmp"; + description = + '' + Temporary directory that needs to be accessible to both clamd + and clamsmtpd. + ''; + }; + + timeout = mkOption { + type = types.int; + default = 180; + description = "Time-out for network connections."; + }; + + transparentProxy = mkOption { + type = types.bool; + default = false; + description = "Enable clamsmtp's transparent proxy support."; + }; + + virusAction = mkOption { + type = with types; nullOr path; + default = null; + description = + '' + Command to run when a virus is found. Please see VIRUS ACTION in + clamsmtpd(8) for a discussion of this option and its safe use. + ''; + }; + + xClient = mkOption { + type = types.bool; + default = false; + description = + '' + Send the XCLIENT command to the receiving server, for forwarding + client addresses and connection information if the receiving + server supports this feature. + ''; + }; + };}); + }; + }; + }; + + ##### implementation + config = let + configfile = conf: pkgs.writeText "clamsmtpd.conf" + '' + Action: ${conf.action} + ClamAddress: ${clamdSocket} + Header: ${conf.header} + KeepAlives: ${toString conf.keepAlives} + Listen: ${conf.listen} + Quarantine: ${if conf.quarantine then "on" else "off"} + MaxConnections: ${toString conf.maxConnections} + OutAddress: ${conf.outAddress} + TempDirectory: ${conf.tempDirectory} + TimeOut: ${toString conf.timeout} + TransparentProxy: ${if conf.transparentProxy then "on" else "off"} + User: clamav + ${optionalString (conf.virusAction != null) "VirusAction: ${conf.virusAction}"} + XClient: ${if conf.xClient then "on" else "off"} + ''; + in + mkIf cfg.enable { + assertions = [ + { assertion = config.services.clamav.daemon.enable; + message = "clamsmtp requires clamav to be enabled"; + } + ]; + + systemd.services = listToAttrs (imap1 (i: conf: + nameValuePair "clamsmtp-${toString i}" { + description = "ClamSMTP instance ${toString i}"; + wantedBy = [ "multi-user.target" ]; + script = "exec ${pkgs.clamsmtp}/bin/clamsmtpd -f ${configfile conf}"; + after = [ "clamav-daemon.service" ]; + requires = [ "clamav-daemon.service" ]; + serviceConfig.Type = "forking"; + serviceConfig.PrivateTmp = "yes"; + unitConfig.JoinsNamespaceOf = "clamav-daemon.service"; + } + ) cfg.instances); + }; +} diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix new file mode 100644 index 000000000000..894b88e25c1b --- /dev/null +++ b/nixos/modules/services/mail/dkimproxy-out.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.dkimproxy-out; + keydir = "/var/lib/dkimproxy-out"; + privkey = "${keydir}/private.key"; + pubkey = "${keydir}/public.key"; +in +{ + ##### interface + options = { + services.dkimproxy-out = { + enable = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable dkimproxy_out. + + Note that a key will be auto-generated, and can be found in + ${keydir}. + ''; + }; + + listen = mkOption { + type = types.str; + example = "127.0.0.1:10027"; + description = "Address:port DKIMproxy should listen on."; + }; + + relay = mkOption { + type = types.str; + example = "127.0.0.1:10028"; + description = "Address:port DKIMproxy should forward mail to."; + }; + + domains = mkOption { + type = with types; listOf str; + example = [ "example.org" "example.com" ]; + description = "List of domains DKIMproxy can sign for."; + }; + + selector = mkOption { + type = types.str; + example = "selector1"; + description = + '' + The selector to use for DKIM key identification. + + For example, if 'selector1' is used here, then for each domain + 'example.org' given in `domain`, 'selector1._domainkey.example.org' + should contain the TXT record indicating the public key is the one + in ${pubkey}: "v=DKIM1; t=s; p=[THE PUBLIC KEY]". + ''; + }; + + keySize = mkOption { + type = types.int; + default = 2048; + description = + '' + Size of the RSA key to use to sign outgoing emails. Note that the + maximum mandatorily verified as per RFC6376 is 2048. + ''; + }; + + # TODO: allow signature for other schemes than dkim(c=relaxed/relaxed)? + # This being the scheme used by gmail, maybe nothing more is needed for + # reasonable use. + }; + }; + + ##### implementation + config = let + configfile = pkgs.writeText "dkimproxy_out.conf" + '' + listen ${cfg.listen} + relay ${cfg.relay} + + domain ${concatStringsSep "," cfg.domains} + selector ${cfg.selector} + + signature dkim(c=relaxed/relaxed) + + keyfile ${privkey} + ''; + in + mkIf cfg.enable { + users.groups.dkimproxy-out = {}; + users.users.dkimproxy-out = { + description = "DKIMproxy_out daemon"; + group = "dkimproxy-out"; + isSystemUser = true; + }; + + systemd.services.dkimproxy-out = { + description = "DKIMproxy_out"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + if [ ! -d "${keydir}" ]; then + mkdir -p "${keydir}" + chmod 0700 "${keydir}" + ${pkgs.openssl}/bin/openssl genrsa -out "${privkey}" ${toString cfg.keySize} + ${pkgs.openssl}/bin/openssl rsa -in "${privkey}" -pubout -out "${pubkey}" + chown -R dkimproxy-out:dkimproxy-out "${keydir}" + fi + ''; + script = '' + exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile} + ''; + serviceConfig = { + User = "dkimproxy-out"; + PermissionsStartOnly = true; + }; + }; + }; +} diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 6d403e448e04..b80aa48f2c86 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -31,6 +31,8 @@ let ${mkBindSockets cfg.bindUISocket} .include "$CONFDIR/worker-controller.inc" } + + ${cfg.extraConfig} ''; in @@ -79,6 +81,15 @@ in ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration to add at the end of the rspamd configuration + file. + ''; + }; + user = mkOption { type = types.string; default = "rspamd"; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index df44d0a54866..c5c41ad296da 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -192,9 +192,11 @@ in mysqlPassword = builtins.readFile (config.services.mysql.rootPassword); }; } - // lib.optionalAttrs (config.services.postgresql.enable && cfg.enableAuthentication) { postgresql-database = { - postgresqlUsername = "root"; - }; } + // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = { + } // lib.optionalAttrs (cfg.enableAuthentication) { + postgresqlUsername = "postgres"; + }; + } // lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = { tomcatPort = 8080; }; } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 7b2b40e59232..9ed5875a0191 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -29,8 +29,12 @@ let gitalyToml = pkgs.writeText "gitaly.toml" '' socket_path = "${lib.escape ["\""] gitalySocket}" + bin_dir = "${cfg.packages.gitaly}/bin" prometheus_listen_addr = "localhost:9236" + [git] + bin_path = "${pkgs.git}/bin/git" + [gitaly-ruby] dir = "${cfg.packages.gitaly.ruby}" @@ -70,7 +74,7 @@ let secret_key_base: ${cfg.secrets.secret} otp_key_base: ${cfg.secrets.otp} db_key_base: ${cfg.secrets.db} - jws_private_key: ${builtins.toJSON cfg.secrets.jws} + openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws} ''; gitlabConfig = { @@ -104,6 +108,7 @@ let ldap.enabled = false; omniauth.enabled = false; shared.path = "${cfg.statePath}/shared"; + gitaly.client_path = "${cfg.packages.gitaly}/bin"; backup.path = "${cfg.backupPath}"; gitlab_shell = { path = "${cfg.packages.gitlab-shell}"; @@ -117,8 +122,6 @@ let }; git = { bin_path = "git"; - max_size = 20971520; # 20MB - timeout = 10; }; monitoring = { ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; @@ -248,7 +251,6 @@ in { databasePassword = mkOption { type = types.str; - default = ""; description = "Gitlab database user password."; }; @@ -440,12 +442,6 @@ in { environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ]; - assertions = [ - { assertion = cfg.databasePassword != ""; - message = "databasePassword must be set"; - } - ]; - # Redis is required for the sidekiq queue runner. services.redis.enable = mkDefault true; # We use postgres as the main data store. @@ -496,7 +492,9 @@ in { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment.HOME = gitlabEnv.HOME; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ]; + environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}"; + environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; + path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ]; serviceConfig = { #PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index f395b9558b5a..6e60316d000c 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -207,7 +207,7 @@ in gitolite setup -pk ${pubkeyFile} fi if [ -n "${hooks}" ]; then - cp ${hooks} .gitolite/hooks/common/ + cp -f ${hooks} .gitolite/hooks/common/ chmod +x .gitolite/hooks/common/* fi gitolite setup # Upgrade if needed diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 81fb024f9094..0888221ab62f 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -32,6 +32,24 @@ in description = "Content of the configuration file"; }; + mathjax = mkOption { + type = types.bool; + default = false; + description = "Enable support for math rendering using MathJax"; + }; + + allowUploads = mkOption { + type = types.nullOr (types.enum [ "dir" "page" ]); + default = null; + description = "Enable uploads of external files"; + }; + + emoji = mkOption { + type = types.bool; + default = false; + description = "Parse and interpret emoji tags"; + }; + branch = mkOption { type = types.str; default = "master"; @@ -84,6 +102,9 @@ in --host ${cfg.address} \ --config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \ --ref ${cfg.branch} \ + ${optionalString cfg.mathjax "--mathjax"} \ + ${optionalString cfg.emoji "--emoji"} \ + ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \ ${cfg.stateDir} ''; }; diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix index 6051c884465d..df0b3ae24c90 100644 --- a/nixos/modules/services/misc/logkeys.nix +++ b/nixos/modules/services/misc/logkeys.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 11463cf4500a..80979547d339 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -578,6 +578,18 @@ in { Extra config options for matrix-synapse. ''; }; + extraConfigFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Extra config files to include. + + The configuration files will be included based on the command line + argument --config-path. This allows to configure secrets without + having to go through the Nix store, e.g. based on deployment keys if + NixOPS is in use. + ''; + }; logConfig = mkOption { type = types.lines; default = readFile ./matrix-synapse-log_config.yaml; @@ -627,7 +639,11 @@ in { Group = "matrix-synapse"; WorkingDirectory = cfg.dataDir; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory ${cfg.dataDir}"; + ExecStart = '' + ${cfg.package}/bin/homeserver \ + ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } + --keys-directory ${cfg.dataDir} + ''; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index 972d8b572d36..50f6f80ad00c 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -8,13 +8,7 @@ let in { options.services.mbpfan = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the mbpfan daemon. - ''; - }; + enable = mkEnableOption "mbpfan, fan controller daemon for Apple Macs and MacBooks"; package = mkOption { type = types.package; diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix new file mode 100644 index 000000000000..7ec8b15906fc --- /dev/null +++ b/nixos/modules/services/misc/osrm.nix @@ -0,0 +1,85 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.osrm; +in + +{ + options.services.osrm = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the OSRM service."; + }; + + address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IP address on which the web server will listen."; + }; + + port = mkOption { + type = types.int; + default = 5000; + description = "Port on which the web server will run."; + }; + + threads = mkOption { + type = types.int; + default = 4; + description = "Number of threads to use."; + }; + + algorithm = mkOption { + type = types.enum [ "CH" "CoreCH" "MLD" ]; + default = "MLD"; + description = "Algorithm to use for the data. Must be one of CH, CoreCH, MLD"; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--max-table-size 1000" "--max-matching-size 1000" ]; + description = "Extra command line arguments passed to osrm-routed"; + }; + + dataFile = mkOption { + type = types.path; + example = "/var/lib/osrm/berlin-latest.osrm"; + description = "Data file location"; + }; + + }; + + config = mkIf cfg.enable { + + users.users.osrm = { + group = config.users.users.osrm.name; + description = "OSRM user"; + createHome = false; + }; + + users.groups.osrm = { }; + + systemd.services.osrm = { + description = "OSRM service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = config.users.extraUsers.osrm.name; + ExecStart = '' + ${pkgs.osrm-backend}/bin/osrm-routed \ + --ip ${cfg.address} \ + --port ${toString cfg.port} \ + --threads ${toString cfg.threads} \ + --algorithm ${cfg.algorithm} \ + ${toString cfg.extraFlags} \ + ${cfg.dataFile} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix new file mode 100644 index 000000000000..57f439365471 --- /dev/null +++ b/nixos/modules/services/misc/xmr-stak.nix @@ -0,0 +1,73 @@ +{ lib, config, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xmr-stak; + + pkg = pkgs.xmr-stak.override { + inherit (cfg) openclSupport cudaSupport; + }; + + xmrConfArg = optionalString (cfg.configText != "") ("-c " + + pkgs.writeText "xmr-stak-config.txt" cfg.configText); + +in + +{ + options = { + services.xmr-stak = { + enable = mkEnableOption "xmr-stak miner"; + openclSupport = mkEnableOption "support for OpenCL (AMD/ATI graphics cards)"; + cudaSupport = mkEnableOption "support for CUDA (NVidia graphics cards)"; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--noCPU" "--currency monero" ]; + description = "List of parameters to pass to xmr-stak."; + }; + + configText = mkOption { + type = types.lines; + default = ""; + example = '' + "currency" : "monero", + "pool_list" : + [ { "pool_address" : "pool.supportxmr.com:5555", + "wallet_address" : "", + "pool_password" : "minername", + "pool_weight" : 1, + }, + ], + ''; + description = '' + Verbatim xmr-stak config.txt. If empty, the -c + parameter will not be added to the xmr-stak command. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.xmr-stak = { + wantedBy = [ "multi-user.target" ]; + bindsTo = [ "network-online.target" ]; + after = [ "network-online.target" ]; + environment = mkIf cfg.cudaSupport { + LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib"; + }; + script = '' + exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs} + ''; + serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in { + # xmr-stak generates cpu and/or gpu configuration files + WorkingDirectory = "/tmp"; + PrivateTmp = true; + DynamicUser = !rootRequired; + LimitMEMLOCK = toString (1024*1024); + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 1d6940c516a9..b8d9e58a5a82 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -64,7 +64,7 @@ let "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"} ''; - smartdOpts = { name, ... }: { + smartdDeviceOpts = { name, ... }: { options = { @@ -108,6 +108,18 @@ in ''; }; + extraOptions = mkOption { + default = []; + type = types.listOf types.str; + example = ["-A /var/log/smartd/" "--interval=3600"]; + description = '' + Extra command-line options passed to the smartd + daemon on startup. + + (See man 8 smartd.) + ''; + }; + notifications = { mail = { @@ -197,7 +209,7 @@ in devices = mkOption { default = []; example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ]; - type = with types; listOf (submodule smartdOpts); + type = with types; listOf (submodule smartdDeviceOpts); description = "List of devices to monitor."; }; @@ -222,7 +234,7 @@ in path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}"; + serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; }; }; diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index df2adb9f2766..7b0e9981cbb1 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -9,6 +9,12 @@ let isBuiltinBackend = name: builtins.elem name [ "graphite" "console" "repeater" ]; + backendsToPackages = let + mkMap = list: name: + if isBuiltinBackend name then list + else list ++ [ pkgs.nodePackages.${name} ]; + in foldl mkMap []; + configFile = pkgs.writeText "statsd.conf" '' { address: "${cfg.listenAddress}", @@ -27,13 +33,21 @@ let prettyprint: false }, log: { - backend: "syslog" + backend: "stdout" }, automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","} ${cfg.extraConfig} } ''; + deps = pkgs.buildEnv { + name = "statsd-runtime-deps"; + pathsToLink = [ "/lib" ]; + ignoreCollisions = true; + + paths = backendsToPackages cfg.backends; + }; + in { @@ -42,11 +56,7 @@ in options.services.statsd = { - enable = mkOption { - description = "Whether to enable statsd stats aggregation service"; - default = false; - type = types.bool; - }; + enable = mkEnableOption "statsd"; listenAddress = mkOption { description = "Address that statsd listens on over UDP"; @@ -110,6 +120,11 @@ in config = mkIf cfg.enable { + assertions = map (backend: { + assertion = !isBuiltinBackend backend -> hasAttrByPath [ backend ] pkgs.nodePackages; + message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; + }) cfg.backends; + users.extraUsers = singleton { name = "statsd"; uid = config.ids.uids.statsd; @@ -120,9 +135,7 @@ in description = "Statsd Server"; wantedBy = [ "multi-user.target" ]; environment = { - NODE_PATH=concatMapStringsSep ":" - (pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules") - (filter (name: !isBuiltinBackend name) cfg.backends); + NODE_PATH = "${deps}/lib/node_modules"; }; serviceConfig = { ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}"; diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix new file mode 100644 index 000000000000..a6a2ec6cbc36 --- /dev/null +++ b/nixos/modules/services/network-filesystems/beegfs.nix @@ -0,0 +1,343 @@ +{ config, lib, pkgs, ...} : + +with lib; + +let + cfg = config.services.beegfs; + + # functions for the generations of config files + + configMgmtd = name: cfg: pkgs.writeText "mgmt-${name}.conf" '' + storeMgmtdDirectory = ${cfg.mgmtd.storeDir} + storeAllowFirstRunInit = false + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + + ${cfg.mgmtd.extraConfig} + ''; + + configAdmon = name: cfg: pkgs.writeText "admon-${name}.conf" '' + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + + ${cfg.admon.extraConfig} + ''; + + configMeta = name: cfg: pkgs.writeText "meta-${name}.conf" '' + storeMetaDirectory = ${cfg.meta.storeDir} + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + storeAllowFirstRunInit = false + + ${cfg.mgmtd.extraConfig} + ''; + + configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" '' + storeStorageDirectory = ${cfg.storage.storeDir} + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + storeAllowFirstRunInit = false + + ${cfg.storage.extraConfig} + ''; + + configHelperd = name: cfg: pkgs.writeText "helperd-${name}.conf" '' + connAuthFile = ${cfg.connAuthFile} + ${cfg.helperd.extraConfig} + ''; + + configClientFilename = name : "/etc/beegfs/client-${name}.conf"; + + configClient = name: cfg: '' + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + + ${cfg.client.extraConfig} + ''; + + serviceList = [ + { service = "admon"; cfgFile = configAdmon; } + { service = "meta"; cfgFile = configMeta; } + { service = "mgmtd"; cfgFile = configMgmtd; } + { service = "storage"; cfgFile = configStorage; } + ]; + + # functions to generate systemd.service entries + + systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg: + (nameValuePair "beegfs-${service}-${name}" (mkIf cfg."${service}".enable { + wantedBy = [ "multi-user.target" ]; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + serviceConfig = rec { + ExecStart = '' + ${pkgs.beegfs}/bin/beegfs-${service} \ + cfgFile=${cfgFile name cfg} \ + pidFile=${PIDFile} + ''; + PIDFile = "/run/beegfs-${service}-${name}.pid"; + TimeoutStopSec = "300"; + }; + }))) cfg); + + systemdHelperd = mapAttrs' ( name: cfg: + (nameValuePair "beegfs-helperd-${name}" (mkIf cfg.client.enable { + wantedBy = [ "multi-user.target" ]; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + serviceConfig = rec { + ExecStart = '' + ${pkgs.beegfs}/bin/beegfs-helperd \ + cfgFile=${configHelperd name cfg} \ + pidFile=${PIDFile} + ''; + PIDFile = "/run/beegfs-helperd-${name}.pid"; + TimeoutStopSec = "300"; + }; + }))) cfg; + + # wrappers to beegfs tools. Avoid typing path of config files + utilWrappers = mapAttrsToList ( name: cfg: + ( pkgs.runCommand "beegfs-utils-${name}" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' + mkdir -p $out/bin + + makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \ + $out/bin/beegfs-check-servers-${name} \ + --add-flags "-c ${configClientFilename name}" \ + --prefix PATH : ${lib.makeBinPath [ pkgs.beegfs ]} + + makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \ + $out/bin/beegfs-ctl-${name} \ + --add-flags "--cfgFile=${configClientFilename name}" + + makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \ + $out/bin/beegfs-df-${name} \ + --add-flags "--cfgFile=${configClientFilename name}" \ + --add-flags --listtargets \ + --add-flags --hidenodeid \ + --add-flags --pools \ + --add-flags --spaceinfo + + makeWrapper ${pkgs.beegfs}/bin/beegfs-fsck \ + $out/bin/beegfs-fsck-${name} \ + --add-flags "--cfgFile=${configClientFilename name}" + '' + )) cfg; +in +{ + ###### interface + + options = { + services.beegfsEnable = mkEnableOption "BeeGFS"; + + services.beegfs = mkOption { + default = {}; + description = '' + BeeGFS configurations. Every mount point requires a separate configuration. + ''; + type = with types; attrsOf (submodule ({ config, ... } : { + options = { + mgmtdHost = mkOption { + type = types.str; + default = null; + example = "master"; + description = ''Hostname of managament host.''; + }; + + connAuthFile = mkOption { + type = types.str; + default = ""; + example = "/etc/my.key"; + description = "File containing shared secret authentication."; + }; + + connPortShift = mkOption { + type = types.int; + default = 0; + example = 5; + description = '' + For each additional beegfs configuration shift all + service TCP/UDP ports by at least 5. + ''; + }; + + client = { + enable = mkEnableOption "BeeGFS client"; + + mount = mkOption { + type = types.bool; + default = true; + description = "Create fstab entry automatically"; + }; + + mountPoint = mkOption { + type = types.str; + default = "/run/beegfs"; + description = '' + Mount point under which the beegfs filesytem should be mounted. + If mounted manually the mount option specifing the config file is needed: + cfgFile=/etc/beegfs/beegfs-client-<name>.conf + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-client.conf. + See documentation for further details. + ''; + }; + }; + + helperd = { + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-helperd.conf. See documentation + for further details. + ''; + }; + }; + + mgmtd = { + enable = mkEnableOption "BeeGFS mgmtd daemon"; + + storeDir = mkOption { + type = types.path; + default = null; + example = "/data/beegfs-mgmtd"; + description = '' + Data directory for mgmtd. + Must not be shared with other beegfs daemons. + This directory must exist and it must be initialized + with beegfs-setup-mgmtd, e.g. "beegfs-setup-mgmtd -C -p <storeDir>" + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-mgmtd.conf. See documentation + for further details. + ''; + }; + }; + + admon = { + enable = mkEnableOption "BeeGFS admon daemon"; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-admon.conf. See documentation + for further details. + ''; + }; + }; + + meta = { + enable = mkEnableOption "BeeGFS meta data daemon"; + + storeDir = mkOption { + type = types.path; + default = null; + example = "/data/beegfs-meta"; + description = '' + Data directory for meta data service. + Must not be shared with other beegfs daemons. + The underlying filesystem must be mounted with xattr turned on. + This directory must exist and it must be initialized + with beegfs-setup-meta, e.g. + "beegfs-setup-meta -C -s <serviceID> -p <storeDir>" + ''; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Additional lines for beegfs-meta.conf. See documentation + for further details. + ''; + }; + }; + + storage = { + enable = mkEnableOption "BeeGFS storage daemon"; + + storeDir = mkOption { + type = types.path; + default = null; + example = "/data/beegfs-storage"; + description = '' + Data directories for storage service. + Must not be shared with other beegfs daemons. + The underlying filesystem must be mounted with xattr turned on. + This directory must exist and it must be initialized + with beegfs-setup-storage, e.g. + "beegfs-setup-storage -C -s <serviceID> -i <storageTargetID> -p <storeDir>" + ''; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Addional lines for beegfs-storage.conf. See documentation + for further details. + ''; + }; + }; + }; + })); + }; + }; + + ###### implementation + + config = + mkIf config.services.beegfsEnable { + + environment.systemPackages = utilWrappers; + + # Put the client.conf files in /etc since they are needed + # by the commandline tools + environment.etc = mapAttrs' ( name: cfg: + (nameValuePair "beegfs/client-${name}.conf" (mkIf (cfg.client.enable) + { + enable = true; + text = configClient name cfg; + }))) cfg; + + # Kernel module, we need it only once per host. + boot = mkIf ( + foldr (a: b: a || b) false + (map (x: x.client.enable) (collect (x: x ? client) cfg))) + { + kernelModules = [ "beegfs" ]; + extraModulePackages = [ pkgs.linuxPackages.beegfs-module ]; + }; + + # generate fstab entries + fileSystems = mapAttrs' (name: cfg: + (nameValuePair cfg.client.mountPoint (optionalAttrs cfg.client.mount (mkIf cfg.client.enable { + device = "beegfs_nodev"; + fsType = "beegfs"; + mountPoint = cfg.client.mountPoint; + options = [ "cfgFile=${configClientFilename name}" "_netdev" ]; + })))) cfg; + + # generate systemd services + systemd.services = systemdHelperd // + foldr (a: b: a // b) {} + (map (x: systemdEntry x.service x.cfgFile) serviceList); + }; +} diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix new file mode 100644 index 000000000000..6b2a770100c5 --- /dev/null +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.davfs2; + cfgFile = pkgs.writeText "davfs2.conf" '' + dav_user ${cfg.davUser} + dav_group ${cfg.davGroup} + ${cfg.extraConfig} + ''; +in +{ + options.services.davfs2 = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable davfs2. + ''; + }; + + davUser = mkOption { + type = types.string; + default = "davfs2"; + description = '' + When invoked by root the mount.davfs daemon will run as this user. + Value must be given as name, not as numerical id. + ''; + }; + + davGroup = mkOption { + type = types.string; + default = "davfs2"; + description = '' + The group of the running mount.davfs daemon. Ordinary users must be + member of this group in order to mount a davfs2 file system. Value must + be given as name, not as numerical id. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + kernel_fs coda + proxy foo.bar:8080 + use_locks 0 + ''; + description = '' + Extra lines appended to the configuration of davfs2. + '' ; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.davfs2 ]; + environment.etc."davfs2/davfs2.conf".source = cfgFile; + + users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { + name = "davfs2"; + gid = config.ids.gids.davfs2; + }); + + users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton { + name = "davfs2"; + createHome = false; + group = cfg.davGroup; + uid = config.ids.uids.davfs2; + description = "davfs2 user"; + }); + }; + +} diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 9b9c91a4f167..09cd9cb22ca8 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -56,6 +56,7 @@ let serviceConfig = { ExecStart = "${samba}/sbin/${appName} ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + LimitNOFILE = 16384; Type = "notify"; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index ed658258c7f9..857657eea4db 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -10,7 +10,7 @@ let # This is somewhat more flexible than preloading the key as an # embedded string. upstreamResolverListPubKey = pkgs.fetchurl { - url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/minisign.pub; + url = https://raw.githubusercontent.com/dyne/dnscrypt-proxy/master/minisign.pub; sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh"; }; @@ -258,9 +258,9 @@ in domain=raw.githubusercontent.com get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)" $get -o dnscrypt-resolvers.csv.tmp \ - https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv + https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv $get -o dnscrypt-resolvers.csv.minisig.tmp \ - https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig + https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig mv dnscrypt-resolvers.csv.minisig{.tmp,} if ! minisign -q -V -p ${upstreamResolverListPubKey} \ -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig ; then diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index ca2e2a065dcf..8f5aeee4a16b 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -126,6 +126,7 @@ let [${tun.name}] type = client destination = ${tun.destination} + destinationport = ${toString tun.destinationPort} keys = ${tun.keys} address = ${tun.address} port = ${toString tun.port} @@ -137,15 +138,15 @@ let '') } ${flip concatMapStrings - (collect (tun: tun ? port && tun ? host) cfg.inTunnels) - (tun: let portStr = toString tun.port; in '' + (collect (tun: tun ? port && tun ? address) cfg.inTunnels) + (tun: '' [${tun.name}] type = server destination = ${tun.destination} keys = ${tun.keys} host = ${tun.address} - port = ${tun.port} - inport = ${tun.inPort} + port = ${toString tun.port} + inport = ${toString tun.inPort} accesslist = ${builtins.concatStringsSep "," tun.accessList} '') } @@ -405,7 +406,13 @@ in default = {}; type = with types; loaOf (submodule ( { name, config, ... }: { - options = commonTunOpts name; + options = { + destinationPort = mkOption { + type = types.int; + default = 0; + description = "Connect to particular port at destination."; + }; + } // commonTunOpts name; config = { name = mkDefault name; }; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 18e2ab9aebf1..011a9b2f58ea 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -72,6 +72,7 @@ in (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53") cfg.interfaces; socketConfig.ListenDatagram = listenStreams; + socketConfig.FreeBind = true; }; systemd.sockets.kresd-control = rec { @@ -82,20 +83,11 @@ in socketConfig = { FileDescriptorName = "control"; Service = "kresd.service"; - SocketMode = "0660"; # only root user/group may connect + SocketMode = "0660"; # only root user/group may connect and control kresd }; }; - # Create the cacheDir; tmpfiles don't work on nixos-rebuild switch. - systemd.services.kresd-cachedir = { - serviceConfig.Type = "oneshot"; - script = '' - if [ ! -d '${cfg.cacheDir}' ]; then - mkdir -p '${cfg.cacheDir}' - chown kresd:kresd '${cfg.cacheDir}' - fi - ''; - }; + systemd.tmpfiles.rules = [ "d '${cfg.cacheDir}' 0770 kresd kresd - -" ]; systemd.services.kresd = { description = "Knot-resolver daemon"; @@ -104,16 +96,15 @@ in User = "kresd"; Type = "notify"; WorkingDirectory = cfg.cacheDir; + Restart = "on-failure"; }; script = '' exec '${package}/bin/kresd' --config '${configFile}' \ - -k '${cfg.cacheDir}/root.key' + -k '${pkgs.dns-root-data}/root.key' ''; - after = [ "kresd-cachedir.service" ]; - requires = [ "kresd.socket" "kresd-cachedir.service" ]; - wantedBy = [ "sockets.target" ]; + requires = [ "kresd.socket" ]; }; }; } diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index ba4e1b1542fe..db1534edfd7c 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -24,6 +24,7 @@ in description = "lldpd user"; group = "_lldpd"; home = "/var/run/lldpd"; + isSystemUser = true; }; users.extraGroups._lldpd = {}; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 366bb2ed7a80..df4246d216d8 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -19,6 +19,8 @@ let iptables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true iptables -w -t nat -F nixos-nat-post 2>/dev/null || true iptables -w -t nat -X nixos-nat-post 2>/dev/null || true + + ${cfg.extraStopCommands} ''; setupNat = '' @@ -53,6 +55,14 @@ let -j DNAT --to-destination ${fwd.destination} '') cfg.forwardPorts} + ${optionalString (cfg.dmzHost != null) '' + iptables -w -t nat -A nixos-nat-pre \ + -i ${cfg.externalInterface} -j DNAT \ + --to-destination ${cfg.dmzHost} + ''} + + ${cfg.extraCommands} + # Append our chains to the nat tables iptables -w -t nat -A PREROUTING -j nixos-nat-pre iptables -w -t nat -A POSTROUTING -j nixos-nat-post @@ -125,15 +135,15 @@ in type = with types; listOf (submodule { options = { sourcePort = mkOption { - type = types.int; + type = types.either types.int (types.strMatching "[[:digit:]]+:[[:digit:]]+"); example = 8080; - description = "Source port of the external interface"; + description = "Source port of the external interface; to specify a port range, use a string with a colon (e.g. \"60000:61000\")"; }; destination = mkOption { type = types.str; example = "10.0.0.1:80"; - description = "Forward connection to destination ip:port"; + description = "Forward connection to destination ip:port; to specify a port range, use ip:start-end"; }; proto = mkOption { @@ -153,6 +163,39 @@ in ''; }; + networking.nat.dmzHost = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.1"; + description = + '' + The local IP address to which all traffic that does not match any + forwarding rule is forwarded. + ''; + }; + + networking.nat.extraCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -A INPUT -p icmp -j ACCEPT"; + description = + '' + Additional shell commands executed as part of the nat + initialisation script. + ''; + }; + + networking.nat.extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -D INPUT -p icmp -j ACCEPT || true"; + description = + '' + Additional shell commands executed as part of the nat + teardown script. + ''; + }; + }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 6bdae32f72bb..62afbf32c2f6 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -241,6 +241,19 @@ in { A list of scripts which will be executed in response to network events. ''; }; + + enableStrongSwan = mkOption { + type = types.bool; + default = false; + description = '' + Enable the StrongSwan plugin. + + If you enable this option the + networkmanager_strongswan plugin will be added to + the option + so you don't need to to that yourself. + ''; + }; }; }; @@ -333,13 +346,13 @@ in { wireless.enable = lib.mkDefault false; }; - powerManagement.resumeCommands = '' - ${config.systemd.package}/bin/systemctl restart network-manager - ''; - security.polkit.extraConfig = polkitConf; - services.dbus.packages = cfg.packages; + networking.networkmanager.packages = + mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ]; + + services.dbus.packages = + optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages; services.udev.packages = cfg.packages; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index c8b8ed547ebb..4241e6fcceab 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -11,6 +11,8 @@ let # build nsd with the options needed for the given config nsdPkg = pkgs.nsd.override { + configFile = "${configFile}/nsd.conf"; + bind8Stats = cfg.bind8Stats; ipv6 = cfg.ipv6; ratelimit = cfg.ratelimit.enable; @@ -788,6 +790,8 @@ in config = mkIf cfg.enable { + environment.systemPackages = [ nsdPkg ]; + users.extraGroups = singleton { name = username; gid = config.ids.gids.nsd; @@ -845,4 +849,6 @@ in }; }; + + meta.maintainers = with lib.maintainers; [ hrdinka ]; } diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index fb9c9dc67f24..f34d8e172b46 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -10,98 +10,126 @@ let options = { - # TODO: require attribute key = mkOption { - type = types.str; - description = "Path to the key file"; + type = types.path; + description = "Path to the key file."; }; - # TODO: require attribute cert = mkOption { - type = types.str; - description = "Path to the certificate file"; + type = types.path; + description = "Path to the certificate file."; }; + + extraOptions = mkOption { + type = types.attrs; + default = {}; + description = "Extra SSL configuration options."; + }; + }; }; moduleOpts = { roster = mkOption { + type = types.bool; default = true; description = "Allow users to have a roster"; }; saslauth = mkOption { + type = types.bool; default = true; description = "Authentication for clients and servers. Recommended if you want to log in."; }; tls = mkOption { + type = types.bool; default = true; description = "Add support for secure TLS on c2s/s2s connections"; }; dialback = mkOption { + type = types.bool; default = true; description = "s2s dialback support"; }; disco = mkOption { + type = types.bool; default = true; description = "Service discovery"; }; legacyauth = mkOption { + type = types.bool; default = true; description = "Legacy authentication. Only used by some old clients and bots"; }; version = mkOption { + type = types.bool; default = true; description = "Replies to server version requests"; }; uptime = mkOption { + type = types.bool; default = true; description = "Report how long server has been running"; }; time = mkOption { + type = types.bool; default = true; description = "Let others know the time here on this server"; }; ping = mkOption { + type = types.bool; default = true; description = "Replies to XMPP pings with pongs"; }; console = mkOption { + type = types.bool; default = false; description = "telnet to port 5582"; }; bosh = mkOption { + type = types.bool; default = false; description = "Enable BOSH clients, aka 'Jabber over HTTP'"; }; httpserver = mkOption { + type = types.bool; default = false; description = "Serve static files from a directory over HTTP"; }; websocket = mkOption { + type = types.bool; default = false; description = "Enable WebSocket support"; }; }; - createSSLOptsStr = o: - if o ? key && o ? cert then - ''ssl = { key = "${o.key}"; certificate = "${o.cert}"; };'' - else ""; + toLua = x: + if builtins.isString x then ''"${x}"'' + else if builtins.isBool x then toString x + else if builtins.isInt x then toString x + else throw "Invalid Lua value"; + + createSSLOptsStr = o: '' + ssl = { + key = "${o.key}"; + certificate = "${o.cert}"; + ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)} + }; + ''; vHostOpts = { ... }: { @@ -114,18 +142,20 @@ let }; enabled = mkOption { + type = types.bool; default = false; description = "Whether to enable the virtual host"; }; ssl = mkOption { - description = "Paths to SSL files"; + type = types.nullOr (types.submodule sslOpts); default = null; - options = [ sslOpts ]; + description = "Paths to SSL files"; }; extraConfig = mkOption { - default = ''''; + type = types.lines; + default = ""; description = "Additional virtual host specific configuration"; }; @@ -144,11 +174,13 @@ in services.prosody = { enable = mkOption { + type = types.bool; default = false; description = "Whether to enable the prosody server"; }; allowRegistration = mkOption { + type = types.bool; default = false; description = "Allow account creation"; }; @@ -156,8 +188,9 @@ in modules = moduleOpts; extraModules = mkOption { - description = "Enable custom modules"; + type = types.listOf types.str; default = []; + description = "Enable custom modules"; }; virtualHosts = mkOption { @@ -183,20 +216,21 @@ in }; ssl = mkOption { - description = "Paths to SSL files"; + type = types.nullOr (types.submodule sslOpts); default = null; - options = [ sslOpts ]; + description = "Paths to SSL files"; }; admins = mkOption { - description = "List of administrators of the current host"; - example = [ "admin1@example.com" "admin2@example.com" ]; + type = types.listOf types.str; default = []; + example = [ "admin1@example.com" "admin2@example.com" ]; + description = "List of administrators of the current host"; }; extraConfig = mkOption { type = types.lines; - default = ''''; + default = ""; description = "Additional prosody configuration"; }; @@ -263,17 +297,17 @@ in }; systemd.services.prosody = { - description = "Prosody XMPP server"; after = [ "network-online.target" ]; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ]; serviceConfig = { User = "prosody"; + Type = "forking"; PIDFile = "/var/lib/prosody/prosody.pid"; ExecStart = "${pkgs.prosody}/bin/prosodyctl start"; }; - }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index f0fddcca766f..aa9c0fa1c09f 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -248,13 +248,10 @@ in let service = { description = "SSH Daemon"; - wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; - + after = [ "network.target" ]; stopIfChanged = false; - path = [ cfgc.package pkgs.gawk ]; - environment.LD_LIBRARY_PATH = nssModulesPath; preStart = diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index ac589be57736..e3b6b638f5a7 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -90,16 +90,24 @@ in [ (allowdeny "allow" (cfg.allow)) (allowdeny "deny" cfg.deny) # see man 5 fcron.conf - { source = pkgs.writeText "fcron.conf" '' - fcrontabs = /var/spool/fcron - pidfile = /var/run/fcron.pid - fifofile = /var/run/fcron.fifo - fcronallow = /etc/fcron.allow - fcrondeny = /etc/fcron.deny - shell = /bin/sh - sendmail = /run/wrappers/bin/sendmail - editor = ${pkgs.vim}/bin/vim - ''; + { source = + let + isSendmailWrapped = + lib.hasAttr "sendmail" config.security.wrappers; + sendmailPath = + if isSendmailWrapped then "/run/wrappers/bin/sendmail" + else "${config.system.path}/bin/sendmail"; + in + pkgs.writeText "fcron.conf" '' + fcrontabs = /var/spool/fcron + pidfile = /var/run/fcron.pid + fifofile = /var/run/fcron.fifo + fcronallow = /etc/fcron.allow + fcrondeny = /etc/fcron.deny + shell = /bin/sh + sendmail = ${sendmailPath} + editor = ${pkgs.vim}/bin/vim + ''; target = "fcron.conf"; gid = config.ids.gids.fcron; mode = "0644"; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 7de2d121e76c..4161c61ed375 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -97,8 +97,8 @@ in systemd.services.clamav-daemon = optionalAttrs cfg.daemon.enable { description = "ClamAV daemon (clamd)"; - after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; - requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; + after = optional cfg.updater.enable "clamav-freshclam.service"; + requires = optional cfg.updater.enable "clamav-freshclam.service"; wantedBy = [ "multi-user.target" ]; restartTriggers = [ clamdConfigFile ]; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index bc79d9f2a590..fa4aeb22ae9d 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -9,6 +9,26 @@ let opt = name: value: optionalString (value != null) "${name} ${value}"; optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}"; + isolationOptions = { + type = types.listOf (types.enum [ + "IsolateClientAddr" + "IsolateSOCKSAuth" + "IsolateClientProtocol" + "IsolateDestPort" + "IsolateDestAddr" + ]); + default = []; + example = [ + "IsolateClientAddr" + "IsolateSOCKSAuth" + "IsolateClientProtocol" + "IsolateDestPort" + "IsolateDestAddr" + ]; + description = "Tor isolation options"; + }; + + torRc = '' User tor DataDirectory ${torDirectory} @@ -20,10 +40,20 @@ let ${optint "ControlPort" cfg.controlPort} '' # Client connection config - + optionalString cfg.client.enable '' - SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr + + optionalString cfg.client.enable '' + SOCKSPort ${cfg.client.socksListenAddress} ${toString cfg.client.socksIsolationOptions} SOCKSPort ${cfg.client.socksListenAddressFaster} ${opt "SocksPolicy" cfg.client.socksPolicy} + + ${optionalString cfg.client.transparentProxy.enable '' + TransPort ${cfg.client.transparentProxy.listenAddress} ${toString cfg.client.transparentProxy.isolationOptions} + ''} + + ${optionalString cfg.client.dns.enable '' + DNSPort ${cfg.client.dns.listenAddress} ${toString cfg.client.dns.isolationOptions} + AutomapHostsOnResolve 1 + AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes} + ''} '' # Relay config + optionalString cfg.relay.enable '' @@ -154,6 +184,55 @@ in ''; }; + socksIsolationOptions = mkOption (isolationOptions // { + default = ["IsolateDestAddr"]; + }); + + transparentProxy = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable tor transaprent proxy"; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1:9040"; + example = "192.168.0.1:9040"; + description = '' + Bind transparent proxy to this address. + ''; + }; + + isolationOptions = mkOption isolationOptions; + }; + + dns = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable tor dns resolver"; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1:9053"; + example = "192.168.0.1:9053"; + description = '' + Bind tor dns to this address. + ''; + }; + + isolationOptions = mkOption isolationOptions; + + automapHostsSuffixes = mkOption { + type = types.listOf types.str; + default = [".onion" ".exit"]; + example = [".onion"]; + description = "List of suffixes to use with automapHostsOnResolve"; + }; + }; + privoxy.enable = mkOption { type = types.bool; default = true; diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 1f2c56a9efa1..4e685e633354 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -56,7 +56,7 @@ in { }; rules = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.lines; default = null; example = '' allow with-interface equals { 08:*:* } diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix new file mode 100644 index 000000000000..b9355bbb9441 --- /dev/null +++ b/nixos/modules/services/system/localtime.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.localtime; +in { + options = { + services.localtime = { + enable = mkOption { + default = false; + description = '' + Enable localtime, simple daemon for keeping the system + timezone up-to-date based on the current location. It uses geoclue2 to + determine the current location and systemd-timedated to actually set + the timezone. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.geoclue2.enable = true; + + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.timedate1.set-timezone" + && subject.user == "localtimed") { + return polkit.Result.YES; + } + }); + ''; + + users.users = [{ + name = "localtimed"; + description = "Taskserver user"; + }]; + + systemd.services.localtime = { + description = "localtime service"; + wantedBy = [ "multi-user.target" ]; + partOf = [ "geoclue.service "]; + + serviceConfig = { + Restart = "on-failure"; + # TODO: make it work with dbus + #DynamicUser = true; + Nice = 10; + User = "localtimed"; + PrivateTmp = "yes"; + PrivateDevices = true; + PrivateNetwork = "yes"; + NoNewPrivileges = "yes"; + ProtectSystem = "strict"; + ProtectHome = true; + ExecStart = "${pkgs.localtime}/bin/localtimed"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 76b0ee6da968..c784f4756d19 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -99,8 +99,8 @@ let user = mkOption { type = types.str; - default = "nginx"; - example = "nginx"; + default = "tt_rss"; + example = "tt_rss"; description = '' User account under which both the update daemon and the web-application run. ''; @@ -466,26 +466,28 @@ let ''; }; - services.nginx.virtualHosts = mkIf (cfg.virtualHost != null) { - "${cfg.virtualHost}" = { - root = "${cfg.root}"; + services.nginx = { + enable = true; + # NOTE: No configuration is done if not using virtual host + virtualHosts = mkIf (cfg.virtualHost != null) { + "${cfg.virtualHost}" = { + root = "${cfg.root}"; - locations."/" = { - index = "index.php"; - }; + locations."/" = { + index = "index.php"; + }; - locations."~ \.php$" = { - extraConfig = '' - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${phpfpmSocketName}; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME ${cfg.root}/$fastcgi_script_name; - ''; + locations."~ \.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_index index.php; + ''; + }; }; }; }; - systemd.services.tt-rss = let dbService = if cfg.database.type == "pgsql" then "postgresql.service" else "mysql.service"; in { @@ -496,7 +498,7 @@ let callSql = e: if cfg.database.type == "pgsql" then '' ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ - ${pkgs.postgresql95}/bin/psql \ + ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \ -U ${cfg.database.user} \ ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ -c '${e}' \ @@ -521,6 +523,14 @@ let '' + (optionalString (cfg.database.type == "pgsql") '' + ${optionalString (cfg.database.host == null && cfg.database.password == null) '' + if ! [ -e ${cfg.root}/.db-created ]; then + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser ${cfg.database.user} + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O ${cfg.database.user} ${cfg.database.name} + touch ${cfg.root}/.db-created + fi + ''} + exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -554,5 +564,28 @@ let requires = ["${dbService}"]; after = ["network.target" "${dbService}"]; }; + + services.mysql = optionalAttrs (cfg.database.type == "mysql") { + enable = true; + package = mkDefault pkgs.mysql; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + services.postgresql = optionalAttrs (cfg.database.type == "pgsql") { + enable = mkDefault true; + }; + + users = optionalAttrs (cfg.user == "tt_rss") { + extraUsers.tt_rss.group = "tt_rss"; + extraGroups.tt_rss = {}; + }; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 700b4469c565..d23e810dcc62 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -50,11 +50,14 @@ let "mod_geoip" "mod_magnet" "mod_mysql_vhost" + "mod_openssl" # since v1.4.46 "mod_scgi" "mod_setenv" "mod_trigger_b4_dl" "mod_uploadprogress" + "mod_vhostdb" # since v1.4.46 "mod_webdav" + "mod_wstunnel" # since v1.4.46 ]; maybeModuleString = moduleName: diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 97511aac9737..2951e63e863e 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -167,7 +167,8 @@ let listenString = { addr, port, ssl, ... }: "listen ${addr}:${toString port} " - + optionalString ssl "ssl http2 " + + optionalString ssl "ssl " + + optionalString (ssl && vhost.http2) "http2 " + optionalString vhost.default "default_server " + ";"; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 801601aafd9d..29f08cc4f307 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -114,6 +114,20 @@ with lib; description = "Path to server SSL certificate key."; }; + http2 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable HTTP 2. + Note that (as of writing) due to nginx's implementation, to disable + HTTP 2 you have to disable it on all vhosts that use a given + IP address / port. + If there is one server block configured to enable http2,then it is + enabled for all server blocks on this IP. + See https://stackoverflow.com/a/39466948/263061. + ''; + }; + root = mkOption { type = types.nullOr types.path; default = null; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 943415e08c64..0b2e5c0b69d9 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -29,7 +29,7 @@ in type = types.package; default = pkgs.tomcat85; defaultText = "pkgs.tomcat85"; - example = lib.literalExample "pkgs.tomcatUnstable"; + example = lib.literalExample "pkgs.tomcat9"; description = '' Which tomcat package to use. ''; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 39b27d4ceb61..4622c7b760f0 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -109,9 +109,5 @@ in }; - config = { - services.xserver.displayManager.session = cfg.session.list; - environment.systemPackages = - mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable - }; + config.services.xserver.displayManager.session = cfg.session.list; } diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 8a523f0d8036..7f3dc0d7847b 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -47,7 +47,7 @@ in export GTK_DATA_PREFIX=${config.system.path} # find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - export XDG_MENU_PREFIX=enlightenment + export XDG_MENU_PREFIX=e- export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}" diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index d2c856fc9332..21d30df5b695 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -136,7 +136,7 @@ in { # find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - export XDG_MENU_PREFIX=gnome + export XDG_MENU_PREFIX=gnome- ${concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index ab8a0a48b483..814503ab0bc4 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -12,6 +12,17 @@ let in filter (x: !(builtins.elem (pkgName x) ysNames)) xs; + addToXDGDirs = p: '' + if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} + fi + + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + ''; + xcfg = config.services.xserver; cfg = xcfg.desktopManager.mate; @@ -20,10 +31,14 @@ in { options = { - services.xserver.desktopManager.mate.enable = mkOption { - type = types.bool; - default = false; - description = "Enable the MATE desktop environment"; + services.xserver.desktopManager.mate = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the MATE desktop environment"; + }; + + debug = mkEnableOption "mate-session debug messages"; }; environment.mate.excludePackages = mkOption { @@ -47,15 +62,34 @@ in # Find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - export XDG_MENU_PREFIX=mate + export XDG_MENU_PREFIX=mate- # Find the mouse export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons + # Let caja find extensions + export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 + + # Let caja extensions find gsettings schemas + ${concatMapStrings (p: '' + if [ -d "${p}/lib/caja/extensions-2.0" ]; then + ${addToXDGDirs p} + fi + '') + config.environment.systemPackages + } + + # Let mate-panel find applets + export MATE_PANEL_APPLETS_DIR=$MATE_PANEL_APPLETS_DIR''${MATE_PANEL_APPLETS_DIR:+:}${config.system.path}/share/mate-panel/applets + export MATE_PANEL_EXTRA_MODULES=$MATE_PANEL_EXTRA_MODULES''${MATE_PANEL_EXTRA_MODULES:+:}${config.system.path}/lib/mate-panel/applets + + # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive) + ${addToXDGDirs pkgs.mate.mate-control-center} + # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update - ${pkgs.mate.mate-session-manager}/bin/mate-session & + ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} & waitPID=$! ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bb4f4e868fea..17a2cde3a65d 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -25,8 +25,8 @@ in type = types.bool; default = true; description = '' - Enable support for Qt 4-based applications. Particularly, install the - Qt 4 version of the Breeze theme and a default backend for Phonon. + Enable support for Qt 4-based applications. Particularly, install a + default backend for Phonon. ''; }; @@ -142,11 +142,13 @@ in kde-gtk-config breeze-gtk + qtvirtualkeyboard + libsForQt56.phonon-backend-gstreamer libsForQt5.phonon-backend-gstreamer ] - ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ] + ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ] # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable bluedevil @@ -193,16 +195,6 @@ in theme = mkDefault "breeze"; }; - boot.plymouth = { - theme = mkDefault "breeze"; - themePackages = mkDefault [ - (pkgs.breeze-plymouth.override { - nixosBranding = true; - nixosVersion = config.system.nixosRelease; - }) - ]; - }; - security.pam.services.kde = { allowNullPassword = true; }; # Doing these one by one seems silly, but we currently lack a better diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 9c42dc8781b9..9d5d03638e04 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -3,15 +3,13 @@ with lib; let - xcfg = config.services.xserver; + pcfg = config.hardware.pulseaudio; cfg = xcfg.desktopManager.xfce; - in { options = { - services.xserver.desktopManager.xfce = { enable = mkOption { type = types.bool; @@ -96,8 +94,8 @@ in pkgs.xfce.xfce4icontheme pkgs.xfce.xfce4session pkgs.xfce.xfce4settings - pkgs.xfce.xfce4mixer - pkgs.xfce.xfce4volumed + (if pcfg.enable then pkgs.xfce.xfce4mixer_pulse else pkgs.xfce.xfce4mixer) + (if pcfg.enable then pkgs.xfce.xfce4volumed_pulse else pkgs.xfce.xfce4volumed) pkgs.xfce.xfce4-screenshooter pkgs.xfce.xfconf # This supplies some "abstract" icons such as @@ -124,6 +122,7 @@ in [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; + environment.variables.GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; # Enable helpful DBus services. services.udisks2.enable = true; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 1d5dcb2c7cbe..35b715b98fcd 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -45,6 +45,8 @@ let theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} background = ${ldmcfg.background} + ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} + ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} ${cfg.extraConfig} ''; @@ -104,6 +106,35 @@ in }; + clock-format = mkOption { + type = types.nullOr types.str; + default = null; + example = "%F"; + description = '' + Clock format string (as expected by strftime, e.g. "%H:%M") + to use with the lightdm gtk greeter panel. + + If set to null the default clock format is used. + ''; + }; + + indicators = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + example = [ "~host" "~spacer" "~clock" "~spacer" "~session" "~language" "~a11y" "~power" ]; + description = '' + List of allowed indicator modules to use for the lightdm gtk + greeter panel. + + Built-in indicators include "~a11y", "~language", "~session", + "~power", "~clock", "~host", "~spacer". Unity indicators can be + represented by short name (e.g. "sound", "power"), service file name, + or absolute path. + + If set to null the default indicators are used. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 5aecdef812e6..d0a87f183b6f 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -170,7 +170,7 @@ in { disableWhileTyping = mkOption { type = types.bool; - default = true; + default = false; description = '' Disable input method while typing. diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index eb97449c6bd9..71eb02ec5954 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -6,7 +6,11 @@ let cfg = config.services.xserver.windowManager.awesome; awesome = cfg.package; - inherit (pkgs.luaPackages) getLuaPath getLuaCPath; + getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}"; + makeSearchPath = lib.concatMapStrings (path: + " --search " + (getLuaPath path "share") + + " --search " + (getLuaPath path "lib") + ); in { @@ -46,10 +50,7 @@ in { name = "awesome"; start = '' - export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}" - export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}" - - ${awesome}/bin/awesome & + ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} & waitPID=$! ''; }; diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix new file mode 100644 index 000000000000..c4c6d82dc5c8 --- /dev/null +++ b/nixos/modules/system/boot/grow-partition.nix @@ -0,0 +1,43 @@ +# This module automatically grows the root partition. +# This allows an instance to be created with a bigger root filesystem +# than provided by the machine image. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + + options = { + boot.growPartition = mkEnableOption "grow the root partition on boot"; + }; + + config = mkIf config.boot.growPartition { + + boot.initrd.extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.gawk}/bin/gawk + copy_bin_and_libs ${pkgs.gnused}/bin/sed + copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk + copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk + + substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ + --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ + --replace "awk" "gawk" \ + --replace "sed" "gnused" + + ln -s sed $out/bin/gnused + ''; + + boot.initrd.postDeviceCommands = '' + rootDevice="${config.fileSystems."/".device}" + if [ -e "$rootDevice" ]; then + rootDevice="$(readlink -f "$rootDevice")" + parentDevice="$(lsblk -npo PKNAME "$rootDevice")" + TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" + udevadm settle + fi + ''; + + }; + +} diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index d78775c27582..cdeff4845948 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -89,9 +89,6 @@ in config = mkIf (config.boot.initrd.network.enable && cfg.enable) { assertions = [ - { assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null; - message = "You should specify at least one host key for initrd SSH"; - } { assertion = cfg.authorizedKeys != []; message = "You should specify at least one authorized key for initrd SSH"; } @@ -121,7 +118,7 @@ in echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} - dropbear -s -j -k -E -m -p ${toString cfg.port} + dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} ''; boot.initrd.secrets = diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 4db9631743e3..90074a1ba77b 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -197,7 +197,7 @@ in "mmc_block" # Support USB keyboards, in case the boot fails and we only have - # a USB keyboard. + # a USB keyboard, or for LUKS passphrase prompt. "uhci_hcd" "ehci_hcd" "ehci_pci" @@ -206,7 +206,7 @@ in "xhci_hcd" "xhci_pci" "usbhid" - "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" + "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp" # Misc. keyboard stuff. "pcips2" "atkbd" "i8042" diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 06f004fb06ec..eefee5a479e7 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -227,6 +227,11 @@ in default = [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" + + # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged + # remove once 'modprobe --show-depends xts' shows ecb as a dependency + "ecb" + (if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' @@ -434,7 +439,9 @@ in ["firewire_ohci" "firewire_core" "firewire_sbp2"]; # Some modules that may be needed for mounting anything ciphered - boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules; + # Also load input_leds to get caps lock light working (#12456) + boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] + ++ luks.cryptoModules; # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 4b0c498424b5..e78fdf1311d3 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -8,9 +8,14 @@ let cfg = config.boot.plymouth; + breezePlymouth = pkgs.breeze-plymouth.override { + nixosBranding = true; + nixosVersion = config.system.nixosRelease; + }; + themesEnv = pkgs.buildEnv { name = "plymouth-themes"; - paths = [ plymouth ] ++ cfg.themePackages; + paths = [ plymouth breezePlymouth ] ++ cfg.themePackages; }; configFile = pkgs.writeText "plymouthd.conf" '' @@ -38,7 +43,7 @@ in }; theme = mkOption { - default = "fade-in"; + default = "breeze"; type = types.str; description = '' Splash screen theme. diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 8cfa1b6921d3..1384873b6631 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -1,35 +1,132 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems; + inSystem = any (fs: fs == "btrfs") config.boot.supportedFilesystems; + + cfgScrub = config.services.btrfs.autoScrub; + + enableAutoScrub = cfgScrub.enable; + enableBtrfs = inInitrd || inSystem || enableAutoScrub; in { - config = mkIf (any (fs: fs == "btrfs") config.boot.supportedFilesystems) { + options = { + # One could also do regular btrfs balances, but that shouldn't be necessary + # during normal usage and as long as the filesystems aren't filled near capacity + services.btrfs.autoScrub = { + enable = mkEnableOption "Enable regular btrfs scrub"; - system.fsPackages = [ pkgs.btrfs-progs ]; + fileSystems = mkOption { + type = types.listOf types.path; + example = [ "/" ]; + description = '' + List of paths to btrfs filesystems to regularily call btrfs scrub on. + Defaults to all mount points with btrfs filesystems. + If you mount a filesystem multiple times or additionally mount subvolumes, + you need to manually specify this list to avoid scrubbing multiple times. + ''; + }; - boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ]; + interval = mkOption { + default = "monthly"; + type = types.str; + example = "weekly"; + description = '' + Systemd calendar expression for when to scrub btrfs filesystems. + The recommended period is a month but could be less + (btrfs-scrub + 8). + See + systemd.time + 7 + for more information on the syntax. + ''; + }; - boot.initrd.extraUtilsCommands = mkIf inInitrd + }; + }; + + config = mkMerge [ + (mkIf enableBtrfs { + system.fsPackages = [ pkgs.btrfs-progs ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd '' copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs ln -sv btrfs $out/bin/btrfsck ln -sv btrfsck $out/bin/fsck.btrfs ''; - boot.initrd.extraUtilsCommandsTest = mkIf inInitrd + boot.initrd.extraUtilsCommandsTest = mkIf inInitrd '' $out/bin/btrfs --version ''; - boot.initrd.postDeviceCommands = mkIf inInitrd + boot.initrd.postDeviceCommands = mkIf inInitrd '' btrfs device scan ''; - }; + }) + + (mkIf enableAutoScrub { + assertions = [ + { + assertion = cfgScrub.enable -> (cfgScrub.fileSystems != []); + message = '' + If 'services.btrfs.autoScrub' is enabled, you need to have at least one + btrfs file system mounted via 'fileSystems' or specify a list manually + in 'services.btrfs.autoScrub.fileSystems'. + ''; + } + ]; + + # This will yield duplicated units if the user mounts a filesystem multiple times + # or additionally mounts subvolumes, but going the other way around via devices would + # yield duplicated units when a filesystem spans multiple devices. + # This way around seems like the more sensible default. + services.btrfs.autoScrub.fileSystems = mkDefault (mapAttrsToList (name: fs: fs.mountPoint) + (filterAttrs (name: fs: fs.fsType == "btrfs") config.fileSystems)); + + # TODO: Did not manage to do it via the usual btrfs-scrub@.timer/.service + # template units due to problems enabling the parameterized units, + # so settled with many units and templating via nix for now. + # https://github.com/NixOS/nixpkgs/pull/32496#discussion_r156527544 + systemd.timers = let + scrubTimer = fs: let + fs' = utils.escapeSystemdPath fs; + in nameValuePair "btrfs-scrub-${fs'}" { + description = "regular btrfs scrub timer on ${fs}"; + + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfgScrub.interval; + AccuracySec = "1d"; + Persistent = true; + }; + }; + in listToAttrs (map scrubTimer cfgScrub.fileSystems); + + systemd.services = let + scrubService = fs: let + fs' = utils.escapeSystemdPath fs; + in nameValuePair "btrfs-scrub-${fs'}" { + description = "btrfs scrub on ${fs}"; + + serviceConfig = { + Type = "oneshot"; + Nice = 19; + IOSchedulingClass = "idle"; + ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}"; + }; + }; + in listToAttrs (map scrubService cfgScrub.fileSystems); + }) + ]; } diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 7fee99115329..2c0a165887bd 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -268,7 +268,7 @@ in assertions = [ { assertion = config.networking.hostId != null; - message = "ZFS requires config.networking.hostId to be set"; + message = "ZFS requires networking.hostId to be set"; } { assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 1d6c41406107..9b4136223c0f 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -128,7 +128,7 @@ in # Make it easy to log in as root when running the test interactively. users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; - services.xserver.displayManager.logToJournal = true; + services.xserver.displayManager.job.logToJournal = true; }; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 6cb9e07ae820..f74c42a777f5 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -11,7 +11,7 @@ with lib; let cfg = config.ec2; in { - imports = [ ../profiles/headless.nix ./ec2-data.nix ./grow-partition.nix ./amazon-init.nix ]; + imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ]; config = { @@ -21,7 +21,7 @@ let cfg = config.ec2; in } ]; - virtualisation.growPartition = cfg.hvm; + boot.growPartition = cfg.hvm; fileSystems."/" = { device = "/dev/disk/by-label/nixos"; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e68bfd860601..4038454b2d2f 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -726,6 +726,11 @@ in networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; + services.udev.extraRules = optionalString config.networking.networkmanager.enable '' + # Don't manage interfaces created by nixos-container. + ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1" + ''; + environment.systemPackages = [ pkgs.nixos-container ]; }); } diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 14826b6272f7..01512911a057 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -223,21 +223,22 @@ let self = { "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; - # 17.09.1483.d0f0657ca0 - "17.09".eu-west-1.hvm-ebs = "ami-cf33e7b6"; - "17.09".eu-west-2.hvm-ebs = "ami-7d061419"; - "17.09".eu-central-1.hvm-ebs = "ami-7548fa1a"; - "17.09".us-east-1.hvm-ebs = "ami-6f669d15"; - "17.09".us-east-2.hvm-ebs = "ami-cbe1ccae"; - "17.09".us-west-1.hvm-ebs = "ami-9d95a5fd"; - "17.09".us-west-2.hvm-ebs = "ami-d3956fab"; - "17.09".ca-central-1.hvm-ebs = "ami-ee4ef78a"; - "17.09".ap-southeast-1.hvm-ebs = "ami-1dfc807e"; - "17.09".ap-southeast-2.hvm-ebs = "ami-dcb350be"; - "17.09".ap-northeast-1.hvm-ebs = "ami-00ec3d66"; - "17.09".ap-northeast-2.hvm-ebs = "ami-1107dd7f"; - "17.09".sa-east-1.hvm-ebs = "ami-0377086f"; - "17.09".ap-south-1.hvm-ebs = "ami-4a064625"; + # 17.09.2681.59661f21be6 + "17.09".eu-west-1.hvm-ebs = "ami-a30192da"; + "17.09".eu-west-2.hvm-ebs = "ami-295a414d"; + "17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1"; + "17.09".eu-central-1.hvm-ebs = "ami-266cfe49"; + "17.09".us-east-1.hvm-ebs = "ami-40bee63a"; + "17.09".us-east-2.hvm-ebs = "ami-9d84aff8"; + "17.09".us-west-1.hvm-ebs = "ami-d14142b1"; + "17.09".us-west-2.hvm-ebs = "ami-3eb40346"; + "17.09".ca-central-1.hvm-ebs = "ami-ca8207ae"; + "17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8"; + "17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f"; + "17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef"; + "17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79"; + "17.09".sa-east-1.hvm-ebs = "ami-4762202b"; + "17.09".ap-south-1.hvm-ebs = "ami-4e376021"; latest = self."17.09"; }; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index e3b3e6a5f4ab..75717e08ab2a 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -6,7 +6,7 @@ let gce = pkgs.google-compute-engine; in { - imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ]; + imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; @@ -29,6 +29,7 @@ in autoResize = true; }; + boot.growPartition = true; boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "virtio_scsi" ]; boot.kernelModules = [ "virtio_pci" "virtio_net" ]; diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index 2cb932d208f0..444c0bc1630e 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -1,48 +1,3 @@ -# This module automatically grows the root partition on virtual machines. -# This allows an instance to be created with a bigger root filesystem -# than provided by the machine image. - -{ config, lib, pkgs, ... }: - -with lib; - -{ - - options = { - - virtualisation.growPartition = mkOption { - type = types.bool; - default = true; - }; - - }; - - config = mkIf config.virtualisation.growPartition { - - boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.gawk}/bin/gawk - copy_bin_and_libs ${pkgs.gnused}/bin/sed - copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk - copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - - substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ - --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ - --replace "awk" "gawk" \ - --replace "sed" "gnused" - - ln -s sed $out/bin/gnused - ''; - - boot.initrd.postDeviceCommands = '' - rootDevice="${config.fileSystems."/".device}" - if [ -e "$rootDevice" ]; then - rootDevice="$(readlink -f "$rootDevice")" - parentDevice="$(lsblk -npo PKNAME "$rootDevice")" - TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" - udevadm settle - fi - ''; - - }; - -} +# This profile is deprecated, use boot.growPartition directly. +builtins.trace "the profile is deprecated, use boot.growPartition instead" +{ } diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix new file mode 100644 index 000000000000..ecd2a8117710 --- /dev/null +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.hypervGuest; + +in { + options = { + virtualisation.hypervGuest = { + enable = mkEnableOption "Hyper-V Guest Support"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ]; + + security.rngd.enable = false; + + # enable hotadding memory + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "hyperv-memory-hotadd-udev-rules"; + destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules"; + text = '' + ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online" + ''; + }); + + systemd = { + packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; + + targets.hyperv-daemons = { + wantedBy = [ "multi-user.target" ]; + }; + }; + }; +} diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 8aa7ad8e3911..64465ae18522 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -37,11 +37,13 @@ in { ''; }; - virtualisation.libvirtd.enableKVM = mkOption { - type = types.bool; - default = true; + virtualisation.libvirtd.qemuPackage = mkOption { + type = types.package; + default = pkgs.qemu; description = '' - This option enables support for QEMU/KVM in libvirtd. + Qemu package to use with libvirt. + `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86) + `pkgs.qemu_kvm` saves disk space allowing to emulate only host architectures. ''; }; @@ -102,7 +104,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ]; + environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ]; boot.kernelModules = [ "tun" ]; @@ -154,9 +156,9 @@ in { # stable (not GC'able as in /nix/store) paths for using in section of xml configs mkdir -p /run/libvirt/nix-emulators - ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/ - ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"} - ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"} + for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do + ln -s --force "$emulator" /run/libvirt/nix-emulators/ + done ${optionalString cfg.qemuOvmf '' mkdir -p /run/libvirt/nix-ovmf diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index 48462dc66da8..b2457403463a 100644 --- a/nixos/modules/virtualisation/lxcfs.nix +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -28,13 +28,9 @@ in { ###### implementation config = mkIf cfg.enable { - services.cgmanager.enable = true; - systemd.services.lxcfs = { description = "FUSE filesystem for LXC"; wantedBy = [ "multi-user.target" ]; - requires = [ "cgmanager.service" ]; - after = [ "cgmanager.service" ]; before = [ "lxc.service" ]; restartIfChanged = false; serviceConfig = { diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index c865cf451e40..c1d2a314daf2 100644 --- a/nixos/modules/virtualisation/nova-config.nix +++ b/nixos/modules/virtualisation/nova-config.nix @@ -6,7 +6,6 @@ with lib; imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix - ./grow-partition.nix ]; config = { @@ -15,8 +14,7 @@ with lib; autoResize = true; }; - virtualisation.growPartition = true; - + boot.growPartition = true; boot.kernelParams = [ "console=ttyS0" ]; boot.loader.grub.device = "/dev/vda"; boot.loader.timeout = 0; diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix deleted file mode 100644 index c2837d0e2e24..000000000000 --- a/nixos/modules/virtualisation/nova.nix +++ /dev/null @@ -1,174 +0,0 @@ -# Module for Nova, a.k.a. OpenStack Compute. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.virtualisation.nova; - - nova = pkgs.nova; - - novaConf = pkgs.writeText "nova.conf" - '' - --nodaemon - --verbose - ${cfg.extraConfig} - ''; - -in - -{ - - ###### interface - - options = { - - virtualisation.nova.enableSingleNode = - mkOption { - default = false; - description = - '' - This option enables Nova, also known as OpenStack Compute, - a cloud computing system, as a single-machine - installation. That is, all of Nova's components are - enabled on this machine, using SQLite as Nova's database. - This is useful for evaluating and experimenting with Nova. - However, for a real cloud computing environment, you'll - want to enable some of Nova's services on other machines, - and use a database such as MySQL. - ''; - }; - - virtualisation.nova.extraConfig = - mkOption { - default = ""; - description = - '' - Additional text appended to nova.conf, - the main Nova configuration file. - ''; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enableSingleNode { - - environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ]; - - environment.etc = - [ { source = novaConf; - target = "nova/nova.conf"; - } - ]; - - # Nova requires libvirtd and RabbitMQ. - virtualisation.libvirtd.enable = true; - services.rabbitmq.enable = true; - - # `qemu-nbd' required the `nbd' kernel module. - boot.kernelModules = [ "nbd" ]; - - system.activationScripts.nova = - '' - mkdir -m 755 -p /var/lib/nova - mkdir -m 755 -p /var/lib/nova/networks - mkdir -m 700 -p /var/lib/nova/instances - mkdir -m 700 -p /var/lib/nova/keys - - # Allow the CA certificate generation script (called by - # nova-api) to work. - mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private - - # Initialise the SQLite database. - ${nova}/bin/nova-manage db sync - ''; - - # `nova-api' receives and executes external client requests from - # tools such as euca2ools. It listens on port 8773 (XML) and 8774 - # (JSON). - jobs.nova_api = - { name = "nova-api"; - - description = "Nova API service"; - - startOn = "ip-up"; - - # `openssl' is required to generate the CA. `openssh' is - # required to generate key pairs. - path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ]; - - respawn = false; - - exec = "${nova}/bin/nova-api --flagfile=${novaConf} --api_paste_config=${nova}/etc/nova/api-paste.ini"; - }; - - # `nova-objectstore' is a simple image server. Useful if you're - # not running the OpenStack Imaging Service (Swift). It serves - # images placed in /var/lib/nova/images/. - jobs.nova_objectstore = - { name = "nova-objectstore"; - - description = "Nova Simple Object Store Service"; - - startOn = "ip-up"; - - preStart = - '' - mkdir -m 700 -p /var/lib/nova/images - ''; - - exec = "${nova}/bin/nova-objectstore --flagfile=${novaConf}"; - }; - - # `nova-scheduler' schedules VM execution requests. - jobs.nova_scheduler = - { name = "nova-scheduler"; - - description = "Nova Scheduler Service"; - - startOn = "ip-up"; - - exec = "${nova}/bin/nova-scheduler --flagfile=${novaConf}"; - }; - - # `nova-compute' starts and manages virtual machines. - jobs.nova_compute = - { name = "nova-compute"; - - description = "Nova Compute Service"; - - startOn = "ip-up"; - - path = - [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm - pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute - pkgs.bridge-utils - ]; - - exec = "${nova}/bin/nova-compute --flagfile=${novaConf}"; - }; - - # `nova-network' manages networks and allocates IP addresses. - jobs.nova_network = - { name = "nova-network"; - - description = "Nova Network Service"; - - startOn = "ip-up"; - - path = - [ pkgs.sudo pkgs.vlan pkgs.dnsmasq pkgs.nettools pkgs.iptables - pkgs.iproute pkgs.bridge-utils pkgs.radvd - ]; - - exec = "${nova}/bin/nova-network --flagfile=${novaConf}"; - }; - - }; - -} diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix deleted file mode 100644 index 2feb0a873951..000000000000 --- a/nixos/modules/virtualisation/openstack/common.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib }: - -with lib; - -rec { - # A shell script string helper to get the value of a secret at - # runtime. - getSecret = secretOption: - if secretOption.storage == "fromFile" - then ''$(cat ${secretOption.value})'' - else ''${secretOption.value}''; - - - # A shell script string help to replace at runtime in a file the - # pattern of a secret by its value. - replaceSecret = secretOption: filename: '' - sed -i "s/${secretOption.pattern}/${getSecret secretOption}/g" ${filename} - ''; - - # This generates an option that can be used to declare secrets which - # can be stored in the nix store, or not. A pattern is written in - # the nix store to represent the secret. The pattern can - # then be overwritten with the value of the secret at runtime. - mkSecretOption = {name, description ? ""}: - mkOption { - description = description; - type = types.submodule ({ - options = { - pattern = mkOption { - type = types.str; - default = "##${name}##"; - description = "The pattern that represent the secret."; - }; - storage = mkOption { - type = types.enum [ "fromNixStore" "fromFile" ]; - description = '' - Choose the way the password is provisionned. If - fromNixStore is used, the value is the password and it is - written in the nix store. If fromFile is used, the value - is a path from where the password will be read at - runtime. This is generally used with - deployment keys of Nixops. - '';}; - value = mkOption { - type = types.str; - description = '' - If the storage is fromNixStore, the value is the password itself, - otherwise it is a path to the file that contains the password. - ''; - }; - };}); - }; - - databaseOption = name: { - host = mkOption { - type = types.str; - default = "localhost"; - description = '' - Host of the database. - ''; - }; - - name = mkOption { - type = types.str; - default = name; - description = '' - Name of the existing database. - ''; - }; - - user = mkOption { - type = types.str; - default = name; - description = '' - The database user. The user must exist and has access to - the specified database. - ''; - }; - password = mkSecretOption { - name = name + "MysqlPassword"; - description = "The database user's password";}; - }; -} diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix deleted file mode 100644 index 7862409a65ec..000000000000 --- a/nixos/modules/virtualisation/openstack/glance.nix +++ /dev/null @@ -1,245 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; with import ./common.nix {inherit lib;}; - -let - cfg = config.virtualisation.openstack.glance; - commonConf = '' - [database] - connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}" - notification_driver = noop - - [keystone_authtoken] - auth_url = ${cfg.authUrl} - auth_plugin = password - project_name = service - project_domain_id = default - user_domain_id = default - username = ${cfg.serviceUsername} - password = ${cfg.servicePassword.pattern} - - [glance_store] - default_store = file - filesystem_store_datadir = /var/lib/glance/images/ - ''; - glanceApiConfTpl = pkgs.writeText "glance-api.conf" '' - ${commonConf} - - [paste_deploy] - flavor = keystone - config_file = ${cfg.package}/etc/glance-api-paste.ini - ''; - glanceRegistryConfTpl = pkgs.writeText "glance-registry.conf" '' - ${commonConf} - - [paste_deploy] - config_file = ${cfg.package}/etc/glance-registry-paste.ini - ''; - glanceApiConf = "/var/lib/glance/glance-api.conf"; - glanceRegistryConf = "/var/lib/glance/glance-registry.conf"; - -in { - options.virtualisation.openstack.glance = { - package = mkOption { - type = types.package; - default = pkgs.glance; - defaultText = "pkgs.glance"; - description = '' - Glance package to use. - ''; - }; - - enable = mkOption { - default = false; - type = types.bool; - description = '' - This option enables Glance as a single-machine - installation. That is, all of Glance's components are - enabled on this machine. This is useful for evaluating and - experimenting with Glance. Note we are currently not - providing any configurations for a multi-node setup. - ''; - }; - - authUrl = mkOption { - type = types.str; - default = http://localhost:5000; - description = '' - Complete public Identity (Keystone) API endpoint. Note this is - unversionned. - ''; - }; - - serviceUsername = mkOption { - type = types.str; - default = "glance"; - description = '' - The Glance service username. This user is created if bootstrap - is enable, otherwise it has to be manually created before - starting this service. - ''; - }; - - servicePassword = mkSecretOption { - name = "glanceAdminPassword"; - description = '' - The Glance service user's password. - ''; - }; - - database = databaseOption "glance"; - - bootstrap = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Bootstrap the Glance service by creating the service tenant, - an admin account and a public endpoint. This option provides - a ready-to-use glance service. This is only done at the - first Glance execution by the systemd post start section. - The keystone admin account is used to create required - Keystone resource for the Glance service. - - This option is a helper for setting up - development or testing environments. - ''; - }; - - endpointPublic = mkOption { - type = types.str; - default = "http://localhost:9292"; - description = '' - The public image endpoint. The link - create endpoint provides more informations - about that. - ''; - }; - - keystoneAdminUsername = mkOption { - type = types.str; - default = "admin"; - description = '' - The keystone admin user name used to create the Glance account. - ''; - }; - - keystoneAdminPassword = mkSecretOption { - name = "keystoneAdminPassword"; - description = '' - The keystone admin user's password. - ''; - }; - - keystoneAdminTenant = mkOption { - type = types.str; - default = "admin"; - description = '' - The keystone admin tenant used to create the Glance account. - ''; - }; - keystoneAuthUrl = mkOption { - type = types.str; - default = "http://localhost:5000/v2.0"; - description = '' - The keystone auth url used to create the Glance account. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.extraUsers = [{ - name = "glance"; - group = "glance"; - uid = config.ids.gids.glance; - - }]; - users.extraGroups = [{ - name = "glance"; - gid = config.ids.gids.glance; - }]; - - systemd.services.glance-registry = { - description = "OpenStack Glance Registry Daemon"; - after = [ "network.target"]; - path = [ pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 775 -p /var/lib/glance/{images,scrubber,image_cache} - chown glance:glance /var/lib/glance/{images,scrubber,image_cache} - - # Secret file managment - cp ${glanceRegistryConfTpl} ${glanceRegistryConf}; - chown glance:glance ${glanceRegistryConf}; - chmod 640 ${glanceRegistryConf} - ${replaceSecret cfg.database.password glanceRegistryConf} - ${replaceSecret cfg.servicePassword glanceRegistryConf} - - cp ${glanceApiConfTpl} ${glanceApiConf}; - chown glance:glance ${glanceApiConf}; - chmod 640 ${glanceApiConf} - ${replaceSecret cfg.database.password glanceApiConf} - ${replaceSecret cfg.servicePassword glanceApiConf} - - # Initialise the database - ${cfg.package}/bin/glance-manage --config-file=${glanceApiConf} --config-file=${glanceRegistryConf} db_sync - ''; - postStart = '' - set -eu - export OS_AUTH_URL=${cfg.bootstrap.keystoneAuthUrl} - export OS_USERNAME=${cfg.bootstrap.keystoneAdminUsername} - export OS_PASSWORD=${getSecret cfg.bootstrap.keystoneAdminPassword} - export OS_TENANT_NAME=${cfg.bootstrap.keystoneAdminTenant} - - # Wait until the keystone is available for use - count=0 - while ! keystone user-get ${cfg.bootstrap.keystoneAdminUsername} > /dev/null - do - if [ $count -eq 30 ] - then - echo "Tried 30 times, giving up..." - exit 1 - fi - - echo "Keystone not yet started. Waiting for 1 second..." - count=$((count++)) - sleep 1 - done - - # If the service glance doesn't exist, we consider glance is - # not initialized - if ! keystone service-get glance - then - keystone service-create --type image --name glance - ID=$(keystone service-get glance | awk '/ id / { print $4 }') - keystone endpoint-create --region RegionOne --service $ID --internalurl http://localhost:9292 --adminurl http://localhost:9292 --publicurl ${cfg.bootstrap.endpointPublic} - - keystone user-create --name ${cfg.serviceUsername} --tenant service --pass ${getSecret cfg.servicePassword} - keystone user-role-add --tenant service --user ${cfg.serviceUsername} --role admin - fi - ''; - serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root - TimeoutStartSec = "600"; # 10min for initial db migrations - User = "glance"; - Group = "glance"; - ExecStart = "${cfg.package}/bin/glance-registry --config-file=${glanceRegistryConf}"; - }; - }; - systemd.services.glance-api = { - description = "OpenStack Glance API Daemon"; - after = [ "glance-registry.service" "network.target"]; - requires = [ "glance-registry.service" "network.target"]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root - User = "glance"; - Group = "glance"; - ExecStart = "${cfg.package}/bin/glance-api --config-file=${glanceApiConf}"; - }; - }; - }; - -} diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix deleted file mode 100644 index e32c5a4cae1b..000000000000 --- a/nixos/modules/virtualisation/openstack/keystone.nix +++ /dev/null @@ -1,220 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; with import ./common.nix {inherit lib;}; - -let - cfg = config.virtualisation.openstack.keystone; - keystoneConfTpl = pkgs.writeText "keystone.conf" '' - [DEFAULT] - admin_token = ${cfg.adminToken.pattern} - policy_file=${cfg.package}/etc/policy.json - - [database] - - connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}" - - [paste_deploy] - config_file = ${cfg.package}/etc/keystone-paste.ini - - ${cfg.extraConfig} - ''; - keystoneConf = "/var/lib/keystone/keystone.conf"; - -in { - options.virtualisation.openstack.keystone = { - package = mkOption { - type = types.package; - example = literalExample "pkgs.keystone"; - description = '' - Keystone package to use. - ''; - }; - - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable Keystone, the OpenStack Identity Service - ''; - }; - - extraConfig = mkOption { - default = ""; - type = types.lines; - description = '' - Additional text appended to keystone.conf, - the main Keystone configuration file. - ''; - }; - - adminToken = mkSecretOption { - name = "adminToken"; - description = '' - This is the admin token used to boostrap keystone, - ie. to provision first resources. - ''; - }; - - bootstrap = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Bootstrap the Keystone service by creating the service - tenant, an admin account and a public endpoint. This options - provides a ready-to-use admin account. This is only done at - the first Keystone execution by the systemd post start. - - Note this option is a helper for setting up development or - testing environments. - ''; - }; - - endpointPublic = mkOption { - type = types.str; - default = "http://localhost:5000/v2.0"; - description = '' - The public identity endpoint. The link - create keystone endpoint provides more informations - about that. - ''; - }; - - adminUsername = mkOption { - type = types.str; - default = "admin"; - description = '' - A keystone admin username. - ''; - }; - - adminPassword = mkSecretOption { - name = "keystoneAdminPassword"; - description = '' - The keystone admin user's password. - ''; - }; - - adminTenant = mkOption { - type = types.str; - default = "admin"; - description = '' - A keystone admin tenant name. - ''; - }; - }; - - database = { - host = mkOption { - type = types.str; - default = "localhost"; - description = '' - Host of the database. - ''; - }; - - name = mkOption { - type = types.str; - default = "keystone"; - description = '' - Name of the existing database. - ''; - }; - - user = mkOption { - type = types.str; - default = "keystone"; - description = '' - The database user. The user must exist and has access to - the specified database. - ''; - }; - password = mkSecretOption { - name = "mysqlPassword"; - description = "The database user's password";}; - }; - }; - - config = mkIf cfg.enable { - # Note: when changing the default, make it conditional on - # ‘system.stateVersion’ to maintain compatibility with existing - # systems! - virtualisation.openstack.keystone.package = mkDefault pkgs.keystone; - - users.extraUsers = [{ - name = "keystone"; - group = "keystone"; - uid = config.ids.uids.keystone; - }]; - users.extraGroups = [{ - name = "keystone"; - gid = config.ids.gids.keystone; - }]; - - systemd.services.keystone-all = { - description = "OpenStack Keystone Daemon"; - after = [ "network.target"]; - path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 755 -p /var/lib/keystone - - cp ${keystoneConfTpl} ${keystoneConf}; - chown keystone:keystone ${keystoneConf}; - chmod 640 ${keystoneConf} - - ${replaceSecret cfg.database.password keystoneConf} - ${replaceSecret cfg.adminToken keystoneConf} - - # Initialise the database - ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync - # Set up the keystone's PKI infrastructure - ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} pki_setup --keystone-user keystone --keystone-group keystone - ''; - postStart = optionalString cfg.bootstrap.enable '' - set -eu - # Wait until the keystone is available for use - count=0 - while ! curl --fail -s http://localhost:35357/v2.0 > /dev/null - do - if [ $count -eq 30 ] - then - echo "Tried 30 times, giving up..." - exit 1 - fi - - echo "Keystone not yet started. Waiting for 1 second..." - count=$((count++)) - sleep 1 - done - - # We use the service token to create a first admin user - export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0 - export OS_SERVICE_TOKEN=${getSecret cfg.adminToken} - - # If the tenant service doesn't exist, we consider - # keystone is not initialized - if ! keystone tenant-get service - then - keystone tenant-create --name service - keystone tenant-create --name ${cfg.bootstrap.adminTenant} - keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${getSecret cfg.bootstrap.adminPassword} - keystone role-create --name admin - keystone role-create --name Member - keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin - keystone service-create --type identity --name keystone - ID=$(keystone service-get keystone | awk '/ id / { print $4 }') - keystone endpoint-create --region RegionOne --service $ID --publicurl ${cfg.bootstrap.endpointPublic} --adminurl http://localhost:35357/v2.0 --internalurl http://localhost:5000/v2.0 - fi - ''; - serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root - TimeoutStartSec = "600"; # 10min for initial db migrations - User = "keystone"; - Group = "keystone"; - ExecStart = "${cfg.package}/bin/keystone-all --config-file=${keystoneConf}"; - }; - }; - }; -} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 770e5fb848a9..26f7945a4eda 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -18,7 +18,7 @@ let "i686-linux" = "${qemu}/bin/qemu-kvm"; "x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64"; "armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; - "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt -cpu host"; + "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; }.${pkgs.stdenv.system}; # FIXME: figure out a common place for this instead of copy pasting diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index d68b3bb73904..00381c426d23 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -8,8 +8,6 @@ let in { - imports = [ ./grow-partition.nix ]; - options = { virtualbox = { baseImageSize = mkOption { @@ -23,7 +21,6 @@ in { }; config = { - system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix { name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}"; @@ -71,6 +68,7 @@ in { autoResize = true; }; + boot.growPartition = true; boot.loader.grub.device = "/dev/sda"; virtualisation.virtualbox.guest.enable = true; diff --git a/nixos/release.nix b/nixos/release.nix index bb6a73eb68ec..3dd670c30bad 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,6 +1,6 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" ] +, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] }: with import ../lib; @@ -89,6 +89,27 @@ let }); }).config)); + makeNetboot = config: + let + config_evaled = import lib/eval-config.nix config; + build = config_evaled.config.system.build; + kernelTarget = config_evaled.pkgs.stdenv.platform.kernelTarget; + in + pkgs.symlinkJoin { + name="netboot"; + paths=[ + build.netbootRamdisk + build.kernel + build.netbootIpxeScript + ]; + postBuild = '' + mkdir -p $out/nix-support + echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products + echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products + echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products + ''; + }; + in rec { @@ -103,28 +124,22 @@ in rec { # Build the initial ramdisk so Hydra can keep track of its size over time. initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); - netboot.x86_64-linux = let build = (import lib/eval-config.nix { + netboot = { + x86_64-linux = makeNetboot { system = "x86_64-linux"; modules = [ ./modules/installer/netboot/netboot-minimal.nix versionModule ]; - }).config.system.build; - in - pkgs.symlinkJoin { - name="netboot"; - paths=[ - build.netbootRamdisk - build.kernel - build.netbootIpxeScript - ]; - postBuild = '' - mkdir -p $out/nix-support - echo "file bzImage $out/bzImage" >> $out/nix-support/hydra-build-products - echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products - echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products - ''; }; + } // (optionalAttrs (elem "aarch64-linux" supportedSystems) { + aarch64-linux = makeNetboot { + system = "aarch64-linux"; + modules = [ + ./modules/installer/netboot/netboot-minimal.nix + versionModule + ]; + };}); iso_minimal = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; @@ -217,6 +232,7 @@ in rec { tests.atd = callTest tests/atd.nix {}; tests.acme = callTest tests/acme.nix {}; tests.avahi = callTest tests/avahi.nix {}; + tests.beegfs = callTest tests/beegfs.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; tests.blivet = callTest tests/blivet.nix {}; tests.boot = callSubTests tests/boot.nix {}; @@ -252,7 +268,6 @@ in rec { tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; - tests.glance = callTest tests/glance.nix {}; tests.gocd-agent = callTest tests/gocd-agent.nix {}; tests.gocd-server = callTest tests/gocd-server.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; @@ -279,7 +294,6 @@ in rec { tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; - tests.keystone = callTest tests/keystone.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; tests.ldap = callTest tests/ldap.nix {}; @@ -333,10 +347,12 @@ in rec { tests.slim = callTest tests/slim.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; tests.snapper = callTest tests/snapper.nix {}; + tests.statsd = callTest tests/statsd.nix {}; tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; + tests.vault = callTest tests/vault.nix {}; tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; }; tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix new file mode 100644 index 000000000000..433910feafe3 --- /dev/null +++ b/nixos/tests/beegfs.nix @@ -0,0 +1,115 @@ +import ./make-test.nix ({ pkgs, ... } : + +let + connAuthFile="beegfs/auth-def.key"; + + client = { config, pkgs, lib, ... } : { + networking.firewall.enable = false; + services.beegfsEnable = true; + services.beegfs.default = { + mgmtdHost = "mgmt"; + connAuthFile = "/etc/${connAuthFile}"; + client = { + mount = false; + enable = true; + }; + }; + + fileSystems = pkgs.lib.mkVMOverride # FIXME: this should be creatd by the module + [ { mountPoint = "/beegfs"; + device = "default"; + fsType = "beegfs"; + options = [ "cfgFile=/etc/beegfs/client-default.conf" "_netdev" ]; + } + ]; + + environment.etc."${connAuthFile}" = { + enable = true; + text = "ThisIsALousySecret"; + mode = "0600"; + }; + }; + + + server = service : { config, pkgs, lib, ... } : { + networking.firewall.enable = false; + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + virtualisation.emptyDiskImages = [ 4096 ]; + + fileSystems = pkgs.lib.mkVMOverride + [ { mountPoint = "/data"; + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + } + ]; + + environment.systemPackages = with pkgs; [ beegfs ]; + environment.etc."${connAuthFile}" = { + enable = true; + text = "ThisIsALousySecret"; + mode = "0600"; + }; + + services.beegfsEnable = true; + services.beegfs.default = { + mgmtdHost = "mgmt"; + connAuthFile = "/etc/${connAuthFile}"; + "${service}" = { + enable = true; + storeDir = "/data"; + }; + }; + }; + +in +{ + name = "beegfs"; + + nodes = { + meta = server "meta"; + mgmt = server "mgmtd"; + storage1 = server "storage"; + storage2 = server "storage"; + client1 = client; + client2 = client; + }; + + testScript = '' + # Initalize the data directories + $mgmt->waitForUnit("default.target"); + $mgmt->succeed("beegfs-setup-mgmtd -C -f -p /data"); + $mgmt->succeed("systemctl start beegfs-mgmtd-default"); + + $meta->waitForUnit("default.target"); + $meta->succeed("beegfs-setup-meta -C -f -s 1 -p /data"); + $meta->succeed("systemctl start beegfs-meta-default"); + + $storage1->waitForUnit("default.target"); + $storage1->succeed("beegfs-setup-storage -C -f -s 1 -i 1 -p /data"); + $storage1->succeed("systemctl start beegfs-storage-default"); + + $storage2->waitForUnit("default.target"); + $storage2->succeed("beegfs-setup-storage -C -f -s 2 -i 2 -p /data"); + $storage2->succeed("systemctl start beegfs-storage-default"); + + # + + # Basic test + $client1->waitForUnit("beegfs.mount"); + $client1->succeed("beegfs-check-servers-default"); + $client1->succeed("echo test > /beegfs/test"); + $client2->waitForUnit("beegfs.mount"); + $client2->succeed("test -e /beegfs/test"); + $client2->succeed("cat /beegfs/test | grep test"); + + # test raid0/stripping + $client1->succeed("dd if=/dev/urandom bs=1M count=10 of=/beegfs/striped"); + $client2->succeed("cat /beegfs/striped > /dev/null"); + + # check if fs is still healthy + $client1->succeed("beegfs-fsck-default --checkfs"); + ''; +}) diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix deleted file mode 100644 index 992b77227a4b..000000000000 --- a/nixos/tests/glance.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ system ? builtins.currentSystem }: - -with import ../lib/testing.nix { inherit system; }; -with pkgs.lib; - -let - glanceMysqlPassword = "glanceMysqlPassword"; - glanceAdminPassword = "glanceAdminPassword"; - - createDb = pkgs.writeText "db-provisionning.sql" '' - create database keystone; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone'; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone'; - - create database glance; - GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' IDENTIFIED BY '${glanceMysqlPassword}'; - GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' IDENTIFIED BY '${glanceMysqlPassword}'; - ''; - - image = - (import ../lib/eval-config.nix { - inherit system; - modules = [ ../../nixos/modules/virtualisation/nova-image.nix ]; - }).config.system.build.novaImage; - - # The admin keystone account - adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=keystone OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; - -in makeTest { - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lewo ]; - }; - machine = - { config, pkgs, ... }: - { - services.mysql.enable = true; - services.mysql.package = pkgs.mysql; - services.mysql.initialScript = createDb; - - virtualisation = { - openstack.keystone = { - enable = true; - database.password = { value = "keystone"; storage = "fromNixStore"; }; - adminToken = { value = "adminToken"; storage = "fromNixStore"; }; - bootstrap.enable = true; - bootstrap.adminPassword = { value = "keystone"; storage = "fromNixStore"; }; - }; - - openstack.glance = { - enable = true; - database.password = { value = glanceMysqlPassword; storage = "fromNixStore"; }; - servicePassword = { value = glanceAdminPassword; storage = "fromNixStore"; }; - - bootstrap = { - enable = true; - keystoneAdminPassword = { value = "keystone"; storage = "fromNixStore"; }; - }; - }; - - memorySize = 2096; - diskSize = 4 * 1024; - }; - - environment.systemPackages = with pkgs.pythonPackages; with pkgs; [ - openstackclient - ]; - }; - - testScript = - '' - $machine->waitForUnit("glance-api.service"); - - # Since Glance api can take time to start, we retry until success - $machine->waitUntilSucceeds("${adminOpenstackCmd} image create nixos --file ${image}/nixos.img --disk-format qcow2 --container-format bare --public"); - $machine->succeed("${adminOpenstackCmd} image list") =~ /nixos/ or die; - ''; -} diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index a9833058f378..ed55b2ff5871 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -36,6 +36,9 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $master->waitForUnit("jenkins"); + + $master->mustSucceed("curl http://localhost:8080 | grep 'Authentication required'"); + print $master->execute("sudo -u jenkins groups"); $master->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users"); @@ -44,4 +47,4 @@ import ./make-test.nix ({ pkgs, ...} : { $slave->mustFail("systemctl is-enabled jenkins.service"); ''; -}) \ No newline at end of file +}) diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix deleted file mode 100644 index 358e352f776f..000000000000 --- a/nixos/tests/keystone.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ system ? builtins.currentSystem }: - -with import ../lib/testing.nix { inherit system; }; -with pkgs.lib; - -let - keystoneMysqlPassword = "keystoneMysqlPassword"; - keystoneMysqlPasswordFile = "/var/run/keystoneMysqlPassword"; - keystoneAdminPassword = "keystoneAdminPassword"; - - createKeystoneDb = pkgs.writeText "create-keystone-db.sql" '' - create database keystone; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY '${keystoneMysqlPassword}'; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '${keystoneMysqlPassword}'; - ''; - # The admin keystone account - adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=${keystoneAdminPassword} OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; - # The created demo keystone account - demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; - -in makeTest { - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lewo ]; - }; - machine = - { config, pkgs, ... }: - { - # This is to simulate nixops deployment process. - # https://nixos.org/nixops/manual/#opt-deployment.keys - boot.postBootCommands = "echo ${keystoneMysqlPassword} > ${keystoneMysqlPasswordFile}"; - - services.mysql.enable = true; - services.mysql.initialScript = createKeystoneDb; - - virtualisation = { - - openstack.keystone = { - enable = true; - # Check if we can get the secret from a file - database.password = { - value = keystoneMysqlPasswordFile; - storage = "fromFile"; - }; - adminToken = { - value = "adminToken"; - storage = "fromNixStore"; - }; - - bootstrap.enable = true; - # Check if we can get the secret from the store - bootstrap.adminPassword = { - value = keystoneAdminPassword; - storage = "fromNixStore"; - }; - }; - - memorySize = 2096; - diskSize = 4 * 1024; - }; - - environment.systemPackages = with pkgs.pythonPackages; with pkgs; [ - openstackclient - ]; - }; - - testScript = - '' - $machine->waitForUnit("keystone-all.service"); - - # Verify that admin ccount is working - $machine->succeed("${adminOpenstackCmd} token issue"); - - # Try to create a new user - $machine->succeed("${adminOpenstackCmd} project create --domain default --description 'Demo Project' demo"); - $machine->succeed("${adminOpenstackCmd} user create --domain default --password demo demo"); - $machine->succeed("${adminOpenstackCmd} role create user"); - $machine->succeed("${adminOpenstackCmd} role add --project demo --user demo user"); - - # Verify this new account is working - $machine->succeed("${demoOpenstackCmd} token issue"); - ''; -} diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index e44e5bf11d33..2d3ecaf94cfa 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,7 +39,7 @@ import ./make-test.nix ({pkgs, ... }: { $client->waitForUnit("cups.service"); $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; - $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + $client->succeed("lpstat -H") =~ "localhost:631" or die; $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/"); diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index f694fc75ef77..8ac0639c6a8c 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -20,7 +20,7 @@ let ''; }; # WARNING: DON'T DO THIS IN PRODUCTION! - # This puts secrets (albeit hashed) directly into the Nix store for ease of testing. + # This puts unhashed secrets directly into the Nix store for ease of testing. environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} '' ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password} ''; diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix new file mode 100644 index 000000000000..d6bbc3901630 --- /dev/null +++ b/nixos/tests/statsd.nix @@ -0,0 +1,40 @@ +import ./make-test.nix ({ pkgs, lib }: + +with lib; + +{ + name = "statsd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes.statsd1 = { + services.statsd.enable = true; + services.statsd.backends = [ "statsd-influxdb-backend" "console" ]; + services.statsd.extraConfig = '' + influxdb: { + username: "root", + password: "root", + database: "statsd" + } + ''; + + services.influxdb.enable = true; + + systemd.services.influx-init = { + description = "Setup Influx Test Base"; + after = [ "influxdb.service" ]; + before = [ "statsd.service" ]; + + script = '' + echo "CREATE DATABASE statsd" | ${pkgs.influxdb}/bin/influx + ''; + }; + }; + + testScript = '' + $statsd1->start(); + $statsd1->waitForUnit("statsd.service"); + $statsd1->succeed("nc -z 127.0.0.1 8126"); + ''; +}) diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix new file mode 100644 index 000000000000..2c08d06f286b --- /dev/null +++ b/nixos/tests/vault.nix @@ -0,0 +1,23 @@ +import ./make-test.nix ({ pkgs, ... }: +{ + name = "vault"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.vault ]; + environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; + services.vault.enable = true; + }; + + testScript = + '' + startAll; + + $machine->waitForUnit('multi-user.target'); + $machine->waitForUnit('vault.service'); + $machine->waitForOpenPort(8200); + $machine->succeed('vault init'); + $machine->succeed('vault status | grep "Sealed: true"'); + ''; +}) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index c519d7dae8be..5574293ba377 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -109,9 +109,6 @@ let } '' ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1 ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 mkdir /mnt diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix new file mode 100644 index 000000000000..cfbb1f24b198 --- /dev/null +++ b/pkgs/applications/altcoins/aeon/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }: + +let + version = "0.9.14.0"; +in +stdenv.mkDerivation { + name = "aeon-${version}"; + + src = fetchFromGitHub { + owner = "aeonix"; + repo = "aeon"; + rev = "v${version}"; + sha256 = "0pl9nfhihj0wsdgvvpv5f14k4m2ikk8s3xw6nd8ymbnpxfzyxynr"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ boost miniupnpc openssl unbound ]; + + installPhase = '' + install -D src/aeond "$out/bin/aeond" + install src/simpleminer "$out/bin/aeon-simpleminer" + install src/simplewallet "$out/bin/aeon-simplewallet" + install src/connectivity_tool "$out/bin/aeon-connectivity-tool" + ''; + + meta = with stdenv.lib; { + description = "Private, secure, untraceable currency"; + homepage = http://www.aeon.cash/; + license = licenses.bsd3; + maintainers = [ maintainers.aij ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix index 0136ab18ceac..01c47b320de5 100644 --- a/pkgs/applications/altcoins/cryptop/default.nix +++ b/pkgs/applications/altcoins/cryptop/default.nix @@ -1,16 +1,15 @@ -{ lib, python2}: +{ lib, buildPythonApplication, fetchPypi, requests, requests-cache }: -python2.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "cryptop"; - version = "0.1.0"; - name = "${pname}-${version}"; + version = "0.2.0"; - src = python2.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh"; + sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ python2.pkgs.requests ]; + propagatedBuildInputs = [ requests requests-cache ]; # No tests in archive doCheck = false; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index aeab29534691..21c6b1341149 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,7 +1,9 @@ -{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2 }: +{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { + aeon = callPackage ./aeon { }; + bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; @@ -20,6 +22,8 @@ rec { btc1 = callPackage ./btc1.nix { withGui = true; }; btc1d = callPackage ./btc1.nix { withGui = false; }; + cryptop = python3.pkgs.callPackage ./cryptop { }; + dashpay = callPackage ./dashpay.nix { }; dogecoin = callPackage ./dogecoin.nix { withGui = true; }; diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 24b891d60eb2..a14276d4fa2d 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec{ then "install -D bitcoin-qt $out/bin/memorycoin-qt" else "install -D bitcoind $out/bin/memorycoind"; + # `make build/version.o`: + # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop. + enableParallelBuilding = false; + meta = { description = "Peer-to-peer, CPU-based electronic cash system"; longDescription= '' diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index b1e3dc2dd93d..f79d54d0ce26 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec{ then "install -D bitcoin-qt $out/bin/primecoin-qt" else "install -D bitcoind $out/bin/primecoind"; + # `make build/version.o`: + # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop. + enableParallelBuilding = false; + meta = { description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers"; longDescription= '' diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index e9236544ee7f..6a8fba3c2bb7 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -2,20 +2,19 @@ , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent , withGui }: -let libsnark = callPackage ./libsnark { inherit boost openssl; }; - librustzcash = callPackage ./librustzcash {}; +let librustzcash = callPackage ./librustzcash {}; in with stdenv.lib; stdenv.mkDerivation rec { name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s"; + sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz"; }; # Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o" @@ -23,17 +22,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib + buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib protobuf libevent libsodium librustzcash ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; - configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark" - "--with-boost-libdir=${boost.out}/lib" + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; patchPhase = '' - sed -i"" '/^\[LIBSNARK_INCDIR/d' configure.ac sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am ''; diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix deleted file mode 100644 index 303b3bc171ef..000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, xbyak, gmp, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "ate-pairing-unstable-${version}"; - version = "2016-05-03"; - - src = fetchFromGitHub { - owner = "herumi"; - repo = "ate-pairing"; - rev = "dcb9da999b1113f90b115bccb6f4b57ddf3a8452"; - sha256 = "0jr6r1cma414k8mhsyp7n8hqaqxi7zklsp6820a095sbb3zajckh"; - }; - - buildInputs = [ gmp xbyak ]; - - installPhase = '' - mkdir -p $out - cp -r lib $out - cp -r include $out - ''; - - meta = with stdenv.lib; { - description = "Optimal Ate Pairing over Barreto-Naehrig Curves"; - homepage = https://github.com/herumi/ate-pairing; - maintainers = with maintainers; [ rht ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix deleted file mode 100644 index be885493dcda..000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, libsodium, callPackage, boost, zlib, openssl, gmp, procps, fetchFromGitHub }: - -let atePairing = callPackage ./ate-pairing.nix { inherit xbyak; }; - mie = callPackage ./mie.nix { }; - xbyak = callPackage ./xbyak.nix {}; -in -stdenv.mkDerivation rec{ - name = "libsnark-unstable-${version}"; - version = "2017-02-09"; - - src = fetchFromGitHub { - owner = "zcash"; - repo = "libsnark"; - rev = "9ada3f84ab484c57b2247c2f41091fd6a0916573"; - sha256 = "0vhslcb9rwqab9szavyn856z4h9w1syiamfcixqmj0s908zzlaaq"; - }; - - buildInputs = [ libsodium atePairing mie xbyak zlib openssl boost gmp ]; - - makeFlags = [ - "PREFIX=$(out)" - "CURVE=ALT_BN128" - "NO_SUPERCOP=1" - "STATIC=1" - ]; - - buildPhase = '' - CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" \ - make lib \ - CURVE=ALT_BN128 \ - MULTICORE=1 \ - STATIC=1 \ - NO_PROCPS=1 \ - NO_GTEST=1 \ - FEATUREFLAGS=-DMONTGOMERY_OUTPUT \ - ''; - - meta = with stdenv.lib; { - description = "a C++ library for zkSNARK proofs"; - homepage = https://github.com/zcash/libsnark; - maintainers = with maintainers; [ rht ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix deleted file mode 100644 index a66ff128293e..000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "mie-unstable-${version}"; - version = "2016-05-10"; - - src = fetchFromGitHub { - owner = "herumi"; - repo = "mie"; - rev = "704b625b7770a8e1eab26ac65d1fed14c2fcf090"; - sha256 = "144bpmgfs2m4qqv7a2mccgi1aq5jmlr25gnk78ryq09z8cyv88y2"; - }; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out - cp -r include $out - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/herumi/mie; - maintainers = with maintainers; [ rht ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix deleted file mode 100644 index 88d432fd1637..000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "xbyak-unstable-${version}"; - version = "2016-05-03"; - - src = fetchFromGitHub { - owner = "herumi"; - repo = "xbyak"; - rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa"; - sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/include - cp -r xbyak $out/include - ''; - - meta = with stdenv.lib; { - description = "JIT assembler for x86, x64"; - homepage = https://github.com/herumi/xbyak; - maintainers = with maintainers; [ rht ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 224ae9f6f6f8..dfa27aa9f2eb 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }: stdenv.mkDerivation rec { - version = "15.12"; + version = "16.06"; name = "mma-${version}"; src = fetchurl { url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; - sha256 = "0k37kcrfaxmwjb8xb1cbqinrkx3g50dbvwqbvwl3l762j4vr8jgx"; + sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; buildInputs = [ makeWrapper python alsaUtils timidity ]; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 4f010213b653..c37963c77f3e 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper +{ stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper , overrideCC, qt5, requireFile, unzip, wine }: @@ -13,8 +13,6 @@ let sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s"; }; - stdenv_multi = overrideCC stdenv gcc_multi; - vst-sdk = stdenv.mkDerivation rec { name = "vstsdk368_08_11_2017_build_121"; src = requireFile { @@ -38,7 +36,7 @@ let in -stdenv_multi.mkDerivation { +multiStdenv.mkDerivation { name = "airwave-${version}"; src = airwave-src; @@ -54,7 +52,7 @@ stdenv_multi.mkDerivation { # For airwave-host-32.exe.so, point wineg++ to 32-bit versions of # these libraries, as $NIX_LDFLAGS contains only 64-bit ones. substituteInPlace src/host/CMakeLists.txt --replace '-m32' \ - '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${stdenv_multi.cc.libc.out}/lib/32' + '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${multiStdenv.cc.libc.out}/lib/32' ''; # libstdc++.so link gets lost in 64-bit executables during diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix deleted file mode 100644 index 022e33991f98..000000000000 --- a/pkgs/applications/audio/amarok/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig -, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib -, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod -, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null -, lz4, lzo, snappy, libaio, pcre -}: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - pname = "amarok"; - version = "2.8.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l"; - }; - - QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - buildInputs = [ - qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/ - taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2 - libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core - lz4 lzo snappy libaio pcre - ]; - - # This is already fixed upstream, will be release in 2.9 - preConfigure = '' - sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake - ''; - - cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; - - enableParallelBuilding = true; - - propagatedUserEnvPkgs = [ qtscriptgenerator ]; - - meta = { - repositories.git = git://anongit.kde.org/amarok.git; - description = "Popular music player for KDE"; - license = "GPL"; - homepage = https://amarok.kde.org; - inherit (kdelibs4.meta) platforms; - }; -} diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix index a96aa3ed65d0..a4ac2943bfbc 100644 --- a/pkgs/applications/audio/amarok/kf5.nix +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -3,7 +3,7 @@ , qca-qt5, qjson, qtscript, qtwebkit , kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor , phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: let @@ -26,7 +26,8 @@ in mkDerivation { qca-qt5 qjson qtscript qtwebkit kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras + curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + pcre snappy taglib taglib_extras ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 8242d035e5b8..e5e8640b4fd9 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "audacious-${version}"; - version = "3.8.2"; + version = "3.9"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; - sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf"; + sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; - sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq"; + sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 803b0115fbdf..353865e8ec04 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, + mkDerivation, lib, fetchurl, fetchpatch, gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, @@ -10,18 +10,23 @@ }: let - version = "3.8.2"; + version = "3.9"; sources = { "audacious-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx"; + sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d"; }; "audacious-plugins-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp"; + sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb"; }; }; + + qt510_plugins_patch = fetchpatch { + url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch"; + sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17"; + }; in mkDerivation { @@ -33,6 +38,8 @@ mkDerivation { nativeBuildInputs = [ gettext pkgconfig ]; + inherit qt510_plugins_patch; + buildInputs = [ # Core dependencies qtbase @@ -55,6 +62,10 @@ mkDerivation { for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do ( + # only patch the plugins + if [ "$i" -eq "1" ]; then + patches=( $qt510_plugins_patch ) + fi src=''${sourceFiles[$i]} sourceRoot=''${sourceRoots[$i]} source $stdenv/setup diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 4dbde82e0921..100bb1c54fd1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.0"; + version = "2.2.1"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry"; + sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix similarity index 77% rename from pkgs/applications/audio/bitwig-studio/default.nix rename to pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index c597e42eaa6d..8b26ba0959d4 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,35 +1,35 @@ -{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf -, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp -, libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb -, libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm +{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf +, glib, gtk2, harfbuzz, jdk, lib, xorg +, libbsd, libjack2, libpng +, libxkbcommon +, makeWrapper, pixman , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; - version = "2.1.3"; + version = "1.3.16"; src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb"; + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; }; nativeBuildInputs = [ dpkg makeWrapper ]; unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; - dontBuild = true; + dontBuild = true; dontPatchELF = true; - dontStrip = true; + dontStrip = true; - libPath = lib.makeLibraryPath [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz - libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender - libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm - zlib + libPath = with xorg; lib.makeLibraryPath [ + alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau + libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb + libxkbfile pixman xcbutil xcbutilwm zlib ]; binPath = lib.makeBinPath [ - ffmpeg xdg_utils zenity + xdg_utils zenity ]; installPhase = '' @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { homepage = http://www.bitwig.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus ]; + maintainers = with maintainers; [ michalrus mrVanDalo ]; }; } diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix new file mode 100644 index 000000000000..e5a5cc7c9c6a --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, bitwig-studio1, + xdg_utils, zenity, ffmpeg }: + +bitwig-studio1.overrideAttrs (oldAttrs: rec { + name = "bitwig-studio-${version}"; + version = "2.2.2"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + }; + + buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; + + binPath = stdenv.lib.makeBinPath [ + ffmpeg xdg_utils zenity + ]; +}) diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 15fca59deee3..82c32903bd86 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "calf-${version}"; - version = "0.0.60"; + version = "0.90.0"; src = fetchurl { url = "http://calf-studio-gear.org/files/${name}.tar.gz"; - sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"; + sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; - buildInputs = [ + buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35fe510cbb2b..57d8b554c4f2 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, vlc -, withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools +, qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -19,11 +18,6 @@ , withStreams ? true }: -# One and only one front-end. -assert withQt5 -> withQt4 == false; -assert withQt4 -> withQt5 == false; -assert withQt4 || withQt5; - # Inter-dependencies. assert withCddb -> withCdda && withTaglib; assert withCdda -> withCddb && withMusicbrainz; @@ -51,9 +45,7 @@ in stdenv.mkDerivation rec { sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; - buildInputs = [ vlc ] - ++ stdenv.lib.optional withQt4 qt4 - ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ] + buildInputs = [ vlc qtbase qtmultimedia qtsvg ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optional withCdda cdparanoia @@ -63,12 +55,11 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional withUdisks udisks2; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ - (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstat withCdda "CDPARANOIA") diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix new file mode 100644 index 000000000000..be941bc3db29 --- /dev/null +++ b/pkgs/applications/audio/denemo/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig +, libjack2, gettext, intltool, guile_2_0, lilypond +, glib, libxml2, librsvg, libsndfile, aubio +, gtk3, gtksourceview, evince, fluidsynth, rubberband +, portaudio, portmidi, fftw, makeWrapper }: + +stdenv.mkDerivation rec { + name = "denemo-${version}"; + version = "2.2.0"; + + src = fetchurl { + url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; + sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh"; + }; + + buildInputs = [ + libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile + aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin + ''; + + nativeBuildInputs = [ + intltool + ]; + + meta = with stdenv.lib; { + description = "Music notation and composition software used with lilypond"; + homepage = http://denemo.org; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.olynch ]; + }; +} diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 918accb4e167..125df237dfe5 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -6,7 +6,7 @@ let src = fetchFromGitHub { sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc"; rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16"; - repo = "reaper"; + repo = "REAPER"; owner = "gillesdegottex"; }; meta = with stdenv.lib; { @@ -16,8 +16,8 @@ let libqaudioextra = { src = fetchFromGitHub { - sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1"; - rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3"; + sha256 = "0m6x1qm7lbjplqasr2jhnd2ndi0y6z9ybbiiixnlwfm23sp15wci"; + rev = "9ae051989a8fed0b2f8194b1501151909a821a89"; repo = "libqaudioextra"; owner = "gillesdegottex"; }; @@ -28,10 +28,10 @@ let in stdenv.mkDerivation rec { name = "dfasma-${version}"; - version = "1.2.5"; + version = "1.4.5"; src = fetchFromGitHub { - sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d"; + sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h"; rev = "v${version}"; repo = "dfasma"; owner = "gillesdegottex"; @@ -42,13 +42,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; postPatch = '' - substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' cp -Rv "${reaperFork.src}"/* external/REAPER cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra - ''; - - preConfigure = '' - qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" + substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" ""; ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 740d6d8d7e0a..6d56f53bd16f 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: stdenv.mkDerivation rec { - name = "dirt-2015-04-28"; + name = "dirt-2018-01-01"; src = fetchFromGitHub { repo = "Dirt"; owner = "tidalcycles"; - rev = "cfc5e85318defda7462192b5159103c823ce61f7"; - sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz"; + rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda"; + sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n"; + fetchSubmodules = true; }; buildInputs = [ libsndfile libsamplerate liblo libjack2 ]; postPatch = '' - sed -i "s|./samples|$out/share/dirt/samples|" file.h - ''; - configurePhase = '' - export DESTDIR=$out + sed -i "s|./samples|$out/share/dirt/samples|" dirt.c ''; + makeFlags = ["PREFIX=$(out)"]; postInstall = '' mkdir -p $out/share/dirt/ cp -r samples $out/share/dirt/ diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a80cc36b2164..a6a7ad22fa1a 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,12 +2,12 @@ , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-unstable-2017-08-04"; + name = "distrho-ports-unstable-2017-10-10"; src = fetchgit { url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "f591a1066cd3929536699bb516caa4b5efd9d025"; - sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9"; + rev = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9"; + sha256 = "1nd542iian9kr2ldaf7fkkgf900ryzqigks999d1jhms6p0amvfv"; }; patchPhase = '' @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { description = "A collection of cross-platform audio effects and plugins"; longDescription = '' Includes: - Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger - drowaudio-reverb drowaudio-tremolo drumsynt EasySSP eqinox - JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay - stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker - TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction - ThePilgrim Vex Wolpertinger + Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger + drowaudio-reverb drowaudio-tremolo drumsynth EasySSP eqinox HiReSam + JuceDemoPlugin KlangFalter LUFSMeter LUFSMeterMulti Luftikus Obxd + PitchedDelay ReFine StereoSourceSeparation TAL-Dub-3 TAL-Filter + TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 + TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger ''; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index fb62b6ea3de6..6ed6d1ee86a0 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "0qqpklzy4wgw9jy0v2810j06712q90bwc69fp7da82536ba058a9"; + sha256 = "06xqqm1ylmpp2s7xk7xav325gc50kxlvh9vf1343b0n3i8xkgjfg"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 889506deb768..f4160ff6f808 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "espeak-ng-${version}"; - version = "2016-08-28"; + version = "1.49.2"; src = fetchFromGitHub { owner = "espeak-ng"; repo = "espeak-ng"; - rev = "b784e77c5708b61feed780d8f1113c4c8eb92200"; - sha256 = "1whix4mv0qvsvifgpwwbdzhv621as3rxpn9ijqc2683h6k8pvcfk"; + rev = version; + sha256 = "17bbl3zi8214iaaj8kjnancjvmvizwybg3sg17qjq4mf5c6xfg2c"; }; nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index a8bf05187e33..50689886fdd2 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,34 +1,31 @@ -{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig -, libpulseaudio, CoreServices, CoreAudio, AudioUnit }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +, alsaLib, glib, libjack2, libsndfile, libpulseaudio +, AudioUnit, CoreAudio, CoreMIDI, CoreServices +}: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.6"; + version = "1.1.8"; - src = fetchurl { - url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2"; - sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj"; + src = fetchFromGitHub { + owner = "FluidSynth"; + repo = "fluidsynth"; + rev = "v${version}"; + sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd"; }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i '40 i\ - #include \ - #include ' \ - src/drivers/fluid_coreaudio.c - ''; + nativeBuildInputs = [ pkgconfig cmake ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin - "-framework CoreAudio -framework CoreServices"; - - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libsndfile ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; + ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; - meta = with stdenv.lib; { + cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off"; + + meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; homepage = http://www.fluidsynth.org; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index e4c6c658efd7..66f82226b507 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -11,10 +11,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fmit-${version}"; - version = "1.1.11"; + version = "1.1.13"; src = fetchFromGitHub { - sha256 = "1w492lf8n2sjkr53z8cvkgywzn0w53cf78hz93zaw6dwwv36lwdp"; + sha256 = "1p374gf7iksrlyvddm3w4qk3l0rxsiyymz5s8dmc447yvin8ykfq"; rev = "v${version}"; repo = "fmit"; owner = "gillesdegottex"; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index e53b498fb6ee..b92d4f6eb1e8 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 -, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt -, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which +, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt +}: stdenv.mkDerivation rec { - name = "gigedit-svn-${version}"; - version = "2342"; + name = "gigedit-${version}"; + version = "1.1.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/gigedit/trunk"; - rev = "${version}"; - sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs"; + src = fetchurl { + url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; }; - patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs"; + patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ]; - preConfigure = "make -f Makefile.cvs"; + preConfigure = "make -f Makefile.svn"; - buildInputs = [ - autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool - libgig libsndfile libtool libxslt pkgconfig - ]; + nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; + + buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch new file mode 100644 index 000000000000..eb00fcc87a24 --- /dev/null +++ b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch @@ -0,0 +1,15 @@ +--- a/src/gigedit/wrapLabel.cc ++++ b/src/gigedit/wrapLabel.cc +@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text + : mWrapWidth(0), + mWrapHeight(0) + { +- // pangomm >= 2.35.1 +-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1))) +- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR); +-#else + get_layout()->set_wrap(Pango::WRAP_WORD_CHAR); +-#endif + set_alignment(0.0, 0.0); + set_text(text); + } diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 50b1bcde58f3..4bd57e15fe5f 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib -, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique +, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook }: @@ -24,11 +24,10 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ - libtool intltool glib gtk2 curl mpd_clientlib libsoup - libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme - wrapGAppsHook + glib gtk2 curl mpd_clientlib libsoup + libunique libmpd libSM libICE sqlite hicolor_icon_theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 9d9af6311832..83df4b33940c 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation { description = "A beautiful cross platform Desktop Player for Google Play Music"; license = stdenv.lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = stdenv.lib.maintainers.SuprDewd; + maintainers = [ stdenv.lib.maintainers.SuprDewd ]; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 3d074bf1e19e..fb1ed7280308 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,65 +1,66 @@ -{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool +{ stdenv, fetchFromGitHub, python3, python3Packages, intltool +, glibcLocales, gnome3, gtk3, wrapGAppsHook , ipodSupport ? false, libgpod -, gnome3 }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "gpodder-${version}"; + version = "3.10.0"; - version = "3.9.3"; + format = "other"; - src = fetchurl { - url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl"; + src = fetchFromGitHub { + owner = "gpodder"; + repo = "gpodder"; + rev = version; + sha256 = "0f3m1kcj641xiwsxan66k81lvslkl3aziakn5z17y4mmdci79jv0"; }; - patches = [ - (fetchpatch { - sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w"; - name = "Fix-soundcloud-feeds.patch"; - url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch"; - }) - (fetchpatch { - sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4"; - name = "use-https-urls-for-soundcloud.patch"; - url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch"; - }) - (fetchpatch { - sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b"; - name = "updates-soundcloud-support-to-recognize-https"; - url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch"; - }) - ]; - postPatch = with stdenv.lib; '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder - - makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [ - "${gnome3.gnome_themes_standard}/share" - "$XDG_ICON_DIRS" - "$GSETTINGS_SCHEMAS_PATH" - ]}'" ''; - buildInputs = [ - intltool python2Packages.coverage python2Packages.minimock - gnome3.gnome_themes_standard gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas + nativeBuildInputs = [ + intltool + python3Packages.wrapPython + wrapGAppsHook + glibcLocales ]; - propagatedBuildInputs = with python2Packages; [ - feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib + buildInputs = [ + python3 + ]; + + checkInputs = with python3Packages; [ + coverage minimock + ]; + + doCheck = true; + + propagatedBuildInputs = with python3Packages; [ + feedparser + dbus-python + mygpoclient + pygobject3 + eyeD3 + podcastparser + html5lib + gtk3 ] ++ stdenv.lib.optional ipodSupport libgpod; + makeFlags = [ + "PREFIX=$(out)" + "share/applications/gpodder-url-handler.desktop" + "share/applications/gpodder.desktop" + "share/dbus-1/services/org.gpodder.service" + ]; + preBuild = '' - make PREFIX="$out" \ - share/applications/gpodder-url-handler.desktop \ - share/applications/gpodder.desktop \ - share/dbus-1/services/org.gpodder.service + export LC_ALL="en_US.UTF-8" ''; - checkPhase = '' - LC_ALL=C python -m gpodder.unittests + installCheckPhase = '' + LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 2f4bde92167b..4b552301dd3d 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -17,7 +17,7 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "6.0.2"; + version = "7.0"; in stdenv.mkDerivation rec { name = "gradio-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { owner = "haecker-felix"; repo = "gradio"; rev = "v${version}"; - sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s"; + sha256 = "0kn08k5dv7yh29ksywcpl6ifrp3p8zzk3p3hkbhzc8fpx84jn7r9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index b149aab06e10..dcb61119ae76 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.35.6"; + version = "0.36.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41"; + sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index ca806aad02fe..d9109dd1c0e7 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom + , suil }: stdenv.mkDerivation rec { name = "ingen-unstable-${rev}"; - rev = "2017-01-18"; + rev = "2017-07-22"; src = fetchgit { - url = "http://git.drobilla.net/cgit.cgi/ingen.git"; - rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340"; - sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k"; + url = "https://git.drobilla.net/cgit.cgi/ingen.git"; + rev = "cc4a4db33f4d126a07a4a498e053c5fb9a883be3"; + sha256 = "1gmwmml486r9zq4w65v91mfaz36af9zzyjkmi74m8qmh67ffqn3w"; + deepClone = true; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper + boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable makeWrapper python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index f1e00e876730..e4d20db78682 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jack_capture-${version}"; - version = "0.9.69"; + version = "0.9.73"; src = fetchurl { url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; - sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; + sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 060b7f703a31..e44dfddd37b7 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jackmeter-0.4"; src = fetchurl { - url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz"; + url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz"; sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; - homepage = http://www.aelius.com/njh/jackmeter/; + homepage = https://www.aelius.com/njh/jackmeter/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 2038f898e3ec..d0ffbf29bcb2 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa-sdk-${version}"; version = "1.13"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz"; + url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index aa0a191bdd1a..e41d2ba96750 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa.h-${version}"; version = "1.13"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz"; + url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 4dad6e58fee9..7f368fe6c281 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,31 +1,24 @@ -{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison -, libjack2, libgig, libsndfile, libtool, lv2, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which +, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { - name = "linuxsampler-svn-${version}"; - version = "2340"; + name = "linuxsampler-${version}"; + version = "2.1.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk"; - rev = "${version}"; - sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7"; + src = fetchurl { + url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; }; - patches = ./linuxsampler_lv2_sfz_fix.diff; - - # It fails to compile without this option. I'm not sure what the bug - # is, but everything works OK for me (goibhniu). - configureFlags = [ "--disable-nptl-bug-check" ]; - preConfigure = '' - sed -e 's/which/type -P/g' -i scripts/generate_parser.sh - make -f Makefile.cvs + make -f Makefile.svn ''; - buildInputs = [ - alsaLib asio autoconf automake bison libjack2 libgig libsndfile - libtool lv2 pkgconfig - ]; + nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ]; + + buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; @@ -40,7 +33,7 @@ stdenv.mkDerivation rec { prior written permission by the LinuxSampler authors. If you have questions on the subject, that are not yet covered by the FAQ, please contact us. - ''; + ''; license = licenses.unfree; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff deleted file mode 100644 index 114726db19d6..000000000000 --- a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff +++ /dev/null @@ -1,50 +0,0 @@ -Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp -=================================================================== ---- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359) -+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy) -@@ -18,6 +18,8 @@ - * MA 02110-1301 USA * - ***************************************************************************/ - -+#define _BSD_SOURCE 1 /* for realpath() */ -+ - #include - #include - #include -@@ -118,6 +120,23 @@ - dmsg(2, ("linuxsampler: Deactivate\n")); - } - -+ static String RealPath(const String& path) -+ { -+ String out = path; -+ char* cpath = NULL; -+#ifdef _WIN32 -+ cpath = (char*)malloc(MAX_PATH); -+ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL); -+#else -+ cpath = realpath(path.c_str(), NULL); -+#endif -+ if (cpath) { -+ out = cpath; -+ free(cpath); -+ } -+ return out; -+ } -+ - String PluginLv2::PathToState(const String& path) { - if (MapPath) { - char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str()); -@@ -131,9 +150,10 @@ - String PluginLv2::PathFromState(const String& path) { - if (MapPath) { - char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str()); -- const String abstract_path(cstr); -+ // Resolve symbolic links so SFZ sample paths load correctly -+ const String absolute_path(RealPath(cstr)); - free(cstr); -- return abstract_path; -+ return absolute_path; - } - return path; - } diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 2e293ee4552d..8d179e8eed11 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -1,18 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool +, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio +}: stdenv.mkDerivation rec { - version = "0.19"; + version = "0.24-1"; pname = "minimodem"; name = "${pname}-${version}"; - src = fetchurl { - url = "http://www.whence.com/${pname}/${name}.tar.gz"; - sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; + src = fetchFromGitHub { + owner = "kamalmostafa"; + repo = "minimodem"; + rev = "${pname}-${version}"; + sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; + preConfigure = '' + aclocal \ + && autoheader \ + && automake --gnu --add-missing \ + && autoconf + ''; + meta = { description = "General-purpose software audio FSK modem"; longDescription = '' @@ -28,3 +39,4 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ relrod ]; }; } + diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 6d353344b07f..f511fa659149 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, libid3tag, libmad -, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig -, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite +{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2 +, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis +, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite , taglib, vampSDK }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - chromaprint fftw flac libid3tag libmad libopus libshout libsndfile + chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 rubberband scons sqlite taglib vampSDK ]; @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { sconsFlags = [ "build=release" "qtdir=${qt4}" + "faad=1" ]; buildPhase = '' diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index a18372870795..c66f78373228 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - name = "mod-distortion-${version}"; - version = "git-2015-05-18"; + name = "mod-distortion-git-${version}"; + version = "2016-08-19"; src = fetchFromGitHub { owner = "portalmod"; repo = "mod-distortion"; - rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a"; - sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19"; + rev = "e672d5feb9d631798e3d56eb96e8958c3d2c6821"; + sha256 = "005wdkbhn9dgjqv019cwnziqg86yryc5vh7j5qayrzh9v446dw34"; }; buildInputs = [ lv2 ]; - installFlags = [ "LV2_PATH=$(out)/lib/lv2" ]; + installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; meta = with stdenv.lib; { homepage = https://github.com/portalmod/mod-distortion; diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index c486ff3de605..1f309c4503bf 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.8.2"; + version = "3.11.0"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "051bzs8p2zz960mi9cmv51q1fmmm15nnb9apph9icicr0p8g7lif"; + sha256 = "1a9pn35vv1b9v0s30ajjg7gjjvcfjwgfyp7z61m567nv6cr37vhq"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix index b09db88bbcb0..063821544aed 100644 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ b/pkgs/applications/audio/mopidy-local-images/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { name = "mopidy-local-images-${version}"; @@ -12,6 +12,12 @@ pythonPackages.buildPythonApplication rec { sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; }; + buildInputs = [ gobjectIntrospection ]; + + checkInputs = [ + pythonPackages.mock + ]; + propagatedBuildInputs = [ mopidy pythonPackages.pykka diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7de8f6941c2b..8541ec6e2727 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://www.mopidy.com/; + homepage = https://www.mopidy.com/; description = '' An extensible music server that plays music from local disk, Spotify, SoundCloud, Google Play Music, and more diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 73352b650921..220e72b568af 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; - homepage = http://www.musicpd.org/clients/mpc/; + homepage = https://www.musicpd.org/clients/mpc/; license = licenses.gpl2; maintainers = with maintainers; [ algorith ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9d6f2fc9c8f9..f56ca009f1e0 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software"; - homepage = http://musescore.org/; + homepage = https://musescore.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.vandenoever ]; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 09c718c63e92..ca147ffc7352 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; - homepage = http://www.musicpd.org/clients/ncmpc/; + homepage = https://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 820ff385c107..3561deb1c736 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "1p6wfgh90h7gj1j3hlvwik3zj07xamkxbya85va2lsj6fkkkk20r"; + sha256 = "0dyrllxgd74nknixjcz6n7m4gw70v246s8z1qss7zfl5yllhb712"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index daa017d1ccbd..73f50e45d3df 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,30 +1,31 @@ { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsaLib, libjack2, tk +, alsaLib, libjack2, tk, fftw }: stdenv.mkDerivation rec { name = "puredata-${version}"; - version = "0.47-1"; + version = "0.48-0"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67"; + sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny"; }; - patchPhase = '' - rm portaudio/configure.in - ''; - nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsaLib libjack2 ]; + buildInputs = [ alsaLib libjack2 fftw ]; configureFlags = '' --enable-alsa --enable-jack + --enable-fftw --disable-portaudio + ''; + # https://github.com/pure-data/pure-data/issues/188 + # --disable-oss + postInstall = '' wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin ''; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index c5a977d741a7..925078fb3a15 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.5.0"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5"; + sha256 = "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 132e4a0fca28..831a30bc4fe2 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.5.0"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw"; + sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 1211570f9bc5..518fef0c4f5e 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig -, qt4 }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools +, liblscp, libgig, qtbase }: stdenv.mkDerivation rec { - name = "qsampler-svn-${version}"; - version = "2342"; + name = "qsampler-${version}"; + version = "0.5.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/qsampler/trunk"; - rev = "${version}"; - sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx"; + src = fetchurl { + url = "mirror://sourceforge/qsampler/${name}.tar.gz"; + sha256 = "0kn1mv31ygjjsric03pkbv7r8kg3bri9ldx2ajc9pyx0p8ggnbmc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake liblscp libtool qt4 ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; + buildInputs = [ liblscp libgig qtbase ]; preConfigure = "make -f Makefile.svn"; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; description = "Graphical frontend to LinuxSampler"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 49d9e80be117..71f41f87009e 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,21 +1,31 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt4 }: +{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qtbase, qttools, qtx11extras, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.3.9"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "08kyn6cl755l9i1grzjx8yi3f8mgiz4gx0hgqad1n0d8yz85087b"; + sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584"; }; - buildInputs = [ alsaLib fluidsynth libjack2 qt4 ]; + # cmake is looking for qsynth.desktop.in and fails if it doesn't find it + # seems like a bug and can presumable go in the next version after 0.5.0 + postPatch = '' + mv src/qsynth.desktop src/qsynth.desktop.in + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Fluidsynth GUI"; homepage = https://sourceforge.net/projects/qsynth; license = licenses.gpl2Plus; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 4bc9371dd17b..e075d68cd285 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , cmake, pkgconfig # Transport , curl @@ -15,6 +15,7 @@ , libappindicator-gtk3 , libnotify , libxdg_basedir +, wxGTK # GStreamer , gst_all_1 # User-agent info @@ -39,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv"; + sha256 = "12mhi0q137cjdpmpczvrcr7szq1ja1r8bm0gh03b925y8xyrqp5z"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release + wxGTK ] ++ stdenv.lib.optional doCheck gmock ++ gstInputs ++ pythonInputs; @@ -65,15 +67,13 @@ stdenv.mkDerivation rec { --replace /usr $out substituteInPlace include/radiotray-ng/common.hpp \ --replace /usr $out - ''; - patches = [ - (fetchpatch { - # Fix menu separators and minor touchup to 'version' - url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch"; - sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr"; - }) - ]; + # We don't find the radiotray-ng-notification icon otherwise + substituteInPlace data/radiotray-ng.desktop \ + --replace radiotray-ng-notification radiotray-ng-on + substituteInPlace data/rtng-bookmark-editor.desktop \ + --replace radiotray-ng-notification radiotray-ng-on + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 3ebdce2b4820..28a69d5a3b76 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -4,13 +4,13 @@ automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile stdenv.mkDerivation rec { repo = "rkrlv2"; - name = "${repo}-b1.0"; + name = "${repo}-b2.0"; src = fetchFromGitHub { owner = "ssj71"; inherit repo; - rev = "a315f5aefe63be7e34663596b8b050410a9b7e72"; - sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; + rev = "beta_2"; + sha256 = "128jcilbrd1l65c01w2bazsb21x78mng0jjkhi3x9crf1n9qbh2m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 1eb366d6bbd9..a8a368054966 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "107p2xsj066q2bil0xcgqrrn7lawp02wzf7qmlajcbnd79jhsi6i"; + sha256 = "1gscwybsbaqbnylmgf2baf71cm2g7a0pd11rqmk3cz9hi3lyjric"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0eaa9bde14f6..63705d40c3f6 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.0"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "1lfylai4gyk512dknj16w2aq9ka8hvqca46nmq5b4rfjmi6dkxf6"; + sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; }; patchPhase = '' diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 7daae31a468b..44c3bd70d3dc 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = http://spatialaudio.net/ssr/; description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; license = stdenv.lib.licenses.gpl3; - maintainer = stdenv.lib.maintainers.fridh; + maintainers = [ stdenv.lib.maintainers.fridh ]; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 249bbe0d8fb7..9ac0c49ebc31 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.64.407.g9bd02c2d-26"; + version = "1.0.69.336.g7edcc575-39"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc"; + sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 2f5a4ebb43f2..8385e1cc5a4d 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0awk2zx0xa6vl6ah24zz0k2mwsx50hh5g1rh32mp790fp4x7l5s8"; + sha256 = "0mvrqk6jy7h2wg442ixwm49w7x15rs4066c2ljrz4kvxlzp5z69i"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 2b79718809ff..27d82942d343 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk +{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre , libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg }: @@ -6,22 +6,23 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.3"; + version = "1.5.6"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0sns35pyw2f74xrv1fxiyf9g9415kvh2rrbdjd60hsiv584nlari"; + sha256 = "0bjfhfslpa2hjrc9h38m7dlr62953w9n4cvkgvfy495cbym12dak"; }; buildInputs = [ alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa - minixml zlib xorg.libpthreadstubs + minixml zlib xorg.libpthreadstubs pcre ]; nativeBuildInputs = [ cmake pkgconfig ]; patchPhase = '' - sed -i -e 's,/usr/share,'$out/share,g src/Misc/Config.cpp src/Misc/Bank.cpp + substituteInPlace src/Misc/Config.cpp --replace /usr $out + substituteInPlace src/Misc/Bank.cpp --replace /usr $out ''; preConfigure = "cd src"; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 52b9a57c00b2..1b3429f39d7f 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -4,16 +4,20 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm"; + sha256 = "1hfpiqdm337gl4ynkmmp2qss2m5z8mzqzjrbiyg6w1v4js7l9phi"; }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; nativeBuildInputs = [ cmake pkgconfig ]; + patchPhase = '' + substituteInPlace src/Misc/Config.cpp --replace /usr $out + ''; + hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 9dd7eb2a2994..13740dd9dfdb 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, lightdm, pkgconfig, intltool , hicolor_icon_theme, makeWrapper , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported +, exo }: #ToDo: bad icons with gtk2; @@ -8,26 +9,18 @@ let ver_branch = "2.0"; - version = "2.0.1"; + version = "2.0.3"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j"; + sha256 = "0c6v2myzqj8nzpcqyvbab7c66kwgcshw2chn5r6dhm7xrx19bcrx"; }; - patches = [ - (fetchurl { - name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch"; - url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616"; - sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm intltool makeWrapper ] + buildInputs = [ lightdm exo intltool makeWrapper ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ @@ -48,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://launchpad.net/lightdm-gtk-greeter; + homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles wkennington ]; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index e82d4c69def6..6765c5f9dfd0 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit +, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils , qt4 ? null , withQt5 ? false, qtbase }: @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; + prePatch = '' + substituteInPlace src/shared-data-manager.c \ + --replace /bin/rm ${coreutils}/bin/rm + ''; + meta = { homepage = https://launchpad.net/lightdm; platforms = platforms.linux; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 86a963bdac48..a7e8799c9c1c 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,8 +4,7 @@ }: let - - version = "0.16.0"; + version = "0.17.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -14,7 +13,7 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; + sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; }; patches = [ ./sddm-ignore-config-mtime.patch ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b9e096c69279..acab0be4258f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let in rec { stable = mkStudio { pname = "android-studio"; - version = "3.0.0.18"; # "Android Studio 3.0" - build = "171.4408382"; - sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br"; + version = "3.0.1.0"; # "Android Studio 3.0.1" + build = "171.4443003"; + sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd"; meta = with stdenv.lib; { description = "The Official IDE for Android (stable version)"; @@ -27,9 +27,9 @@ in rec { preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.3"; # "Android Studio 3.1 Canary 4" - build = "171.4444016"; - sha256Hash = "0qgd0hd3i3p1adv0xqa0409r5injw3ygs50lajzi99s33j6vdc6s"; + version = "3.1.0.6"; # "Android Studio 3.1 Canary 7" + build = "173.4524538"; + sha256Hash = "0rj7swychriznylrr09g0rnj12rymms925xbry85ba72hj1jjf6w"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix index bc39d3466765..46c9625bc986 100644 --- a/pkgs/applications/editors/atom/beta.nix +++ b/pkgs/applications/editors/atom/beta.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-beta-${version}"; - version = "1.23.0-beta0"; + version = "1.24.0-beta2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1vfc8jin07kivdmyw88vbzinbjsb6py9n2ggpvy4cccagnvxwj2y"; + sha256 = "1s5zfccpiyg3nqq3a93dg5sr6pk8gvwf8assq9g78l7qkryqr4ac"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index f5763ea787f3..50c3d182afb8 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.22.0"; + version = "1.23.2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1jxw0m1hfaisf1f875wr28f0mr3h0wjml6pjhfxbybvcblpnd27k"; + sha256 = "04shnmy80ixjrc8d57i5w23xfxw1dmxj7kbygsal9l8kxgd76k7h"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 8f6c5f5c2906..1c9c5bc78ef2 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, gconf, nss, xorg, libcap, systemd, libnotify +, gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let @@ -10,7 +10,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb + xorg.libxcb libsecret ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 5ef29081cf01..fef508bdf1e5 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -114,16 +114,16 @@ rec { }; eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7.1a"; + name = "eclipse-platform-4.7.2"; description = "Eclipse Platform Oxygen"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz; - sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz; + sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk.tar.gz; - sha256 = "013dfk23wa4jy177ywrkkr16wdjf6jxzjcz6mkl4ygki47yj9c5s"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz; + sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d"; }; }; }; @@ -168,16 +168,16 @@ rec { }; eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7.1a"; + name = "eclipse-sdk-4.7.2"; description = "Eclipse Oxygen Classic"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz; - sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz; + sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk.tar.gz; - sha256 = "09c9m88k1cm9bhd900p5yf2q9pijrymgjcbhmagz0fcwhldrv0ys"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz; + sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc"; }; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8d96a79b3c3d..769891423d7e 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -192,12 +192,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "8.0.0.201707161819"; + version = "8.5.1.201712211522"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.5.1/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "0nid4a4qib9vx34ddry7sylj20p2d47dd0vn4zqqmj5dgqx1a1ab"; }; meta = with stdenv.lib; { @@ -362,12 +362,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7.1a"; + version = "4.7.2"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/org.eclipse.jdt-4.7.1a.zip; - sha256 = "1hpvpj8ghfk8aqbzfrpcxw3wxrczq6zd3bpx4sxjrsi926jsjaf4"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip; + sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz"; }; meta = with stdenv.lib; { @@ -424,16 +424,16 @@ rec { spotbugs = buildEclipsePlugin rec { name = "spotbugs-${version}"; - version = "3.1.0.r201710241414-11c9895"; + version = "3.1.1.r201712011030-903b7a0"; srcFeature = fetchurl { url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs"; + sha256 = "12z5dbs10h5k567wbmwz1w4pnidmqsls52qcfdb3zlgr0rqvz072"; }; srcPlugin = fetchurl { url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas"; + sha256 = "0dnkp2alymvyyql7g8w79i27b3c64inhdvpxx1v014ng9liv54xb"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index ee5afe500efe..832dc3c0e799 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "ed-${version}"; version = "1.14.2"; @@ -11,27 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm"; }; - unpackCmd = "tar --lzip -xf"; - nativeBuildInputs = [ lzip ]; - /* FIXME: Tests currently fail on Darwin: - - building test scripts for ed-1.5... - testing ed-1.5... - *** Output e1.o of script e1.ed is incorrect *** - *** Output r3.o of script r3.ed is incorrect *** - make: *** [check] Error 127 - - */ - doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform); - - installFlags = [ "DESTDIR=$(out)" ]; - - configureFlags = [ - "--exec-prefix=${stdenv.cc.targetPrefix}" - "CC=${stdenv.cc.targetPrefix}cc" - ]; + doCheck = true; # not cross; meta = { description = "An implementation of the standard Unix editor"; @@ -54,4 +36,9 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; -} +} // stdenv.lib.optionalAttrs (hostPlatform != buildPlatform) { + # This may be moved above during a stdenv rebuild. + preConfigure = '' + configureFlagsArray+=("CC=$CC") + ''; +}) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index aa8252453921..6a438672601b 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -135,10 +135,10 @@ arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "arbitools"; - version = "0.71"; + version = "0.93"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.71.el"; - sha256 = "1ghf5yla126n7xpn2sc2vg7q8arp7iv2z5f9r9l38vxm6dvnxp50"; + url = "https://elpa.gnu.org/packages/arbitools-0.93.el"; + sha256 = "0z3lqp8dqfkams5h4sw569p48d2rvpd3d8lb4xaw0z8l49y2mvg8"; }; packageRequires = [ cl-lib ]; meta = { @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.91.0"; + version = "12.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar"; - sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3"; + url = "https://elpa.gnu.org/packages/auctex-12.1.0.tar"; + sha256 = "0iy5x61xqkxaph2hq64sg50l1c6yp6qhzppwadayxkdz00b46sas"; }; packageRequires = []; meta = { @@ -239,6 +239,19 @@ license = lib.licenses.free; }; }) {}; + bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "bbdb"; + version = "3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bbdb-3.2.tar"; + sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bbdb.html"; + license = lib.licenses.free; + }; + }) {}; beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "beacon"; version = "1.3.3"; @@ -483,10 +496,10 @@ }) {}; csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "csv-mode"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.6.el"; - sha256 = "1v86qna1ypnr55spf6kjiqybplfbb8ak5gnnifh9vghsgb5jkb6a"; + url = "https://elpa.gnu.org/packages/csv-mode-1.7.el"; + sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6"; }; packageRequires = []; meta = { @@ -755,10 +768,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.4.0.4"; + version = "1.4.0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.4.0.4.tar"; - sha256 = "1l3wb0g6ipyi8yimxah0z6r83376l22pb2s9ba6kxfmhsq5wyc8a"; + url = "https://elpa.gnu.org/packages/el-search-1.4.0.14.tar"; + sha256 = "1qc30dia59i2bklhivfhmsghirnpgz5mvcjdc78n0r8nizb68jfp"; }; packageRequires = [ emacs stream ]; meta = { @@ -959,10 +972,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.3.2"; + version = "1.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.3.2.tar"; - sha256 = "054z6bnfkf7qkgc9xynhzy9xrz780x4csj1r206jhslygjrlf1sj"; + url = "https://elpa.gnu.org/packages/gnorb-1.4.2.tar"; + sha256 = "1892j8gdbcny6b9psxa1lwxsb1gkj9z9z00rfc62kdw8bffmx38y"; }; packageRequires = [ cl-lib ]; meta = { @@ -1106,10 +1119,10 @@ }) {}; ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ivy"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.9.1.tar"; - sha256 = "1jfc3zf6ln7i8pp5j0fpsai2w847v5g77b5fzlxbgvj80g3v5887"; + url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar"; + sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm"; }; packageRequires = [ emacs ]; meta = { @@ -1582,19 +1595,6 @@ license = lib.licenses.free; }; }) {}; - org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { - pname = "org"; - version = "20171127"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20171127.tar"; - sha256 = "18a77yzfkx7x1pckc9c274b2fpswrcqz19nansvbqdr1harzvd20"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/org.html"; - license = lib.licenses.free; - }; - }) {}; osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "osc"; version = "0.1"; @@ -1635,6 +1635,19 @@ license = lib.licenses.free; }; }) {}; + paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "paced"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/paced-1.0.tar"; + sha256 = "0ld7cnlk6pn41hx2yfga5w7vfgg4ql6k25ffnf400nsn7y6wcapd"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/paced.html"; + license = lib.licenses.free; + }; + }) {}; parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parsec"; @@ -1922,10 +1935,10 @@ sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sml-mode"; - version = "6.7"; + version = "6.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sml-mode-6.7.el"; - sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x"; + url = "https://elpa.gnu.org/packages/sml-mode-6.8.el"; + sha256 = "105fcrz5qp95f2n3fdm3awr6z58sbrjihjss6qnrg4lz2ggbc328"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1986,6 +1999,19 @@ license = lib.licenses.free; }; }) {}; + sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "sql-indent"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sql-indent-1.0.tar"; + sha256 = "02cmi96mqk3bfmdh0xv5s0qx310cirs6kq0jqwk1ga41rpp596vl"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/sql-indent.html"; + license = lib.licenses.free; + }; + }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; version = "2.2.4"; @@ -2215,10 +2241,10 @@ }) {}; vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "vlf"; - version = "1.7"; + version = "1.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vlf-1.7.tar"; - sha256 = "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r"; + url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar"; + sha256 = "0cnwxk20573iqkwk0c0h7pyjk0rkr8l2qd0xmyqj8mvdxjb8nnkz"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix index 7b7004b72f30..733393307d3f 100644 --- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix @@ -2,11 +2,11 @@ melpaBuild { pname = "font-lock-plus"; - version = "20170222.1755"; + version = "20180101.25"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; + url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25"; + sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4"; name = "font-lock+.el"; }; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 4f36b01ae06f..a2b9564faa50 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -358,12 +358,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20170615.838"; + version = "20171209.240"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; - sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; + rev = "f11f17382646e13a0c794821ed5efe1692f96652"; + sha256 = "0ynl5fvsamij5ji2cnxp4vbqwbw09c8x8fxx3s80v02yi3xi5fr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -757,12 +757,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "20170110.2036"; + version = "20171201.134"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b3727c766daf383ffbc781e48211d37009056191"; - sha256 = "02cdzi1qxmcyj4m26r5ajgavkizh45m0djqz0n8xszrn6j0zm5rf"; + rev = "519b5cd886f484693fd69b226e307d56137b321b"; + sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +778,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171127.626"; + version = "20171209.2145"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b3727c766daf383ffbc781e48211d37009056191"; - sha256 = "02cdzi1qxmcyj4m26r5ajgavkizh45m0djqz0n8xszrn6j0zm5rf"; + rev = "519b5cd886f484693fd69b226e307d56137b321b"; + sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +824,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; + sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1030,12 +1030,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20171109.1250"; + version = "20180101.1328"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "3bc7a61a9d7923bb71066906e17cb8a0db415c24"; - sha256 = "0dalspw44ra9ik7f1lflmck76ar0v6qig700qczlml52lr9vf045"; + rev = "43d224546a2a557857294a8e3d13c4fe63508e03"; + sha256 = "0cw4br2nx4fa9jsal6b9gavffqjrhq2xgf87szi61dkgi2gacf7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1093,12 +1093,12 @@ ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-popup-menu"; - version = "20170518.2244"; + version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "eae1b0ea1a56cc1da2543e95570867a1a026669d"; - sha256 = "1w1q0r104v9fngzi3q8l6gwzb0c9gdq2jmbjb372j7969py73ywc"; + rev = "7b8ad628a058d32c420f7615927a34a5d51a7ad3"; + sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1114,12 +1114,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20171125.30"; + version = "20171228.1109"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "9bec357bd3eeee1ef27822ae034e1ee3bd270f0c"; - sha256 = "1shn1j28jmwyzakj2cj5d0iihps41086y17pb0hnzcgfsh7q8sij"; + rev = "c0fbdd51be8fdd43fd7a89140ebd4b4c311d45fc"; + sha256 = "0jiq2d2bgp6f26d5hjmd56cv68l2x6rlbpsvp6ig42nydv2yjjkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1197,12 +1197,12 @@ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "adafruit-wisdom"; - version = "20171115.1228"; + version = "20180107.1521"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "ce6a354f6d32e9700615ce3879936d05cc2c8c33"; - sha256 = "1d5jng3kk08q8xhg4ajd5nq9q37ycq24ph70hhrls3p3nd1lgrd5"; + rev = "f637f1b7cb397d4b993a20e94687663f6f09c615"; + sha256 = "0b5k8526p0c3xp2x5xbb5w0qgljasa1lywbbj5jqgnn64i7l5y2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; @@ -1218,12 +1218,12 @@ add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "20170705.2205"; + version = "20171216.1723"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e"; - sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp"; + rev = "1845137703461fc44bd77cf24014ba58f19c369d"; + sha256 = "02s9mv26ycypn4qfshrh17v1hsys2q9vffxj3g4lgq0lykplvkkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1344,12 +1344,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20170915.1249"; + version = "20180102.1441"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79"; - sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq"; + rev = "d00aa65ec2da6944f1ed81da440ad7a9024cfbf0"; + sha256 = "1cjchz7dq42ha6wrn21jqbmf333rg73bz4ppsnd9kz6vqnkgnya0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1552,12 +1552,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20170825.1009"; + version = "20180107.1311"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "ded94ab1421994aa863a4d7538ec7453768ec235"; - sha256 = "1616vkjgn5g4xf40p15847pkqyrlfzp9d143a4cyk7za50a175ll"; + rev = "418e23d9ab85deeaa4818f8dc72e27061687b3e3"; + sha256 = "1b1rsnm85haq04p4189vg2hxff8ncrjv8xmmiwr527ipq7wmd4wf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1573,12 +1573,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20171129.845"; + version = "20180105.2127"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "5cb351b8c21607b68687c9f6b378fd4461239d13"; - sha256 = "0z7h058p3g6a55x00x4p8dlb80iw0sib1lx6ilwm80kkg6zi17wm"; + rev = "c85a9dcc5d6cdb253b12967573884cc7858c6581"; + sha256 = "1qfwwrivrjsxdlmb0fxwf92aadlzawjy661rg64cyqckilcdah0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1678,12 +1678,12 @@ all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-gnus"; - version = "20170726.619"; + version = "20180108.153"; src = fetchFromGitHub { owner = "nlamirault"; repo = "all-the-icons-gnus"; - rev = "45560293e42d02c17c332894f3764dd624d25444"; - sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r"; + rev = "61830f1da0f8ad8e9235133f5470daeb50d2de41"; + sha256 = "19hjy14yalw736cjqbgm3dv4cly545k57ac16vj6c6jalb7wi0l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus"; @@ -1834,12 +1834,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170924.704"; + version = "20171223.1118"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "89fc16d50b889a17521084347b28f3011b84e113"; - sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g"; + rev = "e72e9beeb8c80acfee4d85748464d1c5147946ad"; + sha256 = "01p83h7a40v89xp4ar587xg97y86h8p641znlbd0sqckxkn087cs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2379,12 +2379,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "20171120.359"; + version = "20171224.601"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "86b198afd03f2baffb1efe24c7a89e71100356ea"; - sha256 = "1320zdv6q1cnnvl8s25ymjvd3kz2an98bicansq5bhf413n7fhgb"; + rev = "3082945ca2d9cf6482bc845cadd42e7b1802242e"; + sha256 = "0d7hkxrrxpnzw3lsf648n5sgdc85qfk1r4z3z5cnisr088azh263"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -2505,12 +2505,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171022.2203"; + version = "20171202.1653"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0"; - sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz"; + rev = "5363671b6a8fe8ecd4674497664974e089b2b035"; + sha256 = "04a4v6vpzmhj3g4mqr2fsq47k8spi8c7v4pbzkdz9si097dskvrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2882,12 +2882,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20171015.2239"; + version = "20180103.2312"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123"; - sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r"; + rev = "324549ba1dcf610c3766c272f86bae9d2c49fc70"; + sha256 = "087wkd06v9blxnzhpr5fzv75l1m6vbr82s3v4vg4ny8kjq61af0p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2966,12 +2966,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20170803.916"; + version = "20171217.2049"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1"; - sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6"; + rev = "d5b785ba6118110a9404a7f65429a954ae820d69"; + sha256 = "1a0ayw7jhbw3im5frs0rycl1ya18lbfslcr4xqsgs4kvczar4rzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3096,8 +3096,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "c1dc6f3716d75e1a25953b093af0d760f446ed2f"; - sha256 = "1k0gj5v211r2pkpicn1d2b04vbxz574q11mzyvyr3lb8ic2ql9ii"; + rev = "57c4bb749eb0fad9188c870098a61b03af346b75"; + sha256 = "0hmi8q59spjqchc7zkpfsyi5mplkb8npxfa00f4rxfspwd2il5wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3155,12 +3155,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20170817.1437"; + version = "20171213.756"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; - sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; + rev = "694b92ea58feb30a0104ccf2424fd921235ba517"; + sha256 = "1im7z4sf4zxv97dcwviv7rzlc8ff5ibx8lhqmvhm8kxc0jf84iid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -3491,12 +3491,12 @@ auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-indent-mode"; - version = "20161118.1458"; + version = "20171221.2106"; src = fetchFromGitHub { owner = "mattfidler"; repo = "auto-indent-mode.el"; - rev = "7e939f3a7b092c6c32c97d63fd88aef6cc355cdb"; - sha256 = "18c9469b53kwydhrpd8kivwvs0w0ndfbwkyxixjz9wijp0wmpri1"; + rev = "28069360a7f89ad0286fd6a53db550752ec58488"; + sha256 = "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode"; @@ -3656,6 +3656,27 @@ license = lib.licenses.free; }; }) {}; + auto-sudoedit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-sudoedit"; + version = "20171227.156"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "auto-sudoedit"; + rev = "5a6f7da018fbb880c4c51032b39d7628a478989c"; + sha256 = "190izcami97h2yzw267crs0xny494b9b58dmmb7bqslv38ayl396"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit"; + sha256 = "1clp52fqxsilyi62p1cabhan55lbwax6fqlhccyjbl36yrdig3fh"; + name = "auto-sudoedit"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/auto-sudoedit"; + license = lib.licenses.free; + }; + }) {}; auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: melpaBuild { pname = "auto-virtualenv"; @@ -3932,12 +3953,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20171001.235"; + version = "20171219.710"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "bf781eec7d46cce829ac5bdb114e728a110366e7"; - sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali"; + rev = "108b99d779b94678395f9240e3417bb69ea5501e"; + sha256 = "1acgfmhbgswp7acyzap95xxpd95425lsh0qa48vlc641hvlikahm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; @@ -3953,12 +3974,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20171126.815"; + version = "20171230.220"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "c08fc7c1c6997f7e843175e632d3d812e9f5a5b5"; - sha256 = "1nfrdhai123y17sbs405wsrq6bspmmamjshaws8qbjwal12p4s5q"; + rev = "34d3531a3cd35ae6b9e8dbc37343c027504fdcb0"; + sha256 = "0rgwbm5jcbv132xldbz2kcp09c7hs96329mwfa019v99qdbb5k32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3995,12 +4016,12 @@ avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-menu"; - version = "20170518.2245"; + version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0"; - sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh"; + rev = "990cc94d708c923f761be083b3a57f6f844566c8"; + sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -4016,12 +4037,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20171031.915"; + version = "20180104.624"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "5598fd25e483d8521e6d5f691802fa125947d7cf"; - sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f"; + rev = "526494a2ae86b66a22848e5dc274480e3b4d04ca"; + sha256 = "04fkgiixfd0xgb2m0b48ngv2fmvz2vnjajfl1b59paczz8pnw96l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4274,12 +4295,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20171111.1245"; + version = "20171212.1621"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "cb75b17eeab07a79147fc3e600170e6c35c4b18d"; - sha256 = "0igwdq41y5bd2jd7x3rmaxjqrjfyxwp5xyl5zx8rp0gql8jbn6qb"; + rev = "3b0bb640572825873754276f699b18765c7e5172"; + sha256 = "14pyf9aw8qbc1367j32yl8hn9lxs9027cxsxw510x9qa8ffrmi7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4337,12 +4358,12 @@ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "basic-mode"; - version = "20171125.652"; + version = "20171204.1217"; src = fetchFromGitHub { owner = "dykstrom"; repo = "basic-mode"; - rev = "92cf455677164d251b69eae379a56eda0d881b72"; - sha256 = "18bdrs21vcmfx0hvxjzr1ng91hqa37nvqlgnx8wr0w4p9x0vak9z"; + rev = "b7e851f844e9a5264e44936d1675133b4c3ed39c"; + sha256 = "0q29inrdk9i4rgx3a0km62lzn796hh24365cc3kzylx74g53a3qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; @@ -4397,6 +4418,27 @@ license = lib.licenses.free; }; }) {}; + bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bazel-mode"; + version = "20171226.1551"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "bazel-mode"; + rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25"; + sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; + sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586"; + name = "bazel-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bazel-mode"; + license = lib.licenses.free; + }; + }) {}; bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbcode-mode"; @@ -4420,11 +4462,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20171017.817"; + version = "20180106.910"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93"; - sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1"; + rev = "f18720ff5cd963a0bf6fc0e41293e50c0172b8ae"; + sha256 = "1s5qi8njiqdpgnzlik36islzh13zfhybnynqisr61p602pn4ghk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4545,12 +4587,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20171007.722"; + version = "20171214.2054"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "584af0efa4809252bb37cf165df029410198327e"; - sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w"; + rev = "b355c87723746dc61da464afba2adf9d4ece1db0"; + sha256 = "18l6423s23w3vri49ncs7lpnfamgzc7xm0lqv3x1020030m0lzp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; @@ -4944,16 +4986,16 @@ bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "bind-chord"; - version = "20170717.1152"; + version = "20171204.1210"; src = fetchFromGitHub { - owner = "waymondo"; - repo = "use-package-chords"; - rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026"; - sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds"; + owner = "jwiegley"; + repo = "use-package"; + rev = "5a50f6703140992723a434b9a733644bfab15306"; + sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord"; - sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; + sha256 = "1hyhs3iypyg5730a20axcfzrrglm4nbgdz8x1ifkaa0iy5zc9hb0"; name = "bind-chord"; }; packageRequires = [ bind-key key-chord ]; @@ -4965,12 +5007,12 @@ bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-key"; - version = "20171128.2058"; + version = "20171210.2125"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5726c93730eb96c1f298cade2ab8b8772de06e3b"; - sha256 = "19zjnbq1zw5q0s2kml3d3j40g5c8h1417hrp016cs7dnj348220x"; + rev = "5a50f6703140992723a434b9a733644bfab15306"; + sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5448,12 +5490,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170825.416"; + version = "20180108.41"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "13fca1929639e2239e9b4be060cbd4befd7921b4"; - sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh"; + rev = "836f25c5baa363691a8d31712d07248c0d9a49a7"; + sha256 = "1jh6c6i1jy1f8hskqbpqj2babk9yvqyjxyxy0x11686riasc5vps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5658,12 +5700,12 @@ browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring"; - version = "20171016.1312"; + version = "20171219.1108"; src = fetchFromGitHub { owner = "browse-kill-ring"; repo = "browse-kill-ring"; - rev = "b746d01c888262e81d76f8949869cf9e02759b6a"; - sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d"; + rev = "8debc43e41d7e51532698331c6f283905890b904"; + sha256 = "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring"; @@ -5802,6 +5844,27 @@ license = lib.licenses.free; }; }) {}; + buckwalter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buckwalter"; + version = "20180107.843"; + src = fetchFromGitHub { + owner = "joehakimrahme"; + repo = "buckwalter.el"; + rev = "2aa5451c3682c268adebc6b1191a796466732f53"; + sha256 = "0g270jyf2fd3x8p0jcd86j751spfphgsmwjxl61rk1x1kiql4icd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7dd38487731cc978e104afa39f8954cfc33ba27f/recipes/buckwalter"; + sha256 = "08pnmfy910n5l00kmkn4533x48m3scsxzyra0nl6iry2n39y2kr1"; + name = "buckwalter"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/buckwalter"; + license = lib.licenses.free; + }; + }) {}; buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-buttons"; @@ -5993,12 +6056,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20170125.14"; + version = "20171215.930"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "2742bd1cd9e232cac68d5843e05c043827a2669f"; - sha256 = "00v0v00izzy749h0l22z0g0df96g3s4rbn06dvdara7h01599v00"; + rev = "af1a237b4d1ed31780dd37bcbef51fc8ca9b0603"; + sha256 = "1ccw90a68dahcrkr94xi9apnxjmvzjvd33w78bsr2jyfd82ggsw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6623,12 +6686,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "20171120.824"; + version = "20171209.1232"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "ebc47aed76525382375e12edd21c250b4306bc50"; - sha256 = "164dbjipqx27jhsgj58dzk6ngszl5gdjpg1bbqgj7a8s83h5gxaq"; + rev = "cc539b70ff27afa241936aacc88983d63474e770"; + sha256 = "0nwmbsa9gy5qpmy45qn4ihawrbg6avbancbg0va5dcfbjavp1wz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6665,12 +6728,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20171118.132"; + version = "20171218.855"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "ae6b0523a9f3ca035da642913cb72858cb3926e9"; - sha256 = "0clcjla75jwl4650h1k51b6dgn2ckj6jk2r5ycqi0p25qvspzj29"; + rev = "ba652e464ccdd0860fbc5d932c2ae86c9a31a200"; + sha256 = "1wyk40c61hlkmx3v82hn89chvrx7fyyyc1j2wlhizi7x5cv3c497"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6728,12 +6791,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20170917.1107"; + version = "20171230.452"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "eea660b78c05d70159067f5be8cd3bddb55df4c5"; - sha256 = "0i4f964nqyd260cgy9s9jnpyzwmpmypznwmpvnkijd9pl34yfl04"; + rev = "4c3c8890f72456f3ae4bc2213978f675c39c7a66"; + sha256 = "02jvmrr8xr77lqdr5jsmqr1w7ix48yfkvr1vi7nsc7gzmx8vp28z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6997,6 +7060,48 @@ license = lib.licenses.free; }; }) {}; + celestial-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "celestial-mode-line"; + version = "20171210.1045"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "celestial-mode-line"; + rev = "018b5eb215be58fbae971d9013599966eaa569dc"; + sha256 = "0d92k706qhv1bz11wvnkb5iaanxf2wraxwgzkx8kijpxl771zdqj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cdb1d057f76166ba32d5028f18eec7d09857f990/recipes/celestial-mode-line"; + sha256 = "1s6vn71mxfvvafjs25j12z1gnmxnkvnw716zy5ifx1bs8s5960kq"; + name = "celestial-mode-line"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/celestial-mode-line"; + license = lib.licenses.free; + }; + }) {}; + centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "centered-cursor-mode"; + version = "20170830.948"; + src = fetchFromGitHub { + owner = "andre-r"; + repo = "centered-cursor-mode.el"; + rev = "670af669b6871d4447e11710d1d39a4d5fcd4b17"; + sha256 = "1vihsd0kp6skad7j5y5is5c7qiisz9myspsxsi86i7x8vrhmsvc3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; + sha256 = "1yy50p3xprkqiak3vfly5s5kpbbdmxmw6fhgz13fw97553hr3w5x"; + name = "centered-cursor-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/centered-cursor-mode"; + license = lib.licenses.free; + }; + }) {}; centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-window-mode"; @@ -7088,8 +7193,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "800c1939c7a15b413a4945b7f193cade23aa3e82"; - sha256 = "0ih5vfwrl8bxnyv8ca3f7g31c3iczzvp5lzldq0f9rls3yvhn1b3"; + rev = "388f399536b757722886b777084e22ddad4eb451"; + sha256 = "0qaxgqrgj9dpgv1d9k9a66lqpclrs22pcyppgl2m71fkqzm09ip4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7210,12 +7315,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20171118.437"; + version = "20171229.435"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "08985cc17302f0e90a532fd5d67cfe2429b22444"; - sha256 = "1qn1l48fwhqw3lkag4322r16cq2ms9spg42jf0w1fc0y6w691p54"; + rev = "e0462b42218c94288f5c8a62f2b217bb8037995a"; + sha256 = "1v64yx8pr3aqds3grh79y27qg8x5ad3hwxv96pw0hlhvqc62s4ai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7273,12 +7378,12 @@ char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "char-menu"; - version = "20170518.2247"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d"; - sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96"; + rev = "3235f8e3c88848ce10d25f84a5da39061fd35c0d"; + sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7672,12 +7777,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20171126.150"; + version = "20180107.2236"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "2fe60860161a1541d74fc94138d3094b10a05e4b"; - sha256 = "0i6vz4cmcav1ibzm49c8jsqr0zi4diy1n692j12smznh5kfgrr8k"; + rev = "4fe3a30cf45ee8af911a80b78e6d4d05c42d0f32"; + sha256 = "0z6q2h9nis72sydj1ky37v6g1klchzd04w7ykin0rpm2c0mvbigr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7861,12 +7966,12 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "20171022.724"; + version = "20171215.1403"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee"; - sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk"; + rev = "bb49da54b2fb57524066e54ffee27cb9549ec925"; + sha256 = "0ra9cs407mz5243ymf4qsr92sly0k5gfl24xgdmxczg35w8hn31l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; @@ -7882,12 +7987,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170929.1635"; + version = "20180105.1158"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; - sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; + rev = "9835ecb758c09400082eb8f1c0336eedbfed0134"; + sha256 = "0vhzqcqmhl3rzxrhfyy6r2yp5d07wd8y820cf0hfby6j5i4j247p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7903,12 +8008,12 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20171001.2258"; + version = "20180102.1518"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; - rev = "4b93112b715714fc7b0ac2637df93adb90f35b40"; - sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk"; + rev = "291149ac12877bbd062da993479d3533a26862b0"; + sha256 = "18mva5nn919c86sgk6kdh437vdnlh9bk7fg10xqcpics1yv3viaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; @@ -7966,12 +8071,12 @@ clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; - version = "20170120.137"; + version = "20171202.1318"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "clang-format"; - rev = "7e22204dc5afe0859fb8853ff47942574541eaff"; - sha256 = "148wkr770ch6czn8s8mypbq6r0vnqqi026kqxshvzsql79i9l687"; + rev = "dee259662042ea4f7f339fd95970bb504e440cca"; + sha256 = "1a02yz62xlaz1acqpvrlmwv5syflyfrdpwlmi26ih3kd2hl6p5sl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; @@ -8437,22 +8542,22 @@ license = lib.licenses.free; }; }) {}; - clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }: melpaBuild { pname = "clomacs"; - version = "20170726.436"; + version = "20180101.1354"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1"; - sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x"; + rev = "20706c65f218dd0671b0331f35bd8965e443062a"; + sha256 = "1mkn5y2mgdxv6njhy1njbpigzhx3x2hb618fzcd54yxn59mb5r47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh"; name = "clomacs"; }; - packageRequires = [ cider emacs s ]; + packageRequires = [ cider emacs s simple-httpd ]; meta = { homepage = "https://melpa.org/#/clomacs"; license = lib.licenses.free; @@ -8461,12 +8566,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20171015.822"; + version = "20171219.524"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "49862bfdd1540d443d278fadef16a83388b360cb"; - sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp"; + rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d"; + sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8587,12 +8692,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20171101.236"; + version = "20171221.1616"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "114e2df27f79816f023a07e3e8024c7ab73603f0"; - sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7"; + rev = "dc32d518fdfcb3f6cd014c8235b61562482dfd09"; + sha256 = "0plyqbvb99nplw15bvp246kmn1hyh1l6q2sjnpkdjxc4rrjxhrwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8608,12 +8713,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "20160928.505"; + version = "20180104.1137"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "5def40891fc1ad0a7d7ba7a16bd11b2d26fa66ab"; - sha256 = "0rbdbr07650wwx7isx2a6hx7bpz0ga1a2lki9xjjawn4z8ccc1yd"; + rev = "2c089d80de3945e4f08f13557d59e04cbc942a60"; + sha256 = "01164wd8p0wwabnynsqv34pz53ji1s3k7nb0ff51i616q6095rdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8692,12 +8797,12 @@ cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cnfonts"; - version = "20171127.1706"; + version = "20171205.111"; src = fetchFromGitHub { owner = "tumashu"; repo = "cnfonts"; - rev = "b68eca2c793f36cf57a9b4ec586e7415439fc90a"; - sha256 = "0xwxxkgkhplqcxz8r59px0dxs9bvk51q6r93cqi4h0q6k61j63x8"; + rev = "4583e30d5058773606b830072df38a038d40203a"; + sha256 = "04vc3p4320h3ncxm8s21ijv524w5m0j5gx1f5pyw91k3avvz9hbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; @@ -9070,12 +9175,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171118.1605"; + version = "20171202.1759"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "e7fbdb22bf8c6164cb128750985d10e3eae48cd3"; - sha256 = "1qz1yiyzki3idva80yf2pac3h371m9lhcarh9nvymw0l0h9qciyr"; + rev = "e3e051f88734593d4b7b92f157e618ebfe63693b"; + sha256 = "1nh26v8vk7g5rkqbklan2ai4i4lx3bdn03pch84xyn3drpq40rb3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9364,12 +9469,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20171122.716"; + version = "20180101.1101"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "8dea61206c67951cc83e14d41cea33ba33aea173"; - sha256 = "14fwk2k98yayfm1az1xbyx7y2lqahccj6fx2ksk33dsihp42gm9z"; + rev = "4a8289dc257c3991c3953b64671fc25c887b2ca4"; + sha256 = "178wf0n1mdfx6yqwdqlw7drbr5fy7gf6x6p4094s9br7slk9kssk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9385,12 +9490,12 @@ company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-anaconda"; - version = "20160809.705"; + version = "20171222.342"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; - rev = "b268a00821c79d7e4c5da0d7035356afb389b3a7"; - sha256 = "0pjiiqads9xawcwldic4m7mfi533s3wmqafz4day92v9135xwczj"; + rev = "4519b1c9888b0d9665f0805e08362280a4945081"; + sha256 = "1vsh9m1q6jc4c9xy9xri1764n8fkpz8mz6np6gcmn86jfw5dk0fk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; @@ -9560,12 +9665,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170615.1842"; + version = "20171202.1243"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0"; - sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig"; + rev = "dcad9c07ecbd90d261520ac09251eaa3480ea98a"; + sha256 = "132dw17d8k8sk3g0vbs0qqb359rw33ck4pqx3w2p8kb2zmzam597"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9732,27 +9837,6 @@ license = lib.licenses.free; }; }) {}; - company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "company-eshell-autosuggest"; - version = "20171119.2115"; - src = fetchFromGitHub { - owner = "dieggsy"; - repo = "company-eshell-autosuggest"; - rev = "bde166652d37b40b3ec5126c263fd2fc01799094"; - sha256 = "05rpqmspyalrl295xpypn8bc7bh27y5cr1g6sz3yxsgcrgd54vjc"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest"; - sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f"; - name = "company-eshell-autosuggest"; - }; - packageRequires = [ company emacs ]; - meta = { - homepage = "https://melpa.org/#/company-eshell-autosuggest"; - license = lib.licenses.free; - }; - }) {}; company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; @@ -9777,12 +9861,12 @@ company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "company-flx"; - version = "20161228.1736"; + version = "20180102.2118"; src = fetchFromGitHub { owner = "PythonNut"; repo = "company-flx"; - rev = "0c9fddf7c11c918ed42bd6a5108f8969b37704d5"; - sha256 = "1nv2hlmjdd7y9d25n22gwl0qzrsc0qpfwyhf44g0xq6dg5lgbpkj"; + rev = "05efcafb488f587bb6e60923078d97227462eb68"; + sha256 = "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx"; @@ -9865,8 +9949,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; - sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; + rev = "416643789f088aa5077f667cecde7f966131f6be"; + sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9970,8 +10054,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; - sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; + rev = "3403179a38693a221bfa86def0c99f6342c5eb73"; + sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; @@ -9987,12 +10071,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20171117.1117"; + version = "20180102.1535"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "b1639de23f3e739f9f7fd1b3005a45dae08bf084"; - sha256 = "0dk278abmycxanigb1mq8bhgbcbpsbxgkkwxj8058qdkpnr077a2"; + rev = "678d5e8f1ad76e7bd9e5bf93ed6813f54e769773"; + sha256 = "1yqcikpgnnqg986zyy23jifq40pspdhrhhz825vp92g1k724gj86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10050,12 +10134,12 @@ company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }: melpaBuild { pname = "company-nand2tetris"; - version = "20161011.1748"; + version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; - sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; + rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; + sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris"; @@ -10113,12 +10197,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20171111.757"; + version = "20171226.1924"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b3727c766daf383ffbc781e48211d37009056191"; - sha256 = "02cdzi1qxmcyj4m26r5ajgavkizh45m0djqz0n8xszrn6j0zm5rf"; + rev = "519b5cd886f484693fd69b226e307d56137b321b"; + sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10215,22 +10299,22 @@ license = lib.licenses.free; }; }) {}; - company-racer = callPackage ({ cl-lib ? null, company, dash, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-racer = callPackage ({ cl-lib ? null, company, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-racer"; - version = "20160722.1658"; + version = "20171204.1910"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "company-racer"; - rev = "c2afd3d989ec2bca7dac094b684063a1922905f6"; - sha256 = "0339p8ymyx8yjgv9lp8lrfzc5mp1mh71rg4m325ia084n81p773a"; + rev = "a00381c9d416f375f783fcb6ae8d40669ce1f567"; + sha256 = "13m3yzn4xbyl13z7h1cl6vqjbzikjycy7wydpy4a44yhr466zjr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4671a674dbc1620a41e0ff99508892a25eec2ad/recipes/company-racer"; sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4"; name = "company-racer"; }; - packageRequires = [ cl-lib company dash deferred emacs ]; + packageRequires = [ cl-lib company deferred emacs ]; meta = { homepage = "https://melpa.org/#/company-racer"; license = lib.licenses.free; @@ -10270,8 +10354,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; + sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10312,8 +10396,8 @@ src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; - sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; + rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; + sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -10371,12 +10455,12 @@ company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: melpaBuild { pname = "company-terraform"; - version = "20170812.722"; + version = "20171215.546"; src = fetchFromGitHub { owner = "rafalcieslak"; repo = "emacs-company-terraform"; - rev = "bd97342fa1b3b77bd19a3ff202a5ce5cbead36d4"; - sha256 = "0yv0hiskdxx2653g5crmb9yq6c8azrvdja56wnhm8i9kvhnhkggh"; + rev = "1730e03aec5e67b751f50469c978e83326eae7f3"; + sha256 = "0ha98424vzb4sx03l88mc1mspjl9h5aypkj3jqyla7sxga8a3ifa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; @@ -10494,22 +10578,22 @@ license = lib.licenses.free; }; }) {}; - composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: + composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }: melpaBuild { pname = "composer"; - version = "20170304.1647"; + version = "20171227.421"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9"; - sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y"; + rev = "e6ef820c7f7f221881d185e59943a7ec4fbc484a"; + sha256 = "0cdx17gpcyx8azannk8wiy62fzyf9r9niavr83axsapdidcyrl8i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1"; name = "composer"; }; - packageRequires = [ emacs f request s seq ]; + packageRequires = [ emacs f php-runtime request s seq ]; meta = { homepage = "https://melpa.org/#/composer"; license = lib.licenses.free; @@ -10749,12 +10833,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20170603.945"; + version = "20171215.1616"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; - sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; + rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; + sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10770,12 +10854,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "20171019.347"; + version = "20171211.1744"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; - sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; + rev = "11c2004947e0200e88991e265a5ae971adfbd7b2"; + sha256 = "1snlh828zq6b3znrdg4mfl4an76qbqhmld23pwl89ncp37f2lbhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -10896,12 +10980,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171129.838"; + version = "20180106.127"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "9967b2dd205453b73e8fa5f7bdb3fde3fd9c1c02"; - sha256 = "07mwnlp96hs4627m1jqq6pkg1da2c13sf36m21620xialg9i410b"; + rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; + sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10917,12 +11001,12 @@ counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "20171016.1545"; + version = "20171129.1737"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556"; - sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd"; + rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1"; + sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; @@ -10959,12 +11043,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20171121.1515"; + version = "20171228.1836"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "0e3169b5b476ce5c1548ecc2731c7090695b4779"; - sha256 = "1bj7n4wyz3bxlb86l5lmmg2cqcy2xp1gyf8dp6cbp5z3wfs81y52"; + rev = "e39bb84a590ba121dcd4ca75a3a9ac20a41b7cba"; + sha256 = "19wp4klk1kxrhx2qkdxfdxlhha0v5dz0s90m2kdhqk4s87sggg7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -10998,6 +11082,27 @@ license = lib.licenses.free; }; }) {}; + counsel-notmuch = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, notmuch, s }: + melpaBuild { + pname = "counsel-notmuch"; + version = "20171223.145"; + src = fetchFromGitHub { + owner = "fuxialexander"; + repo = "counsel-notmuch"; + rev = "ac1aaead81c6860d7b8324cc1c00bcd52de5e9ca"; + sha256 = "19frcrz6bx7d7v1hkg0xv7zmbk2sydlsdzn1s96cqzjk1illchkz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54fe0be4e8e8b90cd2dc3cc8b9c573694c8f773b/recipes/counsel-notmuch"; + sha256 = "1n4jp9fa5fbv55am0w1b832ncdih8gi6xflwabpwqqj4k5mj94p1"; + name = "counsel-notmuch"; + }; + packageRequires = [ emacs ivy notmuch s ]; + meta = { + homepage = "https://melpa.org/#/counsel-notmuch"; + license = lib.licenses.free; + }; + }) {}; counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-osx-app"; @@ -11022,12 +11127,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20171127.1157"; + version = "20180105.632"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "e4aa44419a38771ce5c89d98881807dc66c3d310"; - sha256 = "0bb0ay6jpq12gk16yq3f9hb63l8gpc33xq46k4z6f8l69rjsim4b"; + rev = "4d78ae8c90e8ebb903b8e70442989a69e46ff069"; + sha256 = "0s81jrmfql3cjh0bf6vfk3gpb94xqcpbkvjah11j0d0ijgw4y1dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11082,6 +11187,48 @@ license = lib.licenses.free; }; }) {}; + counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-tramp"; + version = "20171224.321"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-counsel-tramp"; + rev = "77212268632bc55c4706e25b94b2fe34b69a30dc"; + sha256 = "050qy8p1lywvq5nf6azn0025500dgh6sfp7lzzmzba9kl38plnnb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; + sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5"; + name = "counsel-tramp"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-tramp"; + license = lib.licenses.free; + }; + }) {}; + counsel-world-clock = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: + melpaBuild { + pname = "counsel-world-clock"; + version = "20171201.2337"; + src = fetchFromGitHub { + owner = "kchenphy"; + repo = "counsel-world-clock"; + rev = "04153fbb21e51b1cfd042bdfc6ed1e8355a1edd7"; + sha256 = "1gmsqhc6dsq823jbg9g19x7bsz5n7ssnqjzhsd8pnnm561g60dcm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9da8c45e7d06647f9591d80e83f851a7f3af85/recipes/counsel-world-clock"; + sha256 = "151vm7g7g0jwjlp0wrwlxrjnh9qsckc10whkfgaz9czzvvmsf4cv"; + name = "counsel-world-clock"; + }; + packageRequires = [ ivy s ]; + meta = { + homepage = "https://melpa.org/#/counsel-world-clock"; + license = lib.licenses.free; + }; + }) {}; cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; @@ -11334,22 +11481,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "20170726.504"; + version = "20171227.1607"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; - sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; + rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; + sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; name = "cricbuzz"; }; - packageRequires = [ dash enlive s ]; + packageRequires = [ dash enlive f s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -11379,12 +11526,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20170801.1334"; + version = "20171230.1100"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f"; - sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"; + rev = "6c02dab04fadd8ffb96dc513467e443b0549d1d3"; + sha256 = "08yv469k3rvnxnqrj7iwywq974z9lp0szkrgxlxxfap03wv59f66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11442,12 +11589,12 @@ crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crystal-mode"; - version = "20171023.212"; + version = "20180104.1920"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "5795e05450016d1337c1a198ae7ea76deeec40e2"; - sha256 = "0yipv79gcwp4i3y8gxjd1npgi8fx2iv8lipb14a8165y84ygkf4l"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; @@ -11484,12 +11631,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20170927.816"; + version = "20171211.2238"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "331b45df9c6e84601cea323638f82ce5e4a68b03"; - sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i"; + rev = "ba7a81a85ee5fd234f24333ab156ce897cb20cc7"; + sha256 = "1jb0aq0fs1l3djb0cjfk0b2igvdd06l8lz0g94f63p324jn8rl62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11505,12 +11652,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20171025.401"; + version = "20180106.1819"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb"; - sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y"; + rev = "3af632652c33e733e0da598f1254f8fcc50fe5b6"; + sha256 = "11xmc3kqn0i702lc103h49yya70fhyib8qi4b15slpnliqx2q8f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11698,8 +11845,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "55af742271f56ecb22eac8b6a5739a1193ed8a7e"; - sha256 = "16fd5v206qqcj7986q8g4fsdhm71hylwsayjsn3lda14grgg532j"; + rev = "682e9f66ce16daf166549c1a16dd3a110894a8ea"; + sha256 = "1mz3m4cs7bm8di8lgi7clkl2fjy4663ir54l32f8l73wjic6c90a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11799,12 +11946,12 @@ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "cwl-mode"; - version = "20171126.2031"; + version = "20171205.145"; src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "2b5eb3922b13b5074545ea6058e0683db864d0ee"; - sha256 = "1r99xmdi4pfaw4nxs3dk8xlrc366xkkq24xhb1v8zaby7i5vid0p"; + rev = "2fa8c8db68a8665ed555126975edd8749bcfc009"; + sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; @@ -11904,12 +12051,12 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "20171127.753"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "14838029b2d94878554308abd3a818a6536c5503"; - sha256 = "1rfhk60vwx2i3bmn98r5q0xgxr40a30z4pn4z9ms7qg2wlqi2vf4"; + rev = "d2faf26420ac16c4056f6eda067b845d33e102cd"; + sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -11950,8 +12097,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "e2a703134a763afb2fc76980806ae73333241508"; - sha256 = "0k0jkwxk6218zqmgv4fvpbnk9iczmxh7k9mx4lp6a9hj3lqc8cxg"; + rev = "5b6497c8329c778c97f6f59f3f358304bc1ebd1e"; + sha256 = "07wwv24zcpxbdjf3mrx2ax4ji70kz1s2llisycfkv8lpfnw96yc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12093,12 +12240,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20171124.1126"; + version = "20180104.1316"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "cb53f004ba30815174a4cfd3dced658b802100e1"; - sha256 = "1v8xfbb9bxy2px4ricq96zifybz0fs8xbasxwv9pm7kdxn3lgwli"; + rev = "bbbc0a93959ac0d22bb3c37243f3d964b7892528"; + sha256 = "0mp16yf9hklddfq220bpiad9hp059rpr0akm3gzl30qdbxqxi8q1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12114,12 +12261,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20171126.1252"; + version = "20180107.1329"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6"; - sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk"; + rev = "f597233a765b80660c6332b5565c7d651e378acc"; + sha256 = "1jjdr1h0hihwh3jabxyy4dq4l6z7w4lhrlmyb6xsxkqss7xsb74c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12156,12 +12303,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "20171104.425"; + version = "20171227.1045"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976"; - sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"; + rev = "d9b82b58ded9014985be6658f4ab17e26ed9e93e"; + sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -12303,12 +12450,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20171010.2057"; + version = "20171206.639"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0"; - sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw"; + rev = "dc90fc7d526d7e65256e050e3b373908a27b6c45"; + sha256 = "0rpg7mn8h47hqcm24avcy8r7v8k8by1wjk5xk9j24bbv77aswj9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12345,12 +12492,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20171028.854"; + version = "20180107.818"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; - sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; + rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba"; + sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12387,12 +12534,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "20171028.804"; + version = "20180107.818"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; - sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; + rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba"; + sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12408,12 +12555,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20170923.719"; + version = "20180101.2352"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; - sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; + rev = "7b514b2c4895034b645cb2028220a411882e3b0e"; + sha256 = "0wrlj4nvqr6qcdap0wa6f1pjf77mnyrw820249qb2flb2j4xbd7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12681,12 +12828,12 @@ decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decl"; - version = "20170314.23"; + version = "20171212.658"; src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "b25825de88289fab5212dfd6d18874ca2748123f"; - sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs"; + rev = "c097d532de13cb69b0fc390afa6d806d0db97588"; + sha256 = "1zfn4rkv9n96li0pbxn6c22ljwhg7gyih1srymrk482r2zfhkja6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -12786,12 +12933,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20171125.25"; + version = "20180105.1152"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "1e8e537c3b5b25e770c1b2f993497298405225b2"; - sha256 = "1phbyak6m97h2md0a8id5aqb5rmkpfw5259l2a7d87gk0lgkaqa2"; + rev = "d52e9898a2719bd5003184196aa3b889c4fcb7b3"; + sha256 = "1is3yjk7jv3nqn7fg76pnicwkhc7bf0wklvygdw1hskwj46ii6g8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -13017,12 +13164,12 @@ dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dhall-mode"; - version = "20171128.2130"; + version = "20171204.1327"; src = fetchFromGitHub { owner = "psibi"; repo = "dhall-mode"; - rev = "e38dde1363ee0b11f2117a53a263ff53f0704433"; - sha256 = "01q82d7njgp73v1hm9zz9ik0bfx6aivw859kr788akjvy8kkssza"; + rev = "bc6aec777594beeac6ba4c6dbfb1c889341589c9"; + sha256 = "0vfkdj1fyykmylh6gg9igpiylb2n7bd4iqq1gl5mdqid8gsv4sgl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; @@ -13056,22 +13203,22 @@ license = lib.licenses.free; }; }) {}; - dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: + dictcc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "dictcc"; - version = "20170318.1232"; + version = "20171213.1334"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "24fb40d0822f97c3d796ae81cb6684cd97263248"; - sha256 = "1faj9c4x306s3ml430s01c9zcg9xgj9p34v630046y4lh4i25qc8"; + rev = "a77cf1fadadcbde762466970b503c8a8916b35b2"; + sha256 = "0aaah14nc8ajqhbjmwp7257k2n8ay6g87spb734kxfs8irzg52fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm"; name = "dictcc"; }; - packageRequires = [ cl-lib dash emacs helm s ]; + packageRequires = [ cl-lib emacs ivy ]; meta = { homepage = "https://melpa.org/#/dictcc"; license = lib.licenses.free; @@ -13119,6 +13266,27 @@ license = lib.licenses.free; }; }) {}; + difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "difflib"; + version = "20171227.718"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "difflib.el"; + rev = "b08850251812d71e62fd6956081299590acdf37b"; + sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; + sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6"; + name = "difflib"; + }; + packageRequires = [ cl-generic emacs ht s ]; + meta = { + homepage = "https://melpa.org/#/difflib"; + license = lib.licenses.free; + }; + }) {}; diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diffscuss-mode"; @@ -13265,6 +13433,27 @@ license = lib.licenses.free; }; }) {}; + dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dimmer"; + version = "20180104.2127"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "dimmer.el"; + rev = "f2e9a383cf03597bde9bcd3fa2e7ecb4ca266041"; + sha256 = "14nmk6kld5q6wd6z3r8v938gyi1x6875i0fbfbmfs5v1hykdm2s5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; + sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r"; + name = "dimmer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dimmer"; + license = lib.licenses.free; + }; + }) {}; dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; @@ -13335,8 +13524,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13356,8 +13545,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13482,8 +13671,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13503,8 +13692,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13629,8 +13818,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13650,8 +13839,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13688,12 +13877,12 @@ dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-rainbow"; - version = "20170922.817"; + version = "20171202.1448"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13709,12 +13898,12 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20160924.335"; + version = "20171229.753"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13730,12 +13919,12 @@ dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sidebar"; - version = "20171124.942"; + version = "20180107.1247"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "815cda0301575493b71ebeb3afdb55178b6d3103"; - sha256 = "0a6zdizm2ihzxmy2cw7g8g5qxpq7iz2my6gf2ilnxsak680m43f8"; + rev = "6b195f841bc86281e0c642999ad4fa03174e832c"; + sha256 = "0bw28p2mcj73rbhpij2mchq7dyfl7881rwmn5qz00km5n64yshlg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -13776,8 +13965,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13877,12 +14066,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20170717.1049"; + version = "20171221.138"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "d181475192138b256e124a42660ac60ae62d11d0"; - sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw"; + rev = "b1c14f307652e5a039165d196a799638feb16cd8"; + sha256 = "0vxa29z08idy74y0140c2ddxysj98d644zih9vvddjjmggj7czna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -13982,12 +14171,12 @@ disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disable-mouse"; - version = "20170929.1353"; + version = "20171226.1715"; src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; - rev = "81639930bcaeedadbcc19728e91719afcac84613"; - sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc"; + rev = "541363bd6353b8b05375552bab884a6315ea545c"; + sha256 = "1grs3cz2zdw49frvxy4vc1z3ld804kk5g2ad6ln5grprcd188bz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; @@ -14296,12 +14485,12 @@ dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dizzee"; - version = "20111009.616"; + version = "20171201.116"; src = fetchFromGitHub { owner = "davidmiller"; repo = "dizzee"; - rev = "37629f390afb8da03ef0ce81c2b3caff660e12f6"; - sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5"; + rev = "e3cf1c2ea5d0fc00747524b6f3c5b905d0a8c8e1"; + sha256 = "1i32msin8ra963w7af6612d038gxb25m1gj97kbjymjq1r8zbdrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee"; @@ -14569,12 +14758,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20171121.2316"; + version = "20180107.925"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "fc31c2b1aa8ef553050ace61beadf08ded58529c"; - sha256 = "0sx0iqwqfrkkjpx84w9cvhzgdsqd5lgc8y1akw689pc4pknl4x52"; + rev = "5a6e407ee9c6035245749ee1f249aed16d651728"; + sha256 = "0gl2rbx649yc4rbljmhdqsa17hnv24lpj5y8fxdh27gnjqksg2zq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14665,8 +14854,8 @@ src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "cd102cffa11a0557b1c04651e8cbd53fe01fbb92"; - sha256 = "01nz471zmj8gxvccyjk6mmwvijk7w6dqn45nhjxnkjb85np8iql0"; + rev = "4ab78f678e9ee40c7c5729dc8f1f5c1a847be2e7"; + sha256 = "0dc3pfqf6nrwnqsiyn49l0pgq7rm31kciwsqagnrjnc85nnbpf9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -14682,12 +14871,12 @@ dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "dokuwiki"; - version = "20170213.122"; + version = "20180101.1659"; src = fetchFromGitHub { owner = "accidentalrebel"; repo = "emacs-dokuwiki"; - rev = "a78289d99068ec3dfb4945877c32751e789d099d"; - sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r"; + rev = "594c4d4904dcc2796bbbd2c0845d9e7c09ccf6f7"; + sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki"; @@ -14766,12 +14955,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20171114.813"; + version = "20180105.1142"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "5cd9e8370220aeeff5b30142c45a58bd9aeeabbd"; - sha256 = "064cqmrlk1cdm0gf4hwagdqxsidvciq4a80vws8bbcg6ri416cbj"; + rev = "464774515c348ad32bad4b062d768d443f44beaf"; + sha256 = "17pszvr2i27drym63j4hkmdhra5j6ixv5i2ab5b8i8049fbrnqzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15249,12 +15438,12 @@ dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dumb-diff"; - version = "20171106.1659"; + version = "20171211.1322"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-diff"; - rev = "a89162a41be228f587f6d778ce2a350ee0b61792"; - sha256 = "1wznlaphsdh6bz5zppwabnmbsymz09b6aqadwr8b3l1r841s4y9v"; + rev = "1a2331d283049b71a07c1b06b1e0627a950d55f4"; + sha256 = "05gmpp4s9y2ql27vb5vpqn3xh35qjfxgq9gzyvg86df43qfl8wvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff"; @@ -15270,12 +15459,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20171122.1614"; + version = "20180107.2324"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "c4b3e4b77df502e229823b2f10d6440c0aa9a433"; - sha256 = "0cckw2h0n06mzcmcmj42ivgnd0why5dfb1hpyrcpqi2aalyk61x2"; + rev = "2e87dc528cfdde9b8e13bb7dcadc12f482bf98fa"; + sha256 = "1jl2mg3w2xj7njdvldilav0drgvr15ddx0bq8jkgxa9l0k718dl7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15354,11 +15543,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20171012.1339"; + version = "20171211.722"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "9e446540a794"; - sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; + rev = "87db00b912be"; + sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15710,12 +15899,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171124.503"; + version = "20180103.1855"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "e4dc1057b02b6736221936e66c188cf71c01916d"; - sha256 = "0knld86pl2im9mjy4s7mxxibdyc4sq9vhxg4jrndyrmldpjya4my"; + rev = "61a504616705feae8c3fd8b01bf315e2cb89f699"; + sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15728,6 +15917,27 @@ license = lib.licenses.free; }; }) {}; + easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-jekyll"; + version = "20180103.1726"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-jekyll"; + rev = "4a529ce42a720960f2594b7081359c8766fc2643"; + sha256 = "1gr72wqs620i56cchblwgsca9wd0fxxcz750fpp594j7xcxn9scl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; + sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; + name = "easy-jekyll"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-jekyll"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -15794,12 +16004,12 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20170810.631"; + version = "20171231.2216"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c"; - sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr"; + rev = "3a7a9a66efed30416e2013da80fed2f79b91def1"; + sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -15920,12 +16130,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20171110.627"; + version = "20171216.408"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2"; - sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55"; + rev = "3a77ba9f1064c2bca47b401974c009e65727c46e"; + sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -16298,12 +16508,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20171107.301"; + version = "20171208.2036"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "2ec90f13ad98481c5324eea4877de7a80d814d86"; - sha256 = "160f7ciy8yp75gja3abm4rjy61wmk2b7b0k032qimiawkvg57bx2"; + rev = "15e26cf5a5a656735fa25bfa75164f0893f4688a"; + sha256 = "0fyncdkxvlbsr4lv686djy2a1wm5qpcnjrkc3zdsbrr6wq8ildgh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16499,8 +16709,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "83e835870d9d10dc3622b09157354332d1154eb7"; - sha256 = "1a4s8m4pkksq23ssisn5yfpcraa1j4qxfg8vjs5hw044y87w6lw9"; + rev = "b7c073e0a29c9632d82b501849e270d62304e22f"; + sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16536,11 +16746,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170906.1216"; + version = "20171229.1435"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "25f9af215781163b10d411fe2b5674033eb24165"; - sha256 = "0mwy5a67hap9bx1klk2pzfaav65drd6mfkkhnk2045z4jvzgkn70"; + rev = "faae6f1384826d18f70b28826dc528d70e91a5c9"; + sha256 = "02hylmgs6il59kkq59i9lpdg9gdirpb2y37xzybh7n5lqyzdafai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; @@ -16650,12 +16860,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20171019.1304"; + version = "20171227.259"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8"; - sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n"; + rev = "afb3e6f1e82abec5407c7a3335bf1c70fa3690d6"; + sha256 = "0q8c35jnxgxmbbbpz4iv3x45ylckq4qi0pq05am5rf5rywlw00v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16704,8 +16914,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "4d5e51241f1863dff58fc23a815aad29f0869e3b"; - sha256 = "0rfryxvnxfzvvgfwg5vfsqf77zxzv4mq97fi9fpbjfariyrz5xga"; + rev = "dfa944ef26802771dca0feea9ea5a17350da9232"; + sha256 = "0qfshiriffbh6bxvghg9y0fzdqayywd4kzjwvq7cin2k99dhhrsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16991,24 +17201,24 @@ license = lib.licenses.free; }; }) {}; - eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: + eldoc-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: melpaBuild { - pname = "eldoc-overlay-mode"; - version = "20170909.651"; + pname = "eldoc-overlay"; + version = "20171219.140"; src = fetchFromGitHub { owner = "stardiviner"; - repo = "eldoc-overlay-mode"; - rev = "4512e5499cd4f647ad3b5212b853f0299d6cff47"; - sha256 = "1dp7pjr89bq0fjjqvha2smw54aymy4pyjx643qp0x1dhpwa7bv5h"; + repo = "eldoc-overlay"; + rev = "a391396f4cdf30a2f27a4c426b58b44ab3d0f0d0"; + sha256 = "1g1sp6ws4y28536jkf5crbkmnrl7jcbh5s3ysyys6xn8gvz0vm17"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode"; - sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954"; - name = "eldoc-overlay-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f865b248002d6d3ba9653c2221072a4aa54cd740/recipes/eldoc-overlay"; + sha256 = "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x"; + name = "eldoc-overlay"; }; packageRequires = [ emacs inline-docs quick-peek ]; meta = { - homepage = "https://melpa.org/#/eldoc-overlay-mode"; + homepage = "https://melpa.org/#/eldoc-overlay"; license = lib.licenses.free; }; }) {}; @@ -17036,12 +17246,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20171125.148"; + version = "20171229.304"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "77ec424e1383b866b404b58fdd92515f9b786eac"; - sha256 = "0f188y0wm2l81sihbi2zz30kml9cpk7jhi2l07id0pd1k8h46d8i"; + rev = "e414534bd0a4149919647beec8fe4e342d2d1219"; + sha256 = "0ahxxjlfpr2zj3sbiz9xyb422pld8xhzzj5nkzxyfksbnbvms5hd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17120,12 +17330,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20171103.737"; + version = "20180107.1156"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef"; - sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv"; + rev = "138fd5661ac07b19525de7750177b1f0d2054006"; + sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17190,12 +17400,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "20171114.2252"; + version = "20171214.2319"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "05e17c42edd03393e862492e9fe5902e44015ad6"; - sha256 = "16gifn20vkp1079r0vy746zq7jqy50c6mmxmm3rbzy5scga1rzjr"; + rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83"; + sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -17215,8 +17425,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef"; - sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv"; + rev = "138fd5661ac07b19525de7750177b1f0d2054006"; + sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17337,12 +17547,12 @@ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20170831.1347"; + version = "20171224.1532"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "9ac6c1a45c620a6d7e0fae3739558fa08b3758a3"; - sha256 = "1yniapnkr3124isnfkv1j4mqwdmb1xb7xngjwprhjlg3k1zj3rfl"; + rev = "d0a63ae9e564f082c904c02fa5123f3a557886c6"; + sha256 = "1h1jr72nxsjpshqp725dh4wcsahr9hkj6y3zc99m8lilndm3x114"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -17673,12 +17883,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20171124.720"; + version = "20180107.1243"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "f1766b9bbe6d534d4f493aee1db617e764cb1e22"; - sha256 = "0y1qic21skxjd8066diy6j1frwbvra3nws599i6aqy27mprlnhyf"; + rev = "e59e3d67b5a2053cb121d235bc51a0d6d438058a"; + sha256 = "1l3sr011cx8sclhw720iph9r03ja7fx3qcixpc65gmxy4r3ihjz0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17699,6 +17909,27 @@ license = lib.licenses.free; }; }) {}; + elpygen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "elpygen"; + version = "20171225.936"; + src = fetchFromGitHub { + owner = "vkazanov"; + repo = "elpygen"; + rev = "21929c997a05968f9eefe52b85a76ceaab3b0d81"; + sha256 = "093ck4dkdvbgafb1bmkmszg1ba81ns5kjbk2iq2b5p9dvfcjjr3k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e670bd79a85c4e2a9ca3355feb8aaefa709f49cb/recipes/elpygen"; + sha256 = "01fak1dz9mna3p4c2r0scb0j10qk3lvpq270jy6rvzlcbwri4akl"; + name = "elpygen"; + }; + packageRequires = [ emacs yasnippet ]; + meta = { + homepage = "https://melpa.org/#/elpygen"; + license = lib.licenses.free; + }; + }) {}; elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elquery"; @@ -17993,85 +18224,85 @@ license = lib.licenses.free; }; }) {}; - emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: + emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20170807.1901"; + version = "20171218.1903"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; + sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax"; name = "emacsql"; }; - packageRequires = [ cl-generic cl-lib emacs finalize ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/emacsql"; license = lib.licenses.free; }; }) {}; - emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-mysql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "20170410.1008"; + version = "20171218.1827"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; + sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy"; name = "emacsql-mysql"; }; - packageRequires = [ cl-generic cl-lib emacs emacsql ]; + packageRequires = [ emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-mysql"; license = lib.licenses.free; }; }) {}; - emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: + emacsql-psql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-psql"; - version = "20170410.1008"; + version = "20171218.1827"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; + sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3"; name = "emacsql-psql"; }; - packageRequires = [ cl-generic cl-lib emacs emacsql pg ]; + packageRequires = [ emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-psql"; license = lib.licenses.free; }; }) {}; - emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-sqlite = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20170806.1551"; + version = "20171218.1827"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; + sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i"; name = "emacsql-sqlite"; }; - packageRequires = [ cl-generic cl-lib emacs emacsql ]; + packageRequires = [ emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-sqlite"; license = lib.licenses.free; @@ -18164,12 +18395,12 @@ ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; - version = "20161105.855"; + version = "20171208.559"; src = fetchFromGitHub { owner = "madnificent"; repo = "ember-mode"; - rev = "3e45cf3e290ac422c1b9713f3e7db5c634bcdaf2"; - sha256 = "0g6xmqrjqzwl67ij05lwk72fdhm77p3b45jf7vc8xfn050nvn06l"; + rev = "755256782478cb724edd8f111225d7c8d342f90c"; + sha256 = "02x12b26l9qyq9cmg56ys222qxbc8zldw40scq3mfhfqqk4b43g7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode"; @@ -18269,11 +18500,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20171126.2321"; + version = "20180103.520"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "0960515e644015c6d85549fa3bef3d67c0ee7116"; - sha256 = "0zsqxckwqhgfbiycx41haky4rggdrwx4vdb7awq1i7nhinfkk7jn"; + rev = "3a8d16d91edae81ffb2bb9efa12d41712edfd4f8"; + sha256 = "1cwsjrjasb2gi28aavy64g4sg9wwfq3wab24klssh3290qrr3gkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18373,12 +18604,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20171102.811"; + version = "20171211.609"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "57924973b9e7a3b059b6dd40decb194abc596875"; - sha256 = "0q1sfb2rgzpvxbpq0d3zl03bc8abyzq2d5pvy8z0ighwbhabkrrs"; + rev = "686be9b27537bdc7987f1ab0525393208bfc480b"; + sha256 = "0c53mbl53ii0h64a1vdvskm29wjr7v1ms54ax5d588bv4c67wsms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -18700,12 +18931,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20171101.1638"; + version = "20171212.1249"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb"; - sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf"; + rev = "4f43eab67a9afb91b0408221d478dcb98131478f"; + sha256 = "0ahvsazrdlwfz0imsfvnhv1f58m7cnib8fzbffdjvvwmmc9g511y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -18784,12 +19015,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20171027.1433"; + version = "20171217.1730"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "483e94546d9b1de5841b8853882d5644cc419479"; - sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz"; + rev = "3d3ab18436ad6089496b3bce1d49c64a86965431"; + sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18897,12 +19128,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20171024.651"; + version = "20171220.1658"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896"; - sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2"; + rev = "71ce3ffd41bdc90c649a044ddbee0b32b329c612"; + sha256 = "0wfhhmv92ymq43h26bn0f7vjbmp9wisl76mqaydqir33a13y3a55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19166,6 +19397,27 @@ license = lib.licenses.free; }; }) {}; + erc-status-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "erc-status-sidebar"; + version = "20171223.1324"; + src = fetchFromGitHub { + owner = "drewbarbs"; + repo = "erc-status-sidebar"; + rev = "9e972f4e31287362020daa81dc7af26999ea6c5b"; + sha256 = "0g7m5r5f01i73k05wny0xycrjcyhzwc314a5lb8h09kglwnmisgv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/29631de8ec4140a8e35cc500902b58115faa3955/recipes/erc-status-sidebar"; + sha256 = "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d"; + name = "erc-status-sidebar"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/erc-status-sidebar"; + license = lib.licenses.free; + }; + }) {}; erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-terminal-notifier"; @@ -19442,12 +19694,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20171117.243"; + version = "20171219.305"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "36c264571369a7d9110dc77dd5043e4be3134f56"; - sha256 = "1hwvyrlhl490l7bx7ynh5jfkrzcfb60k6ip036v830q7jz2c5l4d"; + rev = "68a0f569410f7375c44a9d806930b1172c1d92a8"; + sha256 = "0vbrnca9rfncgyz95505mmg25wl95dab5djjw5nffd627sxgnj2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19609,12 +19861,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170915.801"; + version = "20171220.719"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea"; - sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy"; + rev = "adf879cb108819fc18fea52788b3fa98a57f5177"; + sha256 = "1zcv11vi3vs5i2i104an9nzm9jy889pqfs9xlifz7w9l81qfa2nl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -19690,6 +19942,27 @@ license = lib.licenses.free; }; }) {}; + esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "esh-autosuggest"; + version = "20171223.1855"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "esh-autosuggest"; + rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610"; + sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; + sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx"; + name = "esh-autosuggest"; + }; + packageRequires = [ company emacs ]; + meta = { + homepage = "https://melpa.org/#/esh-autosuggest"; + license = lib.licenses.free; + }; + }) {}; esh-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-buf-stack"; @@ -20050,12 +20323,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171126.2319"; + version = "20171204.1404"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "d0a943d3fbbc8b554d1ccac16bb5a9ea18496e01"; - sha256 = "0krcxdxfwsp7addnsi9rkzr4jan1fw9qppd5ilj4fdrgfj97mr9q"; + rev = "8a5cefe1bfec7c76d03332c4f6dfc224ad4bc61b"; + sha256 = "1p0j7s1vz184l4100gri8x8g453x43k5fmfp3pkvlgifny1vf26a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20215,6 +20488,27 @@ license = lib.licenses.free; }; }) {}; + eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: + melpaBuild { + pname = "eterm-256color"; + version = "20171221.1837"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "eterm-256color"; + rev = "a5560abfa81242dc45ab0342e41e33f6c7e6bc1e"; + sha256 = "0md53lhpxh1yqirfjgx8fq8vsh5zbl2v2hn63nkyh60rv3sc4jkm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; + sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b"; + name = "eterm-256color"; + }; + packageRequires = [ emacs f xterm-color ]; + meta = { + homepage = "https://melpa.org/#/eterm-256color"; + license = lib.licenses.free; + }; + }) {}; ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; @@ -20386,12 +20680,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171129.651"; + version = "20180103.2356"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "1bba6116f3b29488a87503693e70a0bd2b5eaebe"; - sha256 = "1mdpibvif3q9v7l5yp822ss2av4cmipi9jqywqxrw3ak0m0kb24z"; + rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506"; + sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20530,6 +20824,27 @@ license = lib.licenses.free; }; }) {}; + evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-collection"; + version = "20180106.1137"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "evil-collection"; + rev = "1e448e5a426e5c03b8da5f0a203eaa4c681833c6"; + sha256 = "05b70vn46s05ag0s27wagpaznvas3n68hwl03sz84n8d48ix7i59"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; + sha256 = "0wxx6x9lxlnxaa3i36gj4nad3q8c25mbw17bp4aa0agh43yk4bgn"; + name = "evil-collection"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-collection"; + license = lib.licenses.free; + }; + }) {}; evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; @@ -20575,12 +20890,12 @@ evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-easymotion"; - version = "20170110.2004"; + version = "20180102.2115"; src = fetchFromGitHub { owner = "PythonNut"; repo = "evil-easymotion"; - rev = "f9b5aa52f238ea14c2b16982e56c3b2c8f739101"; - sha256 = "098x03vlz3gvkaa3wahi1557l9x39n1v8jclj5aqxvjdzapi6myi"; + rev = "07e1c88b2ea9962e837f97b57dbf3c5bab22662e"; + sha256 = "1j3z7j2g3vsylaykinvbm47c2z8gr172qc6zdfpgzz0hskklkszy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion"; @@ -20764,12 +21079,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20171121.2306"; + version = "20171219.153"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "79a25e4da1dbddfd45b8824bd9e1585a24838baa"; - sha256 = "11lxad2vmmbnmljv2j1282l4j834kwmp98jlv5as29mdrbjchbxv"; + rev = "2670fdf6643a098141e3323ab862e311d917ed35"; + sha256 = "03g6yrrcfc8f2vbiysia0gxgnsy15i9c4iqvbiwpi93y5jj40lzy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -20953,12 +21268,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20171018.722"; + version = "20171213.1019"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a"; - sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3"; + rev = "4cdfbcd13075869c238b2253a64668736a16880e"; + sha256 = "148k9ssq8arlvkvacjxwpyg3g8i961ab6wcgg92jmxwl7ir853yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -21079,12 +21394,12 @@ evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; - version = "20170623.1135"; + version = "20171217.2317"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "e135fd8662406807bc0d9d0f2688e7dbe89b98c8"; - sha256 = "1dw3mf3dckjhnzvwj7jcwlgzkh592njvcg2xbs2wv1456rnnqaz3"; + rev = "adcadd09c9f628a65d73a140c37b649c3415a3cd"; + sha256 = "1iz0hd0h4y9crqwbq7ysnkgvwqhd9vcjcca8hk2506cks8sab73q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -21100,12 +21415,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20171106.1510"; + version = "20171206.441"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "6a05c86bdf668fa2bb8a9daf76f3d7b241d7ba3d"; - sha256 = "0nbgrg1d8g2v7lfdwnd26wm1n4qpwci4a0x3qawngcjkyj9df4q5"; + rev = "41d43709210711c07de69497c5f7db646b7e7a96"; + sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -21163,12 +21478,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-org"; - version = "20171128.1308"; + version = "20171224.753"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "dfaa09d657b6c8798c2389160b979153acee91ea"; - sha256 = "1dhaggc2ic3sl1r1bsn155nhm3hi5j9arj01bfk35vnj3nmpj064"; + rev = "22c248deb6c74a5bcdb0268306eed878a44fe517"; + sha256 = "01ayyd22vs5i7l7h95ia1qzmsm69x0imqcmmfwjnpwibar4s5v9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21244,6 +21559,27 @@ license = lib.licenses.free; }; }) {}; + evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-replace-with-char"; + version = "20171223.906"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-replace-with-char"; + rev = "b08293f380ca8809ef12df572d37f977bed0ae52"; + sha256 = "05d505scnmhplaqrcj7fpb107bfgh4zpxrrq942nn035yw07yjjx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char"; + sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r"; + name = "evil-replace-with-char"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-replace-with-char"; + license = lib.licenses.free; + }; + }) {}; evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-replace-with-register"; @@ -21310,12 +21646,12 @@ evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-smartparens"; - version = "20171103.941"; + version = "20171210.713"; src = fetchFromGitHub { owner = "expez"; repo = "evil-smartparens"; - rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00"; - sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl"; + rev = "026d4a3cfce415a4dfae1457f871b385386e61d3"; + sha256 = "05habba44zls2d20kgzshrq2psagay16cnvcnkqgrbhvj1rxfmrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens"; @@ -21370,15 +21706,36 @@ license = lib.licenses.free; }; }) {}; + evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }: + melpaBuild { + pname = "evil-string-inflection"; + version = "20171225.1815"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-string-inflection"; + rev = "ac261bee68444c2cb9aaab25b58509e8f58efe35"; + sha256 = "1b9h7qpmaqwcdj742y76hrs31l7z9aynih9mkwdcnx5fi2a649la"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; + sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh"; + name = "evil-string-inflection"; + }; + packageRequires = [ emacs evil string-inflection ]; + meta = { + homepage = "https://melpa.org/#/evil-string-inflection"; + license = lib.licenses.free; + }; + }) {}; evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20171127.910"; + version = "20180102.601"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "55c820083a5f28d5361baeb9cd7da92549e5b3f5"; - sha256 = "0qnv0c1byvzlclc8yaq6jjy61vza3zq2i773b30ss0rfpa03p13z"; + rev = "5a20c9757eff64e1567d313eb254126aef2bf3b2"; + sha256 = "094vz707iyjknmhmhdlzc8sv8x86yxgx863c23nm6fjn5n5h7jmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21461,8 +21818,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "1bba6116f3b29488a87503693e70a0bd2b5eaebe"; - sha256 = "1mdpibvif3q9v7l5yp822ss2av4cmipi9jqywqxrw3ak0m0kb24z"; + rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506"; + sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21734,8 +22091,8 @@ src = fetchFromGitHub { owner = "ninrod"; repo = "exato"; - rev = "ba21cd2c8d0588e1c70ba89ebad6df247605e03f"; - sha256 = "12xqysbdnkvz220qf0jz2v40809hcmdmga10ac74yhg00h25nll6"; + rev = "5b709c128680d4dc5ac4c11253eab94a1e38bcbc"; + sha256 = "0ins7z1a3np7h7l2n7syhj10hm01v0gxn0m8kzjim59x57l0l3wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; @@ -21792,12 +22149,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171128.1540"; + version = "20171227.203"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "5e185fa9bcbc2c08624d8b1e3c4fce1b5b433051"; - sha256 = "0qjf6fnag1rwzvlij1n75a9g3a6w83nvzkcxb9nknqv4bcjkhrxg"; + rev = "4324e9e888b08f8884d74458ace00da190b1cc62"; + sha256 = "17fywa9blx5yf9gjhz1axzziz3yn3qw93bi19xaq0vgv26w5s8bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -21834,12 +22191,12 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20170514.1309"; + version = "20171217.2125"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "2357f1d5efd9d5b9e37f3513342237fec2629291"; - sha256 = "0sggq57q8fxzd0my2kwbb2li91zq13cyhxn789bafzxq2d5fpk9h"; + rev = "f99b7630efcdb47c9c6182489c55fba3bcaee521"; + sha256 = "0sdk9qqxd8dkjf554p7ch2w8pd8a7c4q64c5yd8gphc8fmzc32rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -21897,12 +22254,12 @@ extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "extempore-mode"; - version = "20160620.1813"; + version = "20180104.2221"; src = fetchFromGitHub { owner = "extemporelang"; repo = "extempore-emacs-mode"; - rev = "ce052da4899ea85ee33792a344359fdd19bc653b"; - sha256 = "163in2pbvqyknsm3la5zqinlw018crx0f0cvr9caal86v5gx65cr"; + rev = "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5"; + sha256 = "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bd3e57171f5283604e9375613a7a94416ee99a7/recipes/extempore-mode"; @@ -21936,6 +22293,27 @@ license = lib.licenses.free; }; }) {}; + exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "exwm-surf"; + version = "20171204.340"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "exwm-surf"; + rev = "6c17e2c1597fe4b7b454a1dac23b9127ac951e94"; + sha256 = "0rb921fq3pyzv0w1s6n0zx4j7cvv68mb50hfa8nqnppz5ii1k0lb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4fc27fae2b58c7af87dadba9217cc05f8ab4890c/recipes/exwm-surf"; + sha256 = "066qbn1w63irh9b03qs0fv77x71cind22kdj6wygaznrpgwr0kny"; + name = "exwm-surf"; + }; + packageRequires = [ emacs exwm ]; + meta = { + homepage = "https://melpa.org/#/exwm-surf"; + license = lib.licenses.free; + }; + }) {}; exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; @@ -21968,12 +22346,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20171123.6"; + version = "20171216.944"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5"; - sha256 = "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq"; + rev = "ad94b5bed74a74769775e937e167d301f4ea70e3"; + sha256 = "1f1b70fyq9j19i41rsishrdkslwnx0af7gzwirhs25sgkpsqz2hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -22052,12 +22430,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20171119.723"; + version = "20180106.122"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "595519ea07d6ff49e5cb1cbd442eb689f9142ed1"; - sha256 = "1nxkfya6bwn0bmiwcq5q68qpyhkdsc9b4n75vav06nn7w1k5y3gv"; + rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; + sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; @@ -22073,12 +22451,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20170728.1120"; + version = "20171222.138"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6"; - sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz"; + rev = "632b2c44d6e0c8b4b069e3188a1ea42a403c1ad1"; + sha256 = "0nxibjpjifpb6v2k1s1rbci1gjdnls94gd404jfmj4996z4q1wr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -22385,6 +22763,26 @@ license = lib.licenses.free; }; }) {}; + faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faustine"; + version = "20171122.402"; + src = fetchgit { + url = "https://bitbucket.org/yphil/faustine"; + rev = "07a38963111518f86123802f9d477be0d4689a3f"; + sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine"; + sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb"; + name = "faustine"; + }; + packageRequires = [ emacs faust-mode ]; + meta = { + homepage = "https://melpa.org/#/faustine"; + license = lib.licenses.free; + }; + }) {}; fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; @@ -22533,12 +22931,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "20170905.1008"; + version = "20171209.1124"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779"; - sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"; + rev = "d2536b1c48f78679e15a2b50cd5d8c0ffde4b155"; + sha256 = "0f8h32n8mnrwijz3lrslbx521f0fkhn24cwd16r8hcjk976l5kbp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -22579,8 +22977,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a"; - sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm"; + rev = "846731531e7d1d80451787992e07bfe7dedbe9ff"; + sha256 = "0kqsqmfvnh0slx0hmrsw66rh62sgzyhzck7ii9zylkq72wj60fgl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; @@ -22617,12 +23015,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20171123.1508"; + version = "20171219.1858"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "9e308e69883cb43e136a2e9d4f0db495b457b82d"; - sha256 = "0bzbqm8wq8gbz0a18d35ksv0yf65giwcdxhrqzklsxgn9v7p73b8"; + rev = "b9dff2881cefaf2926df35fe23366ce3bd59d157"; + sha256 = "0f6nwbnwh06phg9560q97ksh3m50a9z73z7vrqlppfs27aqx2jbp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22848,12 +23246,12 @@ fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-completion"; - version = "20171104.1509"; + version = "20171209.508"; src = fetchFromGitHub { owner = "Ambrevar"; repo = "emacs-fish-completion"; - rev = "547fe4f61b8e311e5db17be9f6d277d08523beba"; - sha256 = "0qkq23fad7apm2q1xn3b7agkkv3pvcwv012kvma568zk4jcfw3zg"; + rev = "12e5db70b5efe7a3cd37e8fd25eb526d08007aac"; + sha256 = "0p06rahi66fa3i2gfkf6nzf7hnysdpz475d5dib2wps7labfh9qd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion"; @@ -22890,12 +23288,12 @@ fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; - version = "20170518.2311"; + version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "a0fd233bba6206854c5d7365d7182aaae842f210"; - sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz"; + rev = "e053fcc641f1f835f2fdb71143e095c1889b8233"; + sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -22932,12 +23330,12 @@ fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; - version = "20170518.2343"; + version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77"; - sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda"; + rev = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde"; + sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -23128,12 +23526,12 @@ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-compile"; - version = "20171113.929"; + version = "20171213.1019"; src = fetchFromGitHub { owner = "plandes"; repo = "flex-compile"; - rev = "631a5a95bcf783b8d43435d7666ccd8e205a3bd5"; - sha256 = "1jcw8qc6krsl6j5xx7fp7hancqcg9hk6q1c2qwy081yig7537bf7"; + rev = "1952f6deee9d95196906f46fea2b24882cc614b6"; + sha256 = "0wx0857f25k2rr5y6mikhi0czgvf6r1667fy8hjgl6gk0fyi960f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; @@ -23208,6 +23606,27 @@ license = lib.licenses.free; }; }) {}; + fliptext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fliptext"; + version = "20171124.1256"; + src = fetchFromGitHub { + owner = "andre-r"; + repo = "fliptext.el"; + rev = "fd821f645ffebae6ae3894afa7ba7fc06f91afc6"; + sha256 = "1jf63kp1myxihv6r13cddxgr8cchxcnnmylj5dx50y42595ia4yh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e36776cbed8eab151f69d0edd5217a7bba7c2451/recipes/fliptext"; + sha256 = "1wbrvqrvrpk2lx7b6y30rrshr7a25b2191bnx4v8lm3cv16gv8p7"; + name = "fliptext"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fliptext"; + license = lib.licenses.free; + }; + }) {}; floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; @@ -23232,12 +23651,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20171124.1238"; + version = "20180104.1348"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "0a90e5dc9d58dd76ab08ba8ee187e52fa8a9d026"; - sha256 = "1qz3nqm76v3g6j7ps5a06via7vbghsdjz547z8gpv6ncgzj70djv"; + rev = "50dded94ad201fdc9453656a8b15179981cd5acd"; + sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23316,12 +23735,12 @@ flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "flx-isearch"; - version = "20160105.1217"; + version = "20180102.2114"; src = fetchFromGitHub { owner = "PythonNut"; repo = "flx-isearch"; - rev = "54ae0a5a31e6a07b68823d486ff4ec9e4c558588"; - sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1"; + rev = "f132fd6367e369885ab3a865fbfe20eee989bc0b"; + sha256 = "1dcvfl4fyhgw0rhfhixzlzjfr99fisa83f7lmlwzz2zs96myhhkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd1438cc0821b8ae1d01e2a3bc8f07ca8a79134/recipes/flx-isearch"; @@ -23337,12 +23756,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171126.1339"; + version = "20171214.1215"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "d2b3c321d49c887f23b2342766846aee3f073c49"; - sha256 = "1nzqqgggd3g6x1kjszilm0gclk5rg4f6mpda4vyh2hha5j53cwah"; + rev = "6bc54f00666d14197cb8685b42dbd49e19c82ec8"; + sha256 = "0wdmwiy9fd5lbxdp2iix3krb7ia0aly8n5bwxap1pmrl2anjzik9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23551,8 +23970,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "2a0e96889b128808866a1e2e98694be1b251fd37"; - sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb"; + rev = "0fe57ab9c0d6262a3c0dbc9c28a9ca98390a6016"; + sha256 = "1495d09vr8dlf9q6127fa46ghhgyw5bmzx22wdzzrfvc70m041a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; @@ -23628,6 +24047,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-crystal"; + version = "20171124.740"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal"; + sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn"; + name = "flycheck-crystal"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-crystal"; + license = lib.licenses.free; + }; + }) {}; flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-css-colorguard"; @@ -24132,6 +24572,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-lilypond = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-lilypond"; + version = "20171203.532"; + src = fetchFromGitHub { + owner = "hinrik"; + repo = "flycheck-lilypond"; + rev = "cc1b7677a932c42e5dab1661ad7b923d4aae744c"; + sha256 = "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/da99de90193c9ad362afdbbae28dfba52ef3676e/recipes/flycheck-lilypond"; + sha256 = "0yx0jbilr8z58df13wcssp3p95skcvl8mnhhr6lijak44sd7klbf"; + name = "flycheck-lilypond"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-lilypond"; + license = lib.licenses.free; + }; + }) {}; flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-liquidhs"; @@ -24261,12 +24722,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20171014.651"; + version = "20171231.453"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; + sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -24324,12 +24785,12 @@ flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-perl6"; - version = "20150414.1832"; + version = "20171231.445"; src = fetchFromGitHub { owner = "hinrik"; repo = "flycheck-perl6"; - rev = "6a9a929ffb58595bbe9fe3d7c2e78617c8e9bb5a"; - sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3"; + rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94"; + sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6"; @@ -24471,12 +24932,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20171110.48"; + version = "20171207.1754"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4"; - sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763"; + rev = "41e676931f37ba32652edde727e443e304e7e6ee"; + sha256 = "118y7r06cmvas5g2nypabslfch3g5wlzl3p69ynmpfsmbrlclsz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -24538,8 +24999,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; + sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24639,12 +25100,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20170926.317"; + version = "20171231.452"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; + sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -25437,12 +25898,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "20170213.700"; + version = "20171205.940"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; + sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -25462,8 +25923,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; + sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -25483,8 +25944,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; + sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -25504,8 +25965,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; + sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -25609,8 +26070,8 @@ src = fetchFromGitHub { owner = "troyp"; repo = "fn.el"; - rev = "2dc78b7ef9e24f9fe872d40c8fe6050f7ce819cf"; - sha256 = "0nvhis3myclgvazhiljv7fgis1x5hwr5rr8rhxx3290fgsgdp0bw"; + rev = "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8"; + sha256 = "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; @@ -25626,12 +26087,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20170612.743"; + version = "20171203.2103"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "a84ade00a2b57e47430d5b2df5246069f197356f"; - sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835"; + rev = "045ee6175e9340f873db03445c74ff9eefa35a27"; + sha256 = "1hrx8bj4gf0dqbfxgvis62zxnkiyms6v730s55vd8711zxdl0pw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -25857,12 +26318,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170924.1440"; + version = "20180106.920"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2"; - sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6"; + rev = "28d7339f2e70c617f2e8e3979b45d78883a27282"; + sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -26046,12 +26507,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20171121.559"; + version = "20180107.2123"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "5c63d2f199e96bdf8fd60d375b2b6e305a5f9017"; - sha256 = "0vxizl4pr0668b1d94wrl42li2709srvnn5likn8lskv2mv0bnvn"; + rev = "361f2a58151c9e6ab52b59cdd230a3add461a2bb"; + sha256 = "10sgscfw70yw6khzl4nr1w1zh28g7rh4fwr3p2q4ny4z1zsxvbl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -26130,12 +26591,12 @@ frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; - version = "20170802.455"; + version = "20180107.901"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "d2e6a825e2079adb58012e9677c494d317494724"; - sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa"; + rev = "5351741363bb9b4d44ec62ae91cbc9f102cf09f5"; + sha256 = "1a8hz0wqxb14d3kkv91v1wawqllggz7245h4sv62291jmvvhdbb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -26339,8 +26800,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "c95a56561999f526e6fa60bba4a6f830af46b32b"; - sha256 = "0bd3652j3f2qgh72zpl9hhwdyma0xyi2k99jahmyzh5mb5nz6gg5"; + rev = "bf5e51b5c33d5bdd5658f7e8275850d11fc39ca8"; + sha256 = "1sgq8nq6jzgy8akxycvcmgqjaf424v7v9r41pk7r8lw57csrnz37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26465,8 +26926,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "686755bbaba673c244d6f1ede30f5d2f6713a09c"; - sha256 = "0xnim4by9f5ff1l3zs36qhxj8a2qsznri5f2xd5cgl0sp00fv97z"; + rev = "7c726dd897420c9387b3117f11fa78806b66d715"; + sha256 = "0lrpn51ncix4f6cmzac4kymb8w2g3fr44z66xchggdflhys6bvp8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26587,12 +27048,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20171026.554"; + version = "20180102.1712"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "ef1dc851077913a327261a6b971fab5f5f657831"; - sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7"; + rev = "b750cccae7c37a9ee4d40d928bb508cc3234bfbf"; + sha256 = "0a1g7bv4qakzzrvvsh5m5ic3yhha57fj3d09gmr7rb5b3p2kl5cz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -26753,12 +27214,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20171127.2003"; + version = "20171217.1353"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "0947b0e724cd06c1279193633892f56cd888d319"; - sha256 = "0kl1j9jbhbzabdxk78ss07kv73ia1jmnd3ds6slqzv2d3r38pdiy"; + rev = "0bfc6be0d25ff311d739d2f65fd343135142f6f3"; + sha256 = "01jz9yp5g003mhwq0blxy509xcwb8whzqaf90ibdr7v39y96jmdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26774,12 +27235,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20171118.1714"; + version = "20180106.1028"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "dd2376629b03f30e5a657a248140db00f91eceeb"; - sha256 = "13iwr610v6jgh03alcprdsr6s1a0fcqx9iyjzg33p9hd0y56fmda"; + rev = "cdcf369b4b290f5e1e4cac37e48bad21096ac72a"; + sha256 = "1qcb8y4akdnn8j4kfmdynb94v8m0l6qi013kskhq46waf03kw5vg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -26879,12 +27340,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20170918.1838"; + version = "20171203.1553"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530"; - sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1"; + rev = "eec392d2d639030c5a51bce8431f2815ad8e7bc5"; + sha256 = "0mlva84zbi93jrvvd3bgyndc68iib27zsjsd2f52df89198brjqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -26904,8 +27365,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "458aa6e6b107a4b30b64939233c107d1378d0402"; - sha256 = "0x52v1rk94bprvg79nqr0kfy6lcy6r709g1rc72wir1da4zcmpcz"; + rev = "b46dce307e90c3527bc9ed9532a06f29ecf3b085"; + sha256 = "01r8pyfjb6jpa1fi2n4wplymyk0gz2b60g0ngn5hlpirbzqyvy8y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -26946,8 +27407,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "06515c44830788254602af90118de07ae2effb12"; - sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff"; + rev = "0f281bea89edf8f11c82c5359ee2b3ce19888b99"; + sha256 = "0f70nrlqgizsrya1x5kgxib7hxc0ip18b7nh62jclny1fq4r02vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -27005,12 +27466,12 @@ gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gherkin-mode"; - version = "20140107.804"; + version = "20171224.553"; src = fetchFromGitHub { owner = "candera"; repo = "gherkin-mode"; - rev = "ff9e47350c5ba319feb6b87fe20695519681fa64"; - sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y"; + rev = "0313492e7da152f0aa73ddf96c0287ded8f51253"; + sha256 = "15m9a2dcxgmbj0ni2qcxg3vpxvs50pyjvlacm3xd2xhm9wd484hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode"; @@ -27065,22 +27526,22 @@ license = lib.licenses.free; }; }) {}; - ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20171116.803"; + version = "20171223.916"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "d8ec78184ec82d363fb0ac5bab724f390ee71d3d"; - sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h"; + rev = "1395d56496c1581dda0c70a091500e2b947b8d35"; + sha256 = "0p5vn34jln08y4hnywf2vxdcjcqmr043if4da0s3h2cawd7liw2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; name = "ghub"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs let-alist ]; meta = { homepage = "https://melpa.org/#/ghub"; license = lib.licenses.free; @@ -27089,12 +27550,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171019.944"; + version = "20171203.1627"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; - sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; + rev = "4c4a1d009790a805404edf72ff55df6fce3645a7"; + sha256 = "1m0r6g2arzh87iha1kbqb327vv7wy3m9iafw9czp3655k0sx240h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27278,12 +27739,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20171123.752"; + version = "20180107.1020"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "64be29ba47218a9766a2999f8bf366cc9e3256a9"; - sha256 = "15ba8zx1zsg0q8kk2r7hsx4kljdq7mwazh9a1cpzjprs5wn56jr8"; + rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2"; + sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28097,12 +28558,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20170406.732"; + version = "20180107.513"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "d79e519308727dec897f2574c938c6425b9a30c2"; - sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y"; + rev = "1fce747e48290549c859de7b15e6efc351d60861"; + sha256 = "1540qqndv17g39s143mjkk12is9hynx6x6nzpk811sv5rph986iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -28223,12 +28684,12 @@ gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; - version = "20160704.1120"; + version = "20171231.549"; src = fetchFromGitHub { owner = "vapniks"; repo = "gnus-summary-ext"; - rev = "2298b0eca887a9df1e2d7c61d92176bb175ea482"; - sha256 = "1df85xwrr9wciwa83m2qfkfcbi1p623pdhqxm56005x4rmxg0rqr"; + rev = "b2259a2501f4e0c23b51aedf056b812c8140b958"; + sha256 = "1y4379wrd2y9jzbg2bhifwa03nbf84xzb4rhfih6xmh9h5gg4bi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; @@ -28311,8 +28772,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; - sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; + rev = "416643789f088aa5077f667cecde7f966131f6be"; + sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28430,6 +28891,27 @@ license = lib.licenses.free; }; }) {}; + go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-fill-struct"; + version = "20171224.1931"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "go-fill-struct"; + rev = "a613d0b378473eef39e8fd5724abe790aea84321"; + sha256 = "16bgfykvqc61hlx1hj55z15y83zgpavhb853sblds75m8w7mndqg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct"; + sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7"; + name = "go-fill-struct"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/go-fill-struct"; + license = lib.licenses.free; + }; + }) {}; go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "go-gen-test"; @@ -28514,6 +28996,27 @@ license = lib.licenses.free; }; }) {}; + go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-imports"; + version = "20180107.1423"; + src = fetchFromGitHub { + owner = "yasushi-saito"; + repo = "go-imports"; + rev = "5b3a1d520c599553f621efaf9aec71609d2b9bb6"; + sha256 = "19v05qc9fmrbdcrjliw02hqrl29dqsg3l57qp2rn8z63n3s17rqq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports"; + sha256 = "0xxlh4rmyvfxiynsdqng6wd3js7h3azhb8ii0ch7n0hhqkcnda4x"; + name = "go-imports"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/go-imports"; + license = lib.licenses.free; + }; + }) {}; go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; @@ -28682,6 +29185,27 @@ license = lib.licenses.free; }; }) {}; + go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-tag"; + version = "20180106.2125"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "emacs-go-tag"; + rev = "e7cfc490b728dad085ae3c741ef5220d5e88dacf"; + sha256 = "1zpj88kyvsnsxzwnmb2a0nlrgviskw6q31faw8y84q08iyp7d8gc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; + sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f"; + name = "go-tag"; + }; + packageRequires = [ emacs go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-tag"; + license = lib.licenses.free; + }; + }) {}; gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gobgen"; @@ -28706,12 +29230,12 @@ god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "god-mode"; - version = "20151005.925"; + version = "20171221.106"; src = fetchFromGitHub { owner = "chrisdone"; repo = "god-mode"; - rev = "6cf0807b6555eb6fcf8387a4e3b667071ef38964"; - sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix"; + rev = "8bc22eda77af3dc04d0e92e41b0776f61a8c90fe"; + sha256 = "1wg5hngpc16n1ds7yq6kqdf23q8r27v3ppcqcl4jdnx97h9fif99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode"; @@ -28815,8 +29339,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931"; - sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz"; + rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d"; + sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -29084,12 +29608,12 @@ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-chg"; - version = "20170917.1200"; + version = "20180105.1033"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b"; - sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq"; + rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4"; + sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; @@ -29151,8 +29675,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "adf4530b240711895896b14c337f9b77a3143e96"; - sha256 = "19vsni685qxfi2fvf5p6mhlr9qyz741a6i6wxkp9xycb402cwypx"; + rev = "d70eca22cace05a6ed7a5787ecd660724d65d911"; + sha256 = "0rgvlvv8dbm47qcw9wxrdd85rxa1csysqiyrhql6gwd4a5iwrbp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29277,8 +29801,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1"; + sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29315,12 +29839,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20170507.104"; + version = "20171230.440"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "2f7e607cde9dd38ad4a95f3f3ad6cd85eba09f7b"; - sha256 = "0mc29g3hz7fb2a91rr24z2fnlqdwnq1q3lh14qyd7i9zpy5965dl"; + rev = "c8f1dd4ceb3b752bcb4a0122af45e3a197c4fa99"; + sha256 = "1b0azylab54183kf9nmpx6qb8hrr91fsxladwfmiljrcpvf6pdh8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -29536,12 +30060,12 @@ green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-screen-theme"; - version = "20170824.728"; + version = "20171130.234"; src = fetchFromGitHub { owner = "rbanffy"; repo = "green-screen-emacs"; - rev = "05a9641d4f7354be7ff1b8dd34cbe5ef7054348c"; - sha256 = "036l9rbp7p9bf7wb85zr4ykyxiippiwlq53vk30lvkpwbv9vc5qz"; + rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0"; + sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; @@ -29657,22 +30181,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20171024.221"; + version = "20180105.215"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1"; + sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = [ s ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -29727,8 +30251,8 @@ src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "87a59d8c3a25ec8bb00dcdef0efac8ac191c4431"; - sha256 = "1n6l76izdmhyzz2niv6rrb2yfiyf42n0siy9qf1kbynwlcdkl10g"; + rev = "fb4f0a2dd3d146678fee3bf4d7bfce1c8e7cbd00"; + sha256 = "0n9z3m10sim28q2k760vhwczzdprla92hi0g8prpvv1g6bb8qrs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -29786,12 +30310,12 @@ gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gtk-pomodoro-indicator"; - version = "20170517.900"; + version = "20171230.840"; src = fetchFromGitHub { owner = "abo-abo"; repo = "gtk-pomodoro-indicator"; - rev = "0fa0e682b3bd1595f230275d73ca231e93c6d28a"; - sha256 = "1jm7kcray6qd867hacyhs5c7hhdm0fyfa1jx35sh09g5c9xa4x2f"; + rev = "eb59b229de0dde307b20654075a9bbac69899a66"; + sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator"; @@ -29870,12 +30394,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20171114.1204"; + version = "20180107.1303"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "80980e064a9d5f0fa19ad2ac033d104d42021ce8"; - sha256 = "18qnnl18x07399xq41fy9rpzqsvjgm2w4520q5labjl6ndc9y248"; + rev = "b4d897f7daafb5794809760340548b96b0a89ac3"; + sha256 = "1bl6k0vdjl9b10pz76afwnmagjjazp1pxl9rash4m1f6zry4hbj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30436,12 +30960,12 @@ hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hasky-extensions"; - version = "20170830.625"; + version = "20180107.2112"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa"; - sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7"; + rev = "d75dc57f4eaeb92785bde6c26c1031710be1cf00"; + sha256 = "135rn33ldrhz3z6fg1rcdaxs1dnahliw782qc4ffxkays186id63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -30457,12 +30981,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "20170928.359"; + version = "20171231.942"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; - sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; + rev = "7a97d039489ff23b3362b543dea1007357e2ada9"; + sha256 = "1rqj7yypsd25h4x9lx6vkqchq70fwnjs4dpivd7n105h41pz3kiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -30645,12 +31169,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171125.2152"; + version = "20180108.414"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "093fd8c06115dae3428d2ddfa94a1024da282185"; - sha256 = "1r6m65mfrxq7y763k3vc74ayy7nmmfqqka27xybzf0vhwyji4mf2"; + rev = "455ef14604064296b5e382b044d4775814d89eaa"; + sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30813,12 +31337,12 @@ helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-aws"; - version = "20151124.133"; + version = "20171227.132"; src = fetchFromGitHub { owner = "istib"; repo = "helm-aws"; - rev = "512fb7edcdc6c65303b9641bfc737f836939e5e9"; - sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af"; + rev = "d69a0241601d170c034e3b69e8df0b1fec72bff7"; + sha256 = "0975a0nwxlnpln7vrq4hqq4xamrhp1zc4bkwnzpw06dk95s23cb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws"; @@ -30834,12 +31358,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "20170807.1239"; + version = "20171204.2357"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; - sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; + rev = "a2c0fa16113e628500d6822c6605280b94e24038"; + sha256 = "0j4dkz9za2zng43dx8ph688gl5973isxr89v5bw160c65n4lbc6w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -30876,12 +31400,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171022.220"; + version = "20171213.317"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "54de08577f9c19354cc303ee52836263aef486fb"; - sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; + rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; + sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31212,12 +31736,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20161214.548"; + version = "20171215.26"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116"; - sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6"; + rev = "ccb99aee4851bc156a67835299b24099aa8ff5c1"; + sha256 = "0yhhiax06arvimgxvh9xdflgjbkflhi1cp0g8816bwr0hdmv57dh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -31275,12 +31799,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20171129.917"; + version = "20180108.514"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "093fd8c06115dae3428d2ddfa94a1024da282185"; - sha256 = "1r6m65mfrxq7y763k3vc74ayy7nmmfqqka27xybzf0vhwyji4mf2"; + rev = "455ef14604064296b5e382b044d4775814d89eaa"; + sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31569,12 +32093,12 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20170517.1010"; + version = "20180104.2127"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "b1c7d03e80c3012e327f0d518258508acf980c1c"; - sha256 = "18fpsr6kaw2m1bvj05i5qayq6d01v54jw98489bgwshp9wmhsy9m"; + rev = "8133c1a854c8f9e32b3b4c74638fe197535c08f1"; + sha256 = "06111034rvh770ljzdbw7d6rkvy40bjvp4c06ss5s624pyd6qd74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -31611,12 +32135,12 @@ helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ext"; - version = "20171101.1231"; + version = "20171218.1543"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "helm-ext"; - rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646"; - sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j"; + rev = "bdc0d86d43d965dda5ac94ec9c3fdcaa1e71aab1"; + sha256 = "1qfawx9k74rhm9rxcdrx9gpxqrvpgpiv3dz8qgl06mdr0hxrcrrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; @@ -31632,12 +32156,12 @@ helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-exwm"; - version = "20171120.1204"; + version = "20171218.1335"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-exwm"; - rev = "f90ac4356d30d713927c65029345b3aa3624341d"; - sha256 = "10rbqfmxykkmynmlz885hx5bw5hm9b1hcbpz3yjyv2vfbqll9lgm"; + rev = "26f85e253010aa4782c6d77d17d4f6067a0c5edd"; + sha256 = "0zvgfb0ky72yxj6f13knzcp473a03s083q5la4prswchg0r3xrir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm"; @@ -31695,12 +32219,12 @@ helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flx"; - version = "20170404.1230"; + version = "20180102.2116"; src = fetchFromGitHub { owner = "PythonNut"; repo = "helm-flx"; - rev = "c8650d9b34afbc236c28aee12cbee998fda8d810"; - sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5"; + rev = "6640fac5cb16bee73c95b8ed1248a4e5e113690e"; + sha256 = "1fh1dy6xpc476hs87mn9fwxhxi97h7clfnnm7dxb7hg43xmgsjjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx"; @@ -32049,22 +32573,22 @@ license = lib.licenses.free; }; }) {}; - helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }: + helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20170722.710"; + version = "20171215.1159"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "4530a375a46880d53e5d7e906028f71c040de946"; - sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01"; + rev = "bf3b04e04db5bc99b621b90b7d58a5438db14c66"; + sha256 = "06848hjbwj8bkdinbmmzh2sc92l9chzwbglyfl17bwxkcdbxd54i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32"; name = "helm-google"; }; - packageRequires = [ google helm ]; + packageRequires = [ helm ]; meta = { homepage = "https://melpa.org/#/helm-google"; license = lib.licenses.free; @@ -32220,12 +32744,12 @@ helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hunks"; - version = "20170625.1523"; + version = "20171217.1133"; src = fetchFromGitHub { owner = "torgeir"; repo = "helm-hunks.el"; - rev = "56731db3968a57fbb2473529227c2998b7f404b0"; - sha256 = "1kszp6jy4r39r71jjrr8p3nfpylbqyphrsfb4dghh6kl0zxic38j"; + rev = "6392bf716f618eac23ce81140aceb0dfacb9c6d0"; + sha256 = "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; @@ -32455,8 +32979,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; - sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; + rev = "3403179a38693a221bfa86def0c99f6342c5eb73"; + sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; @@ -32745,12 +33269,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170807.611"; + version = "20171202.1216"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "502ea1285b8ce858a3acbc39dd4f54ff1af5b7e3"; - sha256 = "1j87fd9qv7pl7s52ksj7iy023lw76qy4mkgjc4w5rljvm5bdnrgp"; + rev = "94cb602d6373229c88126a5888f03f4b538f0771"; + sha256 = "0jf6dc461ki21w4s5hxj5mx57y3jilxxgd2sc11cv5ilh4x0776v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -32784,27 +33308,6 @@ license = lib.licenses.free; }; }) {}; - helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { - pname = "helm-package"; - version = "20170216.2002"; - src = fetchFromGitHub { - owner = "syohex"; - repo = "emacs-helm-package"; - rev = "0f3ac5623cc6220a65f3c9ec0f587225101e96d5"; - sha256 = "0z45gj2rb4n26khkk9lg445s69c1jwks0hcyqww63asch6ydizgj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package"; - sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y"; - name = "helm-package"; - }; - packageRequires = [ emacs helm ]; - meta = { - homepage = "https://melpa.org/#/helm-package"; - license = lib.licenses.free; - }; - }) {}; helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pages"; @@ -32829,12 +33332,12 @@ helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20170627.1124"; + version = "20180103.1838"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "dc599627789284eea044e881e105586f9e05bc9f"; - sha256 = "143vd248kziz95mdr568qh7wg1h00dxniqr144d867ng1gybi8cb"; + rev = "05a56bb04115153aa84d285e2068e9dd99ed6a38"; + sha256 = "0j7rlgv71cnl0flny6hpjsa99d3mslmxzkshgj0h3zmikp39gimj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; @@ -33253,8 +33756,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; + sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33351,6 +33854,27 @@ license = lib.licenses.free; }; }) {}; + helm-selected = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, selected }: + melpaBuild { + pname = "helm-selected"; + version = "20171222.1810"; + src = fetchFromGitHub { + owner = "takaxp"; + repo = "helm-selected"; + rev = "d2609cdfce14052ab2d9c23761d4fe56966a8ed1"; + sha256 = "0nbfs5s6lshxib6kp20dzh1qbmq079hwcqwi1n61ank22qa9qw5x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acc087661e614d9f30c23fe4a65c020bd3656a29/recipes/helm-selected"; + sha256 = "0ksyh0r59y4abwls6v6v519yxmcjnaryfnxlam48fqqfrsxv1j0h"; + name = "helm-selected"; + }; + packageRequires = [ emacs helm selected ]; + meta = { + homepage = "https://melpa.org/#/helm-selected"; + license = lib.licenses.free; + }; + }) {}; helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-sheet"; @@ -33438,12 +33962,12 @@ helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: melpaBuild { pname = "helm-spotify-plus"; - version = "20170320.609"; + version = "20180107.338"; src = fetchFromGitHub { owner = "wandersoncferreira"; repo = "helm-spotify-plus"; - rev = "847dfafbb5e5d65a44464b0ec8e2b7d88864a9aa"; - sha256 = "0i1vnaiqcs220nc1mjbx0959aa0nbjxhrqkvbrj3zy7ybsya22gq"; + rev = "895f241f1259891d5c89cd42023f119f9fa121d6"; + sha256 = "1sjw0bapik01f3lfnsirpayn7b0169lbjhppb2mqzr3xjxm58wbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus"; @@ -33498,6 +34022,27 @@ license = lib.licenses.free; }; }) {}; + helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: + melpaBuild { + pname = "helm-system-packages"; + version = "20171224.50"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-system-packages"; + rev = "bfc4b6f6f2f05edd6009a2295ed90e8448a52474"; + sha256 = "0jnjgwiqfc2lr452wamdln2fhi7p4r2d9wvkha260gdbld54871q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; + sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4"; + name = "helm-system-packages"; + }; + packageRequires = [ emacs helm seq ]; + meta = { + homepage = "https://melpa.org/#/helm-system-packages"; + license = lib.licenses.free; + }; + }) {}; helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }: melpaBuild { pname = "helm-systemd"; @@ -33543,12 +34088,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20171120.140"; + version = "20171224.702"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "d90be189d8c2b742c9621ff28b1196be683cdb4c"; - sha256 = "1hi7zw4p3w8a14fqv6w2bc0anrjb6d4vglwhmaz50qr2w3plxq15"; + rev = "cb2d2df7e95fc249ebe38ea843288b7194afbd9a"; + sha256 = "0cr36kyzs2q2qbi2815m4c303cc50zcmyn2sw3x5ja3qixi0c087"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33669,12 +34214,12 @@ helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-xref"; - version = "20170822.1708"; + version = "20171209.346"; src = fetchFromGitHub { owner = "brotzeit"; repo = "helm-xref"; - rev = "af55df844aa65275c8f75d3a8705e13717fd3ee6"; - sha256 = "0srjmz3xm6ycx5grjl7iqrnx5qlmg7n42i9wrb3i01zrjrjbqi7x"; + rev = "ad98c3f6e5404e44e7e87210b5827bef75e16a25"; + sha256 = "1z1343lp9n0kn3y4z08bwnxlfvg5pchznnfqy2xhjjbm9ndlhc16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref"; @@ -33708,6 +34253,27 @@ license = lib.licenses.free; }; }) {}; + helm-z = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-z"; + version = "20171203.1925"; + src = fetchFromGitHub { + owner = "yynozk"; + repo = "helm-z"; + rev = "37212220bebea8b9c238cb1bbacd8332b7f26c03"; + sha256 = "1vz958yiva01yl1qj2pz84savcx8jgkvbywhcp4c3a8x3fikf0yl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00/recipes/helm-z"; + sha256 = "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1"; + name = "helm-z"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-z"; + license = lib.licenses.free; + }; + }) {}; helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-zhihu-daily"; @@ -33729,22 +34295,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20171120.321"; + version = "20180107.728"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "c98f271b4c164cc54c4149ab8f486e3a67b55e1c"; - sha256 = "0lcy79ih1l7v5yjg2cpf6fw999hffsa67jl9w1g5x4bkgrai5gzx"; + rev = "04073c80f3c82fa488edcd0cffa4961ff40cf885"; + sha256 = "1cv7ajqrb0mqqlbv1b34ccj4k2qpi3bv217fkh580l8y6g2lcdk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash elisp-refs emacs s ]; + packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -33837,12 +34403,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170702.1915"; + version = "20171226.2035"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "201c795ded01d96690ceadc1dd068744aceaeda8"; - sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab"; + rev = "07c2366d1bdc25e09bebf429050bc0e8a7bb7aa8"; + sha256 = "0xj8jj2mnn2vasiaq7dhx3rd5knqll518ap23wfihnn96cba2rrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -33984,12 +34550,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20171017.1103"; + version = "20171221.351"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "cd65d149b8910edfa5536eeda26988aabcfd511a"; - sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80"; + rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355"; + sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -34131,12 +34697,12 @@ highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indentation"; - version = "20170502.43"; + version = "20171218.137"; src = fetchFromGitHub { owner = "antonj"; repo = "Highlight-Indentation-for-Emacs"; - rev = "5c7717a2224372f7113d13640515df3650388a37"; - sha256 = "13d85qbq6q9pz3yrwpn6rjlrbrjs0fnskkbb5liczyxyk8rzj924"; + rev = "35e2c1d4f8f368685893128f77f90454cb9c2708"; + sha256 = "1rmqi8k8p0f3aawh2l119hsfnnd060bv9hhjx13pabid8xhhvs73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation"; @@ -34403,12 +34969,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "20170609.126"; + version = "20171215.848"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "889e1655c6eb170e0d30c3c1173f7fba87041736"; - sha256 = "012h82m1x2iva2mh3q0rr5s3y8hm1kmnybngnaakzphhshdph32p"; + rev = "cba1110ca413a41a443b8368d63d295d7d36de7a"; + sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34487,12 +35053,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20170722.1714"; + version = "20180102.2118"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; - sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; + rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d"; + sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -34697,12 +35263,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20171101.1139"; + version = "20171201.1156"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "70f4d9c44077eea13bdcb5688475e0c90578e085"; - sha256 = "0j4pk2qr93pxgg8smzhxmlpk9b0rv9w20n1dz5lw42641xx8frnf"; + rev = "594ce27f898ba027cb7f326179ff7875072b03e0"; + sha256 = "1jla31az52qygabd99m8ibq60f4almkbjlg1z63kz7zl98hfxnw7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -34927,11 +35493,11 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20160928.439"; + version = "20171225.652"; src = fetchgit { url = "https://scm.osdn.net/gitroot/howm/howm.git"; - rev = "e0237b07f60011a1926b36848c73340ae46cdb3e"; - sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq"; + rev = "1329df206e5de11e78b5064050b5dc6c5b775d9d"; + sha256 = "0k6b03ifz1d5c3055imm6hicvfryss621bcd9i39pdccazpccj67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; @@ -34947,12 +35513,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20171112.1405"; + version = "20171213.1334"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "ce65ce5d535cc86698ad6012f60fb56d7d80d8db"; - sha256 = "07yd5fqh5y3bbr6capc3x562kl4ia39d55qvz521yxdnzmwsdpq7"; + rev = "64af52688eb09eb42b7228a4e8e40d4a81cd983b"; + sha256 = "1qz1zynkb1nanyi0ylllv80gzkgl2bgx9y82g07w1rfa86qgaghg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -35262,12 +35828,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171114.1217"; + version = "20171202.1141"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "f83c11d4972658b9c687a0357bc2c06bc5461995"; - sha256 = "138dbbmwl681nzv7144wl0sb15zvwc8w6a50w2bh7ir9rcc6d4i3"; + rev = "3220f00a9bdb24667a1c3876b4a2f889dcb77501"; + sha256 = "06aw6l8nn8w6a7dfwh9ifs41acyq0jycszhhisv0idqrs8q5njsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35350,8 +35916,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "e228432bb64385f67f20aa525bce56ae4e8419eb"; - sha256 = "18mqmrq3xwmpzqw4chx7xkgsi4kmh8dhwidih0hhqhfzvmicls0m"; + rev = "1deed8a00e6936903cace1dac123364b6c0cde90"; + sha256 = "0jraj3l7w0bw2c6qkq1bfdfa2zf7xssmk9cdkdgbjjip5xvq31ns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -35404,6 +35970,27 @@ license = lib.licenses.free; }; }) {}; + ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ialign"; + version = "20180107.305"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "interactive-align"; + rev = "df591e452f9a56c69fb69de961baa75751bae3d8"; + sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; + sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j"; + name = "ialign"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ialign"; + license = lib.licenses.free; + }; + }) {}; iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; @@ -35449,12 +36036,12 @@ ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; - version = "20171103.2004"; + version = "20171222.2000"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "6f03040a93d116b73f9fd3d6b52102b57bfaf597"; - sha256 = "0jmb4s4n8yxyavvvd4msr58708jlha7jd8hm5djl91fgf87r3ys3"; + rev = "bfa02c76dabdc02557b67fa556969bc74e255023"; + sha256 = "0isgy5nkcbcf56p4f7xaf0shi4ja99s23gbvan6fimf6ra7qw4i2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; @@ -36100,12 +36687,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20170722.1339"; + version = "20171212.759"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "5c01039112a8c52a0275560575f1f542f3966cf5"; - sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv"; + rev = "2206501895668e1cd395119921bbcd2b16165600"; + sha256 = "1s185lkkbjh2811qs4grgq916x83m58ifl85g9ji9ll4vr3p1al5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -36396,8 +36983,8 @@ src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "62de9b897f0f6168f57cc64532dbcaa1bfcbe47e"; - sha256 = "06i5ql155ik03zyk7hc4vxl6haczr6h2zgfaqinkzqs1gbrg1b8a"; + rev = "0d3d445ce60a77a6c7bcbdbf1ae62cc20d2b5575"; + sha256 = "0q7124qaa3kmag3p3a1wq4axj59dvcsd7ydsh6cl9np2p18illvx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -36601,12 +37188,12 @@ indent-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-info"; - version = "20171122.1555"; + version = "20171216.1509"; src = fetchFromGitHub { owner = "terlar"; repo = "indent-info.el"; - rev = "a295ed813f5c84fe202c9100dd33a46bc1184bc5"; - sha256 = "0i9197vfzn1hk6hx3siri4hfbkc7nia5vsh2k9s6afsg6gvhypzp"; + rev = "e63a918b16d6d1986dd9123670a762e49102ce2b"; + sha256 = "0smh7x49cl8zhhjfvcgbcnr1a4n5rck7cpg797xwi3vr00b4bzv8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1274c0d871c51e358b3de577372dae8e3a04ead0/recipes/indent-info"; @@ -36622,12 +37209,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20171103.750"; + version = "20171215.327"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "6e8e9a8cf9efe4a8624e52f45cb5faa5fe8ec996"; - sha256 = "1hh4r4axnbmi12hk2d3pynvq3nldgbik8jf73v5ddmv06kqlsxya"; + rev = "7d7ff66e699f28478c0d63f39ff6b1477cf0bee7"; + sha256 = "1y2dlq2n0rn70bccjd20s44ihyq1jja7lh2h3d8syy31xc6i1i6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -36664,12 +37251,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171121.513"; + version = "20171213.236"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "a5f7e0b081a02ff96a85d0c96e3cffe9c42ead53"; - sha256 = "1555nr5nzp0ch5gq26i3w3za43w16fvncjqbfv0nlq1cwnsa8brh"; + rev = "4769ab443e153a19c9d40522e5f40656b0ef4385"; + sha256 = "13rii0vnh9d981jklb6apilx8yhqyc69fxp095f7i4n0aimfa413"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36706,12 +37293,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20171120.2310"; + version = "20180102.1324"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "12583f4aba2f4aea3879c0ca5ec1d002c0578371"; - sha256 = "1qk56md12m61nd62h0syh4kjvi2hsfx8a1p9p2rg1dbwvc1ydbdy"; + rev = "247ca70f8ba5104be292aea20fbde6adb37e359f"; + sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36748,12 +37335,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20170615.335"; + version = "20171211.225"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "674a2a837fccea88ada6634e981a656b41d16d8e"; - sha256 = "09am0gq1sx0wv7bvcs7pp118brjj19qr7mis7cxjvrxbryc1mxf4"; + rev = "5ae6149a15068d3e2f83a5bd08e9cd7605f75fa9"; + sha256 = "0778ykgsmhry9h4n6wcszwh0gzkl9n7rx4jd60rplk38qj3p89hv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -36958,12 +37545,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20171106.640"; + version = "20171217.144"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "046d0bb361500e14c718b00930d31c73890929cb"; - sha256 = "02qlqh6fvk8cgf8mrl9m4bmaar45i5kpsjngkqqpl3kgxvycbsk8"; + rev = "8d59548ff5171bf6be6acc58d111674579646124"; + sha256 = "0r63rb99nm7fpw8yn3gkbfka12jqwzkdhv97hm89nvdrxdnbggfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -37167,12 +37754,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20171023.1102"; + version = "20180102.1220"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae"; - sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s"; + rev = "322b3c017153a536ffa3559b64fc1ac16af19a69"; + sha256 = "14gmm3l2wwm96xzijjl070mg8d48zj5hqqxs4vh56hadjd2aijlp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37395,6 +37982,27 @@ license = lib.licenses.free; }; }) {}; + ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ipython-shell-send"; + version = "20171212.318"; + src = fetchFromGitHub { + owner = "jackkamm"; + repo = "ipython-shell-send-el"; + rev = "36523a387c15ee1652a5b0e291d4d4838da5e912"; + sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; + sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8"; + name = "ipython-shell-send"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ipython-shell-send"; + license = lib.licenses.free; + }; + }) {}; iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iqa"; @@ -37461,12 +38069,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20171110.1151"; + version = "20180104.1109"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "1d865c71fefeab952a2f61184d7f77371706954a"; - sha256 = "0xkl9wm63dxwb1s3sd3skbzvsdhva6gfbfz27m7z1j5zdc94x64x"; + rev = "82ba45ec15c9011bbdf1d69cf25c8193d33c0028"; + sha256 = "0iby446mpgjrs4kg0ji8435h3aamdvcxbmv1j3qg0i9p6abmi7f8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -37587,12 +38195,12 @@ isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isortify"; - version = "20170726.1254"; + version = "20171223.1812"; src = fetchFromGitHub { owner = "proofit404"; repo = "isortify"; - rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f"; - sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h"; + rev = "2db50c1f585db8a8ec5fa28a90a8179516c16cd0"; + sha256 = "04wzq9cf1bzbyx3jn7anrzc1r64l23s073xqsfcqb8hgh2swcpl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; @@ -37755,12 +38363,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171129.1005"; + version = "20180104.1212"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "23935401b062fde5557de826814ddc55e75fe1b8"; - sha256 = "055l5rmnkczlz4nhjppa3c7m02mmv8zw7zaf60820911zx1sl32b"; + rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; + sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37776,12 +38384,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171022.220"; + version = "20171213.317"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "54de08577f9c19354cc303ee52836263aef486fb"; - sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; + rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; + sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -37885,8 +38493,8 @@ src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; - sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; + rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d"; + sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -37902,12 +38510,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170703.2350"; + version = "20171130.1143"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "23935401b062fde5557de826814ddc55e75fe1b8"; - sha256 = "055l5rmnkczlz4nhjppa3c7m02mmv8zw7zaf60820911zx1sl32b"; + rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; + sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37923,12 +38531,12 @@ ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-lobsters"; - version = "20170903.445"; + version = "20171202.1241"; src = fetchFromGitHub { owner = "julienXX"; repo = "ivy-lobsters"; - rev = "49923d6b59fc8ede5d930317f63f00577fef60b9"; - sha256 = "1z593062phsxn7y408zj82w4xc8l5y4x6kj919hm8a0d3nf28kg7"; + rev = "4364df4b3685fd1b50865ac9360fb948c0288dd1"; + sha256 = "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters"; @@ -38007,12 +38615,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20171106.2334"; + version = "20180107.1736"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "565ea4128741f68727df9d54dee40c9a89b63885"; - sha256 = "1mqg406gs8blzsay5jmdvr894l5iy4z4q2rmv5f89fvanmnl9d0h"; + rev = "a87d37430afb4cfe1bfff8f65acf3197ca8e0fe9"; + sha256 = "15vshxg2yv2fy1s78xh7gns3lgk50x40y7kw3qvlsdrkfrwbkfdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -38032,8 +38640,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; + sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38049,12 +38657,12 @@ ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-todo"; - version = "20171128.1444"; + version = "20171208.809"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ivy-todo"; - rev = "2dd28974ead8f9e751d8d166d46447b3f87ef76b"; - sha256 = "1lsfygb3jphnn9q0pr9pi78qayk8jw2jmp1rvlkshnglbg6l116x"; + rev = "964e347cea1a6097854d7113f5b07f6c5ef81df0"; + sha256 = "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo"; @@ -38088,6 +38696,27 @@ license = lib.licenses.free; }; }) {}; + ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-xref"; + version = "20171229.252"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "ivy-xref"; + rev = "aa97103ea8ce6ab8891e34deff7d43aa83fe36dd"; + sha256 = "1j4xnr16am5hz02y1jgiz516rqmn43564394qilckmzvi9clhny8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; + sha256 = "1p5a0x83b0bc7b654j1d207s7vifffgwmp26pya2mz0czd68ywy8"; + name = "ivy-xref"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-xref"; + license = lib.licenses.free; + }; + }) {}; ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: melpaBuild { pname = "ivy-youtube"; @@ -38154,12 +38783,12 @@ j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "j-mode"; - version = "20171103.845"; + version = "20171224.1056"; src = fetchFromGitHub { owner = "zellio"; repo = "j-mode"; - rev = "6f7f598eaa1a32ccf06b707631f2d539a2315fba"; - sha256 = "1qldmcawi94pxv62zb2qgr27kr8lwhsql6wi67g0f5dlihpzc8dq"; + rev = "e8725ac8af95498faabb2ca3ab3bd809a8f148e6"; + sha256 = "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode"; @@ -38530,12 +39159,12 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20171108.1431"; + version = "20171212.1053"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; - rev = "9a5095d65de8355c88b102831b81a525d507612a"; - sha256 = "0fm7sl6i5i65y82qsg2s7bdarc6r28qbyffdl43c55bjzxs4xk19"; + rev = "08dbcc9d8d33ed17cfe2de279f6979692c6fcaab"; + sha256 = "09w9rkp6vh3v632kbd38aizbl3njpwxpx3n1819sz452iqsx81c7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; @@ -38971,12 +39600,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "20171031.1819"; + version = "20180103.718"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "5ba81cd7cdd09d41a8e9c9d53d370497bf64edbd"; - sha256 = "113ppyfvly6i03j8kmyd3i6218v0r2f449wk3zbx9vf2d6plzc8v"; + rev = "37e83641fd5eab45e813e4bc74a835fe7229c160"; + sha256 = "0hmrhp3lijd77kl0b98nbl1p8fmgjfry2hhvh5vickx3315w7qgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -39010,22 +39639,22 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20170808.527"; + version = "20171129.2056"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "eb4744122724b24e492c2171fff438e3ee2045a8"; - sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y"; + rev = "83e932e4a83d1a69098ee87e0ab911d299368e60"; + sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; name = "js-comint"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/js-comint"; license = lib.licenses.free; @@ -39139,12 +39768,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20171128.1412"; + version = "20171224.1833"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "ba3263bb1375b5f4f9b6df7bb8d39f4d97f02688"; - sha256 = "1vsy10y0wvklryq2ic1npcw5fism85lvvksx00l3hajax4irg8q8"; + rev = "d72ed2060337e9f4400bcec85f8daaf18cb05413"; + sha256 = "1l3dvgac3pdirsigfkxnhfr2nrrwmn7pkjxr32yrrskfd2li8vhr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -39160,12 +39789,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20171109.921"; + version = "20171207.202"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "35db9111d49536f41e005560e8e90fd93836e8e4"; - sha256 = "059ib04l6ycar7bz515x3nkxbgvr781isba632fvz0a87vdcbqsm"; + rev = "a86cb31b1c9f9719b4c4199a721fe2b8b58a015c"; + sha256 = "06hv1agmwyqxgb37p9f6sazg12mk90cahvym0qpdx9daqcslx381"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -39265,12 +39894,12 @@ json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }: melpaBuild { pname = "json-navigator"; - version = "20170606.34"; + version = "20171220.19"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "json-navigator"; - rev = "d005a253fa73ed2c6c0b3ebbc7dc41be9270c304"; - sha256 = "1dklr166p5gx5y3nzkh758wwr6jvw50c3si05m71247kirhs0f89"; + rev = "7a1fec93500c46ccba4086d10115d8188607d0d0"; + sha256 = "03gjvzlyf90sh2q735qfbbjyqx4z9c3yc8jjp2sjpmp5fjvdm9yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; @@ -39307,12 +39936,12 @@ json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-rpc"; - version = "20170402.955"; + version = "20180104.728"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-json-rpc"; - rev = "e77a62012e4d6c946666eed3a17454d5c6f83367"; - sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg"; + rev = "0992ae71964055230aa5d4d934a1b93b5dfd7eb4"; + sha256 = "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc"; @@ -39828,12 +40457,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20171128.824"; + version = "20180103.1058"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "0aa39e9be32f6ecd1d8a3eebac6953ff7b172d3d"; - sha256 = "0f1l95wlviwbiqwi38g3yzzxmp5z6cj0x7kdsxr39saw1wkdqaam"; + rev = "3fd999ba8940ddda2ad9db7359901d3573a58864"; + sha256 = "1mc9x9pr51dkm1h70ijvllympk2nch52pqy1qzh4m09haqw6akxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -39849,12 +40478,12 @@ kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "kaomoji"; - version = "20170311.2151"; + version = "20171226.2040"; src = fetchFromGitHub { owner = "kuanyui"; repo = "kaomoji.el"; - rev = "91ab93cc7455486182d5e7f88e03d0de44c9953e"; - sha256 = "19l3r2fbp895c46cklrjfwwa5d7i959nd6jc3gk14jyi35gjypyy"; + rev = "90a1490743b2a30762f5454c9d9309018eff83dd"; + sha256 = "1jc796nyrck3k50x6jb1wsaawk396y4gk87gkwb8yd5qks7ci35q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji"; @@ -40227,12 +40856,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "20170518.2358"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "415de48695efd30163a015063873b03f4ca5b743"; - sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn"; + rev = "d21aa7a12f1a76d47249db36eb9825242df9d512"; + sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -40336,8 +40965,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "67f7deef07de85351648332bf644c43fa1722a24"; - sha256 = "166zj90c3dw0hv5gbq0gifr45wrpc0lvb46fhhary542ivyyk109"; + rev = "00c161d076fc754357a133e483699146cdd81518"; + sha256 = "14xlqqxpsp2pvcgzmqk98psff23a5s09637s0aqcij51rd7g5zsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40836,12 +41465,12 @@ lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lastpass"; - version = "20170801.1214"; + version = "20171208.216"; src = fetchFromGitHub { owner = "storvik"; repo = "emacs-lastpass"; - rev = "264250725b3ba23412919ec10cfa7390473b534c"; - sha256 = "1qqmg59vbwb31nx3vi88d53484gy3sg8wnq45xrra45drpjka3ry"; + rev = "a4529ce70b8187ed9ac4972997df152af58ef2eb"; + sha256 = "1h4h7swww2is7qblqi5r1vh26a9lfl52c0yq7rgwd1pqclffgc8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; @@ -40958,6 +41587,27 @@ license = lib.licenses.free; }; }) {}; + latexdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "latexdiff"; + version = "20171225.1623"; + src = fetchFromGitHub { + owner = "galaunay"; + repo = "latexdiff.el"; + rev = "665aa65707d0e8c5778de70f38a42be4ba1def5d"; + sha256 = "1ppxmcbkscsdsnm5vf7lmhzq1y0vkkg8dpp4gh0hmsvqvh7d67bp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d164cf118a2c928c04e4d5cbfd47ac732e626fe0/recipes/latexdiff"; + sha256 = "002frvk31q3plrqa6lldadchck51bch4n126y5l33fyfs0ipspfa"; + name = "latexdiff"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/latexdiff"; + license = lib.licenses.free; + }; + }) {}; launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "launch"; @@ -41087,12 +41737,12 @@ lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "lean-mode"; - version = "20171102.754"; + version = "20180105.1619"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; - sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; + rev = "3403179a38693a221bfa86def0c99f6342c5eb73"; + sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; @@ -41129,12 +41779,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170901.2039"; + version = "20171227.1709"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "24b43e34dd34de23e54d7ddaa2a147efda6af03d"; - sha256 = "0cdcd2hpv34yhpplgqljiyncs2q0i321f4xwfkb2inqbv9q4byhk"; + rev = "cf0c9d84a4f24c1af8059b73cf4ff40343f2b8b2"; + sha256 = "18dlsvsk3az7z26929nx30rkxw9v7aj3x11zfr6rfbawm6xc6fql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41406,8 +42056,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e"; - sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx"; + rev = "3878e7009e9d1d8f3fb26e1b8bdaf21e681f1b52"; + sha256 = "0c88my6c4ycbjqwd8m5jw4ilh4bfap3202sr11z0r6wvc6kf44wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -41683,12 +42333,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20171119.655"; + version = "20180105.1040"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "be34a60a871c02dc4f292fd821b64a2f039e81fc"; - sha256 = "1c4kw676qgkhlil2c867pccj5012wv3fc4nsm3q81w1wq23f0a2a"; + rev = "ee96631f416c410dd30077311f593bf1c58eb50e"; + sha256 = "1hvlvyx0iarh7p8n8sgz4x75clg0i3f4chfis0zi0nxag274nl1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41998,12 +42648,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20171109.2007"; + version = "20180107.2134"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "b6627fdd25fe6d866fe5a53c8bf7923ffd8ab9f9"; - sha256 = "1z17z58rp65qln6lv2l390df2bf6dpnrqdh0q352r4wqzzki8gqn"; + rev = "00b7d06e525ef8d18064261ff125ac965ad06e8f"; + sha256 = "03qklbvz4w0qxcw43pj9kmsj5gnl1c3x3nywirjsn0klldi5q37r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42106,8 +42756,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "17820125d44fa9974c0fe8aa7a68e012ec80c9e5"; - sha256 = "138x5mqzdpw32wjmi876hr0jn21im43vdvayz94hlp057sxhkbcd"; + rev = "14e29de03db7e2b075b70fdb419f7ac428381b11"; + sha256 = "01ly5kms4w7b3jqq3d8d11cg18mlqivzk6ps9hb14wissv4mqg9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -42629,8 +43279,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "6e303c84f1edd9863cacfcfacaf52f7adb64babc"; - sha256 = "0yp608ybsz0920sg55lf01l32204lb2125ip113sl2cgmrp2ygj7"; + rev = "456854bdee8729c21331f93ee9054f2d980fe2ab"; + sha256 = "1vrzi12zsrrbyihin1n83adk7q0vvksalpizd5g42g8d1pnf3zfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -42646,12 +43296,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171129.252"; + version = "20180105.103"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "a28f32744324f576c4fd349eefd4bb4106d02970"; - sha256 = "0mcl2w0ykr0hqwj4i4nyskalk11i4bribh7g52zk2ri6akl3mhxi"; + rev = "768b07d3a76af7ba8dbe4c25aae6379da05fb306"; + sha256 = "1lv8i9lwi1r2npab0nrxmma8ghzlj8nm06kw8iyjyh5c83vi9wab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42692,8 +43342,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd"; - sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar"; + rev = "035fed681ef18a774dcb82e361bd6b5b8778623f"; + sha256 = "0mhs7v1mc23h0rlcyinl3pf1qavjl4s6j5vrf9vc65sggsnw0x1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -42727,15 +43377,57 @@ license = lib.licenses.free; }; }) {}; + lsp-ui = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: + melpaBuild { + pname = "lsp-ui"; + version = "20180107.2330"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-ui"; + rev = "cc4e2035b1a7594bc0de1dd84e5bb6d7b607c39b"; + sha256 = "1i6z4slca09rnsd0n589wxm5dazkm7dkxzp0l5v522glys0p36xk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; + sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; + name = "lsp-ui"; + }; + packageRequires = [ emacs flycheck lsp-mode markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-ui"; + license = lib.licenses.free; + }; + }) {}; + lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-vue"; + version = "20171202.917"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-vue"; + rev = "9085d6c7646d80728d14bf5e4ec9037dfb91e3d1"; + sha256 = "1y9gd20rdyxih823b1x8ika7s6mwiki0dggq67r4jdgpd9f5yabg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue"; + sha256 = "1df3dva31livffy9bzassgqpps3bf9nbqmhngzh8bnhjvvrbj5ic"; + name = "lsp-vue"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-vue"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20170130.435"; + version = "20180104.626"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "652e299cb967fccca827dda381d61a9c144d97de"; - sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb"; + rev = "6c691839b7e784884ae5c390bf1927953cd2bde7"; + sha256 = "0fm1d85302q79r4zrzmdx4v5c1vvr53g687vm5frf9sv8gg6hx0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -43042,15 +43734,15 @@ license = lib.licenses.free; }; }) {}; - magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: + magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171127.435"; + version = "20180107.832"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "64be29ba47218a9766a2999f8bf366cc9e3256a9"; - sha256 = "15ba8zx1zsg0q8kk2r7hsx4kljdq7mwazh9a1cpzjprs5wn56jr8"; + rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2"; + sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; @@ -43061,7 +43753,9 @@ async dash emacs + ghub git-commit + let-alist magit-popup with-editor ]; @@ -43262,12 +43956,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171121.1110"; + version = "20171217.1235"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "70e3cdd6140ebdf477f86b88ac2bd1a8de115e88"; - sha256 = "1187ld4abbb990g0n66rnapqci047pmyanicg7ai9z45dyjf2y3f"; + rev = "3f23e81eb0267d6578d8f1733c5e42699b0229a1"; + sha256 = "1nv3gc3wb7r2l9hbsgx78gqbcdi6iw1l9a0nqq5vjvr3cmb014r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -43283,12 +43977,12 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "20170703.704"; + version = "20171213.737"; src = fetchFromGitHub { owner = "tarsius"; repo = "magit-rockstar"; - rev = "a65042e3445008b55190f1258ae54bd78e12174b"; - sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn"; + rev = "44e3bf03b0c5db914ce391c0c645267f0a5759bd"; + sha256 = "0nqb6ipzql4jxipmh262j9q72sjk4s4cbyz5c61akwxbpr32nz3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; @@ -43388,12 +44082,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171117.525"; + version = "20171224.845"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "3c17a4ca0e167b3f8da100dc40f160047ceaea78"; - sha256 = "1m96zcp7dbgafayc79iiac3q1da5vzx0khmxyd6aw0f0k2x8gxab"; + rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5"; + sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43598,12 +44292,12 @@ malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: melpaBuild { pname = "malinka"; - version = "20170723.1635"; + version = "20171202.221"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb"; - sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h"; + rev = "d4aa517c7a9022eae16c758c7efdb3a0403542d7"; + sha256 = "1rnzvx1nc01sw9fklm36lyllqm6dizj64gnlqbs4nammx7z0spi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; @@ -43745,12 +44439,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20171002.12"; + version = "20171220.419"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "77647573331c602847b06b9e21de69f72cd7bad5"; - sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv"; + rev = "f993b7428c7e83efdbc6e6040d3eae9406d9b090"; + sha256 = "0731w64jxjmphsjpz4fz21h27q4y9afbkbpczspnc90vs1ighn4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -43897,36 +44591,15 @@ license = lib.licenses.free; }; }) {}; - markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { - pname = "markdown-edit-indirect"; - version = "20171126.651"; - src = fetchFromGitHub { - owner = "emacs-pe"; - repo = "markdown-edit-indirect.el"; - rev = "7ed6ab94fbb98394f176ab7aaab0eafe1df2d320"; - sha256 = "0ny9jj35lzpibdv9nrpzwfr7gjr477ljmr2krlf3wfsgvfxc2k76"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect"; - sha256 = "19038vb6ph7l9w1yv8pszyd13ac38l44vb46l9jmgyby773m7644"; - name = "markdown-edit-indirect"; - }; - packageRequires = [ edit-indirect emacs markdown-mode ]; - meta = { - homepage = "https://melpa.org/#/markdown-edit-indirect"; - license = lib.licenses.free; - }; - }) {}; markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171126.929"; + version = "20180101.503"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "ea03dcb144e08dce83c9b0078bb03f767b836f23"; - sha256 = "1jcwpvbzfm41n1wy3dhjvgyz768808m0ga2ghvqbyl86p8k8gs3k"; + rev = "fc4e143831f8590dc9b25da76961536eade02411"; + sha256 = "05q7962wc8px9v2810v6z68qrqr7kvjicc53byyqbxlp4sqcz6x4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44117,12 +44790,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20171018.932"; + version = "20180102.201"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "6a31133b25addabc5ec9c87ba959d69c5122171b"; - sha256 = "1h5ilihlpqg1as6cd58z3flxzhj7izk7sz1nzwhwzvh3kfm47h9d"; + rev = "e25b170779ca8d0cdef0bfeb6f35c264a23a44e8"; + sha256 = "01m5cjjhi02aqpv1c9h7n4kq1b7vplb9cwncb4kx17k5xyml7yb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -44389,12 +45062,12 @@ mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbsync"; - version = "20171128.649"; + version = "20171130.335"; src = fetchFromGitHub { owner = "dimitri"; repo = "mbsync-el"; - rev = "d92928a4df79fa2c587e04df36726a34d11a65eb"; - sha256 = "1aaysvk1130x3z5dmzl3cx983v3vnh99lxlc281nggivjnjdxwvr"; + rev = "911d9ac255e8f7fb4bd21c0e816e44abfeb59128"; + sha256 = "05qqb7399bmjdkfr5gdkf7fpg6xziyd9345x00vz5cbq859p128p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync"; @@ -44473,12 +45146,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20171122.626"; + version = "20171230.802"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "555b8b9ea8ef56dda645ea605b38501cb4222b12"; - sha256 = "1z3vvasah4gq6byq4ibkihy5mbch5zzxnn0gy86jldapwi1z74sq"; + rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; + sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -44746,12 +45419,12 @@ metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "metaweblog"; - version = "20170626.750"; + version = "20171216.1840"; src = fetchFromGitHub { owner = "punchagan"; repo = "metaweblog"; - rev = "c039d1ffb618d19d160bde835fab389e9a7433a3"; - sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k"; + rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a"; + sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; @@ -45144,12 +45817,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20170708.358"; + version = "20171208.958"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5"; - sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c"; + rev = "8bb428b52e974ecea35f3f2b20ad161735085a30"; + sha256 = "10b8y23vamj9r0dnqqcn36w4n8zz61p17njakinfadqa813s4hhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -45207,12 +45880,12 @@ mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mixed-pitch"; - version = "20170723.955"; + version = "20180103.1839"; src = fetchFromGitHub { owner = "jabranham"; repo = "mixed-pitch"; - rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a"; - sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9"; + rev = "e6f063bdc968f8ff21418e9f3b1d501cd0e5d4bd"; + sha256 = "1jgwg8y77gm8fkggmi64vcv855swnb0nra2b59np6k1qacqj1zkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch"; @@ -45290,12 +45963,12 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20171004.336"; + version = "20171212.1428"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; - rev = "7661968fa6974996e58dfa28da33bca0cbde777d"; - sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969"; + rev = "3fb2964c1923fa4ae71741afbd87c76dc16af93a"; + sha256 = "1al8n18h3pnjsaffwbfbxv68zwh7svnkrjjrvzdav1ja5qs39wa4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; @@ -45311,12 +45984,12 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "20170519.4"; + version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392"; - sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p"; + rev = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f"; + sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -45395,12 +46068,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20171016.903"; + version = "20171217.835"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "0f74ecf500f833f7f959187a375dacdd33d4d569"; - sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b"; + rev = "29376477b63e319875ad0969a8103f3864efb2a0"; + sha256 = "1j36ac827llm5ch58hs3yni4jfg0x5fypv5p1i30ffvb7dhn4mmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -45458,12 +46131,12 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "20170519.32"; + version = "20171231.2213"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "88935a26318a574adeeb2301ae8d010f0102b1d3"; - sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a"; + rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069"; + sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -45497,6 +46170,27 @@ license = lib.licenses.free; }; }) {}; + mode-line-bell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mode-line-bell"; + version = "20171231.1939"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "mode-line-bell"; + rev = "dcfad0929a606af0e836d93e78be989a8ac16f87"; + sha256 = "0vpi3x60izvwwcck6scdm4386bc67693nqwwll0mbzf8n9args4v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/26f19808655b0242a1e9e5e5d41f7f794542e243/recipes/mode-line-bell"; + sha256 = "1ri771hb91b7hd203f8zp83h5hcndh8ccc1y8shhqmak6a6l04wk"; + name = "mode-line-bell"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mode-line-bell"; + license = lib.licenses.free; + }; + }) {}; mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-line-debug"; @@ -45710,12 +46404,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20171013.236"; + version = "20180104.429"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "019e07947426f0192fc3458f3f72c19031b607de"; - sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; + rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a"; + sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -45731,12 +46425,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20170623.103"; + version = "20180108.224"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3"; - sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9"; + rev = "c1dd7fe6e14a0ec2dae3135e74dffa797c9df28a"; + sha256 = "1853vvipyngv6chs10rswx5mhm9p3fgm1n3kpp4chhbc3040q97r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -45924,8 +46618,8 @@ src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d"; - sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1"; + rev = "7cbc941a9150468609010a93c429117da2523903"; + sha256 = "1irrcbqi1m6pcsjkbd3nqri158qhl0bcynciwwxdfqb45i67a1m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; @@ -45945,8 +46639,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "bca452544b5e200034d0505a767090a975a21a28"; - sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg"; + rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c"; + sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -46004,12 +46698,12 @@ mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mozc"; - version = "20160102.1506"; + version = "20180101.0"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e"; - sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88"; + rev = "6b878e31fb6ac4347dc9dfd8ccc1080fe718479f"; + sha256 = "03gcda62xl6hfibw3y15lf6b04998kj1v95gyzs3q0bqxav74ahw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -46130,12 +46824,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "20170610.1044"; + version = "20171225.738"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; - sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; + rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; + sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -46193,12 +46887,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20170901.1027"; + version = "20171222.2315"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "ef90cd0f0fb6c841f326db5cad276567eb5f96b5"; - sha256 = "0sym7mp1via65h883f5h45cbfxq58qck7ypcvcfdmnmn9jnl3j9d"; + rev = "3095de457ec88e752f83ce086eff4aeb22399980"; + sha256 = "04y26r7cb0sza8wp45khk8la4mvj4h4ksxfm5z7ry77xi7j2894w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; @@ -46337,21 +47031,21 @@ license = lib.licenses.free; }; }) {}; - multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: + multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20171119.1230"; + version = "20171217.1211"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "f610b74567f3"; - sha256 = "1mwqzfisah0bgh7l2v5mlgq30nviccqmk641m84mh25n195g8dsc"; + rev = "a6e7c1542c0b"; + sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x"; name = "multi-project"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/multi-project"; license = lib.licenses.free; @@ -46927,12 +47621,12 @@ nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nand2tetris"; - version = "20170306.1827"; + version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; - sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; + rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; + sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris"; @@ -46948,12 +47642,12 @@ nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }: melpaBuild { pname = "nand2tetris-assembler"; - version = "20161109.1637"; + version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; - sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; + rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; + sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler"; @@ -47241,12 +47935,12 @@ neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neato-graph-bar"; - version = "20170731.2341"; + version = "20171230.1753"; src = fetchFromGitLab { owner = "RobertCochran"; repo = "neato-graph-bar"; - rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27"; - sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j"; + rev = "c59f15ed9a40aecc174aa22c4bbfa7978e182705"; + sha256 = "0bdgsxdlwpkd3hjnw1jmj30slakzmj2pinj3pyr5qqba9apxnvri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar"; @@ -47266,8 +47960,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "847d1343e63c0a2d25a43f8432c4d750e4e9e7d0"; - sha256 = "0wriamdich72h1m0rmhx1s38ph6q8ak0rfd39kyycw7v8bvwgv08"; + rev = "59b28607968a9bee060b42eac55c69c37d1c0e69"; + sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; @@ -47576,12 +48270,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20171120.1300"; + version = "20180106.437"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "a955a210f147694b257f8e79aa0a4ad23ff4fd44"; - sha256 = "0sbcqb2fa28mb08r0sdb85825z6m5a3wkix4zm56w80mqvrv9ggz"; + rev = "3cb301760d3ff8bb26cad325dc29001893672a46"; + sha256 = "1h1yxn0whyb8wf13vs55a8zs66jz9svm9780sxaxcdr3gkvgqmd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -47783,15 +48477,36 @@ license = lib.licenses.free; }; }) {}; + no-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "no-emoji"; + version = "20171214.2310"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "no-emoji"; + rev = "329b4093bf38f3f4b0e4760c70270d3b45ee554e"; + sha256 = "1799wh6qy2yaadkdvnvp37320wxkhal8vlnj47d32a1bv8l8s91q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af6b04c1f95468254f2cf361964df9fd25d23586/recipes/no-emoji"; + sha256 = "1lr6bzjxwn3yzw0mq36h2k2h8bqb1ngin42swhv022yx6a022zn2"; + name = "no-emoji"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/no-emoji"; + license = lib.licenses.free; + }; + }) {}; no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20171123.1237"; + version = "20180108.305"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "f200aaee54d7ed5de789b825010198cb9c189be2"; - sha256 = "1plmaws2j04nand6avcqikg3kdk53f09ly6xl72rm0nkpm5595wl"; + rev = "e585ca177a55808a17a53e8a9020198a18175543"; + sha256 = "197dr52a2xw3da7zaia48qndmgrs3h8nx6wan9zslpy8497c8bbn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -47954,12 +48669,12 @@ nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nord-theme"; - version = "20171005.1039"; + version = "20180102.1001"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-emacs"; - rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024"; - sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric"; + rev = "b5c1dc762fe3acaa88a0ce9640085d45d0109c43"; + sha256 = "0j1cbwlh646gkjp70maqbq7izchgc23wdax50ykgkw3mxhjrlsf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; @@ -47993,11 +48708,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170927.415"; + version = "20180104.1635"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "cf08295c503a2cefc4c51c5398f3fc1159521ff1"; - sha256 = "1vc49c5n5jdkhvy436avklcvpw6nhdk9kw9gybd6izjbrcjgy62c"; + rev = "54982e520c3bee74e947e311ee5b1219396fa1a8"; + sha256 = "00ni0vnsq4p7cka9jy9fw2rdmkm3gxii7blq1c87bpbvrlwjzrhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48160,12 +48875,12 @@ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20171128.1423"; + version = "20180104.1243"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "02cdb62271545e822c2e6c7287ac21d5b2795f8f"; - sha256 = "0r07g80q9b2san61342frsn7v3k7cy32fj0v7v6gqx27l5jpqrfb"; + rev = "91056b70667036bc78d6c8585cf0bc8fe7ba21c0"; + sha256 = "0pf8ng0r829lrbqjz61wjdag9cb27cx0cj2idgpy92hfiy9s6saa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -48313,12 +49028,12 @@ nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nvm"; - version = "20170513.1501"; + version = "20171217.836"; src = fetchFromGitHub { owner = "rejeep"; repo = "nvm.el"; - rev = "61590e7fdeb19b1d866d26e48aef1af4767e5709"; - sha256 = "04z8zkgp0km575ijijpvmrqs0aa2f0878c5n4rl91hs1grq93mjf"; + rev = "bc0a33257ec16e9f575bb6914b5949199897ada9"; + sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm"; @@ -48443,8 +49158,8 @@ src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "6099e94538083e035a4152335f93eae5b13c8d3f"; - sha256 = "1ws5yngga0zi8cxwd6nzgq17d1k6g44zw2pzivc2fyljxnm70892"; + rev = "99a6f24191cacb343d6090ecc8c1c67f768b2e22"; + sha256 = "1cw62nsdnmllpkn4mqi80vp6s17yf6an418gvr06z8cxqndw07h1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -48522,12 +49237,12 @@ ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-cfengine3"; - version = "20170915.634"; + version = "20180102.1012"; src = fetchFromGitHub { owner = "nickanderson"; repo = "ob-cfengine3"; - rev = "f38f87256efcb2b02f5c7042900087be941c1ddc"; - sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h"; + rev = "93ebcfceec3734f4bd187ae123686187d66fd401"; + sha256 = "0cyjdg8vzaf31gqsgmz5znw7v2p36jiz3sj1jvw7vhr8s4iar81i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3"; @@ -48540,6 +49255,27 @@ license = lib.licenses.free; }; }) {}; + ob-clojure-literate = callPackage ({ cider, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ob-clojure-literate"; + version = "20180106.2121"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "ob-clojure-literate"; + rev = "e2b264f0f42467436f71aac81ca848fe9ab517d5"; + sha256 = "1w0mga44s7lghivw0ixm8gb8ryav5myd9i4x0xbdc8512jgy6a91"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e958745861c9673248955443bcc2c76d504b32f7/recipes/ob-clojure-literate"; + sha256 = "0jprgnslkc9m404n32rr510is823yr9kziqcw70z828fy7wl2glk"; + name = "ob-clojure-literate"; + }; + packageRequires = [ cider dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/ob-clojure-literate"; + license = lib.licenses.free; + }; + }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -48568,8 +49304,8 @@ src = fetchFromGitHub { owner = "brantou"; repo = "ob-coffeescript"; - rev = "b70f3d822c707cb02333fcb739ba4874614cad2a"; - sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd"; + rev = "d68a8335d29c947f388b4fa556de4f3ee75a19c6"; + sha256 = "0hjyvvq089c0m9hqjlk3fb07z24vha7fmvfy8w9203jxqkazm1di"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; @@ -48778,8 +49514,8 @@ src = fetchFromGitHub { owner = "brantou"; repo = "ob-hy"; - rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; - sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + rev = "cad6a1aaa463e8d72d37b12744be1c5732bb8cc4"; + sha256 = "0cm238139vf356vayv3xzx5gw2hlklzgrbpzk3ixnfh4gkgnmdj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; @@ -48795,12 +49531,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20171111.740"; + version = "20171209.634"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "0cd6f75657df904637fbef7b540344ef5c559c3f"; - sha256 = "1rmlc6xnj6nh39rscz9963k5wlppiysibby32r314lxk6n03gj0l"; + rev = "a3bf46dd6c9a76f4cd5058f3ab5426d90f0c073a"; + sha256 = "0ck3r5qwp4184anpa9f9hjp3rra6yx5hkwcxg1byippp75hdc50m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -48921,12 +49657,12 @@ ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-php"; - version = "20171017.2206"; + version = "20180103.441"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-php"; - rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1"; - sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs"; + rev = "08b41282fba31abca030a387062c3f1eb25a723f"; + sha256 = "1anrqqd4g4pq2ngslgkqarxisgmn9i7nggj2m76ny7ga1hxi2agv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php"; @@ -49551,12 +50287,12 @@ olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20171102.1906"; + version = "20171209.644"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "cd2fdca25935a47a5d3b0417a206f886579f8c45"; - sha256 = "0cm630yvsdib868xl9x1ng3i64dcyzvq8pzhhaz99b7zc7wfayvh"; + rev = "e824a21f5e284bc7e111b6f325258bba8396d9ec"; + sha256 = "07hz7nj81pj0vwql30ln8isypqyhwv4y36gfzs475hgjim2mvdh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -49698,12 +50434,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20171119.1236"; + version = "20171226.1147"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "b0c61e91d1b600875ad2eae06fe72a179a3028b6"; - sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd"; + rev = "95f56022edf9fcaba8402db05a6927af050b12a8"; + sha256 = "133maq29hfjaq4vilz9wvr9vjkschkpydkw2197sscv7whfzv78j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -50232,12 +50968,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20171116.2353"; + version = "20180107.1655"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "e2cadeeb83060437d2b002215680f399ca3281d7"; - sha256 = "03yv1897vvj147sxs58kwq614365slkqszzxvlkarbqvxgamm30s"; + rev = "42596a3c29e9b6b64c05b04db04d23ea282560e4"; + sha256 = "1ca0x87i6vqs004dr6qc9hi1lqbvj82464cbfj3vr0z2n5pi7hl5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50484,12 +51220,12 @@ org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dashboard"; - version = "20171128.301"; + version = "20171223.1124"; src = fetchFromGitHub { owner = "bard"; repo = "org-dashboard"; - rev = "cc9bb28da4cd029328bb3c9973be944a17289cb0"; - sha256 = "10brbq3pyx1nm0r7wigx7j1164lxmh9j6gp6pywq9w9ip62b1ma3"; + rev = "02c0699771d199075a286e4502340ca6e7c9e831"; + sha256 = "0zi23xgv5fq827dljhzp6m2v7ggr3pdw3fpgq8515gs9q4f12v1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard"; @@ -50858,22 +51594,22 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "org-jira"; - version = "20171126.1833"; + version = "20180103.1813"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "d125ade5069e0840e204142ca3d4405cac2593f7"; - sha256 = "00wqz6k72iv6mwvpg9qv35qfkk8fpq1nsww80jddafdfzlslm0bw"; + rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7"; + sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; name = "org-jira"; }; - packageRequires = [ cl-lib emacs request ]; + packageRequires = [ cl-lib emacs request s ]; meta = { homepage = "https://melpa.org/#/org-jira"; license = lib.licenses.free; @@ -50987,12 +51723,12 @@ org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mind-map"; - version = "20171109.1238"; + version = "20171206.645"; src = fetchFromGitHub { owner = "theodorewiles"; repo = "org-mind-map"; - rev = "9d6e262bedd94daf9de269f4d56de277275677cb"; - sha256 = "0jgkkgq7g64zckrmjib0hvz0qy3ynz5vz13qbmlpf096l3bb65wn"; + rev = "d7854dbd30d565d3087d2810d6a77cc882988eae"; + sha256 = "0jkm6ar07m399hqanjpw6y7bxdr59j72skmi9ncgjyb81ch70g36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map"; @@ -51029,12 +51765,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "20171101.506"; + version = "20171219.314"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "366cd5ad33b53940bc7b8d28b7d01f7acd19f74c"; - sha256 = "0a9jaja7xdslcjjlm3an2kri3f6sivc21hgk6hp4qvd4vmqkl111"; + rev = "ccf477735d76c078b44bba7bff12e7e30e66bdb3"; + sha256 = "17dxdghnh3h24584pa374pmz0a7qr13p0a4rfsndns9xv8wfzbic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -51075,8 +51811,8 @@ src = fetchFromGitHub { owner = "Rahi374"; repo = "org-notebook"; - rev = "d90c4aeca2442161e6dd89de175561af85aace03"; - sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz"; + rev = "86042d866bf441e2c9bb51f995e5994141b78517"; + sha256 = "0znxn6zzc9645m3wmkryf4xwjskf7gwylrg6z2kmr1wpjlpfwb01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook"; @@ -51089,6 +51825,27 @@ license = lib.licenses.free; }; }) {}; + org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-noter"; + version = "20171229.1823"; + src = fetchFromGitHub { + owner = "weirdNox"; + repo = "org-noter"; + rev = "ad3ecfc75bba19625dab07f4ff0483f043ddaf70"; + sha256 = "09y9pamb7zld41qlvfpp5szl0lyblrjd2211qzbs8zm4mk3hlzy3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; + sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf"; + name = "org-noter"; + }; + packageRequires = [ cl-lib emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-noter"; + license = lib.licenses.free; + }; + }) {}; org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; @@ -51225,12 +51982,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161130.1053"; + version = "20180102.2349"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "9de96eef6f187a10cd910e3bc3eb274d38856819"; - sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; + rev = "645f451df82fb5ebdf42b2c208711d307781062d"; + sha256 = "1iq90f821iycqs1qff1m2vjl1czri01c484gcnn50wnf7mdfynhk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; @@ -51372,12 +52129,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "20170404.318"; + version = "20171219.58"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "0736e8508b19fe9c3a3911f357d30e3e498e3e3b"; - sha256 = "1c7wfgs1y9jyj63dfqzw60f2qi96dcdmbn5l258nx1rk25n5iz3l"; + rev = "24500edf303a854f09a88b07e1a16a21e164eb87"; + sha256 = "0c2d5dbr10p1hz51ybygmwv25si6sfwy21kc9xmbjyrrlw5l5sqv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -51393,12 +52150,12 @@ org-randomnote = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-randomnote"; - version = "20171117.848"; + version = "20171210.557"; src = fetchFromGitHub { owner = "mwfogleman"; repo = "org-randomnote"; - rev = "552742f0574171629824c9627b4cc59ce3d73d74"; - sha256 = "0jgdn0g2jab62i2i9yw7mhbd1cikqkx8skq7zrd7l64jd8my70xp"; + rev = "c89eb4cf625ea7e7624b6a2d3d5676ce25ab03d7"; + sha256 = "05ap1kbq5cwak70jlm3m0pvbax75kg3281qxs5flz3qbkfsbg3h2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote"; @@ -51483,12 +52240,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20171127.2044"; + version = "20171222.818"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "459484e80a0c3fefbfad922b0afb97c8e0d93ce2"; - sha256 = "0limqwc4qlr68rq6gm6w72cafjmq8jns2dcgz8cjdx4mpzng7kvm"; + rev = "66e23994c0964762b7a4bfe8662e81aa609e7a22"; + sha256 = "15kqfp0l0dsyw7qb7yfdfxsbjqzg7kcfp43nv7xiw808616vn7m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51515,12 +52272,12 @@ org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-repo-todo"; - version = "20160307.1029"; + version = "20171227.1719"; src = fetchFromGitHub { owner = "waymondo"; repo = "org-repo-todo"; - rev = "b164bacefcd3c55dd40cd1a9e91ffefd315b400d"; - sha256 = "0as82hf81czks9fcmhy9wjwl8d4mbylrm13c02y8abp0am41r28f"; + rev = "f73ebd91399c5760ad52c6ad9033de1066042003"; + sha256 = "0c74zwmac8x1y8jimdx473v0falpky2kfig8pnaxavz415gb315q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo"; @@ -51596,6 +52353,27 @@ license = lib.licenses.free; }; }) {}; + org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "org-send-ebook"; + version = "20171231.2313"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "org-send-ebook"; + rev = "a22d565413b82c415c4f12daab5bfcc489053ec5"; + sha256 = "19qf3a8vagbfbdj2cd7wklran4z6w9ddlimy0r15pxs23abicwjl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook"; + sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d"; + name = "org-send-ebook"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://melpa.org/#/org-send-ebook"; + license = lib.licenses.free; + }; + }) {}; org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; @@ -51872,12 +52650,12 @@ org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-tree-slide"; - version = "20160513.2325"; + version = "20171129.2238"; src = fetchFromGitHub { owner = "takaxp"; repo = "org-tree-slide"; - rev = "fed7ec7e6df59cffcdb4c13a9345f4d828404dd8"; - sha256 = "0b97jqskn5c2cbah3qj9bi5was31sijrp01dca36g5y53lpz7n79"; + rev = "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134"; + sha256 = "153bg0x7ypla11pq51jmsgzfjklwwnrq56xgpbfhk1j16xwz9hyf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide"; @@ -51998,12 +52776,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170826.1843"; + version = "20171218.1911"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "62a6400746847f246e12493271f0bb52f7465a92"; - sha256 = "1xnb6yd5ny5i6hvzxfsnga5m75si5y8vc1j3vfs42r99s2ns8yid"; + rev = "aa7a5730f4a58a53c41370dcde7bec43d5c1a2cd"; + sha256 = "1ivf156186myr84rqbd8rn6wa8qjrip7la6sgc8k6ggg6lzvkqac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -52214,22 +52992,22 @@ license = lib.licenses.free; }; }) {}; - orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }: + orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglue"; - version = "20150503.114"; + version = "20171220.426"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "orglue"; - rev = "1274652d527cb6afe45d1acb79f41be5a2886ee4"; - sha256 = "0qf2k89nldfm3njcnygh8ak8fz5m9ykmpzfx1cnfffxcyi139s9f"; + rev = "ae2a45c19b52e45db7891093a3ff17ba2e51c507"; + sha256 = "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue"; sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j"; name = "orglue"; }; - packageRequires = [ epic org org-mac-link ]; + packageRequires = [ epic org ]; meta = { homepage = "https://melpa.org/#/orglue"; license = lib.licenses.free; @@ -52340,22 +53118,22 @@ license = lib.licenses.free; }; }) {}; - origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + origami = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "origami"; - version = "20170129.805"; + version = "20180101.753"; src = fetchFromGitHub { owner = "gregsexton"; repo = "origami.el"; - rev = "5630536d04613476e13b413fe05fd0bbff4107ca"; - sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd"; + rev = "1f38085c8f9af7842765ed63f7d6dfe4dab59366"; + sha256 = "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr"; name = "origami"; }; - packageRequires = [ dash emacs s ]; + packageRequires = [ cl-lib dash emacs s ]; meta = { homepage = "https://melpa.org/#/origami"; license = lib.licenses.free; @@ -52662,8 +53440,8 @@ src = fetchFromGitHub { owner = "articuluxe"; repo = "outrespace"; - rev = "cf2a397971f82c87dcfbe3400e3e7c2de79fa68e"; - sha256 = "1rxyyvax3f0fh3k8majkhpdrnlqg4pg7hl68q61csiccayx04213"; + rev = "0a3b53d283fe8adb8de45766d284704ed4557e23"; + sha256 = "0cas2divgdjai06f6jk5c808vhvg5dcwyc9nam2krvd8k5y5nd8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace"; @@ -52830,8 +53608,8 @@ src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "31ed40ad3f0b3166cb3e772f8689b12d7f2cfe1b"; - sha256 = "1p9pdm3mhwf5ldl0g4c8kf8iqwzqg0f88qd0nmw33mm8mvikvv1h"; + rev = "93bd7b42ad4a70d7008470820266546d261222d6"; + sha256 = "078ihlpwajmzb0l4h5pqqx1y9ak7qwbrh7kfrqwd0jn114fah1yd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -52889,12 +53667,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20171129.933"; + version = "20180107.1554"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "95dd1ea388a9d625bec6ef4f59f09ee28a991a2e"; - sha256 = "0camyxihrjl3yxwkw806ir3pghfibh9y1kr1j1pash1zsvlpb93s"; + rev = "44ac07fb5d3a30662dd2c4643fe9d9e3ce85465d"; + sha256 = "1p3053kkjq1kv91jm6myp3ikjvh53c3yrnvrxfg5jndr6p1zawqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -52973,12 +53751,12 @@ ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ox-mediawiki"; - version = "20161228.850"; + version = "20180105.1354"; src = fetchFromGitHub { owner = "tomalexander"; repo = "orgmode-mediawiki"; - rev = "9e13392fe88817564f46a7a9f1eadebf54a2c346"; - sha256 = "1x584gbwr1jhbxgzmjr6z801lqzqcaqzypkz25zz2spmh4n8fz9f"; + rev = "a9327150293e370e500ba55bddfe5fc435c6bf9b"; + sha256 = "0dsq86hli24imdkgsf45asx23kriw9di3d0cf5z8axfpkcbkn770"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki"; @@ -53040,8 +53818,8 @@ src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "55861adfceeae436deeae8402f545b771ad3484b"; - sha256 = "1pvijswwx3a4bb1z32kk9x70ba07zr2wjr913ri8gp81kj84zb0x"; + rev = "cd3c59f6c0ea49e0cac31d8392a5bbac02886d8f"; + sha256 = "04wppfxjm43bc5c8i5l5kbpln7rhifgqrmbjbxdbqd3vl4lpcnzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; @@ -53351,12 +54129,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20171006.1846"; + version = "20171201.1903"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "ff64e1171e8330972c26bf547042429927aed7c7"; - sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks"; + rev = "9abfb14d9ad903ef73895a27b9964b5e6023d752"; + sha256 = "0brd8zhiyn9kpbc0za455vjbb5v49i2pj3hhj1lbdcghzwq39jvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -53498,12 +54276,12 @@ page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20171020.108"; + version = "20171210.31"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "ae1c0065984429c7364a667abb9180e80134c4c0"; - sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j"; + rev = "fd3b7e38ad8747cd009ead7ef1bb150849ccc693"; + sha256 = "0ik5v2kd0l5a6sznld5ncdb4lsyqbbw7axs0qwxc968b540k9zq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; @@ -53603,12 +54381,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170927.1048"; + version = "20171217.551"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "c840a8f941940bb8e694c635995566faee995c7b"; - sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n"; + rev = "4e10a68314afb5087163ee09133b9032a368c85f"; + sha256 = "11v0q3d68q9am9scjd38lw2vqx48aqzqs32316i9xsbp962snrxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -53645,12 +54423,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20170720.127"; + version = "20171216.1545"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "58f893d54c0916ad832097a579288ef8ce405da5"; - sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i"; + rev = "242bc6fb154ed02d5829644778586234e31c0710"; + sha256 = "1ghkphkpvabmzds6pib88fpwgv83rcfqv78j59kjxhkcgpzd8bw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -53687,12 +54465,12 @@ paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "paper-theme"; - version = "20170924.1231"; + version = "20180107.1613"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2"; - sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6"; + rev = "28d7339f2e70c617f2e8e3979b45d78883a27282"; + sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -53937,12 +54715,12 @@ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsec"; - version = "20170508.1500"; + version = "20171202.2031"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "8755c60826efaa8603b0d4300bfba9abaa072584"; - sha256 = "03yzs4l53j4fvviqfhdn3cxc710yrg4wdbnl7r69yn69r4di9bfj"; + rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1"; + sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -54088,8 +54866,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd"; - sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw"; + rev = "bd1cadd5620279b5ee781434b4f0731eb9ad730d"; + sha256 = "017na2x0hrx4837w5xky3qnzrq3a36fi3mnjpdrv92pr06hbnc4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -54336,12 +55114,12 @@ pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pc-bufsw"; - version = "20150923.13"; + version = "20180107.1040"; src = fetchFromGitHub { owner = "ibukanov"; repo = "pc-bufsw"; - rev = "a76120bca9821c355069f135b4e6978351b66bc2"; - sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m"; + rev = "b99ba484e18ebf2b88654704146746490bb7625f"; + sha256 = "184nnkfh7n6vbbmvykvklr1dn3dcwjj3w800irdg55bbnkxxzkj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2bbd34d673935846c286e73a1e2efaa00ab01a/recipes/pc-bufsw"; @@ -54459,22 +55237,22 @@ license = lib.licenses.free; }; }) {}; - pcmpl-pip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + pcmpl-pip = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "pcmpl-pip"; - version = "20171109.1932"; + version = "20171201.33"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "pcmpl-pip"; - rev = "50345753df4420f1ca4d1b8cb56b0f8d29d2969c"; - sha256 = "0svl0xxh3amc52kj73m3mi732gm3907l2gk7i91iy0ynp6v3f0rz"; + rev = "8b001b579fc015f80ee0e4f3211058b830bf7c47"; + sha256 = "0f8s2gn82dhyrnv0j688697xy0ig2yhn5m94gwhcllxq5a3yhbdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-pip"; sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr"; name = "pcmpl-pip"; }; - packageRequires = []; + packageRequires = [ f s seq ]; meta = { homepage = "https://melpa.org/#/pcmpl-pip"; license = lib.licenses.free; @@ -54793,22 +55571,22 @@ license = lib.licenses.free; }; }) {}; - persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: + persp-fr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: melpaBuild { pname = "persp-fr"; - version = "20170908.44"; + version = "20180103.642"; src = fetchFromGitHub { owner = "rocher"; repo = "persp-fr"; - rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0"; - sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8"; + rev = "aeb3b5de6135269091bb9aa0396973766c27fc88"; + sha256 = "0l6hlgn54iw2f6ry0gw79rsbz1r4svxf2xwffi580vi68wrcnvf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; name = "persp-fr"; }; - packageRequires = [ emacs persp-mode ]; + packageRequires = [ dash emacs persp-mode ]; meta = { homepage = "https://melpa.org/#/persp-fr"; license = lib.licenses.free; @@ -54817,12 +55595,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20171014.111"; + version = "20180104.843"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "ccf87da2c230c3a91e627105b0f034a954e6842a"; - sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw"; + rev = "eef754ce06159e220a9f3c99db3809925f41b8f1"; + sha256 = "1x4s1nlnvab3sgzm0glkazfpc7lkh64af5nc4jjz1jzin8v0m055"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -54901,12 +55679,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170916.404"; + version = "20171203.221"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6"; - sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3"; + rev = "edb70c530bda50ff3d1756e32a703d5fef5e5480"; + sha256 = "12h0kj96s4h8z4kqalp7hccnlnqn5lrax3df75gz16pskx2dwxqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; @@ -55342,12 +56120,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20171107.826"; + version = "20180105.541"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "1e9ec6411e6ad3c85225e724215c28b01232fe18"; - sha256 = "0c8gdy6hc03c9al91j1py6xg0c6qzbhkcyzn4423lnkakv33iiwp"; + rev = "c3f3ac1665a77a0d3ee425244c77d923eadc9621"; + sha256 = "1flhbqqg2jnlh8l8p7g130arq3fx27z5h8ki98wgd070s794x39y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55867,12 +56645,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20170529.2212"; + version = "20180102.1852"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949"; - sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v"; + rev = "2a31fb9251922667692337c867612947d2139696"; + sha256 = "0g01a34q3dsn23s7s94xxmrvqalmvzi3hdz2hgh4swn4hrp4bzqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -56119,8 +56897,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "981c523ddbd1462970335a1069573ca3bdd3df5e"; - sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi"; + rev = "d4e434046121b395e8e96ac3dcb4a8f6113f4fd3"; + sha256 = "1abk6v8afmbn1sfyjkw14zvq1xgfnpsvi6m4qaglpa460awsnq9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -56178,12 +56956,12 @@ pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }: melpaBuild { pname = "pocket-mode"; - version = "20170327.438"; + version = "20171201.515"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-mode"; - rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46"; - sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra"; + rev = "229de7d35b7e5605797591c46aa8200d7efc363c"; + sha256 = "0j3axac4lp7p00a7mf7frryqg1y3jwqaw0s475gz606642vg9l45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode"; @@ -56377,12 +57155,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20170925.2301"; + version = "20171214.727"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "16bed77ff933cb5f8430b6eacf27509631d22072"; - sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56"; + rev = "612912789b01d5d53975f0b2e64322ab79035be1"; + sha256 = "0ia344z9gvnq37kvac534mpcl5rx84qg2cjgr6lrxa4svnq6353x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -56629,12 +57407,12 @@ popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "popup-switcher"; - version = "20161130.656"; + version = "20171205.51"; src = fetchFromGitHub { owner = "kostafey"; repo = "popup-switcher"; - rev = "86809fbd3c3c3d566043043b6577ccf8133ac855"; - sha256 = "1r8g3wxyklkck9af1x7rg7hyj8fnf28fd34p12vv17mhnqzb4x4y"; + rev = "f5788a31918e37bb5c04139048c667bcec9f1b62"; + sha256 = "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher"; @@ -56860,12 +57638,12 @@ prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prassee-theme"; - version = "20170406.1953"; + version = "20180105.1644"; src = fetchFromGitHub { owner = "prassee"; repo = "prassee-emacs-theme"; - rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa"; - sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps"; + rev = "b68d13f929364b9bb087f8f587798144218f7dc6"; + sha256 = "08r22xsrlycl0lyqg5qi5wv5w4zhdawmi8ikdgvn5776qaixb6r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; @@ -57321,12 +58099,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171126.6"; + version = "20180107.2233"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "184d3451c9258cfbbfa2b26a07c7daeee2e9a605"; - sha256 = "0a3h980xyqx7wx90gnfzqjs5zhakq8cygvxgc7iy0v54d6qp5v5s"; + rev = "293849974df45b60bad572bfdc5166575fbbf0a5"; + sha256 = "0pi1m7wzw772hvxx1iaqj33nw9mlgdp8pnir41205awl2hh7w2i0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -57384,12 +58162,12 @@ projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projectile-git-autofetch"; - version = "20170612.1011"; + version = "20171129.1447"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "51b40134000a2411c6342e865e63f74c950a9310"; - sha256 = "0g4g4sjinmigyxs1irxv0yg524iq2hy8za09ksm3wbnbfa7w35ml"; + rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba"; + sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; @@ -57766,8 +58544,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "0289dd8f90b79ad3d2376aadec4538f9ac8b0417"; - sha256 = "0jiayas6q9miycn8b79r8366n778qzgx79xch7kx5b8wklv8li05"; + rev = "bab843b8b96757ed2138fdc01dc5d82d47a2239c"; + sha256 = "0b5vj227rr501fzy8y6hbg0q2y0z6hs8yk39m7crw3fwd4zqyn0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57804,12 +58582,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20171122.347"; + version = "20180101.1421"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "633b07b238aff51dc4b95a75c67910a18ba28da1"; - sha256 = "0myvb9dqxm5g1zf7hgx6frgkr5h5839sdnrv25xf2h1w8jmyc0cn"; + rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2"; + sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -57940,12 +58718,12 @@ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20171018.829"; + version = "20171208.2029"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e"; - sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v"; + rev = "894a86d0ae4e855ae6044af6d7e106f8996c97c2"; + sha256 = "0phf9y5rcahhavbvnsh6hfm3ig7vr3fs7m503zv1sac9is5zxypi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -58045,12 +58823,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170928.1007"; + version = "20171220.2249"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "e04f041386ebfe29fc67c3407e85b577b820df4f"; - sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l"; + rev = "b3ed5057166a4f49dfa9be638523a348b55a2fd2"; + sha256 = "0sgws5cl4vc8707l66lq0zi1p6pxik0474ihg9jczh2xxnq4clsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -58066,12 +58844,12 @@ purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purescript-mode"; - version = "20170926.242"; + version = "20171203.2234"; src = fetchFromGitHub { owner = "dysinger"; repo = "purescript-mode"; - rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861"; - sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr"; + rev = "2d1fa590a6de875ea4bd964349df0ba5e24fb1f3"; + sha256 = "00n15i3b33glhqc2yqs3axrdyc8id20w543cx74nn5ab4ybbjm4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; @@ -58446,8 +59224,8 @@ src = fetchFromGitHub { owner = "ssbb"; repo = "pyenv-mode-auto"; - rev = "714e322319ad7a8f5f2a3691aa431537b8a1b26c"; - sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4"; + rev = "783a93488e255346f9b1b2658424ffe0d670e8cf"; + sha256 = "090c5lnw2fz674c49szjsac3hdj5dwbnrbn921kvhw6q5lsn8z47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto"; @@ -58488,8 +59266,8 @@ src = fetchFromGitHub { owner = "JackCrawley"; repo = "pygen"; - rev = "430e2a059b6e2b0d76700cf79a3de55d9deefd9b"; - sha256 = "1blb9j3y1vfph0gxsslr4gw2diyqqb6xbkrkkcp8vzmx4jr06ki3"; + rev = "9019ff44ba49d7295b1476530feab91fdadb084b"; + sha256 = "01gmggjv36jc8660xfpfy70cydabhymd17q3z16cjqvsxapbj7nf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen"; @@ -58502,22 +59280,22 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20171125.43"; + version = "20180108.310"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "4e43cc0786574236268238fff99c6c8c3ed340bc"; - sha256 = "0kapr0xxb31bcz052hdz9ysh544276h5xms5m8m43banxi16szmb"; + rev = "eefbdec87ae923c91dbe33fcfc1af5a47b2e2ba5"; + sha256 = "0y7m9446dlip4qwx7s3w2jgx5s0r1s4cjvgacby20l1vs25k5drk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; name = "pyim"; }; - packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ]; + packageRequires = [ async cl-lib emacs popup pyim-basedict ]; meta = { homepage = "https://melpa.org/#/pyim"; license = lib.licenses.free; @@ -58635,8 +59413,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "6ef5895e7d8dd54a12f5e2a37239806ac3ef0a71"; - sha256 = "0bc4rfr230j855wka59wpaqx372xn15zhkg0gkcg135krplwmc9l"; + rev = "f5a7e4327d2f31744d3ae84e46ac4cde1b76b2d3"; + sha256 = "138zpjb1ckvh5bwl3l7ig7wl57b7zlr91yx2mgk71j3bbwjcjjg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -58778,12 +59556,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20171126.1618"; + version = "20180104.1009"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "183e9d1db2855a997faeadb63dba143cbdc97062"; - sha256 = "135w7c5imzc6m2in7w3zylac3q68fahyk05ivxw9qlc9p0axbs4x"; + rev = "ff5ca6ed9e5eabad355bfb1218bd8020a846b77f"; + sha256 = "1na11xf6w781kifh8rp02909difn4jy66z38h0q1lhjdm82p2p25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -58862,12 +59640,12 @@ pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pythonic"; - version = "20160221.1123"; + version = "20171219.810"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "87475def246b84339f464e80c76c7e7fcc2e780a"; - sha256 = "1j93c4rx7llyfvfvvvcrcpsj47zb56kkdii1lnyzay4n5zakhjhf"; + rev = "ce9c45564efa5553f6268c34f5f1ca2dfcb4d4da"; + sha256 = "0kv9iv3d5jdrl9c5pnay6lj3if3a0l3f8gc01mms7b8xdpk37xr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; @@ -58883,12 +59661,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20171005.1106"; + version = "20171215.1329"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "9f528449dfc35516647118689a2104603f23b49c"; - sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45"; + rev = "651a624fb41898d0c68970889ef7a72bad78b10b"; + sha256 = "0plpj3ndwvdzmnwinhpkq4z3pk6zmhjwxq0wjkkgl8vy12jkywpx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -59009,12 +59787,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20170727.557"; + version = "20171207.1139"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d"; - sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7"; + rev = "355d06d5364a1be62e662eec77d32ae3c7b6d739"; + sha256 = "083qm5zpxcnf03179bkpba89m5l9l6vamnhwlp2fnaqxshh5nb9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -59237,22 +60015,22 @@ license = lib.licenses.free; }; }) {}; - racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: + racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20170218.516"; + version = "20171211.1548"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33"; - sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5"; + rev = "cb74060bbaff8e505ba36e20e4a3a763ee7dd4c8"; + sha256 = "1azhvwm42sracyg9vj51k72pq3mm2gfimdvrbz50p5ijmirmllja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi"; name = "racer"; }; - packageRequires = [ dash emacs f rust-mode s ]; + packageRequires = [ dash emacs f pos-tip rust-mode s ]; meta = { homepage = "https://melpa.org/#/racer"; license = lib.licenses.free; @@ -59870,12 +60648,12 @@ real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; - version = "20170918.730"; + version = "20180107.1850"; src = fetchFromGitHub { owner = "chillaranand"; repo = "real-auto-save"; - rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d"; - sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa"; + rev = "d813632c1e754539cc92953ac4c3609105f9af58"; + sha256 = "0gz0w7zxl865shz9mf5xv8xi5mjq969600jqh4laazvhyk32skmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save"; @@ -59891,12 +60669,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20171006.1840"; + version = "20180102.1645"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f"; - sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6"; + rev = "2b3ffb5c375dd32a633668eec969148590b489b4"; + sha256 = "0sbldlhji6rzxjs2hip54sn376ar6rqbyaancmg85y85349q6q3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60212,12 +60990,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20171124.728"; + version = "20180102.1356"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "90a6efb6e63fbb7c14561512d35a5237aa9ca448"; - sha256 = "19kq13qh5f2jw5gxhi56d1vymf0vs46jhgfq8zqqkhbknd2lypni"; + rev = "73a87f907871e5dcd559e2ed2ea73370021b0390"; + sha256 = "1j1i8l81a3s5h482r7whsdl1fbgmnb2s2zijf7vbnq92dvmx6pfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60230,6 +61008,27 @@ license = lib.licenses.free; }; }) {}; + redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: + melpaBuild { + pname = "redshank"; + version = "20171115.1156"; + src = fetchFromGitHub { + owner = "emacsattic"; + repo = "redshank"; + rev = "9b64da7895973a29a32320a13c08de69befa0006"; + sha256 = "0vzha8pn4bgdnri1j5cgmasvn9j3ny0rh0i0plhjbys26f88klnb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank"; + sha256 = "0p18rkn09qb4ssr6jix13kqc3jld407qr2z2k8z78i3xy4bfzr5f"; + name = "redshank"; + }; + packageRequires = [ paredit ]; + meta = { + homepage = "https://melpa.org/#/redshank"; + license = lib.licenses.free; + }; + }) {}; redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; @@ -60342,8 +61141,8 @@ src = fetchFromGitHub { owner = "zonuexe"; repo = "right-click-context"; - rev = "10578576f6cb2945aed00fdcd585fc65cd2c5c31"; - sha256 = "07bhw6ll2ad5725rq6jlvp2v8aqhlrbsywjng5ypmcvds5dhgbsk"; + rev = "a50d473c3bfb33537d12025115a14c821fa5325a"; + sha256 = "0n3jdclyxgi579mab8ayynrrcbwpk4rhq3l5dzfpsy1lk690g7hn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; @@ -60463,12 +61262,12 @@ remark-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "remark-mode"; - version = "20171128.146"; + version = "20171217.2356"; src = fetchFromGitHub { owner = "torgeir"; repo = "remark-mode.el"; - rev = "01a0952e1ebed01cef3904e0eac00c6b34cea1ef"; - sha256 = "1maw5g7rflhyv0k1c1l7r72sqcjnqabajdvipsx89lzhizs29axf"; + rev = "e8a95f25d865d6165a7fdb1cadf5e6f0bb5ee73b"; + sha256 = "01qdaby7mn5d8y95wcbqzwzcbjmf2329g6yjbvmdd1gn6s7qzs0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/161a45835a153c6ac81b99311482f5dd36507da1/recipes/remark-mode"; @@ -60799,12 +61598,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20170727.825"; + version = "20171203.1248"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; - sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; + rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38"; + sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -60824,8 +61623,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; - sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; + rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38"; + sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -60841,12 +61640,12 @@ restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: melpaBuild { pname = "restclient-test"; - version = "20160618.315"; + version = "20180106.1246"; src = fetchFromGitHub { owner = "simenheg"; repo = "restclient-test.el"; - rev = "a21e41b905b423e762eeb4da3a236c8b1aea8c49"; - sha256 = "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih"; + rev = "4518561bc9661fedacb6fb352e9677207f45c418"; + sha256 = "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test"; @@ -61408,12 +62207,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171129.36"; + version = "20180107.2358"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; + sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61807,12 +62606,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20171106.510"; + version = "20171208.1015"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "04e3078ffc5f4b95e0a62960e36866d4bf1a9537"; - sha256 = "1gj3wyb0bdz7a80bysji241pw47gy20k5f1jif3m2j186ki6f2s5"; + rev = "27911c88b0d32b66429d61bb056ecf1b10e66598"; + sha256 = "1p8z1s3j0cbwxkbcb1p3h4m1vmrxrpkch0xax24jmkpzjrqhl7j9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -61853,8 +62652,8 @@ src = fetchFromGitHub { owner = "senny"; repo = "rvm.el"; - rev = "8e45a9bad8e317ff195f384dab14d3402497dc79"; - sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm"; + rev = "134497bc460990c71ab8fa75431156e62c17da2d"; + sha256 = "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm"; @@ -61870,12 +62669,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20170217.1021"; + version = "20180102.547"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "f6073b56c43a8bc4fc01eb27faba3335d556606a"; - sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks"; + rev = "fee33898b5726b3c15b6ceb2ebb051bebd4f3592"; + sha256 = "1rpn309s7a7rgs2n9l4m409x2r5p83xkgaq1aa2dab4p594hy29g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -61993,6 +62792,27 @@ license = lib.licenses.free; }; }) {}; + sailfish-scratchbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sailfish-scratchbox"; + version = "20171202.532"; + src = fetchFromGitHub { + owner = "vityafx"; + repo = "sailfish-scratchbox.el"; + rev = "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089"; + sha256 = "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e76261e7dffcb607839440843b085709c2c90b26/recipes/sailfish-scratchbox"; + sha256 = "1s0glsi4fm6is7fv9vy1h14frq8a4bgahkc8w08vqfnpiin2r567"; + name = "sailfish-scratchbox"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sailfish-scratchbox"; + license = lib.licenses.free; + }; + }) {}; salesforce-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "salesforce-utils"; @@ -62231,8 +63051,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "3ad7670e026086a042d1962db5a599cfe2069078"; - sha256 = "0q6bhgm84ybg2ns3mqi6b2q7bs8jsca1ky0xwjdwqw6bbh7gnyfx"; + rev = "3473eb1a568669779e3e896ededd0d0708766fe4"; + sha256 = "0d6ky2kglqraq61k9ikk1nbrpmra8h16vhhafkail41wq36vx6x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62433,6 +63253,27 @@ license = lib.licenses.free; }; }) {}; + scp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "scp"; + version = "20171203.1851"; + src = fetchFromGitHub { + owner = "tszg"; + repo = "emacs-scp"; + rev = "447305db246d9c9240678dd9c734ed920300463a"; + sha256 = "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/62f5c9284de51373a4015cf053d66977cf00d175/recipes/scp"; + sha256 = "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw"; + name = "scp"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/scp"; + license = lib.licenses.free; + }; + }) {}; scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "scpaste"; @@ -62769,21 +63610,21 @@ license = lib.licenses.free; }; }) {}; - secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: + secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "secretaria"; - version = "20170828.945"; + version = "20180104.720"; src = fetchgit { url = "https://bitbucket.org/shackra/secretaria.el"; - rev = "1cd32d957864be1ba5c44a3f505f662832169a28"; - sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg"; + rev = "e9d59d264ba30f8055a1ee1576fe9296d5b41055"; + sha256 = "10ijr9babki05j3wlhwsym85q868kirivsml7jlmi1csnn2y3c6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv"; name = "secretaria"; }; - packageRequires = [ alert emacs f org s ]; + packageRequires = [ alert emacs f s ]; meta = { homepage = "https://melpa.org/#/secretaria"; license = lib.licenses.free; @@ -62981,12 +63822,12 @@ sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-navigation"; - version = "20160830.1840"; + version = "20171215.1007"; src = fetchFromGitHub { owner = "noctuid"; repo = "emacs-sentence-navigation"; - rev = "f9aedbfc2b8d7957f427dac87558948c80582429"; - sha256 = "13413jpk84hs5hy05rlgkcr7h8diw46xhb9zdj1p9lh145s7si8w"; + rev = "b2fc2de3aaf1e2e7fd12d6d75a5b6c4b23614022"; + sha256 = "0s7xqs3r9ygc6vcba8ghsd7rbrgy7dkis3y1d36ik4w5dqh9qlvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation"; @@ -63002,12 +63843,12 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20170320.1311"; + version = "20171213.1209"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "8afaf6aa2c63a003e2899e3e5ba8be85f6fdd350"; - sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh"; + rev = "1b487722ba817347030b50df01491dbbff4b2891"; + sha256 = "0q8nnm5b6dp9qlnjg3hw7l863xiiajdfd4nk2i5p1gfx549mcdv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme"; @@ -63191,12 +64032,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20171018.1120"; + version = "20171209.1401"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3"; - sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0"; + rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; + sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -63233,12 +64074,12 @@ shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shader-mode"; - version = "20171108.916"; + version = "20180105.1500"; src = fetchFromGitHub { owner = "midnightSuyama"; repo = "shader-mode"; - rev = "29118fc483bd6ad3fa42cb80867fae9dbd613fff"; - sha256 = "1hybqwaicdy99wp8chaxjxyhqd8fwqvq1fh7w49wdy83lwr5g3a0"; + rev = "c141841feeee48299cff6651ed2e201a052e0570"; + sha256 = "177kn9zrnzsayx9n9ym9k9a1rrbn8sycv1v67knpca05wkxg53zi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode"; @@ -63569,12 +64410,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20171018.131"; + version = "20171224.1958"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "2666d95df942f23e7837f27206b8352701fa22dd"; - sha256 = "1y11wi0qclsab1mq65rcaml71n8qyiqp1w3baxzmby17jjn4646p"; + rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1"; + sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -63800,12 +64641,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20171108.910"; + version = "20171230.1219"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa2fda2419b6e2540f1e6eb3789b6a247c319050"; - sha256 = "1imnpbc1wkx8gwac1v3ailycjxs4yxwhbhifgn20jib85nn8s66i"; + rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8"; + sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -63989,12 +64830,12 @@ simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-call-tree"; - version = "20161007.1913"; + version = "20171223.1037"; src = fetchFromGitHub { owner = "vapniks"; repo = "simple-call-tree"; - rev = "431206e9c2b88cbab9cfe9ebf3f6cb73f5e6740f"; - sha256 = "1qwswf5i060j396gfsr60zid0lqwf5xkrq3q0c1s6nz9wxlhayjw"; + rev = "51cbb9baac4a71c9e2759b3dbbd48829b7b0ea79"; + sha256 = "16blbycmqgkkvx1pqyld7jbb37wpwjh1y8kcd23ckdd9pr8qccfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree"; @@ -64052,12 +64893,12 @@ simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-paren"; - version = "20171121.1039"; + version = "20180104.1016"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "c7baee2bfdb67e35c8c000eafed88fe7389224c0"; - sha256 = "1na2dmr6gn9bfvmg0jdrff3l6g6zqns0pmb2fl05wzhlkab9xprn"; + rev = "6a8c33443a1e8d502d272584a4a09b23a2342679"; + sha256 = "01lr9rndk5l2ssdqvrxikwhl9sswcp3hn233bjsq9kv6i5f9r8ca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; @@ -64157,12 +64998,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20170618.644"; + version = "20171201.1806"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "78ab3d818633c0d6575cd1895c119bd690003bf6"; - sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g"; + rev = "0fd6dbd0566af29964078e4b74baf69c2f52381a"; + sha256 = "0qlwmxrz2kngri7ywy64bja0najq9m6asq2gr53ns0mkq1ngf0l8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -64325,12 +65166,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20171128.1956"; + version = "20180103.1928"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "9b8149fc3dce10af10d4ed2833fdb5eaafc970ca"; - sha256 = "028a3nnyins0pp33m5zjyz4v28v1vd49vaj8pppi6dks9kvajspg"; + rev = "58b1309255563819ee8f83f625af49ac0353bed1"; + sha256 = "1bj43ircd9djk4i58qwxvmcbhzybxb954k52l80pk441ffk8v4vx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64388,12 +65229,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20171106.1331"; + version = "20171230.1630"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "55fc578ed829b95a63c31cec242bd86a6e0be39e"; - sha256 = "1bgmk0kr0y15lm2cmkmzw529r2k98j4c3n8v1k4rsxw1rj8961n3"; + rev = "179741a0616f78f4e5901fe04dea79654c504fba"; + sha256 = "0vljhr6gkmw5jkdzhq6vsl9sa48hv1a02d9g4sfwqraz85k4x85k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64409,12 +65250,12 @@ slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-company"; - version = "20161229.743"; + version = "20180108.426"; src = fetchFromGitHub { owner = "anwyn"; repo = "slime-company"; - rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb"; - sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g"; + rev = "fb54d166ca3e61e8f82020b7c5cfeafd3f4ad425"; + sha256 = "1sqsnvgr83h6v51fmin5ng2sbdpkj4cl4p2vy2xh7fa6zh00137m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company"; @@ -64556,12 +65397,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20171111.1604"; + version = "20171220.1443"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "83c88318bca48b1269924cd5c76b9777ecf84f11"; - sha256 = "0s6y54mi4p336cmky9kvfhwrwfkhvl8awy73knf27zfhclhjfh7c"; + rev = "436094626698e77efa38cbf45681db7ea6b7e9f7"; + sha256 = "08zii0vaa8w72adi2fy7v5rwvqp8kbv2wv0cws1q6wz9z95jjnmx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -64846,6 +65687,27 @@ license = lib.licenses.free; }; }) {}; + smart-jump = callPackage ({ dumb-jump, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-jump"; + version = "20180107.1054"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "smart-jump"; + rev = "7042923b6edff126d59808fa718bf38c5f53464e"; + sha256 = "1g7vbqzh03cxqk9wjrq6j9dy4ij2m4x0p7iq08nrvlqsl6xr9g9r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump"; + sha256 = "14c7p6xqasd0fgn70zj1jlpwjxldzqx44bcdqdk6nmjihw0rk632"; + name = "smart-jump"; + }; + packageRequires = [ dumb-jump emacs ]; + meta = { + homepage = "https://melpa.org/#/smart-jump"; + license = lib.licenses.free; + }; + }) {}; smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-mark"; @@ -65059,12 +65921,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171129.412"; + version = "20171201.242"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "0f6cc64852282e553342fad30a4134552a97c458"; - sha256 = "1qaz2zcflfpiip95jnmk1r20q616faav1rlld0bbc7jg4lsnvzzp"; + rev = "65fbcfc849afb89e2642f9b87f66e6a96382f88c"; + sha256 = "0k4ar82axgxs84l2qdmrhhgf82309j2cxrv2gaxc3g7cxnj16ska"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -65143,12 +66005,12 @@ smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smbc"; - version = "20160706.1522"; + version = "20171229.1008"; src = fetchFromGitHub { owner = "sakshamsharma"; repo = "emacs-smbc"; - rev = "c377b806118d82140197d9cb1095548477e00497"; - sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h"; + rev = "10538e3d575ba6ef3c94d555af2744b42dfd36c7"; + sha256 = "0b2fndvp9kzlr65b0gr0z5hmapa4y96a6zvc2nrlijffkgyk05nn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc"; @@ -65605,12 +66467,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "20171109.1215"; + version = "20171209.1350"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "ce91b8709124738abb4a1612d4801e16f1d0faec"; - sha256 = "1aval7m02m05w9is496za6kasp071jkwj29n1jsyixjzsfpbkrzi"; + rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2"; + sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -65626,12 +66488,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20171114.1506"; + version = "20180101.42"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "642b2afa38cb59b9e940e5082614e36c6e6a94a3"; - sha256 = "04qcch0y4jrvi7vfnjbyfvbj8ajjrhhcqhxkk4i035vcfchnpx14"; + rev = "2dd2699b2f315374333292b132dc0dc03719aba2"; + sha256 = "04365kpw8a3f3963v6c3q8zka5xivx9jikvcar7fx59l4l7k5i2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -65647,12 +66509,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20171113.1058"; + version = "20171231.741"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "b8ddfd683c3335805f0a4788244bf0d224ffc6ae"; - sha256 = "0s5hb4l3x9q3vch0i314138p53aq9kb0pyn9whk7r9zwrzvi34jd"; + rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; + sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -65668,12 +66530,12 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20171117.426"; + version = "20171205.405"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "dbc618db5f98ed86cd421c5646573358bdef8283"; - sha256 = "1s0r5zpv5d6sbg8fjmax641dwmlygvfpfx4j69v49pgxcwpyzpq2"; + rev = "3cf101b3b299735ed91658c7791ea4f04164e076"; + sha256 = "1x2w7qcx9xcvagb47hlc5vsf5aj5mr0mzvnazyd7ajjilbzn48yr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; @@ -65735,8 +66597,8 @@ src = fetchFromGitHub { owner = "omouse"; repo = "emacs-sos"; - rev = "01b5e25814b2e76db3814a967e25edf85d33bcac"; - sha256 = "1w1fdf5ppz22aq40w5wmi2619sgkvw97rr8zqigw1acva0pxysaa"; + rev = "1573adca912b88b5010d99a25c83a5b2313bd39c"; + sha256 = "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos"; @@ -65864,12 +66726,12 @@ sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcekit"; - version = "20170126.353"; + version = "20180101.34"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; - sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; + rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; + sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; @@ -66011,12 +66873,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20171118.626"; + version = "20180107.1039"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "7807f341e1ef3d0700d0f7e05bb14054139c4298"; - sha256 = "1ylvd49ap41rd2csi9y8l8kwi7dkjy3khjzswrnqm1zb8q15vj16"; + rev = "3c43532474164ff5829a7558b49173b5b565a048"; + sha256 = "1kxqqvnkkjf2rfgc62mlqhb6ffx34hbhdcv9m7idiyf54nqxm13k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -66154,22 +67016,22 @@ license = lib.licenses.free; }; }) {}; - speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speed-type"; - version = "20161230.815"; + version = "20171230.847"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "9940383d94688e7f130b01f9872182ab59edf00f"; - sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm"; + rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135"; + sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06"; name = "speed-type"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/speed-type"; license = lib.licenses.free; @@ -66259,24 +67121,24 @@ license = lib.licenses.free; }; }) {}; - spike-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: melpaBuild { - pname = "spike-theme"; - version = "20160530.733"; + pname = "spiral"; + version = "20180105.1253"; src = fetchFromGitHub { - owner = "m31271n"; - repo = "spike-theme"; - rev = "7a7766be0b6197103840644bb074f864d0d91cd8"; - sha256 = "0ah19a68d6fda3g5zzvqz28cms0yiadykkx7p8hiid4s4mdl41hj"; + owner = "unrepl"; + repo = "spiral"; + rev = "b25c42dd5add3192e846a5fe34be689e73f0c28c"; + sha256 = "16ls5iy98p9y8f5q9l3wz1g187zbpli2zgcjvnsbsv480bdpzgf6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd64f15c3fb7eee1bfdd0d7db5affa5c10052a6f/recipes/spike-theme"; - sha256 = "06pv0zzw0w12xlafyhakf09cl0hkyzis0g2bh2jn3pv4ac2kmwkp"; - name = "spike-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; + sha256 = "18rww2nfy5s22czabk71wqzrb53r0p2635872vr44b6kfwlb6qcw"; + name = "spiral"; }; - packageRequires = []; + packageRequires = [ a avy clojure-mode emacs highlight treepy ]; meta = { - homepage = "https://melpa.org/#/spike-theme"; + homepage = "https://melpa.org/#/spiral"; license = lib.licenses.free; }; }) {}; @@ -66619,12 +67481,12 @@ ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssass-mode"; - version = "20170817.1216"; + version = "20171201.509"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ssass-mode"; - rev = "d17d2de381ffc96e62e77435fb7b387bf59aceec"; - sha256 = "1vw2mzn8yczgyspgmv4f621d7h10qxa8hfzalb14bvwqn4h37spy"; + rev = "a95c4c9f99895cc582849b35e90ae13f1587ddce"; + sha256 = "1ldw72ggk22ih5j9fyb3bl0ngyfdkzfcyg97mp0mb40w8ly68qav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; @@ -66703,12 +67565,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20171122.352"; + version = "20171211.311"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "0d8b5deadab439d43cb9730c9d0f1a99e5e3d523"; - sha256 = "0brmxx1j4nkp242h2gsz115zvvpclpqck6f8l0aqkkv9lmicvk4k"; + rev = "ee808acef916c7cf828923e6517a6867044caaf5"; + sha256 = "0dv2d6rhp23ckpzzdda3w3p5l7pps8vxs7b98r6320w2a2villq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -67081,12 +67943,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20171117.1731"; + version = "20180102.643"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "e644c8bf2a5e36ddadcfe4de657588c00fd368dd"; - sha256 = "1p5i5jkybzjb008hlq90mjrbcap67dszzmp9flarkq6p0sf1lw12"; + rev = "d3bbc560bad160ba183778ca4628a2cce34fdd65"; + sha256 = "1yjy11s027r7v8bzwsqfpfzh2r2ywnywx7ngajw9gy9yfchw1xxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -67394,12 +68256,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171016.1420"; + version = "20171229.1712"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "345e00569333095eb24e61239a80b0f0c77b2d11"; - sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb"; + rev = "5caf98ab49c6b3c421d8f274c0682bbb7fc662fe"; + sha256 = "1niifkdirlwcyx5rk398dgk9lqnqr06ilhh0r89hx1xxdnbjglbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -67709,12 +68571,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20170918.51"; + version = "20171228.2315"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; - sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; + rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f"; + sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -67751,12 +68613,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20171129.820"; + version = "20180102.1035"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "23935401b062fde5557de826814ddc55e75fe1b8"; - sha256 = "055l5rmnkczlz4nhjppa3c7m02mmv8zw7zaf60820911zx1sl32b"; + rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; + sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67877,12 +68739,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20170521.1832"; + version = "20171225.1159"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "8f1e3346286cfa5a5299ef192cc5aca3f37a7745"; - sha256 = "1ans6l0rv71w2vq0v4137jr0jhgzhkk62l7cq6b5m83v4ld9gr09"; + rev = "9488c03726464e4bd0ed0b448d203c5c7f8c212f"; + sha256 = "14b0cqq2qbr2nxl9pqpbb9m948bdlsjwgzmkif2hdfvrwrr2sbzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -68066,12 +68928,12 @@ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20171004.1037"; + version = "20180105.831"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf"; - sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9"; + rev = "01fa7cf280d27dbb2af2261cc0e8ff2aa14742b1"; + sha256 = "19snnxiyjkgzsrdynxdyzmqc168jdzcvk9jr5g2w9ca2f0x7m9s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -68128,12 +68990,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20171120.1205"; + version = "20180103.1837"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "1ec26d1d32a95de6f201571d85f4f12b9975c580"; - sha256 = "040hqfs22pdfp3s9i499148alw78q15x74kqyzj1jl30g6a846za"; + rev = "f5576f36885f97c9c753e5f1b80318efc626210f"; + sha256 = "1ylmqlv2n0f3qqxf60gq93fr7z9zjghivy5swml3s8r3pc8a3iyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -68170,12 +69032,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20171006.1352"; + version = "20180101.1803"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5"; - sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa"; + rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90"; + sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -68463,12 +69325,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20171126.2321"; + version = "20171221.1001"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "e4e55cf2646c0479262db013b15b6831dd2069fa"; - sha256 = "1dsix9hn5x4wc562jcmxw7802shch1qj9xjfi7ys1rbwa2awm8rx"; + rev = "a97df8c51d77696787aaf55c67207f19c803fabe"; + sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -69072,12 +69934,12 @@ test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-kitchen"; - version = "20171129.1021"; + version = "20171129.1235"; src = fetchFromGitHub { owner = "jjasghar"; repo = "test-kitchen-el"; - rev = "f8d832aae4a244fb578963a728f66ef02f8e0a5b"; - sha256 = "0a9pvr4jnz4lfap7ibs786isgnfsa5fczil3pz4mccv1zgfxlibq"; + rev = "0fc0ca4808425f03fbeb8125246043723e2a179a"; + sha256 = "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen"; @@ -69132,6 +69994,27 @@ license = lib.licenses.free; }; }) {}; + texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "texfrag"; + version = "20171229.1913"; + src = fetchFromGitHub { + owner = "TobiasZawada"; + repo = "texfrag"; + rev = "ba1382c073b1f73cb411fb30e618480b9a804916"; + sha256 = "19cinynqicsfdvpa8jmrrx9xmbplw2wnykm3bcii8rs5vkwdh61b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; + sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x"; + name = "texfrag"; + }; + packageRequires = [ auctex emacs ]; + meta = { + homepage = "https://melpa.org/#/texfrag"; + license = lib.licenses.free; + }; + }) {}; textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textile-mode"; @@ -69240,12 +70123,12 @@ theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; - version = "20161130.1440"; + version = "20171221.1127"; src = fetchFromGitHub { owner = "hadronzoo"; repo = "theme-changer"; - rev = "60e3dd7cbd237225fef34179168006501a27b06b"; - sha256 = "06y36i3h5m85d6b47cr0hghhbkd8kv23lm6ipc9swkmq0hl3pxfg"; + rev = "61945695a30d678e6a5d47cbe7c8aff59a8c30ea"; + sha256 = "14xc36jfgj8896pklrkpg394fgikir051rh9vm70v132n6i9j0cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer"; @@ -69391,8 +70274,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "20e16bc6a41c6faead040aed7f3c00b9d2e7f842"; - sha256 = "1dlfd9vz4vvj3pvfwjqvpc27rf26pfbsalrpymi61vgjd2v4ri3j"; + rev = "1b855d47aab32dc89e6e4271e8ac8872b049e1ba"; + sha256 = "1qrisw42nzbd1m09aihpigc63xm0yhhli5103aibww0pa904fr2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69429,12 +70312,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "20171127.1739"; + version = "20171218.1803"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "35b5edb1863c5b77841e2c98aca4a6760690f06e"; - sha256 = "1zy1rs1j8axa72j3562m1718gmrvrqmssvz136l5za2l2h0ls5rx"; + rev = "f0579f38ff14954df5002ce30ae6d4a2c978d461"; + sha256 = "0b3rbsd978ch0hiv45sqg9g4zsxhjn557j5f72vjql8cx1h5d8s4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -69447,15 +70330,36 @@ license = lib.licenses.free; }; }) {}; + tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: + melpaBuild { + pname = "tidal"; + version = "20171207.1452"; + src = fetchFromGitHub { + owner = "tidalcycles"; + repo = "Tidal"; + rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; + sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; + sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a"; + name = "tidal"; + }; + packageRequires = [ emacs haskell-mode ]; + meta = { + homepage = "https://melpa.org/#/tidal"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20171111.1922"; + version = "20171214.543"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263"; - sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x"; + rev = "008f8f9cf44c81e230d58ed3d932e0ee43c2e09f"; + sha256 = "0s42f66lp3mn44jq04r4ccxac0l150w9nvy3bbvx8xxza2zn7lrw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -70023,6 +70927,27 @@ license = lib.licenses.free; }; }) {}; + total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "total-lines"; + version = "20171227.439"; + src = fetchFromGitHub { + owner = "hinrik"; + repo = "total-lines"; + rev = "c762f08d039c8103f71c747e00304f209c2254f4"; + sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines"; + sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh"; + name = "total-lines"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/total-lines"; + license = lib.licenses.free; + }; + }) {}; totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "totd"; @@ -70109,12 +71034,12 @@ traad = callPackage ({ dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20171128.413"; + version = "20180104.2351"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "8df6255ab00a94f128f057e084aa06b55b381ecf"; - sha256 = "09lqaz8jiza9s0ir8pj05dk60v2lxgza9v3fmqv34h4f4lwh98zy"; + rev = "ad160e32f4cc9849aa570ed8e29269a0845921ae"; + sha256 = "0rj8fg66rzrw1hv707p0dmf025c1dymp373z87ryy5sxs24vn3j5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -70137,12 +71062,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "20151129.319"; + version = "20171210.1302"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; - sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; + rev = "9835ecb758c09400082eb8f1c0336eedbfed0134"; + sha256 = "0vhzqcqmhl3rzxrhfyy6r2yp5d07wd8y820cf0hfby6j5i4j247p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -70242,12 +71167,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20171029.1210"; + version = "20180101.1803"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480"; - sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n"; + rev = "b52760e0160f99312a1773953e7725800c13bb40"; + sha256 = "195z30yaj0qibkaci7imfhp4sr7zxhmlg4fq4bjzvawlmxi1i56p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -70347,12 +71272,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171129.938"; + version = "20180107.1246"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e75bbb8de8849b9b969bf184f8bb16b43e48700a"; - sha256 = "01d9dblsc30zwcrr2n6jsqk769iqva5vsl331s6wi5yvi3lzdgpw"; + rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; + sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -70368,12 +71293,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20170925.2232"; + version = "20171225.951"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e75bbb8de8849b9b969bf184f8bb16b43e48700a"; - sha256 = "01d9dblsc30zwcrr2n6jsqk769iqva5vsl331s6wi5yvi3lzdgpw"; + rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; + sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -70389,12 +71314,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "20171114.1009"; + version = "20171204.845"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e75bbb8de8849b9b969bf184f8bb16b43e48700a"; - sha256 = "01d9dblsc30zwcrr2n6jsqk769iqva5vsl331s6wi5yvi3lzdgpw"; + rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; + sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -70597,12 +71522,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171126.1319"; + version = "20171204.1417"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "4a88a0c6ae1af5a5457c78f9d58c9dd8958ad380"; - sha256 = "02abqy5ayfnzhm6a350bbklfn71wh8ipbx9cvlib58xj174swh7m"; + rev = "a6d1589e256d861bfb51c59756b0aa25e88dfb89"; + sha256 = "0i9x6cvx61djavn35v8j4ildli0s9ixalxbwc4yb7sdax7379xhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70828,12 +71753,12 @@ twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twittering-mode"; - version = "20170312.735"; + version = "20180107.412"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "63c96fb029033b1a300b90aa922e167c7c405bcb"; - sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk"; + rev = "c27d9b5b1dd20a1600e89909ac9c0ccd08af9bf9"; + sha256 = "00vir1vfkprxm23if6cfjvliiwbza18n7gmh74bdnp1zkg2xy0hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; @@ -70870,12 +71795,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20171109.727"; + version = "20171229.810"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "5b0487aae890e7e9f7105a679deecc50428e912d"; - sha256 = "08qx9g40aws9s9cpmayc6r3bjrvx8sy32vfy0rz3jkpjyqc6485x"; + rev = "330c887241cf585aa4e2e3f3e9d851f28b92b08e"; + sha256 = "05bsr5drz8d5p0fx4ai2cfgmgzyi3245gpbr61iyv37an3zkcrav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -70933,12 +71858,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20170519.51"; + version = "20171231.2214"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5"; - sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj"; + rev = "41309d8a64a992f532753093742c15d413c446b5"; + sha256 = "1fqaf4n236l4qzy4ac370laysb9jnj98769nri6qkirsfzk6hcgd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -70954,12 +71879,12 @@ typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typo"; - version = "20171005.1045"; + version = "20171209.223"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "typoel"; - rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee"; - sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij"; + rev = "9dad93b6f367f02f52c8d9bf15d446d922cec294"; + sha256 = "1xaikwl265v67b7hilrhjgwzr6bcha9idnp82f27msqzdfdzxf0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; @@ -71528,6 +72453,27 @@ license = lib.licenses.free; }; }) {}; + universal-emotions-emoticons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "universal-emotions-emoticons"; + version = "20171209.1820"; + src = fetchFromGitHub { + owner = "grettke"; + repo = "universal-emotions-emoticons"; + rev = "c89063a4f8e00f8e9c4dc6c252474b6d4bfc4e01"; + sha256 = "0wgff3bbjgskbm1c4cww6akia93hd5sqr9md5szkqm6iiqi3q95z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons"; + sha256 = "1aj3k3yrvasn3zmfwz5si046hlyhnjdmxh7i8li6rc0v0qwl7p86"; + name = "universal-emotions-emoticons"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/universal-emotions-emoticons"; + license = lib.licenses.free; + }; + }) {}; unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unkillable-scratch"; @@ -71636,16 +72582,16 @@ use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20171129.840"; + version = "20171226.1104"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "cf0009b3016cb6c150816815160325e6137a3a68"; - sha256 = "1mylqw42cy773cwx00j8984f4ga17d4nfa5vfajj54c3aji0grsx"; + rev = "5a50f6703140992723a434b9a733644bfab15306"; + sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; - sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; + sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp"; name = "use-package"; }; packageRequires = [ bind-key emacs ]; @@ -71657,16 +72603,16 @@ use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20170717.1152"; + version = "20171207.2240"; src = fetchFromGitHub { - owner = "waymondo"; - repo = "use-package-chords"; - rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026"; - sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds"; + owner = "jwiegley"; + repo = "use-package"; + rev = "5a50f6703140992723a434b9a733644bfab15306"; + sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords"; - sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; + sha256 = "1217l0gpxcp8532p0d3g1xd2015qpx2g5xm0kwsbxdmffqqdaar3"; name = "use-package-chords"; }; packageRequires = [ bind-chord bind-key key-chord use-package ]; @@ -71678,16 +72624,16 @@ use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }: melpaBuild { pname = "use-package-ensure-system-package"; - version = "20171105.2300"; + version = "20171205.1029"; src = fetchFromGitHub { - owner = "waymondo"; - repo = "use-package-ensure-system-package"; - rev = "a58682fbe3eb632a285ef23d3121e82abc225dcb"; - sha256 = "0snjimd2lcyi01cm9044kj4cxcqb3d17yv8pvf9wc4pc00v9x87p"; + owner = "jwiegley"; + repo = "use-package"; + rev = "5a50f6703140992723a434b9a733644bfab15306"; + sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7cc204aec6f3f399a704f97b4e05c6a7cd3940/recipes/use-package-ensure-system-package"; - sha256 = "1mmrnlhjb26lk0iirsxfks74j0bbs3bj375x23w9fk7fp4bjlhby"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; + sha256 = "1cl61nwgsz5dh3v9rdiww8mq2k1sbx27gr6izb4ij4pnzjp7aaj6"; name = "use-package-ensure-system-package"; }; packageRequires = [ system-packages use-package ]; @@ -72350,12 +73296,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20170730.2206"; + version = "20171231.2212"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42"; - sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn"; + rev = "1469c953bc20d21d87ce5d92def767e551cda07c"; + sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -72665,12 +73611,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170928.1057"; + version = "20180104.1421"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8"; - sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y"; + rev = "3fa65f8ac8a4c54f13c32fd43c9865c92c22ce07"; + sha256 = "00mj1qmcsfndnk7vif7aa9nqy7hd3cnbmn6fhik1mmsqrazcbp0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -72686,12 +73632,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20171029.1905"; + version = "20180104.1611"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3"; - sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk"; + rev = "b489a63dabe0f2fee2730121ecabb1b4f4c11761"; + sha256 = "09fkyyj0lg3q9q0874q0jpvx1h8rf26g96sn9a2xw0j3fl5ab1n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -72728,12 +73674,12 @@ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20171119.1701"; + version = "20171221.2317"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "2666d95df942f23e7837f27206b8352701fa22dd"; - sha256 = "1y11wi0qclsab1mq65rcaml71n8qyiqp1w3baxzmby17jjn4646p"; + rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1"; + sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -72874,12 +73820,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20171019.550"; + version = "20171209.227"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77"; - sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd"; + rev = "2a058670d9f65e7c9e5b203b31d5946bcb2bf144"; + sha256 = "1kpw9al401x7mwzan273dz38699hirz5rdlpwihmrvccpa279r6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -73483,12 +74429,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20171114.700"; + version = "20171217.1916"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "1234342878f9c9c9bc23ebe754e85d7fa155a51f"; - sha256 = "1bj8g5xw140r3zfiyyr8x8559pvy1a1p7gjpg9w8c8h3n0xnp799"; + rev = "ef384e781e6107850c7fadc78cb0675d7fe72e69"; + sha256 = "1xiw2blc1z2fvpz30i350gk28nfwlallnqvqmxibb84rydadx705"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -73676,8 +74622,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842"; - sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c"; + rev = "1b09b1b2848ab21c412f2fe7a259b1dcea2c733c"; + sha256 = "1g53id1wc6xfa3066m9c4f0f0chsnsv8mqqs5v6zx7yf4nv9v9ja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -74091,12 +75037,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20171127.635"; + version = "20171217.1239"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "73d3d1ac1470001e184a5ead88f770eeb71a5461"; - sha256 = "0a9lf5apbxsy270is6cxa2akc8nzaw1l18ppdrairlm77psm8m7h"; + rev = "05338d893f3879391d7283324364b472e3f4f4d1"; + sha256 = "0h5wlskfb0xpw1jjijcvyl2ivylky3y2czmfi8f0qv9vz6g495w3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -74700,12 +75646,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171101.1546"; + version = "20180107.1546"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "c007dee9faeae7b4ef1cfd21c97952768f520f8e"; - sha256 = "1vkfff3w09h3gbwz9wqlrab29558ms03x5cgzzdxs0mjaq40pvnz"; + rev = "c7ebabe6ccff0bce35cf7feb1cef34f4c69aee50"; + sha256 = "1r4ld1b8dd39bggjhzj6rd3wan3yhw5sm3zi623yad7w48c4xpna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -75376,8 +76322,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "f4deb73234ae515c69b7972d5b11f614d18f6948"; - sha256 = "07qv05jji5q5954p7y5pw1rf52f29642bsd6hnhjw9h40xbw5pvp"; + rev = "b851eb86a8a78378ad0f734e2c56f3f5f4d052ec"; + sha256 = "009j6b7k5dc4n2zyi86d0bnl2a77ril9phqkx29jz5lcr0ndarwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -75498,12 +76444,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20170607.819"; + version = "20171221.636"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "70e755fcf58e37092de2c335355eab93d5f1fb44"; - sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml"; + rev = "aa643aeaaf72fa19c4610ce47088a1fbc4e33ecb"; + sha256 = "0815ki5fx6jr15ljjw48spxjknqwhcm6qzk8pl7hxw162r3nxh6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -75519,12 +76465,12 @@ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; - version = "20170519.115"; + version = "20180105.1447"; src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "492eb038b35f49b1012fb843d880bccc40f2260b"; - sha256 = "1jj1j525xlwhylsysay52f4rdrwz3r72ghx4iggkxqiqbv919ia4"; + rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f"; + sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -75645,12 +76591,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170923.1646"; + version = "20180102.1824"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "4ab9cb5bac683112852f58b26557a7dc283b717b"; - sha256 = "1sjvzdzzkifw6751gplvm964b85c04jcl1sbq6pjm75alsjv6mrp"; + rev = "04062d8b4f7391069058345e1efd673add0357f8"; + sha256 = "11xn4h182p738apiphxvdzrnb4gc2nam039xzxfx9fsvfxph6ziw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -75666,12 +76612,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20171127.423"; + version = "20180107.147"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "72d3292f7a5df67502ae990278642f56164e1463"; - sha256 = "10r2z3fi28dj31w7qk9sjkx3wpvciqa2qa9harvgkrs1n2anxhj9"; + rev = "3ab16fb46517d3f084ce838bb5fce71d22601a16"; + sha256 = "1nw95nmnc4y1l3dm44yn1kb88179x5455g5sap20dm7a6zxbf94g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -75707,11 +76653,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20171030.502"; + version = "20180106.654"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + rev = "668632d9392e"; + sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -75839,6 +76785,27 @@ license = lib.licenses.free; }; }) {}; + yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yoficator"; + version = "20171206.1630"; + src = fetchFromGitLab { + owner = "link2xt"; + repo = "yoficator"; + rev = "5ad60258097147cdd8d71147722cc4203a59a0b0"; + sha256 = "0b2xzkw0rxbxfk6rxapy82zl61k51cis9nsnw67v7h2s2423jhcr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator"; + sha256 = "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r"; + name = "yoficator"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yoficator"; + license = lib.licenses.free; + }; + }) {}; yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoshi-theme"; @@ -75968,12 +76935,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20171109.926"; + version = "20171216.1027"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "613f4c69513c7ffe7cb00a6c477cd5e8e6378d40"; - sha256 = "03n3ixkzfva5r2a7qdkl0b9254q56f9fh202lrkcgg135ynhkrhc"; + rev = "62d91fd7c054b0747f1309c012976deb471d4608"; + sha256 = "1ddr47xy86kajwwf7dnzz9a9qh7bd9wkf7x30qwlygc41mg6w6zy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -76051,12 +77018,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20171128.610"; + version = "20180103.535"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "37b19b9adf633afd4adf88826e9618e5b1f09461"; - sha256 = "049ly4jg9lxdmgsckciwfdmf5xj746z3slk5y47vlv56wyjs6ksz"; + rev = "12ca2cc6348decc964c148c36a3cde0846f4fc1a"; + sha256 = "11vpqkgspp2abf2rgpzcpz4miaq1lgbhg5w0li1qai6ybslz212z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -76491,12 +77458,12 @@ zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zzz-to-char"; - version = "20170519.335"; + version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0"; - sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y"; + rev = "8ddda49de3356d8fa0308d79b5d68272baf2c57b"; + sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index d8b548b03e49..61257c5b5735 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -36,6 +36,9 @@ self: }); overrides = { + # Expects bash to be at /bin/bash + ac-rtags = markBroken super.ac-rtags; + # upstream issue: mismatched filename ack-menu = markBroken super.ack-menu; @@ -46,10 +49,16 @@ self: # upstream issue: missing file header bufshow = markBroken super.bufshow; + # part of a larger package + caml = dontConfigure super.caml; + # part of a larger package # upstream issue: missing package version cmake-mode = markBroken (dontConfigure super.cmake-mode); + # Expects bash to be at /bin/bash + company-rtags = markBroken super.company-rtags; + # upstream issue: missing file header connection = markBroken super.connection; @@ -86,6 +95,9 @@ self: # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; + # Expects bash to be at /bin/bash + flycheck-rtags = markBroken super.flycheck-rtags; + # upstream issue: missing file header fold-dwim = markBroken super.fold-dwim; @@ -95,6 +107,9 @@ self: # upstream issue: mismatched filename helm-lobsters = markBroken super.helm-lobsters; + # Expects bash to be at /bin/bash + helm-rtags = markBroken super.helm-rtags; + # upstream issue: missing file header helm-words = markBroken super.helm-words; @@ -104,6 +119,9 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; + # Expects bash to be at /bin/bash + ivy-rtags = markBroken super.ivy-rtags; + # upstream issue: missing file header jsfmt = markBroken super.jsfmt; @@ -119,6 +137,12 @@ self: # upstream issue: missing file header maxframe = markBroken super.maxframe; + # version of magit-popup needs to match magit + # https://github.com/magit/magit/issues/3286 + magit = super.magit.override { + inherit (self.melpaPackages) magit-popup; + }; + # missing OCaml merlin = markBroken super.merlin; @@ -135,6 +159,9 @@ self: # missing OCaml ocp-indent = markBroken super.ocp-indent; + # upstream issue: missing dependency + org-readme = markBroken super.org-readme; + # upstream issue: missing file header perl-completion = markBroken super.perl-completion; @@ -169,6 +196,9 @@ self: # upstream issue: missing file header stgit = markBroken super.stgit; + # upstream issue: missing file header + tawny-mode = markBroken super.tawny-mode; + # upstream issue: missing file header textmate = markBroken super.textmate; @@ -178,6 +208,9 @@ self: # upstream issue: missing file header voca-builder = markBroken super.voca-builder; + # upstream issue: missing dependency + weechat-alert = markBroken super.weechat-alert; + # upstream issue: missing file header window-numbering = markBroken super.window-numbering; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 3abf4e8955fc..dd3a30271f39 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -233,12 +233,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "1.9.2"; + version = "2.0.2"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; - sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; + rev = "d14b0898f88c9f2911ebf68c1cbaae09e28b534a"; + sha256 = "02f8avxvcpr3ns4f0dw72jfx9c89aib5c2j54qcfz66fhka9jnvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -548,12 +548,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.9"; + version = "2.0.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "16e6647115d848085a99e77a21a3db51bec4a288"; - sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a"; + rev = "519b5cd886f484693fd69b226e307d56137b321b"; + sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -569,12 +569,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.9"; + version = "2.0.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "16e6647115d848085a99e77a21a3db51bec4a288"; - sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a"; + rev = "519b5cd886f484693fd69b226e307d56137b321b"; + sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -758,12 +758,12 @@ ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-zap"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-zap"; - rev = "0acdd83a5abd59606495e67a4ee01f7856e5d359"; - sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca"; + rev = "1a9bf779d8f9225ede9ec482b840942bb58111df"; + sha256 = "0r875w4aq3p091hcrpkpqsivn1q9hmq2ppa1rvxzdaq0rhl9kfz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap"; @@ -902,15 +902,36 @@ license = lib.licenses.free; }; }) {}; + adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "adafruit-wisdom"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "adafruit-wisdom.el"; + rev = "67e1fb17964c09514e7635dba85fb14b0926e49c"; + sha256 = "097r31l4fpj4yd2ajv6zwgwn35fwn3c83qg9yzm2rjz1rdcwxlrw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; + sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad"; + name = "adafruit-wisdom"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/adafruit-wisdom"; + license = lib.licenses.free; + }; + }) {}; add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; - sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; + rev = "a1043b7cdb1ea98055a2c99f8d37584a553ca362"; + sha256 = "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1648,12 +1669,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "0.6.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "86b198afd03f2baffb1efe24c7a89e71100356ea"; - sha256 = "1320zdv6q1cnnvl8s25ymjvd3kz2an98bicansq5bhf413n7fhgb"; + rev = "942affd6b7538d1e829ee257bbd829cb4e860cce"; + sha256 = "0njynjg7p7i5li668ldpvmnpc5w7bikcs4cmkf26vf5n714fvlc1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -2575,6 +2596,27 @@ license = lib.licenses.free; }; }) {}; + bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bazel-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "bazel-mode"; + rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25"; + sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; + sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586"; + name = "bazel-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bazel-mode"; + license = lib.licenses.free; + }; + }) {}; bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbcode-mode"; @@ -4214,12 +4256,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1"; - sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h"; + rev = "74f7901b416efbd032bb4f8b5c25f57fdf731115"; + sha256 = "0n2b6q8r2gzr3ghyvg5sawir47rk7jmsslvxx6by27bn77h4nzil"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -4277,7 +4319,7 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; @@ -4625,12 +4667,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "49862bfdd1540d443d278fadef16a83388b360cb"; - sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp"; + rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d"; + sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -4709,12 +4751,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "7746fdb2fe0177341aadeafec2ae73aa08ddfaf6"; - sha256 = "0byicha5rfcgx644hh9hvcy7z9q3kbkd0f4b33bcw8jd20pvgmk6"; + rev = "166bf4c490b8f46eca057fc23c3f3c2e042e9cb3"; + sha256 = "1qgny1px7afgxi7hj12fg0zk55sy9mbk0w5sigamyzxp336nfxmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5231,27 +5273,6 @@ license = lib.licenses.free; }; }) {}; - company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "company-eshell-autosuggest"; - version = "1.0.1"; - src = fetchFromGitHub { - owner = "dieggsy"; - repo = "company-eshell-autosuggest"; - rev = "a1de14ae79c720fa681fafa000b2650c42cf5050"; - sha256 = "1l4fc6crkm1yhbcidrdi19dirnyhjdfdyyz67s6va1i0v3gx0w6w"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest"; - sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f"; - name = "company-eshell-autosuggest"; - }; - packageRequires = [ company emacs ]; - meta = { - homepage = "https://melpa.org/#/company-eshell-autosuggest"; - license = lib.licenses.free; - }; - }) {}; company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: melpaBuild { pname = "company-ghc"; @@ -5444,12 +5465,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.9"; + version = "2.0.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "16e6647115d848085a99e77a21a3db51bec4a288"; - sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a"; + rev = "519b5cd886f484693fd69b226e307d56137b321b"; + sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5849,12 +5870,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; - sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; + rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; + sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -5870,12 +5891,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; - sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; + rev = "aaa847b43af225ccb282aab2d9cddafe500d9f62"; + sha256 = "0n2z91g7p9i724xqx2qq4s5xnxnf4vjccnvy1i706cddpjn02d6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -5954,12 +5975,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -5972,22 +5993,22 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "f95e4812cd17e5f8069c9209241396780d414680"; - sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73"; + rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1"; + sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; name = "counsel-bbdb"; }; - packageRequires = []; + packageRequires = [ emacs ivy ]; meta = { homepage = "https://melpa.org/#/counsel-bbdb"; license = lib.licenses.free; @@ -6017,12 +6038,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "ec56d4650ad11cd0cf8c7e168d9d6a5dfd9cdae8"; - sha256 = "0xmjsa5ic4hh9lrkblf6si7q7s6xcnvs83rnpj5an23jxg7r12ma"; + rev = "921fa5a062bda9a0f9226fdaa76530ad809ff7b9"; + sha256 = "1qvp3ihchfwy57sfnnkk6m591s381w57ppig9c0izlbzw3n7hi7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -6056,6 +6077,48 @@ license = lib.licenses.free; }; }) {}; + counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "counsel-projectile"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "ericdanan"; + repo = "counsel-projectile"; + rev = "536872f022f449548bdb97faa1776d1d44499d73"; + sha256 = "0pm5sqhr24n2ffycazxgl3d3dl7gai8svwz01vc0pgx9c0x75kl8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; + sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl"; + name = "counsel-projectile"; + }; + packageRequires = [ counsel projectile ]; + meta = { + homepage = "https://melpa.org/#/counsel-projectile"; + license = lib.licenses.free; + }; + }) {}; + counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-tramp"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-counsel-tramp"; + rev = "d4c35e1aca724af6a0084362a027fdd70876d2c8"; + sha256 = "0dflm700n9wzn2nrwlbrh1558zv0c9fzzrs43d1kqvzw98wihfz2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; + sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5"; + name = "counsel-tramp"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-tramp"; + license = lib.licenses.free; + }; + }) {}; coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; @@ -6161,22 +6224,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "0.2.10"; + version = "0.3.5"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; - sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; + rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; + sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; name = "cricbuzz"; }; - packageRequires = [ dash enlive s ]; + packageRequires = [ dash enlive f s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -6245,6 +6308,27 @@ license = lib.licenses.free; }; }) {}; + crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "crystal-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; + sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk"; + name = "crystal-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/crystal-mode"; + license = lib.licenses.free; + }; + }) {}; csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; @@ -7022,6 +7106,27 @@ license = lib.licenses.free; }; }) {}; + difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "difflib"; + version = "0.3.8"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "difflib.el"; + rev = "b08850251812d71e62fd6956081299590acdf37b"; + sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; + sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6"; + name = "difflib"; + }; + packageRequires = [ cl-generic emacs ht s ]; + meta = { + homepage = "https://melpa.org/#/difflib"; + license = lib.licenses.free; + }; + }) {}; diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diffview"; @@ -7127,6 +7232,27 @@ license = lib.licenses.free; }; }) {}; + dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dimmer"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "dimmer.el"; + rev = "b0faaa6919e633229ced07ff8bd8b5c68b90243a"; + sha256 = "04k7m5kg2a32ldgxfc2jkdwbmxzyc3yv66871ywv9152db2g7iml"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; + sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r"; + name = "dimmer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dimmer"; + license = lib.licenses.free; + }; + }) {}; dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; @@ -7746,12 +7872,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "1.2.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728"; - sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr"; + rev = "bc747b3b65baf737f99dc4ccf68558581958bbba"; + sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -8001,8 +8127,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "9e446540a794"; - sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; + rev = "87db00b912be"; + sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -8207,12 +8333,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "2.3.18"; + version = "2.8.21"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "e4dc1057b02b6736221936e66c188cf71c01916d"; - sha256 = "0knld86pl2im9mjy4s7mxxibdyc4sq9vhxg4jrndyrmldpjya4my"; + rev = "61a504616705feae8c3fd8b01bf315e2cb89f699"; + sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -8225,6 +8351,27 @@ license = lib.licenses.free; }; }) {}; + easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-jekyll"; + version = "1.5.12"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-jekyll"; + rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; + sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; + sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; + name = "easy-jekyll"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-jekyll"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -8375,12 +8522,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "0.6.16"; + version = "0.6.17"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2"; - sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55"; + rev = "3a77ba9f1064c2bca47b401974c009e65727c46e"; + sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -8690,12 +8837,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.7.9"; + version = "3.7.10"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "82f6ee43b8e35e6d04882d9c9942a22746fde0f1"; - sha256 = "1scxkgq4ij33306fjydwcqs69x5hpfw9l52z1xcprg51s23f2hgh"; + rev = "b7c073e0a29c9632d82b501849e270d62304e22f"; + sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -9055,12 +9202,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "bc1913e4275b69ac69e93981bf575a2053ef1657"; - sha256 = "04zn1lww8zcfi2anrkyfmgg55r40wfrj9qvpzh9xl9l2qcsbs4pk"; + rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83"; + sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -9479,85 +9626,85 @@ license = lib.licenses.free; }; }) {}; - emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: + emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax"; name = "emacsql"; }; - packageRequires = [ cl-lib emacs finalize ]; + packageRequires = [ cl-generic cl-lib emacs finalize ]; meta = { homepage = "https://melpa.org/#/emacsql"; license = lib.licenses.free; }; }) {}; - emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy"; name = "emacsql-mysql"; }; - packageRequires = [ cl-lib emacs emacsql ]; + packageRequires = [ cl-generic cl-lib emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-mysql"; license = lib.licenses.free; }; }) {}; - emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: + emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: melpaBuild { pname = "emacsql-psql"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3"; name = "emacsql-psql"; }; - packageRequires = [ cl-lib emacs emacsql pg ]; + packageRequires = [ cl-generic cl-lib emacs emacsql pg ]; meta = { homepage = "https://melpa.org/#/emacsql-psql"; license = lib.licenses.free; }; }) {}; - emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i"; name = "emacsql-sqlite"; }; - packageRequires = [ cl-lib emacs emacsql ]; + packageRequires = [ cl-generic cl-lib emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-sqlite"; license = lib.licenses.free; @@ -9932,12 +10079,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6"; - sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg"; + rev = "3d3ab18436ad6089496b3bce1d49c64a86965431"; + sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -10254,12 +10401,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.1.7"; + version = "20.2.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "2302ea8ca97b8a9075e9234d15430c47d3a115c8"; - sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls"; + rev = "194513197e19cd592f3f5c2231510542f5193fe4"; + sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10418,6 +10565,27 @@ license = lib.licenses.free; }; }) {}; + esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "esh-autosuggest"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "esh-autosuggest"; + rev = "a8a9381e76ea2e0d934bc70caa47f23209bcc155"; + sha256 = "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; + sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx"; + name = "esh-autosuggest"; + }; + packageRequires = [ company emacs ]; + meta = { + homepage = "https://melpa.org/#/esh-autosuggest"; + license = lib.licenses.free; + }; + }) {}; esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; @@ -10754,6 +10922,27 @@ license = lib.licenses.free; }; }) {}; + eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: + melpaBuild { + pname = "eterm-256color"; + version = "0.3.12"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "eterm-256color"; + rev = "89b20de890bc890331abe2d5e27a7e3129cde7b8"; + sha256 = "1bh0wqz2wkp8i1g8r8wgqzny0f5igflca5hkwq9p8ql84jkwlm69"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; + sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b"; + name = "eterm-256color"; + }; + packageRequires = [ emacs f xterm-color ]; + meta = { + homepage = "https://melpa.org/#/eterm-256color"; + license = lib.licenses.free; + }; + }) {}; ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; @@ -11156,12 +11345,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd"; - sha256 = "1bydqdk52q8777m234jxp03y2zz23204r1fyq39ks9h9bpglc561"; + rev = "41d43709210711c07de69497c5f7db646b7e7a96"; + sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -11258,6 +11447,27 @@ license = lib.licenses.free; }; }) {}; + evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-replace-with-char"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-replace-with-char"; + rev = "dddbbafdd620cc48dd0a257baf4010e1b415ebe8"; + sha256 = "0gcmva2q1bxqp3p8cl1nf19kh4nkgfdm64havyzhnkwq18q84pxi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char"; + sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r"; + name = "evil-replace-with-char"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-replace-with-char"; + license = lib.licenses.free; + }; + }) {}; evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-rsi"; @@ -11363,15 +11573,36 @@ license = lib.licenses.free; }; }) {}; + evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }: + melpaBuild { + pname = "evil-string-inflection"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-string-inflection"; + rev = "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f"; + sha256 = "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; + sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh"; + name = "evil-string-inflection"; + }; + packageRequires = [ emacs evil string-inflection ]; + meta = { + homepage = "https://melpa.org/#/evil-string-inflection"; + license = lib.licenses.free; + }; + }) {}; evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; - sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; + rev = "f6162a7b5a65a297c8ebb8a81ce6e1278f958bbc"; + sha256 = "0kqkji4yn4khfrgghwkzgbh687fs3p07lj61x4i7w1ay1416lvn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -11785,12 +12016,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "541cb518afa5010029492847292c248f88b3ea42"; - sha256 = "1j6gc2pp5w3iwyjm4h3d0ahzs0ac3pah8lzfhpg4nkibl0nc1bcg"; + rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; + sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; @@ -11950,6 +12181,26 @@ license = lib.licenses.free; }; }) {}; + faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faustine"; + version = "0.4"; + src = fetchgit { + url = "https://bitbucket.org/yphil/faustine"; + rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168"; + sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine"; + sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb"; + name = "faustine"; + }; + packageRequires = [ emacs faust-mode ]; + meta = { + homepage = "https://melpa.org/#/faustine"; + license = lib.licenses.free; + }; + }) {}; fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; @@ -11995,12 +12246,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "1.89"; + version = "1.90"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779"; - sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"; + rev = "f7b3f99b41ff017f50a21ad53eed16f8ef5ab7ee"; + sha256 = "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -12058,12 +12309,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.4.5"; + version = "5.4.6"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "9e308e69883cb43e136a2e9d4f0db495b457b82d"; - sha256 = "0bzbqm8wq8gbz0a18d35ksv0yf65giwcdxhrqzklsxgn9v7p73b8"; + rev = "31ebfd65d254904ba3e5ec96507c0b01d7768940"; + sha256 = "1xy7a6crng5x7k0x810ijrm882gm597ljwzi4cj2i93js625cw2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -12356,22 +12607,22 @@ license = lib.licenses.free; }; }) {}; - flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "0.1"; + version = "0.3"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458"; - sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp"; + rev = "50dded94ad201fdc9453656a8b15179981cd5acd"; + sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s"; name = "flow-minor-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/flow-minor-mode"; license = lib.licenses.free; @@ -12566,6 +12817,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-crystal"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal"; + sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn"; + name = "flycheck-crystal"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-crystal"; + license = lib.licenses.free; + }; + }) {}; flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; @@ -12800,12 +13072,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; + sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -12926,12 +13198,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e"; - sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k"; + rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4"; + sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -13031,12 +13303,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; + sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -13850,12 +14122,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "5c63d2f199e96bdf8fd60d375b2b6e305a5f9017"; - sha256 = "0vxizl4pr0668b1d94wrl42li2709srvnn5likn8lskv2mv0bnvn"; + rev = "f1dc9dff6779c0ce6ab0a1c0ae349df1194a314f"; + sha256 = "0j1s6qws773aq3si7pnc1xmlrh9x3v3sfdni6pnlsirv2sc7c4g9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -14467,12 +14739,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "da60fa2316bf829cab18676afd5a43088ac06b60"; - sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs"; + rev = "d8ec78184ec82d363fb0ac5bab724f390ee71d3d"; + sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -15367,6 +15639,27 @@ license = lib.licenses.free; }; }) {}; + go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-dlv"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "benma"; + repo = "go-dlv.el"; + rev = "45a9e8a047c9995eb7c802268d96b3e527569f41"; + sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv"; + sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8"; + name = "go-dlv"; + }; + packageRequires = [ go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-dlv"; + license = lib.licenses.free; + }; + }) {}; go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-eldoc"; @@ -15409,6 +15702,27 @@ license = lib.licenses.free; }; }) {}; + go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-fill-struct"; + version = "0.1"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "go-fill-struct"; + rev = "3c97c92e78f3629a7a1069404c7c641881c16d0e"; + sha256 = "0ara9qqv31pr7dpcby6xp24llf79m0dmwrx4yv6w0bhxi197fmlx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct"; + sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7"; + name = "go-fill-struct"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/go-fill-struct"; + license = lib.licenses.free; + }; + }) {}; go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; @@ -15535,6 +15849,27 @@ license = lib.licenses.free; }; }) {}; + go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-tag"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "emacs-go-tag"; + rev = "a239f58bbef2629086d9e2cf90a64ba3d389a8a3"; + sha256 = "1w1m05ypl94xn2qvypbgvjhq7gysi13g42pqwlmppgsdh1kphwha"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; + sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f"; + name = "go-tag"; + }; + packageRequires = [ emacs go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-tag"; + license = lib.licenses.free; + }; + }) {}; godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; @@ -15706,12 +16041,12 @@ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-chg"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "171b1331022caf12d8c3593e9b5075f87ee958d4"; - sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc"; + rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4"; + sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; @@ -15874,12 +16209,12 @@ grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grails-mode"; - version = "1.0.2"; + version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; - sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; + rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; + sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -15916,12 +16251,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; - sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; + rev = "22c8df52c0fb8899fa748fa2980947ab38b53380"; + sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -16074,12 +16409,12 @@ green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-screen-theme"; - version = "1.0.0.1"; + version = "1.0.24"; src = fetchFromGitHub { owner = "rbanffy"; repo = "green-screen-emacs"; - rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e"; - sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn"; + rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0"; + sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; @@ -16153,22 +16488,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "1.0.2"; + version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; - sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; + rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; + sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = []; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -16303,12 +16638,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "54bd174b514c5de11e82c4263ac2723addb0fe87"; - sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2"; + rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185"; + sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -16680,12 +17015,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; - sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; + rev = "17b9facafcff8203012c037c5a589f290169fc33"; + sha256 = "00k13sl2yjnqjjdqlmz8ril07xw5al2ysbsnpmz81sccqa1kbikr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -16743,12 +17078,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "cec6fb275fa37715bbcbf2abc716457521065068"; - sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y"; + rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161"; + sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -17079,12 +17414,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "cec6fb275fa37715bbcbf2abc716457521065068"; - sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y"; + rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161"; + sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -17769,27 +18104,6 @@ license = lib.licenses.free; }; }) {}; - helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { - pname = "helm-package"; - version = "0.3"; - src = fetchFromGitHub { - owner = "syohex"; - repo = "emacs-helm-package"; - rev = "117f5f26c96c0854aadaf9c52aaec961195d5798"; - sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package"; - sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y"; - name = "helm-package"; - }; - packageRequires = [ cl-lib helm ]; - meta = { - homepage = "https://melpa.org/#/helm-package"; - license = lib.licenses.free; - }; - }) {}; helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pages"; @@ -18213,12 +18527,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.6.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "d90be189d8c2b742c9621ff28b1196be683cdb4c"; - sha256 = "1hi7zw4p3w8a14fqv6w2bc0anrjb6d4vglwhmaz50qr2w3plxq15"; + rev = "ee7f6a2c09df5fdc28b4d910840a7c56922059c3"; + sha256 = "0lkzi6h6wkm19mn7v6wjy50kd96k6hw7jhx7pxwgfp577816c7c2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -18315,22 +18629,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "0.2"; + version = "0.5"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050"; - sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm"; + rev = "9fdbf5b24df28b046731db1c7a1cc90338d55dce"; + sha256 = "13kw0i4vhd8fgwgchap5qxckvhs00ifr7z68whnd3xzklx3v47bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash elisp-refs emacs s ]; + packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -18570,12 +18884,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "e18ec3f55e288883f8042065190572e91651733d"; - sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; + rev = "cba1110ca413a41a443b8368d63d295d7d36de7a"; + sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -19092,6 +19406,27 @@ license = lib.licenses.free; }; }) {}; + ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ialign"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "interactive-align"; + rev = "df591e452f9a56c69fb69de961baa75751bae3d8"; + sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; + sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j"; + name = "ialign"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ialign"; + license = lib.licenses.free; + }; + }) {}; ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; @@ -19788,12 +20123,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "956b22e7941d71216799ca4e8d5244e94fad9558"; - sha256 = "1wakfwmb43na3g2yqign764kwi791x7ikzmf76pkdpky70a5dkhz"; + rev = "247ca70f8ba5104be292aea20fbde6adb37e359f"; + sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -20141,6 +20476,27 @@ license = lib.licenses.free; }; }) {}; + ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ipython-shell-send"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "jackkamm"; + repo = "ipython-shell-send-el"; + rev = "36523a387c15ee1652a5b0e291d4d4838da5e912"; + sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; + sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8"; + name = "ipython-shell-send"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ipython-shell-send"; + license = lib.licenses.free; + }; + }) {}; ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ir-black-theme"; @@ -20228,12 +20584,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -20333,12 +20689,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -20772,12 +21128,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "1.0.2"; + version = "1.0.6"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb"; - sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j"; + rev = "37e83641fd5eab45e813e4bc74a835fe7229c160"; + sha256 = "0hmrhp3lijd77kl0b98nbl1p8fmgjfry2hhvh5vickx3315w7qgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -20790,22 +21146,22 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; - sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; + rev = "83e932e4a83d1a69098ee87e0ab911d299368e60"; + sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; name = "js-comint"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/js-comint"; license = lib.licenses.free; @@ -21213,12 +21569,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.0.5"; + version = "1.1.1"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "08e13adfab07c9cf7b0df313c77eac8fb393b284"; - sha256 = "0wijf5493wmp219ypbvhp0c4q76igrxijzdalbgkyp2gf8xvq6b4"; + rev = "d4a1cbae1fc77192e5844291821709c82c9dc455"; + sha256 = "04k2yz3vrj1h0zf6cz0jd97fg8zah2j980l5ycsgyy0dk9ysink8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22207,12 +22563,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.19.1"; + version = "2.20.1"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "b6627fdd25fe6d866fe5a53c8bf7923ffd8ab9f9"; - sha256 = "1z17z58rp65qln6lv2l390df2bf6dpnrqdh0q352r4wqzzki8gqn"; + rev = "eed38dc66430802e754c48bb44aaf524d7b1596c"; + sha256 = "1rl279h18z9fka4zdaqm2h4jxpq3wykja3x7jyhj4bnrqvkw66gh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -22882,22 +23238,22 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794"; - sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i"; + rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5"; + sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; name = "magithub"; }; - packageRequires = [ emacs ghub-plus magit s ]; + packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ]; meta = { homepage = "https://melpa.org/#/magithub"; license = lib.licenses.free; @@ -23228,12 +23584,12 @@ mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mastodon"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac"; - sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7"; + rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318"; + sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -23417,12 +23773,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5"; - sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8"; + rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; + sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -23564,12 +23920,12 @@ metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "metaweblog"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "punchagan"; repo = "metaweblog"; - rev = "2200eacde17edb66bbdde9c0b6b65481f40d498b"; - sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k"; + rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a"; + sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; @@ -24046,12 +24402,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "019e07947426f0192fc3458f3f72c19031b607de"; - sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; + rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a"; + sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -24172,12 +24528,12 @@ mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; - sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; + rev = "c17501b48ded8261d815ab60bf14cddf7040be72"; + sha256 = "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -24277,12 +24633,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; - sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; + rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; + sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -24400,6 +24756,26 @@ license = lib.licenses.free; }; }) {}; + multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "multi-project"; + version = "0.0.26"; + src = fetchhg { + url = "https://bitbucket.com/ellisvelo/multi-project"; + rev = "a6e7c1542c0b"; + sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; + sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x"; + name = "multi-project"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/multi-project"; + license = lib.licenses.free; + }; + }) {}; multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; @@ -25114,11 +25490,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.25.2"; + version = "0.26pre2"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "83f266136369452b859393429b8530efac2e09fb"; - sha256 = "0idim2yslpjzbzy5hh9qhw1gy0h9p92rs0jrr8d2l9y8nsnh6zzr"; + rev = "4cb1eeba83416a12c616aca6469c027b8b8a303d"; + sha256 = "0brcdwblfj3nb2ca0izvhlm3x1pf0r72wsa9f2hf0ssnh9w2z40s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -25383,6 +25759,27 @@ license = lib.licenses.free; }; }) {}; + ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-coffeescript"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-coffeescript"; + rev = "b70f3d822c707cb02333fcb739ba4874614cad2a"; + sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; + sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p"; + name = "ob-coffeescript"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-coffeescript"; + license = lib.licenses.free; + }; + }) {}; ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; @@ -25404,6 +25801,27 @@ license = lib.licenses.free; }; }) {}; + ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-hy"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-hy"; + rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; + sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; + sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7"; + name = "ob-hy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ob-hy"; + license = lib.licenses.free; + }; + }) {}; ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; @@ -25635,22 +26053,22 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674"; - sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn"; + rev = "35d275d8bdfc5107c25db5a4995b65ba936f1d56"; + sha256 = "00havcpsbk54xfcys9lhm9sv1d753jk3cmvssa2c52pp5frpxz3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd"; name = "olivetti"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/olivetti"; license = lib.licenses.free; @@ -25768,8 +26186,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "b0c61e91d1b600875ad2eae06fe72a179a3028b6"; - sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd"; + rev = "95f56022edf9fcaba8402db05a6927af050b12a8"; + sha256 = "133maq29hfjaq4vilz9wvr9vjkschkpydkw2197sscv7whfzv78j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -26297,22 +26715,22 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "org-jira"; - version = "2.8.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "9315d871556ebe92e766544ff5210dc85ad1ef33"; - sha256 = "03ddwdzby0s3km0a3dmn6mfdp2zsiqyrddvpp8mgj77rb039g08k"; + rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7"; + sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; name = "org-jira"; }; - packageRequires = [ cl-lib emacs request ]; + packageRequires = [ cl-lib emacs request s ]; meta = { homepage = "https://melpa.org/#/org-jira"; license = lib.licenses.free; @@ -26614,12 +27032,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "0.5"; + version = "0.5.2"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "14a065e1d376838f16a6ba32ed8710304542a4e6"; - sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir"; + rev = "60364c18725d2f3898a9099e7e546ae406dd6578"; + sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -26688,12 +27106,12 @@ org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-repo-todo"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "waymondo"; repo = "org-repo-todo"; - rev = "904a26089d87db59a40421d6f857b189e70dfbe3"; - sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9"; + rev = "cba6145c6821fd2bbd96a1c9ef2346c281b76ad2"; + sha256 = "0b57qy87sa8qcki16rgh16ldziay57yd7f98cpinaq0adcrqywy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo"; @@ -26979,22 +27397,22 @@ license = lib.licenses.free; }; }) {}; - org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: + org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; - sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; + rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0"; + sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40"; name = "org2blog"; }; - packageRequires = [ metaweblog org xml-rpc ]; + packageRequires = [ htmlize metaweblog org xml-rpc ]; meta = { homepage = "https://melpa.org/#/org2blog"; license = lib.licenses.free; @@ -27432,12 +27850,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "1213df6c6d9adcd706306523a5ce0c66d118b4c7"; - sha256 = "1j4b7f5bgpc8vhmxprqriy3688i3lp3fgvxcnnnb2v0sjq1pbac8"; + rev = "b47f6f79603adb4f505500ed83150afca7601cfc"; + sha256 = "1xlkmiwgxsai0hsx9r1gx88bdj72vxaq0icr399ksnwba58rwmr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -28604,12 +29022,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "1.18.2"; + version = "1.18.4"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3"; - sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr"; + rev = "ad7d1092e1d66602482c5b54ed0609c6171dcae1"; + sha256 = "03yp07dxmxmhm8p5qcxsfdidhvnrpls20nr234cz6yamjl5zszh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -29681,12 +30099,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.5.0"; + version = "3.5.1.1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "2761122b810fe8861004ae785cc3ab39f384d342"; - sha256 = "01z3p947hyzi3p42fiqnx6lskz4inqw89lp2agqj9wfyfvag3369"; + rev = "860bd12fec5c69e6529565165532b3d5108a7d97"; + sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -30056,22 +30474,22 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "1.6.4"; + version = "1.7"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; - sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; + rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc"; + sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; name = "pyim"; }; - packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ]; + packageRequires = [ async cl-lib emacs popup pyim-basedict ]; meta = { homepage = "https://melpa.org/#/pyim"; license = lib.licenses.free; @@ -30707,22 +31125,28 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: + realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "6dc971269f6f9435e5159c2cfe66fc5e4b296df2"; - sha256 = "1pl758xp2gfy8h313ggpmqv7sjb8h6qdrqj68ypxch70k9vq76z8"; + rev = "3804711863630affe79614a1527bc12c0955ec7c"; + sha256 = "0fi48xh6rc7z146rafkabqhg6wy3zv85apn1bciw9pysazblq8pb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15"; name = "realgud"; }; - packageRequires = [ load-relative loc-changes test-simple ]; + packageRequires = [ + cl-lib + emacs + load-relative + loc-changes + test-simple + ]; meta = { homepage = "https://melpa.org/#/realgud"; license = lib.licenses.free; @@ -32325,12 +32749,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b"; - sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih"; + rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; + sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -32703,12 +33127,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa45e7b586b1215ca1af05c14984ce872571b5f7"; - sha256 = "0ya7vbp71vmvli35rwcwspbclss5ngr1ck9074i2gg1dzrqyxijn"; + rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8"; + sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -33522,12 +33946,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358"; - sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma"; + rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2"; + sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -33561,6 +33985,27 @@ license = lib.licenses.free; }; }) {}; + solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "solidity-mode"; + version = "0.1.8"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "emacs-solidity"; + rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; + sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; + sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx"; + name = "solidity-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/solidity-mode"; + license = lib.licenses.free; + }; + }) {}; sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "sos"; @@ -34047,12 +34492,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23"; - sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw"; + rev = "ab4b80e206163b09a021f7de157e8bd4ae66358b"; + sha256 = "1c8hk7xwwlgkdw5xjcznpmajv904v2vs8mrcnmlay99r2qj3p2yx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -34487,12 +34932,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "3.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; - sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; + rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f"; + sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -34529,12 +34974,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -34756,6 +35201,27 @@ license = lib.licenses.free; }; }) {}; + system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "system-packages"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jabranham"; + repo = "system-packages"; + rev = "149c253583e8b4d56a851b1e91e456260749cdea"; + sha256 = "1c0q9c0wq9kskg8p6mnh6mnkivlabb46aqfcs7ms21497ndlmlsv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; + sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; + name = "system-packages"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/system-packages"; + license = lib.licenses.free; + }; + }) {}; system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-specific-settings"; @@ -35410,12 +35876,12 @@ thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "b2a4d4ae21c789b689dd162deb819665567f481c"; - sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh"; + rev = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba"; + sha256 = "1scv403g5a2081awg5za5d3parj1lg63llnnac11d6fn7j7ms99p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -35449,15 +35915,36 @@ license = lib.licenses.free; }; }) {}; + tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: + melpaBuild { + pname = "tidal"; + version = "0.9.6"; + src = fetchFromGitHub { + owner = "tidalcycles"; + repo = "Tidal"; + rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; + sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; + sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a"; + name = "tidal"; + }; + packageRequires = [ emacs haskell-mode ]; + meta = { + homepage = "https://melpa.org/#/tidal"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263"; - sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x"; + rev = "1ee2e6e5f6e22b180af08264e5654b26599f96fe"; + sha256 = "0gd149vlf3297lm595xw3hc9jd45wisbrpbr505qhkffrj60q1lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -35554,6 +36041,27 @@ license = lib.licenses.free; }; }) {}; + total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "total-lines"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "hinrik"; + repo = "total-lines"; + rev = "58a9fb0ffca63e3dfb3b27c7d91b4630e422903b"; + sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines"; + sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh"; + name = "total-lines"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/total-lines"; + license = lib.licenses.free; + }; + }) {}; tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tox"; @@ -35661,12 +36169,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.13.3"; + version = "1.15.3"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9e12a68018e23ee10e8db48789f7358ed5375390"; - sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp"; + rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; + sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -35682,12 +36190,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.13.3"; + version = "1.15.3"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9e12a68018e23ee10e8db48789f7358ed5375390"; - sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp"; + rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; + sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -35703,12 +36211,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.13.3"; + version = "1.15.3"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9e12a68018e23ee10e8db48789f7358ed5375390"; - sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp"; + rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; + sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -36347,8 +36855,8 @@ sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; - sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; + sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp"; name = "use-package"; }; packageRequires = [ bind-key diminish ]; @@ -36759,12 +37267,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43"; - sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng"; + rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc"; + sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -38207,12 +38715,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "0.9.4"; + version = "0.9.7"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "bcf698acbdb4df91f587942348739b407a8b0807"; - sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs"; + rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695"; + sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -38356,8 +38864,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + rev = "668632d9392e"; + sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 0550a1bbd3ff..6d23d508228b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -38,6 +38,9 @@ self: # upstream issue: mismatched filename ack-menu = markBroken super.ack-menu; + # Expects bash to be at /bin/bash + ac-rtags = markBroken super.ac-rtags; + airline-themes = super.airline-themes.override { inherit (self.melpaPackages) powerline; }; @@ -45,10 +48,16 @@ self: # upstream issue: missing file header bufshow = markBroken super.bufshow; + # part of a larger package + caml = dontConfigure super.caml; + # part of a larger package # upstream issue: missing package version cmake-mode = markBroken (dontConfigure super.cmake-mode); + # Expects bash to be at /bin/bash + company-rtags = markBroken super.company-rtags; + # upstream issue: missing file header connection = markBroken super.connection; @@ -76,6 +85,9 @@ self: inherit (self.melpaPackages) ess popup; }; + # upstream issue: doesn't build + eterm-256color = markBroken super.eterm-256color; + # upstream issue: missing dependency highlight evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; @@ -85,6 +97,9 @@ self: # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; + # Expects bash to be at /bin/bash + flycheck-rtags = markBroken super.flycheck-rtags; + # upstream issue: missing file header fold-dwim = markBroken super.fold-dwim; @@ -94,12 +109,21 @@ self: # upstream issue: mismatched filename helm-lobsters = markBroken super.helm-lobsters; + # Expects bash to be at /bin/bash + helm-rtags = markBroken super.helm-rtags; + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; # upstream issue: missing file header initsplit = markBroken super.initsplit; + # upstream issue: recipe fails + insert-shebang = markBroken super.insert-shebang; + + # Expects bash to be at /bin/bash + ivy-rtags = markBroken super.ivy-rtags; + # upstream issue: missing file header jsfmt = markBroken super.jsfmt; @@ -140,12 +164,18 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; + # upstream issue: missing file header + rcirc-menu = markBroken super.rcirc-menu; + # upstream issue: missing file header speech-tagger = markBroken super.speech-tagger; # upstream issue: missing file header stgit = markBroken super.stgit; + # upstream issue: missing file header + tawny-mode = markBroken super.tawny-mode; + # upstream issue: missing file header textmate = markBroken super.textmate; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index ff38319dbedf..b173dcff936c 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20171127"; + version = "20180108"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171127.tar"; - sha256 = "0q9mbkyridz6zxkpcm7yk76iyliij1wy5sqqpcd8s6y5zy52zqwl"; + url = "https://orgmode.org/elpa/org-20180108.tar"; + sha256 = "02rs7zi3dzps0mlyfbgiywd2smnlw0pk8ps1nqk0d5hx3n6d15yv"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171127"; + version = "20180108"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171127.tar"; - sha256 = "0759g1lnwm9fz130cigvq5y4gigbk3wdc5yvz34blnl57ghir2k8"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180108.tar"; + sha256 = "10mhiqsrxxmhsy8dl88r456shx6ajm4w19pz259b960551r596iz"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index af3298a5883e..f87cc72f2f2b 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -36,9 +36,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = - [ ./clean-env.patch ] - ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch; + patches = [ + ./clean-env.patch + ] ++ lib.optionals stdenv.isDarwin [ + ./at-fdcwd.patch + + # Backport of the fix to + # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html + # Should be removed when switching to Emacs 26.1 + (fetchurl { + url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; + sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; + }) + ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ] diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 10816e0a283f..4964de13986f 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z"; + sha256 = "1d2q99xa7dhdpqkipapzi1r1mvynf70s7sgdczd59kn0d8sr3map"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 5ff5c0845d00..9288d293b916 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { - Simple project management - Plugin interface ''; - homepage = http://www.geany.org/; + homepage = https://www.geany.org/; license = "GPL"; maintainers = []; platforms = platforms.all; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index ec0d90115e64..3dabbea5ea7a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -234,12 +234,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0gv9krqy4bhijx5s005qhswxnc05l1jsjlxs0h15z23bmv7rlpnf"; /* updated by script */ + sha256 = "19pb78s5pa5ywifi1azs8gpg0a65c9n3yiqng348a7s27azkw01z"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -273,12 +273,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "04qp37pv4z6d9gw6j56m4zfxw4v2cydk8w7jzyzrcg52jr064kwi"; /* updated by script */ + sha256 = "70cc4f36a6517c7af980456758214414ea74c5c4f314ecf30dd2640600badd62"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -286,12 +286,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0w9ihi6vzgfiav2qia7d7vrn14k8v56npir0dyx7ii8an887s7ws"; /* updated by script */ + sha256 = "0lygnhn2wbs1678g3jbd3c5yzxnjp106qx7v9kgvb1k6l9mqb3my"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -299,12 +299,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1byhlm5bnp6ic4n2xg17v4g34ipygy50i9xj4292b0xw7srxh910"; /* updated by script */ + sha256 = "1grkqvj4j33d8hmy11ipkcci20sw7jpnc5zl28a9g85f2pzvsvs0"; }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; @@ -312,12 +312,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1lca3g5h716l97pkqfb8i7apsnx445xzcc9j41d0y3yyncf5hwxr"; /* updated by script */ + sha256 = "1xp4hva2wj2r3haqwmji4vpg6xm9fsx2xihslwmq89vfrbzybyq6"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -325,12 +325,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "06lh0nxmzn0lsyd6isyb6gf01h4nbksi0f03hwwm6wdfvsfw92pb"; /* updated by script */ + sha256 = "0bqavq9f9pg82yh04bpzpb3a36980v2bn70j1ch6gsm3hdd75swv"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -351,12 +351,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "04h299mbzwrdgqxkff0vgpj2kbisb29l55mm6r45amgpqcnms6i5"; /* updated by script */ + sha256 = "01y89blg30y41j2h254mhf7b7d7nd3bgscinn03vpkjfg7hzr689"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.3"; @@ -364,12 +364,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0whr5zygrbi044pl48ac2w7a4rxldbaqlf76dkfqj83g2wl4n990"; /* updated by script */ + sha256 = "1if99qjpnf9x7d3f1anpiglg9lwc3phamfd4wbyi9yjnk3rf5qcr"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix new file mode 100644 index 000000000000..bea1e18e0612 --- /dev/null +++ b/pkgs/applications/editors/micro/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "micro-${version}"; + version = "1.3.4"; + + goPackagePath = "github.com/zyedidia/micro"; + + src = fetchFromGitHub { + owner = "zyedidia"; + repo = "micro"; + rev = "v${version}"; + sha256 = "1giyp2xk2rb6vdyfnj5wa7qb9fwbcmmwm16wdlnmq7xnp7qamdkw"; + fetchSubmodules = true; + }; + + subPackages = [ "cmd/micro" ]; + + buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ]; + + meta = with stdenv.lib; { + homepage = https://micro-editor.github.io; + description = "Modern and intuitive terminal-based text editor"; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index dcb124bcb125..87ead669b70e 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,15 +20,13 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0z5sxji8jh8sh0g3inbzndhsrbm4qyqlvjrxl5wkxbr61lnxa5k3"; + sha256 = "0m9xm085pi0fhmmshgppipjimr1jkxksbyg8pa5cwaap3d2vgk2f"; }; - patches = [ ./nano-2.9.1-darwin.patch ]; - nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch b/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch deleted file mode 100644 index d3a630d4486e..000000000000 --- a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/lib/stat.c -+++ b/lib/stat.c -@@ -48,4 +48,6 @@ orig_stat (const char *filename, struct stat *buf) - #include "sys/stat.h" - -+#include "stat-time.h" -+ - #include - #include diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index ba3abe6a221f..0233d6345285 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -9,6 +9,7 @@ , withPyGUI ? false , vimAlias ? false +, viAlias ? false , configure ? null }: @@ -82,7 +83,7 @@ let (optionalString withPython3 python3Wrapper) + (optionalString withRuby rubyWrapper)}" --unset PYTHONPATH '' + optionalString (withRuby) - ''--suffix PATH : \"${rubyEnv}/bin\" --set GEM_HOME \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" ''; + ''--suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath} ''; neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; @@ -174,7 +175,9 @@ let }; }; -in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation { +in if (vimAlias == false && viAlias == false && configure == null) + then neovim + else stdenv.mkDerivation { name = "neovim-${neovim.version}-configured"; inherit (neovim) version meta; @@ -187,6 +190,8 @@ in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivat done '' + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim + '' + optionalString viAlias '' + ln -s $out/bin/nvim $out/bin/vi '' + optionalString (configure != null) '' wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" ''; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index b508521790bf..bf2363d3939b 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of integrated tools for the R language"; - homepage = http://www.rstudio.com/; + homepage = https://www.rstudio.com/; license = licenses.agpl3; maintainers = with maintainers; [ ehmry changlinli ciil ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index d1c0ab274f06..0dde8fbe7297 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake , python, qtbase, qttools, zlib }: -let -# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.0.3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "1j8307h7xkxqwr8rpr9fn1svm5h10k61w6zxr4sgph1hiv8x33aa"; + sha256 = "1c6n5xshadxv5qwv8kfrj1kbfnkvx6nyxc9p4mpzkjrkxw1b1qf1"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index b20a6e5ec45c..22e7c3d31b36 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.38"; + version = "0.9.41"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557"; + sha256 = "e4916f86c7c12aec8fd59b3ef79c2a4d3f77b02a0a9e962916c688871c9fda1d"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9"; + sha256 = "18960fb4b2cd6cf9cb77025a4035a3258f1599b1d225fb673b49c1588fa272d6"; } ; diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 273ef33250fc..98f45f6be02d 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vala_0_26, which, autoconf, automake +{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake , libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_26 which autoconf automake + buildInputs = [ vala_0_28 which autoconf automake libtool glib gtk3 libwnck3 asciidoc gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index becb5ccc29a1..3a3a0d1a7812 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; src = fetchurl { - url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz"; + url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz"; sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx"; }; meta = { description = "A terminal visual binary diff viewer"; - homepage = http://www.cjmweb.net/vbindiff/; + homepage = https://www.cjmweb.net/vbindiff/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index c87563293bab..15477c5c7d45 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.18.1"; + version = "1.19.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "13gs0spqkbxw4i3a0b060v5bi68zfkp3i8vqk41i0fkbshnc7c7i"; - "x86_64-linux" = "0h7nfyrn4ybm9p1czjb48p3cd3970hpyn6pj8l4ir1hqygcq6dwi"; - "x86_64-darwin" = "093k8s2msi0xz11wy2yf1rppwkx6kv5psgii4w44l59ji8qgpamk"; + "i686-linux" = "0ypx1jrzg76f8p4yh9hi3bhsrc6w4r7rg6i2aa6q7s8ny0q9hrlx"; + "x86_64-linux" = "1934wdiy2d1fzcjxjyf60dw1g1pp3lk2wv41xgrabfy5j2xfz14r"; + "x86_64-darwin" = "1zbcddgdwvmnk1gpmgw6rz0rswhkfc72wcjdbvgghm4msfwcgvc8"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 3382bb3e56d7..987b544c5565 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -4,15 +4,15 @@ }: stdenv.mkDerivation { - name = "grass-7.0.2"; + name = "grass-7.2.2"; src = fetchurl { - url = http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz; - sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf"; + url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; + sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); configureFlags = [ @@ -22,9 +22,12 @@ stdenv.mkDerivation { "--with-wxwidgets" "--with-netcdf" "--with-geos" - "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/" + "--with-postgres" + "--with-postgres-libs=${postgresql.lib}/lib/" # it complains about missing libmysqld but doesn't really seem to need it - "--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql" + "--with-mysql" + "--with-mysql-includes=${mysql.connector-c}/include/mysql" + "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" ]; @@ -40,17 +43,20 @@ stdenv.mkDerivation { scripts/r.pack/r.pack.py \ scripts/r.tileset/r.tileset.py \ scripts/r.unpack/r.unpack.py \ - scripts/v.krige/v.krige.py \ scripts/v.rast.stats/v.rast.stats.py \ scripts/v.to.lines/v.to.lines.py \ scripts/v.what.strds/v.what.strds.py \ scripts/v.unpack/v.unpack.py \ scripts/wxpyimgview/*.py \ gui/wxpython/animation/g.gui.animation.py \ + gui/wxpython/datacatalog/g.gui.datacatalog.py \ gui/wxpython/rlisetup/g.gui.rlisetup.py \ gui/wxpython/vdigit/g.gui.vdigit.py \ temporal/t.rast.accumulate/t.rast.accumulate.py \ temporal/t.rast.accdetect/t.rast.accdetect.py \ + temporal/t.rast.algebra/t.rast.algebra.py \ + temporal/t.rast3d.algebra/t.rast3d.algebra.py \ + temporal/t.vect.algebra/t.vect.algebra.py \ temporal/t.select/t.select.py for d in gui lib scripts temporal tools; do patchShebangs $d @@ -58,7 +64,7 @@ stdenv.mkDerivation { ''; postInstall = '' - wrapProgram $out/bin/grass70 \ + wrapProgram $out/bin/grass72 \ --set PYTHONPATH $PYTHONPATH \ --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' @@ -72,6 +78,5 @@ stdenv.mkDerivation { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; - broken = true; }; } diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f64845f6e43a..d689254f2c85 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.14"; + name = "qgis-2.18.15"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; + # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory - #enableParallelBuilding = true; + enableParallelBuilding = false; # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "199nc539kd8fxbfny61s4sv8bvrhlxw59dmvw6m70gnff6mpc8fq"; + sha256 = "1jpprkk91s2wwx0iiqlnsngxnn52zs32bad799fjai58nrsh8b7b"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 4d229450a4a7..847421de3b1f 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -2,15 +2,15 @@ libharu, opencv, vigra, postgresql }: stdenv.mkDerivation rec { - name = "saga-5.0.0"; + name = "saga-6.2.0"; buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/project/saga-gis/SAGA%20-%205/SAGA%20-%205.0.0/saga-5.0.0.tar.gz"; - sha256 = "9be997209737e80262d9f13fd9b9797194a9f2facb10e5b9bd756d8cda675089"; + url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.2.0/saga-6.2.0.tar.gz"; + sha256 = "91b030892c894ba02eb4292ebfc9ccbf4acf3062118f2a89a9a11208773fa280"; }; meta = { diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 973e7f88e800..e1d8dd01f9c5 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-9"; - sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w"; + version = "7.0.7-19"; + sha256 = "1naib6hspmq7d4gfpsksx78gc1lq3p2v3i9pxkkdvr9p9j15c4az"; patches = []; }; in diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 4e0ddfa8def8..519bf025b43e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-23"; - sha256 = "0cd6zcbcfvznf0i3q4xz1c4wm4cfplg4zc466lvlb1w8qbn25948"; + version = "6.9.9-28"; + sha256 = "132kdl7jlkghfg3smdab14c29cpvrx65ibipxkmwg1nc88ycqivh"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. @@ -36,13 +36,10 @@ stdenv.mkDerivation rec { name = "imagemagick-${version}"; inherit (cfg) version; - src = fetchurl { - urls = [ - "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" - # the original source above removes tarballs quickly - "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" - "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" - ]; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = cfg.version; inherit (cfg) sha256; }; diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f190b421b056..f7a813f36061 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -15,6 +15,7 @@ let name = "qtnproperty"; inherit src; sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; + patches = [ ./qtnproperty-parallel-building.patch ]; buildInputs = [ qtscript qtbase qtdeclarative ]; nativeBuildInputs = [ qmake flex bison ]; postInstall = '' @@ -46,6 +47,10 @@ in stdenv.mkDerivation rec { --run "cd $d" ''; + # $ cd Sources; qmake; make ../workdir/linux-g++-dgb-gl4/obj/glwidget.o + # fatal error: properties/ImageProperties.peg.h: No such file or directory + enableParallelBuilding = false; + meta = { homepage = https://github.com/kmkolasinski/AwesomeBump; description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch new file mode 100644 index 000000000000..b3f8e68dd1ad --- /dev/null +++ b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch @@ -0,0 +1,9 @@ +--- a/PEG/Flex.pri ++++ b/PEG/Flex.pri +@@ -1,5 +1,6 @@ + flex.name = Flex ${QMAKE_FILE_IN} + flex.input = FLEX_SOURCES ++flex.depends = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp + flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp + + win32:flex.commands = win_flex --wincompat -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 8c1db9c039e7..5fd636ff7c59 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.2.5"; + version = "2.4.0"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3"; + sha256 = "0y0q7a7k09sbg05k5xl1lz8n2ak1v8yarfv222ksvmbrxs53hdwx"; }; buildInputs = @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = https://www.darktable.org; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ]; + maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ]; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a74c7c44bdb8..9a26dcdaa6a0 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -75,7 +75,6 @@ mkDerivation rec { libqtav libusb1 mesa - mysql opencv3 pcre @@ -84,7 +83,8 @@ mkDerivation rec { qtsvg qtwebkit - kcalcore + # https://bugs.kde.org/show_bug.cgi?id=387960 + #kcalcore kconfigwidgets kcoreaddons kfilemetadata @@ -99,8 +99,6 @@ mkDerivation rec { threadweaver ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" @@ -124,6 +122,10 @@ mkDerivation rec { patchFlags = "-d core -p1"; + # `en make -f core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/build.make core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/manager/expoblendingthread.cpp.o`: + # digikam_version.h:37:24: fatal error: gitversion.h: No such file or directory + enableParallelBuilding = false; + meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 80d2b2903678..a845bc63a385 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -49,7 +49,7 @@ buildPythonPackage { meta = { description = "Display Calibration and Characterization powered by Argyll CMS"; - homepage = http://displaycal.net/; + homepage = https://displaycal.net/; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b447fa7810f4..478e9d2b4530 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.22.2"; + version = "2.23"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05"; + sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index ff87b70a0c1e..a2cbffd5d217 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libart_lgpl, libexif, gettext, xorg +, python2Packages, libexif, gettext, xorg , AppKit, Cocoa, gtk-mac-integration }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libart_lgpl libexif gettext xorg.libXpm + python pygtk libexif gettext xorg.libXpm wrapPython ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 92e6084ce673..d01286e15a64 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, - pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: + pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: stdenv.mkDerivation rec { name = "giv-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl - sed -i s,/usr/local,$out, SConstruct + sed -i s,/usr/local,$out, SConstruct ''; patches = [ ./build.patch ]; @@ -25,15 +25,14 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff - json_glib ]; + nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; + buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ]; - meta = { + meta = with stdenv.lib; { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c8c9ac8f26ef..11a2b3a8c8b9 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.26"; in +let version = "1.3.27"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"; + sha256 = "0rq35p3rml10cxz2z4s7xcfsilhhk19mmy094g3ivz0fg797hcnh"; }; patches = [ diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 5f27cb446994..4b5c4517deab 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "17.02"; + version = "17.07"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; + sha256 = "1j361pvxywi4nb2alhnnd4qpqrpg6503gbi17cadcdi434gbqbsd"; }; nativeBuildInputs = [ qmake4Hook ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "CAD program for creating virtual LEGO models"; homepage = http://www.leocad.org/; license = licenses.gpl2; - inherit (qt4.meta) platforms; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index ac2a194b7ca4..c25c1277ee0b 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A minimal image viewer using raw XLib"; - homepage = http://www.johnhawthorn.com/meh/; + homepage = https://www.johnhawthorn.com/meh/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index d73697673bfe..1e76743eccf4 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,51 +1,65 @@ -{ stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }: +{ stdenv, fetchFromGitHub, mesa_glu, qtbase, qtscript, qtxmlpatterns }: -stdenv.mkDerivation rec { - name = "meshlab-1.3.3"; +let + meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; + vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803"; +in stdenv.mkDerivation { + name = "meshlab-2016.12"; - src = fetchurl { - url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz"; - sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9"; - }; + srcs = + [ + (fetchFromGitHub { + owner = "cnr-isti-vclab"; + repo = "meshlab"; + rev = meshlabRev; + sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc"; + name = "meshlab-${meshlabRev}"; + }) + (fetchFromGitHub { + owner = "cnr-isti-vclab"; + repo = "vcglib"; + rev = vcglibRev; + sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + name = "vcglib-${vcglibRev}"; + }) + ]; - # I don't know why I need this; without this, the rpath set at the beginning of the - # buildPhase gets removed from the 'meshlab' binary - dontPatchELF = true; + sourceRoot = "meshlab-${meshlabRev}"; - patches = [ ./include-unistd.diff ]; + patches = [ ./fix-2016.02.patch ]; hardeningDisable = [ "format" ]; + enableParallelBuilding = true; buildPhase = '' - mkdir -p "$out/include" + # MeshLab has ../vcglib hardcoded everywhere, so move the source dir + mv ../vcglib-${vcglibRev} ../vcglib + + cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" - cd meshlab/src + pushd external qmake -recursive external.pro - make + buildPhase popd qmake -recursive meshlab_full.pro - make + buildPhase ''; installPhase = '' - mkdir -p $out/opt/meshlab $out/bin $out/lib - pushd distrib - cp -R * $out/opt/meshlab - popd + mkdir -p $out/opt/meshlab $out/bin + cp -Rv distrib/* $out/opt/meshlab ln -s $out/opt/meshlab/meshlab $out/bin/meshlab + ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - sourceRoot = "."; - - buildInputs = [ qt4 unzip vcg ]; + buildInputs = [ mesa_glu qtbase qtscript qtxmlpatterns ]; meta = { - description = "System for the processing and editing of unstructured 3D triangular meshes"; - homepage = http://meshlab.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; + description = "A system for processing and editing 3D triangular meshes."; + homepage = http://www.meshlab.net/; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; }; } diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch new file mode 100644 index 000000000000..ebccccc00a29 --- /dev/null +++ b/pkgs/applications/graphics/meshlab/fix-2016.02.patch @@ -0,0 +1,88 @@ +From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001 +From: Marco Callieri +Date: Mon, 9 Jan 2017 16:06:14 +0100 +Subject: [PATCH 1/3] resolved ambiguity for abs overloads + + +diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp +index 364d53bf..ef3d4a2d 100644 +--- a/src/meshlabplugins/edit_quality/eqhandle.cpp ++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp +@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) + setCursor(Qt::OpenHandCursor); + + QPointF newPos = event->scenePos(); +- qreal handleOffset = abs(newPos.x()-pos().x()); ++ qreal handleOffset = std::fabs(newPos.x()-pos().x()); + + if (handleOffset >= std::numeric_limits::epsilon()) + { +-- +2.15.0 + + +From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001 +From: Marco Callieri +Date: Tue, 10 Jan 2017 10:05:05 +0100 +Subject: [PATCH 2/3] again, fabs ambiguity + + +diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp +index ef3d4a2d..d29f8c45 100644 +--- a/src/meshlabplugins/edit_quality/eqhandle.cpp ++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp +@@ -30,6 +30,7 @@ FIRST RELEASE + #include "eqhandle.h" + #include + #include ++#include + + EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, + EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, +@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) + setCursor(Qt::OpenHandCursor); + + QPointF newPos = event->scenePos(); +- qreal handleOffset = std::fabs(newPos.x()-pos().x()); ++ qreal handleOffset = fabs(newPos.x()-pos().x()); + + if (handleOffset >= std::numeric_limits::epsilon()) + { +-- +2.15.0 + + +From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001 +From: Patrick Chilton +Date: Mon, 4 Dec 2017 21:27:23 +0100 +Subject: [PATCH 3/3] io_TXT -> io_txt + + +diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro +index 6ea7f1db..2a95c127 100644 +--- a/src/meshlab_full.pro ++++ b/src/meshlab_full.pro +@@ -16,7 +16,7 @@ SUBDIRS = common \ + meshlabplugins/io_x3d \ + meshlabplugins/io_expe \ + meshlabplugins/io_pdb \ +- plugins_experimental/io_TXT \ ++ plugins_experimental/io_txt \ + # Filter plugins + meshlabplugins/filter_aging \ + meshlabplugins/filter_ao \ +diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp +similarity index 100% +rename from src/plugins_experimental/io_TXT/io_txt.cpp +rename to src/plugins_experimental/io_txt/io_txt.cpp +diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h +similarity index 100% +rename from src/plugins_experimental/io_TXT/io_txt.h +rename to src/plugins_experimental/io_txt/io_txt.h +diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro +similarity index 100% +rename from src/plugins_experimental/io_TXT/io_txt.pro +rename to src/plugins_experimental/io_txt/io_txt.pro +-- +2.15.0 + diff --git a/pkgs/applications/graphics/meshlab/include-unistd.diff b/pkgs/applications/graphics/meshlab/include-unistd.diff deleted file mode 100644 index 74f28a4d2119..000000000000 --- a/pkgs/applications/graphics/meshlab/include-unistd.diff +++ /dev/null @@ -1,13 +0,0 @@ -*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500 ---- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500 -*************** -*** 75,80 **** ---- 75,81 ---- - #define pb_close _close - #define DIR_SEP "\\" - #else -+ #include - #define pb_mkdir(n) mkdir(n,0755) - #define pb_access access - #define pb_stat stat - diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index f7175f9d2b87..a4e73d2f5b5a 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,36 +1,104 @@ -{ stdenv, fetchurl, makeWrapper, xulrunner }: +{ stdenv, fetchurl, lib, makeWrapper, + # build dependencies + alsaLib, atk, cairo, cups, dbus, expat, fontconfig, + freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xlibs, + glibc, udev +}: stdenv.mkDerivation rec { - version = "2.0.21"; + version = "3.0.4"; name = "pencil-${version}"; src = fetchurl { - url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "0xq3gczqy7gzf1997qxdql5z7qqk1vabr0rzgakmsi4dq2q4d3kq"; + url = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb"; + sha256 = "58e2b794c615ea8715d8374f177e19c87f7071e359826ec34a59836d537a62fd"; }; - buildPhase = ""; + sourceRoot = "."; - buildInputs = [ makeWrapper ]; + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + buildPhase = ":"; + + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p "$out" - cp -r usr/* "$out" - sed -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \ - -i "$out/bin/pencil" - sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \ - -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \ - -i "$out/share/applications/pencil.desktop" + mkdir -p $out/bin + cp -R usr/share opt $out/ - wrapProgram $out/bin/pencil \ - --prefix PATH ":" ${xulrunner}/bin + # fix the path in the desktop file + substituteInPlace \ + $out/share/applications/pencil.desktop \ + --replace /opt/ $out/opt/ + + # symlink the binary to bin/ + ln -s $out/opt/Pencil/pencil $out/bin/pencil + ''; + + + preFixup = let + packages = [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + nspr + nss + xlibs.libX11 + xlibs.libXScrnSaver + xlibs.libXcomposite + xlibs.libXcursor + xlibs.libXdamage + xlibs.libXext + xlibs.libXfixes + xlibs.libXi + xlibs.libXrandr + xlibs.libXrender + xlibs.libXtst + stdenv.cc.cc.lib + stdenv.cc.cc + glibc + ]; + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + in '' + # patch executable + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/opt/Pencil" \ + $out/opt/Pencil/pencil + + # patch libnode + patchelf \ + --set-rpath "${libPath}" \ + $out/opt/Pencil/libnode.so + + # libffmpeg is for some reason not executable + chmod a+x $out/opt/Pencil/libffmpeg.so + + # fix missing libudev + ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1 + wrapProgram $out/opt/Pencil/pencil \ + --prefix LD_LIBRARY_PATH : $out/opt/Pencil ''; meta = with stdenv.lib; { description = "GUI prototyping/mockup tool"; - homepage = https://github.com/prikhi/pencil; - license = licenses.gpl2; # Commercial license is also available - maintainers = with maintainers; [ bjornfor prikhi ]; - platforms = platforms.linux; + homepage = "https://pencil.evolus.vn/"; + license = licenses.gpl2; # Commercial license is also available + maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 82e8793199b6..01affbbbd94c 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz"; + url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://photoqt.org/; + homepage = https://photoqt.org/; description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index f4a4b6bb9d85..a3151238438b 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -56,9 +56,9 @@ buildDotnetPackage rec { ''; makeWrapperArgs = [ - ''--prefix MONO_GAC_PREFIX ':' "${gtksharp}"'' - ''--prefix LD_LIBRARY_PATH ':' "${gtksharp}/lib"'' - ''--prefix LD_LIBRARY_PATH ':' "${gtksharp.gtk.out}/lib"'' + ''--prefix MONO_GAC_PREFIX : ${gtksharp}'' + ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib'' + ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib'' ]; postInstall = '' diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 39f4e0a26d24..9e5958871cc0 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk3 } : +{ stdenv, fetchFromGitHub, pkgconfig +, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler +}: stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "06blqckj3bpbi2kl5ndv2d10r7nw62r386kfwrkic9amynlv9gki"; + sha256 = "0zn7ps73lw04l9i4777c90ik07v3hkg66mnpz8vvvwjyi40i77a7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ getopt which gtk3 ]; + buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake deleted file mode 100644 index 7be7cb63f701..000000000000 --- a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(GIT_BRANCH master) -set(GIT_VERSION 4.2.1115) -set(GIT_CHANGESET 0821eea7b6a4ac2fce1fcf644e06078e161e41e3) -set(GIT_TAGDISTANCE 1115) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 91a34a505f2f..5743f0c1bcb6 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; buildInputs = [ - cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + pixman libpthreadstubs gtkmm3 libXau libXdmcp lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun ]; diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix deleted file mode 100644 index fb73feb4a099..000000000000 --- a/pkgs/applications/graphics/rawtherapee/dev.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx -}: - -stdenv.mkDerivation rec { - name = "rawtherapee-git-2016-10-10"; - - src = fetchFromGitHub { - owner = "Beep6581"; - repo = "RawTherapee"; - rev = "0821eea7b6a4ac2fce1fcf644e06078e161e41e3"; - sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; - - NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; - - # Copy generated ReleaseInfo.cmake so we don't need git. File was - # generated manually using `./tools/generateReleaseInfo` in the - # source folder. Make sure to regenerate it when updating. - preConfigure = '' - cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake - ''; - - enableParallelBuilding = true; - - meta = { - description = "RAW converter and digital photo processing software"; - homepage = http://www.rawtherapee.com/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch b/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch deleted file mode 100644 index 3c87ce64e26b..000000000000 --- a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ca0afa8d5f3cc7d09b6bab32d155a87c550f0d7b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fl=C3=B6ssie?= -Date: Sat, 1 Oct 2016 12:38:24 +0200 -Subject: [PATCH] Fix incompatibility with glibmm 2.50 (#3440) - -Kudos to @Hombre57 for the suggestion. ---- - rtgui/dirbrowser.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc -index d3fc8bf..6f25f0f 100644 ---- a/rtgui/dirbrowser.cc -+++ b/rtgui/dirbrowser.cc -@@ -59,7 +59,7 @@ std::vector listSubDirs (const Glib::RefPtr& dir, bool - } catch (const Glib::Exception& exception) { - - if (options.rtSettings.verbose) { -- std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl; -+ std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl; - } - - } diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch new file mode 100644 index 000000000000..e6ed05ea97a5 --- /dev/null +++ b/pkgs/applications/graphics/renderdoc/custom_swig.patch @@ -0,0 +1,32 @@ +diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt +index 2df9ffa5..66bafaba 100644 +--- a/qrenderdoc/CMakeLists.txt ++++ b/qrenderdoc/CMakeLists.txt +@@ -65,16 +65,6 @@ include(ExternalProject) + # Need bison for swig + find_package(BISON) + +-# Compile our custom SWIG that will do scoped/strong enum classes +-ExternalProject_Add(custom_swig +- # using an URL to a zip directly so we don't clone the history etc +- URL ${RENDERDOC_SWIG_PACKAGE} +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 +- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null +- BUILD_COMMAND $(MAKE) > /dev/null 2>&1 +- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1) +- + # Lastly find PySide 2, optionally, for Qt5 Python bindings + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + +@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces}) + get_filename_component(swig_file ${in} NAME_WE) + + add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py +- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} ++ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} +- DEPENDS custom_swig + DEPENDS ${RDOC_REPLAY_FILES} + DEPENDS ${QRD_INTERFACE_FILES}) + diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 2a5bbb9401a4..2bd3ab89161f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,8 +1,26 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison -, autoconf, automake, pcre, vulkan-loader, xorg +, pcre, vulkan-loader, xorg, autoreconfHook }: +let + custom_swig = stdenv.mkDerivation { + name = "renderdoc-custom-swig"; + src = fetchFromGitHub { + owner = "baldurk"; + repo = "swig"; + rev = "renderdoc-modified-1"; + sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x"; + }; + + nativeBuildInputs = [ autoreconfHook pcre ]; + + autoreconfPhase = '' + patchShebangs autogen.sh + ./autogen.sh + ''; + }; +in stdenv.mkDerivation rec { name = "renderdoc-${version}"; version = "0.91"; @@ -17,7 +35,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison autoconf automake pcre ]; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ]; cmakeFlags = [ "-DBUILD_VERSION_HASH=${src.rev}" @@ -28,6 +47,7 @@ stdenv.mkDerivation rec { # TODO: use this instead of preConfigure once placeholders land #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/" ]; + preConfigure = '' cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" ''; @@ -41,8 +61,14 @@ stdenv.mkDerivation rec { ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; + + # Set path to custom swig binary + NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig"; + enableParallelBuilding = true; + patches = [ ./custom_swig.patch ]; + meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = https://renderdoc.org/; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 3ef23142b2ed..5d35857f05e1 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, avahi, libjpeg, libusb1, libv4l, net_snmp +, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng , gettext, pkgconfig # List of { src name backend } attibute sets - see installFirmware below: @@ -24,7 +24,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" ; - buildInputs = [ avahi libusb1 libv4l net_snmp ]; + buildInputs = [ avahi libusb1 libv4l net_snmp libpng ]; nativeBuildInputs = [ gettext pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index dbf79bf20acb..e746f83e5d49 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-06-11"; + version = "2017-12-01"; src = fetchgit { - sha256 = "0jpavig7bg7l72drlwipmsg03j6qdy5aq2r3kj6a2h6ahpnm2549"; - rev = "5ba37467e88ca8052973b37128ce8fd36ad5d61d"; + sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8"; + rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index b0a6f7caf885..b23ddbf9d78b 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,38 +1,37 @@ -{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib -, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook -, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }: +{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite +, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib +, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook +, itstool, libgdata }: -# for dependencies see http://www.yorba.org/projects/shotwell/install/ +# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling stdenv.mkDerivation rec { version = "${major}.${minor}"; major = "0.27"; - minor = "1"; + minor = "2"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89"; + sha256 = "0bxc15gk2306fvxg6bg1s6c706yd89i66ldng0z102mcfi98warb"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; + nativeBuildInputs = [ + meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook + ]; - configureFlags = [ "--disable-gsettings-convert-install" ]; + buildInputs = [ + gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk + gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee + libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas + libraw json_glib glib gdk_pixbuf librsvg gnome3.rest + gnome3.gcr gnome3.defaultIconTheme libgdata + ]; - preConfigure = '' - patchShebangs . + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee - which udev libgudev gnome3.gexiv2 hicolor_icon_theme - libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - gnome_doc_utils gnome3.rest gnome3.gcr - gnome3.defaultIconTheme itstool libgdata ]; - meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; homepage = https://wiki.gnome.org/Apps/Shotwell; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 43d6229ab2bc..be1a799a9ecf 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype , json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre +, wrapGAppsHook }: stdenv.mkDerivation rec { name = "solvespace-2.3-20170808"; @@ -11,9 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig cmake wrapGAppsHook + ]; buildInputs = [ - cmake zlib libpng cairo freetype + zlib libpng cairo freetype json_c fontconfig gtkmm3 pangomm glew mesa_glu xlibs.libpthreadstubs xlibs.libXdmcp pcre ]; @@ -38,11 +41,11 @@ stdenv.mkDerivation rec { --replace /usr/bin/ $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "A parametric 3d CAD program"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ edef ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.edef ]; + platforms = platforms.linux; homepage = http://solvespace.com; }; } diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 31908dcfd9f0..f1adc6bd10ea 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -22,7 +22,7 @@ let else if stdenv.system == "i686-linux" then "x86" else - abort "Unsupported platform"; + throw "Unsupported platform ${stdenv.system}"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index dcb7c512ddef..a8b4038b11f3 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.17.1"; + version = "3.17.2"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl"; + sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch new file mode 100644 index 000000000000..1b5e12c7ec32 --- /dev/null +++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch @@ -0,0 +1,49 @@ +From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 +From: gnidorah +Date: Fri, 22 Dec 2017 17:36:03 +0300 +Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" + +This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. +--- + CMakeLists.txt | 3 --- + KF5AkonadiConfig.cmake.in | 6 +++--- + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9788bea94..15bad00fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -285,9 +285,6 @@ configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR +- AKONADI_INCLUDE_DIR +- KF5Akonadi_DATA_DIR + ) + + install(FILES +diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in +index 75abede50..10f039376 100644 +--- a/KF5AkonadiConfig.cmake.in ++++ b/KF5AkonadiConfig.cmake.in +@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@") + find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@") + find_dependency(Qt5Network "@QT_REQUIRED_VERSION@") + +-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") ++set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") ++set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") + + find_dependency(Boost "@Boost_MINIMUM_VERSION@") + +@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) + + # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed +-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") ++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") +-- +2.15.1 + diff --git a/pkgs/applications/kde/akonadi/series b/pkgs/applications/kde/akonadi/series index 9e067f0a0008..f828d503cc77 100644 --- a/pkgs/applications/kde/akonadi/series +++ b/pkgs/applications/kde/akonadi/series @@ -1,2 +1,3 @@ akonadi-paths.patch akonadi-timestamps.patch +0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix index 3d7bf26c794e..1470406d5a43 100644 --- a/pkgs/applications/kde/akonadiconsole.nix +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion, kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim, - ktextwidgets, kxmlgui, messagelib, qtbase, + ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian }: mkDerivation { @@ -16,6 +16,6 @@ mkDerivation { buildInputs = [ akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui - messagelib qtbase libkdepim + messagelib qtbase libkdepim akonadi-search xapian ]; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 378fcde41e10..dc57a3554f31 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -63,7 +63,6 @@ let kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; }; in { - kdelibs = callPackage ./kdelibs { inherit attica phonon; }; akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; @@ -102,6 +101,7 @@ let kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; + kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; kholidays = callPackage ./kholidays.nix {}; @@ -124,6 +124,7 @@ let kontactinterface = callPackage ./kontactinterface.nix {}; korganizer = callPackage ./korganizer.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; + ksmtp = callPackage ./ksmtp {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; @@ -135,6 +136,7 @@ let libkdcraw = callPackage ./libkdcraw.nix {}; libkdepim = callPackage ./libkdepim.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; + libkgapi = callPackage ./libkgapi.nix {}; libkipi = callPackage ./libkipi.nix {}; libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; @@ -154,8 +156,6 @@ let print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; syndication = callPackage ./syndication.nix {}; - - l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; }); }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 1542b9c25190..5a12918fb978 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.12.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch index 6275bb84c17b..fe8b15febf2e 100644 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -11,85 +11,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme_p.h QString author; QString email; -Index: grantleetheme-17.04.0/src/grantleetheme.cpp -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme.cpp -+++ grantleetheme-17.04.0/src/grantleetheme.cpp -@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr - , description(other.description) - , name(other.name) - , dirName(other.dirName) -- , absolutePath(other.absolutePath) -+ , absolutePaths(other.absolutePaths) - , author(other.author) - , email(other.email) - , loader(other.loader) -@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine() - - void ThemePrivate::setupLoader() - { -- // Get the parent dir with themes, we set the theme directory separately -- QDir dir(absolutePath); -- dir.cdUp(); -+ QStringList templateDirs; -+ for (const QString& path : absolutePaths) { -+ QDir dir(path); -+ dir.cdUp(); -+ templateDirs << dir.absolutePath(); -+ } - - loader = QSharedPointer::create(); -- loader->setTemplateDirs({ dir.absolutePath() }); -+ loader->setTemplateDirs(templateDirs); - loader->setTheme(dirName); - - if (!sEngine) { -@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c - KConfigGroup group(&config, QStringLiteral("Desktop Entry")); - if (group.isValid()) { - d->dirName = dirName; -- d->absolutePath = themePath; -+ d->absolutePaths = QStringList(themePath); - d->name = group.readEntry("Name", QString()); - d->description = group.readEntry("Description", QString()); - d->themeFileName = group.readEntry("FileName", QString()); -@@ -141,7 +142,7 @@ Theme::~Theme() - - bool Theme::operator==(const Theme &other) const - { -- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); -+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); - } - - Theme &Theme::operator=(const Theme &other) -@@ -185,7 +186,12 @@ QString Theme::dirName() const - - QString Theme::absolutePath() const - { -- return d->absolutePath; -+ return d->absolutePaths.first(); -+} -+ -+QStringList Theme::absolutePaths() const -+{ -+ return d->absolutePaths; - } - - QString Theme::author() const -@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem - return result; - } - -+void Theme::addThemeDir(const QString& path) -+{ -+ QDir dir(path); -+ dir.cdUp(); -+ d->absolutePaths << dir.absolutePath(); -+} -+ - void Theme::addPluginPath(const QString &path) - { - if (!ThemePrivate::sEngine) { Index: grantleetheme-17.04.0/src/grantleetheme.h =================================================================== --- grantleetheme-17.04.0.orig/src/grantleetheme.h @@ -153,3 +74,80 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp } } } +--- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300 ++++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300 +@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr + , description(other.description) + , name(other.name) + , dirName(other.dirName) +- , absolutePath(other.absolutePath) ++ , absolutePaths(other.absolutePaths) + , author(other.author) + , email(other.email) + , loader(other.loader) +@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine() + + void ThemePrivate::setupLoader() + { +- // Get the parent dir with themes, we set the theme directory separately +- QDir dir(absolutePath); +- dir.cdUp(); ++ QStringList templateDirs; ++ for (const QString& path : absolutePaths) { ++ QDir dir(path); ++ dir.cdUp(); ++ templateDirs << dir.absolutePath(); ++ } + + loader = QSharedPointer::create(); +- loader->setTemplateDirs({ dir.absolutePath() }); ++ loader->setTemplateDirs(templateDirs); + loader->setTheme(dirName); + + if (!sEngine) { +@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c + KConfigGroup group(&config, QStringLiteral("Desktop Entry")); + if (group.isValid()) { + d->dirName = dirName; +- d->absolutePath = themePath; ++ d->absolutePaths = QStringList(themePath); + d->name = group.readEntry("Name", QString()); + d->description = group.readEntry("Description", QString()); + d->themeFileName = group.readEntry("FileName", QString()); +@@ -140,7 +143,7 @@ Theme::~Theme() + + bool Theme::operator==(const Theme &other) const + { +- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); ++ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); + } + + Theme &Theme::operator=(const Theme &other) +@@ -184,7 +187,12 @@ QString Theme::dirName() const + + QString Theme::absolutePath() const + { +- return d->absolutePath; ++ return d->absolutePaths.first(); ++} ++ ++QStringList Theme::absolutePaths() const ++{ ++ return d->absolutePaths; + } + + QString Theme::author() const +@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem + return result; + } + ++void Theme::addThemeDir(const QString& path) ++{ ++ QDir dir(path); ++ dir.cdUp(); ++ d->absolutePaths << dir.absolutePath(); ++} ++ + void Theme::addPluginPath(const QString &path) + { + if (!ThemePrivate::sEngine) { diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix deleted file mode 100644 index daf0a55b19e5..000000000000 --- a/pkgs/applications/kde/kde-locale-4.nix +++ /dev/null @@ -1,27 +0,0 @@ -name: args: - -{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }: - -mkDerivation (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt4"; - - outputs = [ "out" ]; - - nativeBuildInputs = - [ automoc4 cmake gettext perl ] - ++ (args.nativeBuildInputs or []); - buildInputs = - [ kdelibs ] - ++ (args.buildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; - - preFixup = '' - propagatedBuildInputs= - propagatedNativeBuildInputs= - ''; -}) diff --git a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch deleted file mode 100644 index b7d7300e9a84..000000000000 --- a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 13:54:57 -0500 -Subject: [PATCH 1/2] old kde4 cmake policies - ---- - cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake -index 7d54b9b..c435571 100644 ---- a/cmake/modules/FindKDE4Internal.cmake -+++ b/cmake/modules/FindKDE4Internal.cmake -@@ -345,6 +345,39 @@ - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below -+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) -+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3) -+cmake_policy(VERSION 2.4.5) -+ -+# CMake 2.6, set compatibility behaviour to cmake 2.4 -+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above -+# resets the policy settings, so we get a lot of warnings -+ -+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough -+cmake_policy(SET CMP0000 OLD) -+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests -+cmake_policy(SET CMP0002 OLD) -+# CMP0003: add the link paths to the link command as with cmake 2.4 -+cmake_policy(SET CMP0003 OLD) -+# CMP0005: keep escaping behaviour for definitions added via add_definitions() -+cmake_policy(SET CMP0005 OLD) -+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file -+# where this is done, macros and functions are executed with the policies as they -+# were when the were defined. Keep the OLD behaviour so we can set the policies here -+# for all KDE software without the big warning -+cmake_policy(SET CMP0011 OLD) -+ -+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files -+# in this directory over those from CMAKE_MODULE_PATH -+cmake_policy(SET CMP0017 NEW) -+ -+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake -+if (POLICY CMP0026) -+ cmake_policy(SET CMP0026 OLD) -+endif (POLICY CMP0026) -+ -+ - # Only do something if it hasn't been found yet - if(NOT KDE4_FOUND) - --- -2.5.0 - diff --git a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch deleted file mode 100644 index ff0306ea1488..000000000000 --- a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 13:56:03 -0500 -Subject: [PATCH 2/2] polkit install path - ---- - kdecore/auth/ConfigureChecks.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake -index 7cf9cb5..c8334ae 100644 ---- a/kdecore/auth/ConfigureChecks.cmake -+++ b/kdecore/auth/ConfigureChecks.cmake -@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1") - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) --- -2.5.0 - diff --git a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch deleted file mode 100644 index a79d7b2b7d16..000000000000 --- a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp -index ab8f76d..2ae5089 100644 ---- a/kdecore/kernel/kstandarddirs.cpp -+++ b/kdecore/kernel/kstandarddirs.cpp -@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults() - else - { - xdgdirList.clear(); -- xdgdirList.append(QString::fromLatin1("/etc/xdg")); --#ifdef Q_WS_WIN -- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); --#else -- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); --#endif - } - - QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); -@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults() - } - } else { - xdgdirList = kdedirDataDirs; --#ifndef Q_WS_WIN -- xdgdirList.append(QString::fromLatin1("/usr/local/share/")); -- xdgdirList.append(QString::fromLatin1("/usr/share/")); --#endif - } - - localXdgDir = readEnvPath("XDG_DATA_HOME"); -diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp -index 4c9cad9..6849d45 100644 ---- a/solid/solid/xdgbasedirs.cpp -+++ b/solid/solid/xdgbasedirs.cpp -@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource ) - { - if ( qstrncmp( "data", resource, 4 ) == 0 ) { - if ( instance()->mDataDirs.isEmpty() ) { -- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" ); -+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" ); - } - return instance()->mDataDirs; - } else if ( qstrncmp( "config", resource, 6 ) == 0 ) { - if ( instance()->mConfigDirs.isEmpty() ) { -- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" ); -+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" ); - } - return instance()->mConfigDirs; - } diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix deleted file mode 100644 index 31e578e228a9..000000000000 --- a/pkgs/applications/kde/kdelibs/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, lib, - automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info, - attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase, - libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4, - shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch -}: - -mkDerivation { - name = "kdelibs"; - - outputs = [ "out" "dev" ]; - - outputInclude = "out"; - - setOutputFlags = false; - - nativeBuildInputs = [ - automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info - ]; - buildInputs = [ - attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 - polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre - ]; - propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - - patches = [ - ./0001-old-kde4-cmake-policies.patch - ./0002-polkit-install-path.patch - ./0003-remove_xdg_impurities.patch - ]; - - # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DWITH_SOLID_UDISKS2=ON" - "-DKDE_DEFAULT_HOME=.kde" - ]; - - meta = { - platforms = lib.platforms.linux; - homepage = http://www.kde.org; - license = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 0fde861a0237..3230efd82017 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -5,7 +5,7 @@ akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, + pimcommon, qtwebengine, libkgapi }: mkDerivation { @@ -19,7 +19,7 @@ mkDerivation { akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon + pimcommon libkgapi ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix new file mode 100644 index 000000000000..6a50f1d08d1c --- /dev/null +++ b/pkgs/applications/kde/kget.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme, + kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui +}: + +mkDerivation { + name = "kget"; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme + kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui + ]; + + meta = with lib; { + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index 19ce2ba94f30..c4b7c0ab4327 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, + akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ akonadi kcmutils ki18n kio ]; + buildInputs = [ akonadi kcmutils ki18n kio ksmtp ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index b18a3f7fdc1e..4523a69fc1be 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -10,7 +10,7 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; - buildInputs = [ kcodecs qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch new file mode 100644 index 000000000000..74e83761eb7d --- /dev/null +++ b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch @@ -0,0 +1,25 @@ +From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001 +From: gnidorah +Date: Fri, 22 Dec 2017 19:32:47 +0300 +Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 83c2bcb..5f6d47c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS + REQUIRED_HEADERS KSMTP_HEADERS + ) + +-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h +-- +2.15.1 + diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix new file mode 100644 index 000000000000..6a5f51a17bfe --- /dev/null +++ b/pkgs/applications/kde/ksmtp/default.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcoreaddons, kio, kmime, cyrus_sasl +}: + +mkDerivation { + name = "ksmtp"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kio kmime ]; + propagatedBuildInputs = [ cyrus_sasl ]; + patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; +} diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix deleted file mode 100644 index 10a8472d5a9e..000000000000 --- a/pkgs/applications/kde/l10n.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ callPackage, recurseIntoAttrs, lib }: - -let - - kdeLocale4 = import ./kde-locale-4.nix; - -in - -lib.mapAttrs (name: attr: recurseIntoAttrs attr) { - ar = { - qt4 = callPackage (kdeLocale4 "ar" {}) {}; - }; - bg = { - qt4 = callPackage (kdeLocale4 "bg" {}) {}; - }; - bs = { - qt4 = callPackage (kdeLocale4 "bs" {}) {}; - }; - ca = { - qt4 = callPackage (kdeLocale4 "ca" {}) {}; - }; - ca_valencia = { - qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {}; - }; - cs = { - qt4 = callPackage (kdeLocale4 "cs" {}) {}; - }; - da = { - qt4 = callPackage (kdeLocale4 "da" {}) {}; - }; - de = { - qt4 = callPackage (kdeLocale4 "de" {}) {}; - }; - el = { - qt4 = callPackage (kdeLocale4 "el" {}) {}; - }; - en_GB = { - qt4 = callPackage (kdeLocale4 "en_GB" {}) {}; - }; - eo = { - qt4 = callPackage (kdeLocale4 "eo" {}) {}; - }; - es = { - qt4 = callPackage (kdeLocale4 "es" {}) {}; - }; - et = { - qt4 = callPackage (kdeLocale4 "et" {}) {}; - }; - eu = { - qt4 = callPackage (kdeLocale4 "eu" {}) {}; - }; - fa = { - qt4 = callPackage (kdeLocale4 "fa" {}) {}; - }; - fi = { - qt4 = callPackage (kdeLocale4 "fi" {}) {}; - }; - fr = { - qt4 = callPackage (kdeLocale4 "fr" {}) {}; - }; - ga = { - qt4 = callPackage (kdeLocale4 "ga" {}) {}; - }; - gl = { - qt4 = callPackage (kdeLocale4 "gl" {}) {}; - }; - he = { - qt4 = callPackage (kdeLocale4 "he" {}) {}; - }; - hi = { - qt4 = callPackage (kdeLocale4 "hi" {}) {}; - }; - hr = { - qt4 = callPackage (kdeLocale4 "hr" {}) {}; - }; - hu = { - qt4 = callPackage (kdeLocale4 "hu" {}) {}; - }; - ia = { - qt4 = callPackage (kdeLocale4 "ia" {}) {}; - }; - id = { - qt4 = callPackage (kdeLocale4 "id" {}) {}; - }; - is = { - qt4 = callPackage (kdeLocale4 "is" {}) {}; - }; - it = { - qt4 = callPackage (kdeLocale4 "it" {}) {}; - }; - ja = { - qt4 = callPackage (kdeLocale4 "ja" {}) {}; - }; - kk = { - qt4 = callPackage (kdeLocale4 "kk" {}) {}; - }; - km = { - qt4 = callPackage (kdeLocale4 "km" {}) {}; - }; - ko = { - qt4 = callPackage (kdeLocale4 "ko" {}) {}; - }; - lt = { - qt4 = callPackage (kdeLocale4 "lt" {}) {}; - }; - lv = { - qt4 = callPackage (kdeLocale4 "lv" {}) {}; - }; - mr = { - qt4 = callPackage (kdeLocale4 "mr" {}) {}; - }; - nb = { - qt4 = callPackage (kdeLocale4 "nb" {}) {}; - }; - nds = { - qt4 = callPackage (kdeLocale4 "nds" {}) {}; - }; - nl = { - qt4 = callPackage (kdeLocale4 "nl" {}) {}; - }; - nn = { - qt4 = callPackage (kdeLocale4 "nn" {}) {}; - }; - pa = { - qt4 = callPackage (kdeLocale4 "pa" {}) {}; - }; - pl = { - qt4 = callPackage (kdeLocale4 "pl" {}) {}; - }; - pt = { - qt4 = callPackage (kdeLocale4 "pt" {}) {}; - }; - pt_BR = { - qt4 = callPackage (kdeLocale4 "pt_BR" {}) {}; - }; - ro = { - qt4 = callPackage (kdeLocale4 "ro" {}) {}; - }; - ru = { - qt4 = callPackage (kdeLocale4 "ru" {}) {}; - }; - sk = { - qt4 = callPackage (kdeLocale4 "sk" {}) {}; - }; - sl = { - qt4 = callPackage (kdeLocale4 "sl" {}) {}; - }; - sr = { - qt4 = callPackage (kdeLocale4 "sr" { - preConfigure = '' - patchShebangs \ - 4/sr/sr@latin/scripts/ts-pmap-compile.py \ - 4/sr/scripts/ts-pmap-compile.py \ - 4/sr/data/resolve-sr-hybrid \ - 4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \ - 4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py - ''; - }) {}; - }; - sv = { - qt4 = callPackage (kdeLocale4 "sv" {}) {}; - }; - tr = { - qt4 = callPackage (kdeLocale4 "tr" {}) {}; - }; - ug = { - qt4 = callPackage (kdeLocale4 "ug" {}) {}; - }; - uk = { - qt4 = callPackage (kdeLocale4 "uk" {}) {}; - }; - wa = { - qt4 = callPackage (kdeLocale4 "wa" {}) {}; - }; - zh_CN = { - qt4 = callPackage (kdeLocale4 "zh_CN" {}) {}; - }; - zh_TW = { - qt4 = callPackage (kdeLocale4 "zh_TW" {}) {}; - }; -} diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index edd9732d051b..3fd486056542 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -8,8 +8,8 @@ mkDerivation { license = with licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ kcodecs ki18n kio kwidgetsaddons libmusicbrainz5 diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix new file mode 100644 index 000000000000..7ff3a1f04b09 --- /dev/null +++ b/pkgs/applications/kde/libkgapi.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtwebengine, kio, kcalcore, kcontacts +}: + +mkDerivation { + name = "libkgapi"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtwebengine kio kcalcore kcontacts ]; +} diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index fd628a7aacfd..efe850ab414d 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, extra-cmake-modules +, lib, extra-cmake-modules, gettext, python , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools , qtquickcontrols2, qtsvg, qttools @@ -12,11 +12,13 @@ mkDerivation { maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + propagatedBuildInputs = [ drumstick fluidsynth kcoreaddons kcrash qtquickcontrols2 qtsvg qttools ]; + enableParallelBuilding = true; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 2edfb0d79bb3..4f6146598a19 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2235 +3,1691 @@ { akonadi = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz"; - sha256 = "01sn0c5b679v76djpd7rx3cgzn3idpsjc3m3wgrvjzfyqs18f2al"; - name = "akonadi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-17.12.0.tar.xz"; + sha256 = "0f42wfsicibls845a50b7fzxcdyyi8k9g4l5jpf9si3q6imvq2zn"; + name = "akonadi-17.12.0.tar.xz"; }; }; akonadi-calendar = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-17.08.3.tar.xz"; - sha256 = "1w14a27k0hw4i9vnv2bkh12jpvb6jh31i6jd4hxaxvvmmjwl68b6"; - name = "akonadi-calendar-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-calendar-17.12.0.tar.xz"; + sha256 = "196gn9lbyw8dv2w4a8j1fy85hql9q8f4ps6pf7pas2pcvja3j68x"; + name = "akonadi-calendar-17.12.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz"; - sha256 = "19b5my6svq32nwagkq5p0al7mzf844d4pp0764irgdcfk6ciakkw"; - name = "akonadi-calendar-tools-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-calendar-tools-17.12.0.tar.xz"; + sha256 = "19wgijhmv3kjbwdplw9ggs1plhgd2n16aqs0wyhb18wkjv4dgl08"; + name = "akonadi-calendar-tools-17.12.0.tar.xz"; }; }; akonadiconsole = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz"; - sha256 = "1ccmdarzb60f22ypnfmr1gzrc7byw08c2h3zhni9g1jab327i2vk"; - name = "akonadiconsole-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadiconsole-17.12.0.tar.xz"; + sha256 = "0xz9vr49qfsry76rmmyfm78k6wqwbsx40nkhyim0pf5npa3ax0v5"; + name = "akonadiconsole-17.12.0.tar.xz"; }; }; akonadi-contacts = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-contacts-17.08.3.tar.xz"; - sha256 = "0fh9rja4dlvambx6ig4gszgr26rrxfhmgdn0541fsg5hpkpifsx9"; - name = "akonadi-contacts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-contacts-17.12.0.tar.xz"; + sha256 = "17sxdayliw78vsnpknl81b8cd3kaz8aiblgjsh3xl9kdrmm1y0nj"; + name = "akonadi-contacts-17.12.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-import-wizard-17.08.3.tar.xz"; - sha256 = "1hza7bl6anzxp32dpw79v73lgqssmdw32qhkinnacws7x9kcvpag"; - name = "akonadi-import-wizard-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-import-wizard-17.12.0.tar.xz"; + sha256 = "0pi08ab58wc6zxvw9pdkrnk5y6sg4ydb2a4dsyrb1dmzywrqcjk2"; + name = "akonadi-import-wizard-17.12.0.tar.xz"; }; }; akonadi-mime = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-mime-17.08.3.tar.xz"; - sha256 = "1374wvyh29ba5s60m8przch5rmxvxzc2kjfw1gxhkrl7k8hfi4k8"; - name = "akonadi-mime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-mime-17.12.0.tar.xz"; + sha256 = "04snsl5152b4jfgvdg2115z06zql15ny0pjs9iqld3mmmc371317"; + name = "akonadi-mime-17.12.0.tar.xz"; }; }; akonadi-notes = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-notes-17.08.3.tar.xz"; - sha256 = "0bnr6j8pqqx6hg8hq51yzaky5hyym5lxyj9rwcsmm75x2c29wxb7"; - name = "akonadi-notes-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-notes-17.12.0.tar.xz"; + sha256 = "0ckr0c0zd8f2703gkrviilqxd5kfwm7ca77728hvzccs33nr1jr4"; + name = "akonadi-notes-17.12.0.tar.xz"; }; }; akonadi-search = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-search-17.08.3.tar.xz"; - sha256 = "16d6v2d1irh02kd4dcvjhv17sqkps4xq4dpa4x1wb3q5qzxhmqcr"; - name = "akonadi-search-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akonadi-search-17.12.0.tar.xz"; + sha256 = "1kmqybhk47r6wr15aqg4j4z47yl0qzyllrnpcksm5ggfam8m2k58"; + name = "akonadi-search-17.12.0.tar.xz"; }; }; akregator = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz"; - sha256 = "1jd48yj9sl4z46qfk3qkm98q33f1qblsyjdr7ff8znxkg2pw5xg6"; - name = "akregator-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/akregator-17.12.0.tar.xz"; + sha256 = "0lmjiw6b2ckfrq9c1xwrhdg5f3sgrh9l1hrxc5k0xyhx8hnbqj9r"; + name = "akregator-17.12.0.tar.xz"; }; }; analitza = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz"; - sha256 = "1j0z63sfah2ypjb3szcr7dqndw18lcy8l9440q8kzq0gyl83cn3v"; - name = "analitza-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/analitza-17.12.0.tar.xz"; + sha256 = "0y418j7y2lhy5mp03irqpg8lgzqmwynfc8lkmf1rxj4445z8lpg2"; + name = "analitza-17.12.0.tar.xz"; }; }; ark = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ark-17.08.3.tar.xz"; - sha256 = "1qz333nd23x4ldx675cxs7ka2vz45xmkfsakdg8m3x26i7jnl86x"; - name = "ark-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ark-17.12.0.tar.xz"; + sha256 = "0l4agh5nd3v8chm75gha3fc6w0qzl60m28i2syfb6090xr7di5s3"; + name = "ark-17.12.0.tar.xz"; }; }; artikulate = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz"; - sha256 = "13hg9cjdwhfya57xan96ma55msani0lx7v55zh0hv0jab9fxgv1n"; - name = "artikulate-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/artikulate-17.12.0.tar.xz"; + sha256 = "042wf2h5jrj7dmpks6nj9vvqrc4xfw2n97lvindndhmj6sia1h72"; + name = "artikulate-17.12.0.tar.xz"; }; }; audiocd-kio = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/audiocd-kio-17.08.3.tar.xz"; - sha256 = "0n1xfypn2m56iw65p52yfbbqn17c6kc1x8syh35ifg9c1147y8ar"; - name = "audiocd-kio-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/audiocd-kio-17.12.0.tar.xz"; + sha256 = "1nwwwsklz98dj4wvb5bbgphpw42vhnj7gxjgvskf52ap9q4y6xkm"; + name = "audiocd-kio-17.12.0.tar.xz"; }; }; baloo-widgets = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/baloo-widgets-17.08.3.tar.xz"; - sha256 = "031yhv8ivqzr63maylsin60hfv45awry6xigfy0kfqj06q63944g"; - name = "baloo-widgets-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/baloo-widgets-17.12.0.tar.xz"; + sha256 = "1j8p0vfp3x8a5kbqjak8ikmby5hzabcwwa0n4lic596mb2s2v9xd"; + name = "baloo-widgets-17.12.0.tar.xz"; }; }; blinken = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/blinken-17.08.3.tar.xz"; - sha256 = "15nnsyqy73inqqys1r8khh1vvl24ljmgjpxlqg8vlfb6d8dsc8yx"; - name = "blinken-17.08.3.tar.xz"; - }; - }; - blogilo = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/blogilo-17.08.3.tar.xz"; - sha256 = "18vbvs5cih9vcxfqsia35q8bzc4ldzaajvnv9iqmisg060fxfwi9"; - name = "blogilo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/blinken-17.12.0.tar.xz"; + sha256 = "0djzv65akvpi69nfv9jjjff986a7ph0mlw916m1iqiwg91ix1car"; + name = "blinken-17.12.0.tar.xz"; }; }; bomber = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz"; - sha256 = "1rmjlhyc46jxjsc303zl56c3k15q1qvp4yfl78v5l2pwmk8vdxzn"; - name = "bomber-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/bomber-17.12.0.tar.xz"; + sha256 = "0cr72ym979dka7bw773ng85db2qix7ikw4pwncvan07x9c6kr0p9"; + name = "bomber-17.12.0.tar.xz"; }; }; bovo = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz"; - sha256 = "1npzzjgzhgbv7pnz3j9if2c5qa5b9ghzj7llp8yndf6dz31qibps"; - name = "bovo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/bovo-17.12.0.tar.xz"; + sha256 = "0m4sr7ym469lkpmc4syx0b90nn0l52iwiz59gw70bw394vmd88cn"; + name = "bovo-17.12.0.tar.xz"; }; }; calendarsupport = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz"; - sha256 = "1ii3h42jkskrizg29ii17jkdxgsqs3lwzsd7ypgw1k8gk9fyyqxh"; - name = "calendarsupport-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/calendarsupport-17.12.0.tar.xz"; + sha256 = "0vm6fp6cla3gwvznlzn69d9lc7nca8ns54j7jwd509gi4ssmh2bb"; + name = "calendarsupport-17.12.0.tar.xz"; }; }; cantor = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz"; - sha256 = "0yz71lxwzl5r9k2fzs4iyhyx811rc77m6n1lqagd2c29hnnchn9w"; - name = "cantor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/cantor-17.12.0.tar.xz"; + sha256 = "10zpv1j9h6cjpxkp4dc982zyw5dqzdayljfbwywxdqryxdw00rlw"; + name = "cantor-17.12.0.tar.xz"; }; }; cervisia = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz"; - sha256 = "0272zf51rn1a9k796fspp456zq6j21bddfn7r350pd6ra19ay7j8"; - name = "cervisia-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/cervisia-17.12.0.tar.xz"; + sha256 = "0blzqh51ii6a9ys64xphzgah1cvxaqxrxpvbhxvldywry9brbbhg"; + name = "cervisia-17.12.0.tar.xz"; }; }; dolphin = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz"; - sha256 = "02bb66411jy03s4wicalnsl6sxmslhdb3wxsqh7sdyh63llna5b5"; - name = "dolphin-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/dolphin-17.12.0.tar.xz"; + sha256 = "0swc8f502v3cvanxsry77bvwqzlspk934hcaahzklfigv7v5kg9v"; + name = "dolphin-17.12.0.tar.xz"; }; }; dolphin-plugins = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/dolphin-plugins-17.08.3.tar.xz"; - sha256 = "1s2rjrvfs5i87gx3fsz0mqdr7106ds5747wq6n2sfzjkvippygay"; - name = "dolphin-plugins-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/dolphin-plugins-17.12.0.tar.xz"; + sha256 = "1cyfwp7ny8l1ak4a64gcphb0a5kvdb8d0mbqm1fbcq1zzcvi4w8b"; + name = "dolphin-plugins-17.12.0.tar.xz"; }; }; dragon = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz"; - sha256 = "0fxzwfg0l7lnsswb51h8gmh4wngmng9sgm5nhn6wmwhfbhbzgagq"; - name = "dragon-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/dragon-17.12.0.tar.xz"; + sha256 = "1qa6mwr64z4c13jg9paqr8f462pcpk7hqvb46h3aswh4h57d837z"; + name = "dragon-17.12.0.tar.xz"; }; }; eventviews = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz"; - sha256 = "0j1r833kzf9sparvqnfn8r7klf4j0z8jwrgclf87rggmx0dn2v4y"; - name = "eventviews-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/eventviews-17.12.0.tar.xz"; + sha256 = "07p4fv5mzqbnafglr3ww7iccxyqm4shj03vw4aq790ld6qcxqbv4"; + name = "eventviews-17.12.0.tar.xz"; }; }; ffmpegthumbs = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz"; - sha256 = "19bkpc316wlhswgrbszpj65lrzsdp443c1174hqknm0srvp6fbvv"; - name = "ffmpegthumbs-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ffmpegthumbs-17.12.0.tar.xz"; + sha256 = "0102nqrvcjzmmbf0k3chivhpl44vgz53k2zskpzkpvpzzgd5s484"; + name = "ffmpegthumbs-17.12.0.tar.xz"; }; }; filelight = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz"; - sha256 = "06j6api909shraflfpn0cyvxaa57s2dq178kshkfv5yppxjpfpja"; - name = "filelight-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/filelight-17.12.0.tar.xz"; + sha256 = "01pbpvi74wlz60vrz3cgrnyc22zcvlkfc8m2w7h765y4gddkgplj"; + name = "filelight-17.12.0.tar.xz"; }; }; granatier = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz"; - sha256 = "1z2gs73k8ymz09x72hvyylwqs6pxbnivz86hbb9pb1mlb7x5fgvs"; - name = "granatier-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/granatier-17.12.0.tar.xz"; + sha256 = "1smcpjz4zfzpx92zs32hdgqkfxn0rljq6wgqjdcnbl8phjd04vqi"; + name = "granatier-17.12.0.tar.xz"; }; }; grantlee-editor = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/grantlee-editor-17.08.3.tar.xz"; - sha256 = "1cb77qmzzk64mkbzvywksvpfqw88mwmg7sqrni4apsasvg9mvygx"; - name = "grantlee-editor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/grantlee-editor-17.12.0.tar.xz"; + sha256 = "0h8987qydi310q0arg3l82n6ah8zs7z02vrnb30ffw827mxsfm99"; + name = "grantlee-editor-17.12.0.tar.xz"; }; }; grantleetheme = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz"; - sha256 = "0zag5gmaqi068hw8s71ascj7s8clg1sickrfpzjf3nhcf6y669rp"; - name = "grantleetheme-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/grantleetheme-17.12.0.tar.xz"; + sha256 = "0ak01wifp2zk10rmsnwh2df5xlqbha5jgdxjs6n873pz21hx0kng"; + name = "grantleetheme-17.12.0.tar.xz"; }; }; gwenview = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz"; - sha256 = "05c96y5yrdgh7228bw3agn344g02hylnb2fw8crjcdapsiya4v1w"; - name = "gwenview-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/gwenview-17.12.0.tar.xz"; + sha256 = "1m9vckn73i94n4gc66613ahx6i3qybafnn461fxnjwl5xykbsh9z"; + name = "gwenview-17.12.0.tar.xz"; }; }; incidenceeditor = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/incidenceeditor-17.08.3.tar.xz"; - sha256 = "0qfcycivlgzjx8j4b2bd4qjp3x8wbiax477bmz56sfv7q0vp1dgm"; - name = "incidenceeditor-17.08.3.tar.xz"; - }; - }; - jovie = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/jovie-17.08.3.tar.xz"; - sha256 = "1a4v97p3yfwr5zn5qkfkw1ln7liz47f3bnhdb6yzzi03s5xfrk1z"; - name = "jovie-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/incidenceeditor-17.12.0.tar.xz"; + sha256 = "0vmiwhxa7hiplvy1m24z53293bkq14zgi5jvrc5kmficg4ms1361"; + name = "incidenceeditor-17.12.0.tar.xz"; }; }; juk = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/juk-17.08.3.tar.xz"; - sha256 = "0735rdrn80akfb8viq8y77kxa28y1rg5infp26q7cy5cd4r6fvsi"; - name = "juk-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/juk-17.12.0.tar.xz"; + sha256 = "18nxrddy4ifyjnbc1ynh4zgym16av53j1vbnz2y6szf8gqj96ci2"; + name = "juk-17.12.0.tar.xz"; }; }; k3b = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/k3b-17.08.3.tar.xz"; - sha256 = "0kshb3j4djb9npkia0m0ffyrwja3drsyxw7hpgyxxswik6kwbvgk"; - name = "k3b-17.08.3.tar.xz"; - }; - }; - kaccessible = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaccessible-17.08.3.tar.xz"; - sha256 = "0sfrs57npp4y1yyw16chgrvyp6bnf4jymffblj5h7pb4bv0xlsmk"; - name = "kaccessible-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/k3b-17.12.0.tar.xz"; + sha256 = "1rn2jk21gp3gw5l1gcl0jhiyds7wsf3cpk7jl0zwqvg17df5j82c"; + name = "k3b-17.12.0.tar.xz"; }; }; kaccounts-integration = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaccounts-integration-17.08.3.tar.xz"; - sha256 = "0cir87m7f8sf70vvr8sxfhklgxigvv6npijphbbim7fnzc4z37m0"; - name = "kaccounts-integration-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kaccounts-integration-17.12.0.tar.xz"; + sha256 = "1vawy9bq4ngq8zxflaibazdjrx1vzxpkznh07lnz9isq6d21266k"; + name = "kaccounts-integration-17.12.0.tar.xz"; }; }; kaccounts-providers = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaccounts-providers-17.08.3.tar.xz"; - sha256 = "1y3ykj4q6m14q2lskliv0qy0ml0j9i9svhq06g2j25zd5wwlhbp5"; - name = "kaccounts-providers-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kaccounts-providers-17.12.0.tar.xz"; + sha256 = "13fbq89blgics3ix0arkzdd4z6hq77n8jkdr060axs4kgnmbv7i6"; + name = "kaccounts-providers-17.12.0.tar.xz"; }; }; kaddressbook = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz"; - sha256 = "1dq3lgrvg7s65mc2x2sgkwpz623ygb0by0y571dqjaz219j03955"; - name = "kaddressbook-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kaddressbook-17.12.0.tar.xz"; + sha256 = "10grv5a47gwfliz17qx74dwahabcrrz4553ijqlqkbjrw0p793zg"; + name = "kaddressbook-17.12.0.tar.xz"; }; }; kajongg = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz"; - sha256 = "00xb764nxzihz9kh7a82cm7slrj78zjl3s5qb90s03y375q4bha6"; - name = "kajongg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kajongg-17.12.0.tar.xz"; + sha256 = "16p6a2bzgy9r8v8zhwbdja3qkh1j75r3gr72lv7fqi2q8pnqn6m2"; + name = "kajongg-17.12.0.tar.xz"; }; }; kalarm = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz"; - sha256 = "0rmdxx59iykn6f746dw9p0dyk96wds4kqr6w2y8fscp889i05g2a"; - name = "kalarm-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kalarm-17.12.0.tar.xz"; + sha256 = "0s9dbl7xf6kyjxxrip11a1f9vanxlcyrcmjkillp6iah2r9zghv2"; + name = "kalarm-17.12.0.tar.xz"; }; }; kalarmcal = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz"; - sha256 = "0g4vxkjkc38p2aigmfr2q2qd6x8pr4fj53jkvjq314vqg9sbak9c"; - name = "kalarmcal-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kalarmcal-17.12.0.tar.xz"; + sha256 = "1qr6y46xzylwfr6af52gshcvh9485nfbfflcls8bp343kr0mcvyz"; + name = "kalarmcal-17.12.0.tar.xz"; }; }; kalgebra = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz"; - sha256 = "0hcrl205z2m5108g1kgxnmkrrg6x2m2p59cmdkbsd0ly0jnfc9w2"; - name = "kalgebra-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kalgebra-17.12.0.tar.xz"; + sha256 = "1h4ji0drl3mvxxwhfikxyg1ljwv8vjpr9npyp8qrj9swy7jjxzpw"; + name = "kalgebra-17.12.0.tar.xz"; }; }; kalzium = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz"; - sha256 = "142lcm1d7v8xknmqg00cgdz3iaydr6c9wblpij3wykffd53x7ind"; - name = "kalzium-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kalzium-17.12.0.tar.xz"; + sha256 = "0y7873q3zbqm3hgh3gglrdc0bad7pcjpv5fgdmxil3m6vand3kfl"; + name = "kalzium-17.12.0.tar.xz"; }; }; kamera = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz"; - sha256 = "0zrny1f27z0drsna2lpw9sr4y7z479lys3vzcysgf1fv8b8jdjdh"; - name = "kamera-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kamera-17.12.0.tar.xz"; + sha256 = "0n60ycp4ldrn07lci6a78i8g0y5j708s4kgdrh2sn2f91ppwr90c"; + name = "kamera-17.12.0.tar.xz"; }; }; kanagram = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz"; - sha256 = "1v5k67dw47i3n8635w1sc63n7f63hd9wvb44yxaw88clk46acn0k"; - name = "kanagram-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kanagram-17.12.0.tar.xz"; + sha256 = "15v22d7jdjjlc8lyraiiwx29qv0xf94y30zb7r1p661b7l1zqba3"; + name = "kanagram-17.12.0.tar.xz"; }; }; kapman = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz"; - sha256 = "0gici0v3ya16nk0b33cm5n95gdfhjqpy8wjg5y8bj12dby1d0n2w"; - name = "kapman-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kapman-17.12.0.tar.xz"; + sha256 = "10jwyr6dzryam720n53xmcky6a8dgvh9gpwl6c4lx68swq4s62hb"; + name = "kapman-17.12.0.tar.xz"; }; }; kapptemplate = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz"; - sha256 = "16j1lx6rp0lqmcd8fyaishc0i2670v0map270z9575101338cyvm"; - name = "kapptemplate-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kapptemplate-17.12.0.tar.xz"; + sha256 = "17bkfnvaj23azra44rr9pf926nvwnsbzg5j23b65q83j6wd0k12w"; + name = "kapptemplate-17.12.0.tar.xz"; }; }; kate = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kate-17.08.3.tar.xz"; - sha256 = "1yjzhf0a1skxz6iipac3z1p2wswn8bfjfr3k8qb6lhwlhbapc33x"; - name = "kate-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kate-17.12.0.tar.xz"; + sha256 = "18nygn4ibxii4va84jlxc93j8v6v1wiilbfhvri140wdlfqqs1bv"; + name = "kate-17.12.0.tar.xz"; }; }; katomic = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz"; - sha256 = "0y00la43lc1352fipzglyvaf1cqalf0vkygg8r9vizm8vycp7hp9"; - name = "katomic-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/katomic-17.12.0.tar.xz"; + sha256 = "1flkz4cvsrma12wyz84lcpirh1ns7ldn564asg25s7mffm2mlmni"; + name = "katomic-17.12.0.tar.xz"; }; }; kblackbox = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz"; - sha256 = "18lz0nb8zp95higssscgcr2cj1ni71bckk1wazyryxkmmmqk2rdn"; - name = "kblackbox-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kblackbox-17.12.0.tar.xz"; + sha256 = "0q9rk2cy75r9pbfl10plm4wbii3x8pp08g0kpyly20f8h4bmb5hd"; + name = "kblackbox-17.12.0.tar.xz"; }; }; kblocks = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz"; - sha256 = "1nf3ws0dzzwqc87v6jqi1x5zm7w56cgfingr5plpp3cj8wv8jnvw"; - name = "kblocks-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kblocks-17.12.0.tar.xz"; + sha256 = "08rq5crw9d3m231g8cpnrcd8628p4ci6abc32hkpbcd01qyjlvis"; + name = "kblocks-17.12.0.tar.xz"; }; }; kblog = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz"; - sha256 = "0cnbn0wmva8xm2i05w5pdikw5mbx3z6mim3k98v2r954qml7xqdk"; - name = "kblog-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kblog-17.12.0.tar.xz"; + sha256 = "16hqdsni76ajm8a00xplh4k3cjckykbnv3bbf90hamx5cm8ycdf3"; + name = "kblog-17.12.0.tar.xz"; }; }; kbounce = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz"; - sha256 = "12yj5jmpvhj5cxr4i818lp9cbcrdrvq9r7s202nzx5znxs11bbf6"; - name = "kbounce-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kbounce-17.12.0.tar.xz"; + sha256 = "1kgxl7nlr0j4y921bw1alrk40n3051bgcm08877iadna783j3xnd"; + name = "kbounce-17.12.0.tar.xz"; }; }; kbreakout = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz"; - sha256 = "14d4cx91vv8bvvpjwbrwcvjczzs8j58yzazsfgqwhrj47cwhya43"; - name = "kbreakout-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kbreakout-17.12.0.tar.xz"; + sha256 = "0pvz250z6h1x8mhdcgb662yhc6j6sxgr48r24j017q5k8r1pc2w5"; + name = "kbreakout-17.12.0.tar.xz"; }; }; kbruch = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz"; - sha256 = "0jxlybkmzs24482fmy7hhk2apyq26fpdblpnpdbqnydz95707475"; - name = "kbruch-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kbruch-17.12.0.tar.xz"; + sha256 = "13brwkadwp92rwybxjcz3sb8iiy0rhykk2wlpn7jg8vfxi203v73"; + name = "kbruch-17.12.0.tar.xz"; }; }; kcachegrind = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz"; - sha256 = "0xmnpbli7ndlv0532hpnqgvbkpw8y176jydhs6hy73ywwm416mvs"; - name = "kcachegrind-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcachegrind-17.12.0.tar.xz"; + sha256 = "04ddsj0gsb7s967gn2g7018q2zl3lflybgkzq7rjkpbxyn3d503z"; + name = "kcachegrind-17.12.0.tar.xz"; }; }; kcalc = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz"; - sha256 = "0ck1hjv1v9fj7ckl4blpmfxzjx61ihc6av71m710nk7iv6gncsfm"; - name = "kcalc-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcalc-17.12.0.tar.xz"; + sha256 = "04k369crs8nsz16dk4cwyx3l7nycypjc4xs9jzkjx9rl9k9vnrqr"; + name = "kcalc-17.12.0.tar.xz"; }; }; kcalcore = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz"; - sha256 = "0iy6dwzrcwzhjcz8yajp4mvbxr6vkxp4bnbnh9k2zvxgmg4y63h5"; - name = "kcalcore-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcalcore-17.12.0.tar.xz"; + sha256 = "1n5isq169dm3ngsnmwdhlcs2k4rp5zncv72vx0rb9p84skqn7xh4"; + name = "kcalcore-17.12.0.tar.xz"; }; }; kcalutils = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz"; - sha256 = "1vs6qnv31s01i7wb7kz86v17z0wrymcclmwx2hj7vl4jqr532zdq"; - name = "kcalutils-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcalutils-17.12.0.tar.xz"; + sha256 = "19jwvakjiqwg3iakc8wgdw5fpyr2a2kpbxxsj9hf1ddi6wgq5hkq"; + name = "kcalutils-17.12.0.tar.xz"; }; }; kcharselect = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz"; - sha256 = "1ib3rqd43yprnp07vvmg029a44dimisycv030j3qd87r3yw06phs"; - name = "kcharselect-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcharselect-17.12.0.tar.xz"; + sha256 = "190dhqc121bs4s13y4zdxrlwid7p1sjqj2ggb2xma6fq67bbsc2g"; + name = "kcharselect-17.12.0.tar.xz"; }; }; kcolorchooser = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz"; - sha256 = "17aa2k8z7i7ds2s3ampkci4n0003rsbx4fj3l773ylb11fyl3b2f"; - name = "kcolorchooser-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcolorchooser-17.12.0.tar.xz"; + sha256 = "17arn0fdqkb9ixhdxmh6sicp2cs6k8f5sg4jc4z0fi076ysxwnlb"; + name = "kcolorchooser-17.12.0.tar.xz"; }; }; kcontacts = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz"; - sha256 = "0dsx0bgf6rcqrl31xcklh368lr93pn2ylipw81svpnqya1ry31dk"; - name = "kcontacts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcontacts-17.12.0.tar.xz"; + sha256 = "0358zb2imdnlilhz58niysvpfd6l33fjyiplzjdibswq1ad8bbbl"; + name = "kcontacts-17.12.0.tar.xz"; }; }; kcron = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz"; - sha256 = "0xmd25dfhpkaa6zzmc7xdfn4fv0awfqjv2r166hmqd32gnx70bry"; - name = "kcron-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kcron-17.12.0.tar.xz"; + sha256 = "092s5c4x59dflkgymk17pj7spzxl2vmiq76dr4d3ilh9w0yx77zl"; + name = "kcron-17.12.0.tar.xz"; }; }; kdav = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz"; - sha256 = "1v7xclq8qz4pmvp1asavammlfwi2pg1y0fabapqpnglx194rbwic"; - name = "kdav-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdav-17.12.0.tar.xz"; + sha256 = "0cqshlidk4fbznpv5yk9ghmx7wxlmfmsd8w3pkqnbznzh2pd6zns"; + name = "kdav-17.12.0.tar.xz"; }; }; kdebugsettings = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz"; - sha256 = "1gfcnwpmx6dd12d9kycf0khi5s85932b1wvyw1mr5dhlqyyqf1s4"; - name = "kdebugsettings-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdebugsettings-17.12.0.tar.xz"; + sha256 = "076g2hymykm6dxln3llwfhayzrdswjy9cjdhwi70kxmw3xd1x3fl"; + name = "kdebugsettings-17.12.0.tar.xz"; }; }; kde-dev-scripts = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-dev-scripts-17.08.3.tar.xz"; - sha256 = "1dydd198jfcjm58m5qk071kx18gbgnbwf9mcx20ibanq17cdh3px"; - name = "kde-dev-scripts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kde-dev-scripts-17.12.0.tar.xz"; + sha256 = "0yl0xffgr94ymk5cw32z1y9ymn1rr9nyh9k3gip9aspi3rmrhw4r"; + name = "kde-dev-scripts-17.12.0.tar.xz"; }; }; kde-dev-utils = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-dev-utils-17.08.3.tar.xz"; - sha256 = "184sx4i5k8rnx5572460v2jnd0abdr2i5gp74khbjlgagkdvcj07"; - name = "kde-dev-utils-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kde-dev-utils-17.12.0.tar.xz"; + sha256 = "0qf1mpp4cq1gdhd29d5v2lvcdsi8k9xivqly1jha96b0wgziqqwq"; + name = "kde-dev-utils-17.12.0.tar.xz"; }; }; kdeedu-data = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdeedu-data-17.08.3.tar.xz"; - sha256 = "12vy656ng14gq93cw30bwdg15jvwr6qvlsjk0vfmljvcbc9171ww"; - name = "kdeedu-data-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdeedu-data-17.12.0.tar.xz"; + sha256 = "0fpxhz1pj1lz2b2l45ivmlr36hayj4h1g6b0960wavmhdfacr0pi"; + name = "kdeedu-data-17.12.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-mobipocket-17.08.3.tar.xz"; - sha256 = "1rfi44lh25knc0jf02fazh6s4wy1h8m76i9njcjxbjrz7x518cfj"; - name = "kdegraphics-mobipocket-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdegraphics-mobipocket-17.12.0.tar.xz"; + sha256 = "1015nd0cn1mbak68h0gl2hsax6angwxvssa8j8wsv96rnjfpds9f"; + name = "kdegraphics-mobipocket-17.12.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-thumbnailers-17.08.3.tar.xz"; - sha256 = "0irsa4x6pi5jq36yz1kgkdv8946w05mr19afydpz1jpa2knhkc6i"; - name = "kdegraphics-thumbnailers-17.08.3.tar.xz"; - }; - }; - kde-l10n-ar = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ar-17.08.3.tar.xz"; - sha256 = "0j06r39gam92bxm25vc8x7bxm6143pww42d9ala13akh3gh56wmy"; - name = "kde-l10n-ar-17.08.3.tar.xz"; - }; - }; - kde-l10n-ast = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ast-17.08.3.tar.xz"; - sha256 = "1kmv0ajbd9dws1al4qx9k2hnsqf2dwkj2ww12xn3flrqg71kgnpb"; - name = "kde-l10n-ast-17.08.3.tar.xz"; - }; - }; - kde-l10n-bg = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bg-17.08.3.tar.xz"; - sha256 = "0dv2hdki9mbc6kq6b1gzpqijgq31ffz4la9aprzj57mk4l14vkp1"; - name = "kde-l10n-bg-17.08.3.tar.xz"; - }; - }; - kde-l10n-bs = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bs-17.08.3.tar.xz"; - sha256 = "0makcag2kjns6528ldrjr52r412yi1y947lqq5db8ya6i8bxlsl2"; - name = "kde-l10n-bs-17.08.3.tar.xz"; - }; - }; - kde-l10n-ca = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca-17.08.3.tar.xz"; - sha256 = "13n0y9rmcnaka5hnmjp6x99pdvx19bb5f7m0wmnkkq0v8xs0cr53"; - name = "kde-l10n-ca-17.08.3.tar.xz"; - }; - }; - kde-l10n-ca_valencia = { - version = "ca_valencia-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca@valencia-17.08.3.tar.xz"; - sha256 = "0h4iznjvzy4lvb91vpb4f7jlrvi3a9z56i7j3xm0ihf1qmgxxzmj"; - name = "kde-l10n-ca_valencia-17.08.3.tar.xz"; - }; - }; - kde-l10n-cs = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-cs-17.08.3.tar.xz"; - sha256 = "0dadsgmg7pvagpq0nj4hs889zvk2lw085wlv2mw6jfminjav4c2d"; - name = "kde-l10n-cs-17.08.3.tar.xz"; - }; - }; - kde-l10n-da = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-da-17.08.3.tar.xz"; - sha256 = "04w1clqk3p0zkv01406iwkwp572vwfpn94x8g7hxraaz2rzs2qnf"; - name = "kde-l10n-da-17.08.3.tar.xz"; - }; - }; - kde-l10n-de = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-de-17.08.3.tar.xz"; - sha256 = "1cxpdwvpymf1yqgs54v6f8hgxwyblv0i0zpm5w5wrimmg8lnbrc8"; - name = "kde-l10n-de-17.08.3.tar.xz"; - }; - }; - kde-l10n-el = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-el-17.08.3.tar.xz"; - sha256 = "1csskz68dsrlvkr5iri8w0wx2g5h7db18dpnlcmbl076l9ds9nmv"; - name = "kde-l10n-el-17.08.3.tar.xz"; - }; - }; - kde-l10n-en_GB = { - version = "en_GB-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-en_GB-17.08.3.tar.xz"; - sha256 = "1vf6h68biiqr9vzqlig34z47clkdk6ncr3mhan7rajsk1dlp6qwy"; - name = "kde-l10n-en_GB-17.08.3.tar.xz"; - }; - }; - kde-l10n-eo = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eo-17.08.3.tar.xz"; - sha256 = "0a7wk6xfhq7zj02zjadnp7ml97r5vvgjvlm5yajz6l4q5l0vsdnn"; - name = "kde-l10n-eo-17.08.3.tar.xz"; - }; - }; - kde-l10n-es = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-es-17.08.3.tar.xz"; - sha256 = "1b7jzccicb58s3v796x0k2fwyfq8qmqyb5b26y5x9xknk7mv3fkz"; - name = "kde-l10n-es-17.08.3.tar.xz"; - }; - }; - kde-l10n-et = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-et-17.08.3.tar.xz"; - sha256 = "1d10yq8d5fjhgc0zvz3izl1c15i9g8vw5kgs2mvciwhaj6sqgk78"; - name = "kde-l10n-et-17.08.3.tar.xz"; - }; - }; - kde-l10n-eu = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eu-17.08.3.tar.xz"; - sha256 = "1r6nyjibagqfk4s1c2sylxlsq3jv7vhc01bbwpdl314rhcv67lkq"; - name = "kde-l10n-eu-17.08.3.tar.xz"; - }; - }; - kde-l10n-fa = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fa-17.08.3.tar.xz"; - sha256 = "0slrrsp8wgh33zv779mqdf3km4h88mzqfzdds08g8hr3mimp8ibj"; - name = "kde-l10n-fa-17.08.3.tar.xz"; - }; - }; - kde-l10n-fi = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fi-17.08.3.tar.xz"; - sha256 = "10axj320my3bgfqn1rpwpn4nii3bh39afsvqkbz6xh01sci4z47w"; - name = "kde-l10n-fi-17.08.3.tar.xz"; - }; - }; - kde-l10n-fr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fr-17.08.3.tar.xz"; - sha256 = "0gqmq0hwxmj2awjyhhy81nwrks4mlqdnbfinxsrsj1kmklsx8pdg"; - name = "kde-l10n-fr-17.08.3.tar.xz"; - }; - }; - kde-l10n-ga = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ga-17.08.3.tar.xz"; - sha256 = "0p7jy5sh2x1fc6mfacs1f5brq86hw6xk7bccc30k5c8b0kfbvdf4"; - name = "kde-l10n-ga-17.08.3.tar.xz"; - }; - }; - kde-l10n-gl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-gl-17.08.3.tar.xz"; - sha256 = "185yw84i04llag4kpi3lmmy9niis2z3rd5ch2x7y4jyq3kdpwhi4"; - name = "kde-l10n-gl-17.08.3.tar.xz"; - }; - }; - kde-l10n-he = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-he-17.08.3.tar.xz"; - sha256 = "0dx0mvl4vapkyir8a0a1dgv2h1hjsr5n2ykjihk21ykf7axvqqd4"; - name = "kde-l10n-he-17.08.3.tar.xz"; - }; - }; - kde-l10n-hi = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hi-17.08.3.tar.xz"; - sha256 = "0f6p7bwvvqj7jdaqsn4nxjsb5cdna9q4cp59wfy05ppi685qqp4v"; - name = "kde-l10n-hi-17.08.3.tar.xz"; - }; - }; - kde-l10n-hr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hr-17.08.3.tar.xz"; - sha256 = "0yd4sqfa59ca57ig55x46fp59pjxby6ha5bhkzhcd1d2baa4a672"; - name = "kde-l10n-hr-17.08.3.tar.xz"; - }; - }; - kde-l10n-hu = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hu-17.08.3.tar.xz"; - sha256 = "1s3vgjslnffxivrx69dnz4c2iyjf2awv51k8bbbfjw271422wvfg"; - name = "kde-l10n-hu-17.08.3.tar.xz"; - }; - }; - kde-l10n-ia = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ia-17.08.3.tar.xz"; - sha256 = "1jpvla8h5ji9lcdhk7rinixkyr6wax30wp9wvqqqd8p9dp18i0cp"; - name = "kde-l10n-ia-17.08.3.tar.xz"; - }; - }; - kde-l10n-id = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-id-17.08.3.tar.xz"; - sha256 = "191x45jv4bzkglyng7fp3fblcbirp9k94h9r54sk32idwqkiwngx"; - name = "kde-l10n-id-17.08.3.tar.xz"; - }; - }; - kde-l10n-is = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-is-17.08.3.tar.xz"; - sha256 = "1h3pw9rnssf6wh1n5r01gqnz7riqz6hismndd67xw4pnq7vqpjkm"; - name = "kde-l10n-is-17.08.3.tar.xz"; - }; - }; - kde-l10n-it = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-it-17.08.3.tar.xz"; - sha256 = "0n4ivcyjcb47h3455wnzhnlkf26h29r2f9j1dgw9rw32aczb8l68"; - name = "kde-l10n-it-17.08.3.tar.xz"; - }; - }; - kde-l10n-ja = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ja-17.08.3.tar.xz"; - sha256 = "0qxf7c8l61xwkhn81phyw4849frzrc032fnbphlgq1nc9kqygara"; - name = "kde-l10n-ja-17.08.3.tar.xz"; - }; - }; - kde-l10n-kk = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-kk-17.08.3.tar.xz"; - sha256 = "0wlzv9kgpa2ah2j8dd4vn5gr9jkbmzl6ph3lm5mr7rf0pl14qws2"; - name = "kde-l10n-kk-17.08.3.tar.xz"; - }; - }; - kde-l10n-km = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-km-17.08.3.tar.xz"; - sha256 = "07arvlwxq59xjlgmf348rdrm1gfbzx9yds6qj667mrbk7h1n5ibr"; - name = "kde-l10n-km-17.08.3.tar.xz"; - }; - }; - kde-l10n-ko = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ko-17.08.3.tar.xz"; - sha256 = "0cw6v0iqq79hc4llw37s630gf36npc7ngsihqlia4y3pn4mzabwf"; - name = "kde-l10n-ko-17.08.3.tar.xz"; - }; - }; - kde-l10n-lt = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lt-17.08.3.tar.xz"; - sha256 = "0mv31nqdxp9wcnwch0sqrgz5pp1y3gmv25p8jvbrfrivpbkmhwv3"; - name = "kde-l10n-lt-17.08.3.tar.xz"; - }; - }; - kde-l10n-lv = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lv-17.08.3.tar.xz"; - sha256 = "0lyh2lj1h5ihhy22hh0is3s3qd8x88wgbwrqkq9802vksy7f587l"; - name = "kde-l10n-lv-17.08.3.tar.xz"; - }; - }; - kde-l10n-mr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-mr-17.08.3.tar.xz"; - sha256 = "1zpciw63xk0s6jpkw4fpw0d17fcc4h1fdl6v1d3w3c1rs7dmmw9y"; - name = "kde-l10n-mr-17.08.3.tar.xz"; - }; - }; - kde-l10n-nb = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nb-17.08.3.tar.xz"; - sha256 = "024ii25iz8lf2g6k1nrr1lmian3wzq4ljx3y8ss1vz244m047xss"; - name = "kde-l10n-nb-17.08.3.tar.xz"; - }; - }; - kde-l10n-nds = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nds-17.08.3.tar.xz"; - sha256 = "0bp9ap276z86mxldasq6cdskrwkh48z9yfrblgffhh94941i0gcn"; - name = "kde-l10n-nds-17.08.3.tar.xz"; - }; - }; - kde-l10n-nl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nl-17.08.3.tar.xz"; - sha256 = "00mzrk682r30i8x3navpad3b9jm15h5mp81v92q5cmcmblvvaw0l"; - name = "kde-l10n-nl-17.08.3.tar.xz"; - }; - }; - kde-l10n-nn = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nn-17.08.3.tar.xz"; - sha256 = "0d45g2n7hvk7p2n84674fqdnsz26hk0scczr6w3kzb2zk95x5734"; - name = "kde-l10n-nn-17.08.3.tar.xz"; - }; - }; - kde-l10n-pa = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pa-17.08.3.tar.xz"; - sha256 = "0sg35fmw0rs3nzyrhkfvh8b5nm86w5qkjgic4ymrib0grjxbdjcj"; - name = "kde-l10n-pa-17.08.3.tar.xz"; - }; - }; - kde-l10n-pl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pl-17.08.3.tar.xz"; - sha256 = "0sk19zh9ykldm66d51k8pkmyql5cfxvgpzp8q3c3n9g60cdx510x"; - name = "kde-l10n-pl-17.08.3.tar.xz"; - }; - }; - kde-l10n-pt = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt-17.08.3.tar.xz"; - sha256 = "135g0wq2cfkgvwv1y1w9wnnz2bsdf5sdijqnvazkb6j3is4fz2pw"; - name = "kde-l10n-pt-17.08.3.tar.xz"; - }; - }; - kde-l10n-pt_BR = { - version = "pt_BR-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt_BR-17.08.3.tar.xz"; - sha256 = "0ww3rhijqs1h9ihszkqvxdi0d4185zpm336837741nwqg601dik0"; - name = "kde-l10n-pt_BR-17.08.3.tar.xz"; - }; - }; - kde-l10n-ro = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ro-17.08.3.tar.xz"; - sha256 = "1d45j7xx1mzzgjwqw5svhkcb5v0hqbbzcwg1x1j7xqcggdlx4075"; - name = "kde-l10n-ro-17.08.3.tar.xz"; - }; - }; - kde-l10n-ru = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ru-17.08.3.tar.xz"; - sha256 = "10py3cz4mpgcaskrsbbr26arg01c3im26zqmjcdwjnkgp8s780pj"; - name = "kde-l10n-ru-17.08.3.tar.xz"; - }; - }; - kde-l10n-sk = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sk-17.08.3.tar.xz"; - sha256 = "01607982ms2smr05nslp79x6fjqhvlpjdkkv8fs4vwxvii9wd77w"; - name = "kde-l10n-sk-17.08.3.tar.xz"; - }; - }; - kde-l10n-sl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sl-17.08.3.tar.xz"; - sha256 = "10ljgz3jrgbgb06ijq1sp46qc3d7dbyz8dql56zcgz1pbv6pyxqz"; - name = "kde-l10n-sl-17.08.3.tar.xz"; - }; - }; - kde-l10n-sr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sr-17.08.3.tar.xz"; - sha256 = "1m12x7w0m4n97crmy9ad6szx92z3cqsvm6fbh99naaaf033962jn"; - name = "kde-l10n-sr-17.08.3.tar.xz"; - }; - }; - kde-l10n-sv = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sv-17.08.3.tar.xz"; - sha256 = "1qqry4xakc4qp140jr5306xfp58d33rxp44mrvmdngzh30bqs6g2"; - name = "kde-l10n-sv-17.08.3.tar.xz"; - }; - }; - kde-l10n-tr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-tr-17.08.3.tar.xz"; - sha256 = "1as31vjsig32s31qxnx6ykfgpyya3s362ml576ndiyrj84znzby0"; - name = "kde-l10n-tr-17.08.3.tar.xz"; - }; - }; - kde-l10n-ug = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ug-17.08.3.tar.xz"; - sha256 = "1jx2g5xczybfz9915py30g9rqds0191bsaywnj241nzqizy20csz"; - name = "kde-l10n-ug-17.08.3.tar.xz"; - }; - }; - kde-l10n-uk = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-uk-17.08.3.tar.xz"; - sha256 = "14c30x7j8inswccjfb3yslwxjp0ispp1wzq6j4nl5zzj24lkicf8"; - name = "kde-l10n-uk-17.08.3.tar.xz"; - }; - }; - kde-l10n-wa = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-wa-17.08.3.tar.xz"; - sha256 = "0mz0g6hf4z59vb4i0zkvmyx85mxz7fpwi6yyng03iqzlbpdq0qj7"; - name = "kde-l10n-wa-17.08.3.tar.xz"; - }; - }; - kde-l10n-zh_CN = { - version = "zh_CN-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_CN-17.08.3.tar.xz"; - sha256 = "1l60z9wicf5ka9ik5b85qh0z3n7g9msjv3ckwzm2kj41q9r30559"; - name = "kde-l10n-zh_CN-17.08.3.tar.xz"; - }; - }; - kde-l10n-zh_TW = { - version = "zh_TW-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_TW-17.08.3.tar.xz"; - sha256 = "1br778qbxnbsrdpvd34g2m3xc1v725ib4689kw5g36pm1jlf55h0"; - name = "kde-l10n-zh_TW-17.08.3.tar.xz"; - }; - }; - kdelibs = { - version = "4.14.38"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdelibs-4.14.38.tar.xz"; - sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p"; - name = "kdelibs-4.14.38.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdegraphics-thumbnailers-17.12.0.tar.xz"; + sha256 = "1p0jj4j28rab2m68zaiqfkz5h65ar99v5qd7v3jj7yqkgimiqrkh"; + name = "kdegraphics-thumbnailers-17.12.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdenetwork-filesharing-17.08.3.tar.xz"; - sha256 = "0vy2cyd9ifxrqw9zk4hyidiprd7730q7hm1gc44l6b4siimxyb4x"; - name = "kdenetwork-filesharing-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdenetwork-filesharing-17.12.0.tar.xz"; + sha256 = "0hhgxmsnjxv99qjbgyw0fli9mxffbk0i4lnmzla186i3wbbq0fng"; + name = "kdenetwork-filesharing-17.12.0.tar.xz"; }; }; kdenlive = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz"; - sha256 = "1nh6cmxkr47zlpvcrjm8dfylsdmncb5qhyvb86rypr1qqmbifg5x"; - name = "kdenlive-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdenlive-17.12.0.tar.xz"; + sha256 = "1jn8bbsdishccdp7lqqyr9y7wcw7rq4gsisp3cjkdbzg44ahjmnp"; + name = "kdenlive-17.12.0.tar.xz"; }; }; kdepim-addons = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdepim-addons-17.08.3.tar.xz"; - sha256 = "1r0qgrliw2g82vgj63l00x0visjclxh2fafngl8ga4dk411nfg4x"; - name = "kdepim-addons-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdepim-addons-17.12.0.tar.xz"; + sha256 = "0z13271dwavf4fiixbxc17l4iajk5dyfnfmjgdq95cpfajk5zchs"; + name = "kdepim-addons-17.12.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdepim-apps-libs-17.08.3.tar.xz"; - sha256 = "0706ndzw315szab2qg30x7a6f50iv439rrpdpy321q7ay5fm0f2p"; - name = "kdepim-apps-libs-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdepim-apps-libs-17.12.0.tar.xz"; + sha256 = "19ml929qzxzdm3rgnvqni63xq4h692wwr3gnh8x3m32gdc1shslx"; + name = "kdepim-apps-libs-17.12.0.tar.xz"; }; }; kdepim-runtime = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdepim-runtime-17.08.3.tar.xz"; - sha256 = "0qc6kkc5rsg9l5plciass6p1ym7arlp6yk7x5ycy53k7fbsh4ak7"; - name = "kdepim-runtime-17.08.3.tar.xz"; - }; - }; - kde-runtime = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-runtime-17.08.3.tar.xz"; - sha256 = "15nfkfz2wwlr1rp93sl1kmxl35wpnlf86225ihl43nhwn6pihb38"; - name = "kde-runtime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdepim-runtime-17.12.0.tar.xz"; + sha256 = "1xxka2hi0ih8g4lxdga47zix3hf3krdh9rf5bvmpj7z1j317zvnp"; + name = "kdepim-runtime-17.12.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdesdk-kioslaves-17.08.3.tar.xz"; - sha256 = "11akksc09mzxnjiqcsxwgwcxzcjpw50cr277lp7p6rx1hdbwlk7a"; - name = "kdesdk-kioslaves-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdesdk-kioslaves-17.12.0.tar.xz"; + sha256 = "020a7d4k5901rpwxibm4ncm8vdncyranp8bmajzq4d3x1q2i63x8"; + name = "kdesdk-kioslaves-17.12.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdesdk-thumbnailers-17.08.3.tar.xz"; - sha256 = "1hhsskrhkq3z6phjkvc43gzsmx0apcpr4sjr9zqqfy847zqsvfm2"; - name = "kdesdk-thumbnailers-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdesdk-thumbnailers-17.12.0.tar.xz"; + sha256 = "11fmy2g1nhzgv158vhc1x57is4qjhkv4gkkafnmvww3cj2alsipx"; + name = "kdesdk-thumbnailers-17.12.0.tar.xz"; }; }; kdf = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz"; - sha256 = "1s291c4g51y92wplrqkl528py83xfviyvv1qjyp3c7nyf6g2jvwq"; - name = "kdf-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdf-17.12.0.tar.xz"; + sha256 = "1g55wzjwyi3x1bfr4vpv4rbiah3fb5cdqx4h4cb4pxi7438hifbg"; + name = "kdf-17.12.0.tar.xz"; }; }; kdialog = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz"; - sha256 = "1n6n06sqgq1s2781pnsbfyczc68l5xx6l0idymj3pmniz3q4svp8"; - name = "kdialog-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdialog-17.12.0.tar.xz"; + sha256 = "1n1466qsgcj0x9z1745pvqcyljz3215kz71jd9ckghz8v3xllyrw"; + name = "kdialog-17.12.0.tar.xz"; }; }; kdiamond = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz"; - sha256 = "1czhmxs3k7mx82r1k88h8riwn9jxlz6w60mi4jx8b29qcm532f53"; - name = "kdiamond-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kdiamond-17.12.0.tar.xz"; + sha256 = "1x08y561l3qwnwwx4wp7j4y26cv0g102csm9zgy8pwp32r74c7my"; + name = "kdiamond-17.12.0.tar.xz"; }; }; keditbookmarks = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/keditbookmarks-17.08.3.tar.xz"; - sha256 = "115ys7703m611dw6ap2kqv4rgzxp15dsscg1y2gx09afc8fg2i62"; - name = "keditbookmarks-17.08.3.tar.xz"; - }; - }; - kfilereplace = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfilereplace-17.08.3.tar.xz"; - sha256 = "1ksv9igzq65wgsam6ynbbzzyriacbk7y48dzh190p8k2bdf6gij6"; - name = "kfilereplace-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/keditbookmarks-17.12.0.tar.xz"; + sha256 = "0kpm9a3b7ylf0admyfll7ysjmn76gihgh1d0faxvcdg099f19n2z"; + name = "keditbookmarks-17.12.0.tar.xz"; }; }; kfind = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz"; - sha256 = "16f27ykh52vphq6wjyi1vy6vrzshj0cawmc8fy7y1j5yzzdkx1hk"; - name = "kfind-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kfind-17.12.0.tar.xz"; + sha256 = "066780dnn031ppavin14jikxs8v1qv5b5hvxxdbfhay01gmj6fzy"; + name = "kfind-17.12.0.tar.xz"; }; }; kfloppy = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz"; - sha256 = "1d5xn0rxc92k60hc1860mji8dzq932gg4by42gylwldcvgdija14"; - name = "kfloppy-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kfloppy-17.12.0.tar.xz"; + sha256 = "0q61b8yw69gf9ssxkvisnk5i2f9plsxybdnzx6pfv6fxi427pv69"; + name = "kfloppy-17.12.0.tar.xz"; }; }; kfourinline = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz"; - sha256 = "1bxzlx55i6vbk8cmpx38g1xdx0swqwd73lw5z584affw464ps1n9"; - name = "kfourinline-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kfourinline-17.12.0.tar.xz"; + sha256 = "0gs5lpbv4vwknkj90i874ylmanc5lw5dx0hibg9khadqv7qgj1cr"; + name = "kfourinline-17.12.0.tar.xz"; }; }; kgeography = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz"; - sha256 = "19k39rjm9lwbv3p6iifam80li5bhw4xf2g4i4hj0h7gyrj9gb1mp"; - name = "kgeography-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kgeography-17.12.0.tar.xz"; + sha256 = "14i0bpncqgldg7sviyqjhv2nw81g5niidvm15d3n4v5p2msabvv4"; + name = "kgeography-17.12.0.tar.xz"; }; }; kget = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kget-17.08.3.tar.xz"; - sha256 = "01z3ij4iv3kgwy0fcnrf4qpfgapflx1pgv2hiaykgsj6ij24fx6a"; - name = "kget-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kget-17.12.0.tar.xz"; + sha256 = "17al8j2dw0hdsrpgjbz4j8qgxqsj8asy9s4pqb5ks34an2vb7bp3"; + name = "kget-17.12.0.tar.xz"; }; }; kgoldrunner = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz"; - sha256 = "1k09pw7lm17702p0lliyl767zwk4n3gkkzj441cq3fqjnwm93lx4"; - name = "kgoldrunner-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kgoldrunner-17.12.0.tar.xz"; + sha256 = "0cm6rw2ar2j7xpnzrih39rrjky2cv6s6samqv2bfal7l7ra6ad3h"; + name = "kgoldrunner-17.12.0.tar.xz"; }; }; kgpg = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz"; - sha256 = "1g06n6i9qqvalmpg2zan7qg7j7dp4rn152pashs3jxij29n1bw7h"; - name = "kgpg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kgpg-17.12.0.tar.xz"; + sha256 = "1mabbarra8kca0r72pacbrgp3pcbb94ycm7z2sb65gd8d0qily7k"; + name = "kgpg-17.12.0.tar.xz"; }; }; khangman = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz"; - sha256 = "1fny78d3vaaz67css4i14pnvkm5p586ib8mwrs2rglc931c89dqq"; - name = "khangman-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/khangman-17.12.0.tar.xz"; + sha256 = "09n62lkxrryvq36hmcygi4mdiy0r1ydql9khv3yz1p2zfz81qmwg"; + name = "khangman-17.12.0.tar.xz"; }; }; khelpcenter = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz"; - sha256 = "089aahdr1yibff4y0l78m0wzz7m0mc090g4fp4aj4gp56wz6i5jn"; - name = "khelpcenter-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/khelpcenter-17.12.0.tar.xz"; + sha256 = "0mcw60w3d93zgncvakzdds3mazw7ck469i20x4wwv6cd98cg1f7k"; + name = "khelpcenter-17.12.0.tar.xz"; }; }; kholidays = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz"; - sha256 = "17razwvskf6i5hidlfp98bmfrijp8hn5gxrqcjxc49wpkhlj70jm"; - name = "kholidays-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kholidays-17.12.0.tar.xz"; + sha256 = "1m6vh2f0mm71jhbil0ck31axvhbxqpibzpf7x82fcrwmgvwjlzyg"; + name = "kholidays-17.12.0.tar.xz"; }; }; kidentitymanagement = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz"; - sha256 = "0k926vwdhrk4ilpn0zhkcn26j1h7nqlzzi9mimybz1sp4fzxa83v"; - name = "kidentitymanagement-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kidentitymanagement-17.12.0.tar.xz"; + sha256 = "1jdlnjzabpfsbxp0yv1xanhp4hbigj7z80qsi0h27b3k0h3i4i8p"; + name = "kidentitymanagement-17.12.0.tar.xz"; }; }; kig = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kig-17.08.3.tar.xz"; - sha256 = "0wf03fm7fpph52ilxckz02ikn6mq486ps8p8byq2vvfwh6z0w6wg"; - name = "kig-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kig-17.12.0.tar.xz"; + sha256 = "06f5dcwqf012a4rszyf4mxjaaj4g35kn30pklsvb7kvdd2ybnmcf"; + name = "kig-17.12.0.tar.xz"; }; }; kigo = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz"; - sha256 = "1k850vmsifvab14aaqkivgrw8794yhvn7d10c5ib2zf6447cl8m5"; - name = "kigo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kigo-17.12.0.tar.xz"; + sha256 = "0zrl0js6zj41ag9xp65kzmmli6phqps6w7a0sbg8h7qd0m1ml1v7"; + name = "kigo-17.12.0.tar.xz"; }; }; killbots = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz"; - sha256 = "0ds391xx2d792069kl998f84qym26964ph5bja6bwkhgvws84r9g"; - name = "killbots-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/killbots-17.12.0.tar.xz"; + sha256 = "1594mdzdj9754gb26smains54lf1xs7mdxkx716cqjkm9fs7vv3s"; + name = "killbots-17.12.0.tar.xz"; }; }; kimagemapeditor = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kimagemapeditor-17.08.3.tar.xz"; - sha256 = "0clzk2d63hy1vvkdpxa1j5pp7y28x467wd9zfvv6k2vw703ghqlx"; - name = "kimagemapeditor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kimagemapeditor-17.12.0.tar.xz"; + sha256 = "0dd0yg29r6cada1arm2b7ihjxc015hd56dzygc66cxy0ni8cxmyn"; + name = "kimagemapeditor-17.12.0.tar.xz"; }; }; kimap = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz"; - sha256 = "0c5inldmlwc5x2q1vhvj0wv61h6986m068a2k4xrrbirpb4pcwls"; - name = "kimap-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kimap-17.12.0.tar.xz"; + sha256 = "08hh5phcj33sni2bz8jqcip7ilvv9q0i0m4wxnlawli2wxkpzab5"; + name = "kimap-17.12.0.tar.xz"; }; }; kio-extras = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kio-extras-17.08.3.tar.xz"; - sha256 = "0gq187435yd0251znqicpcn0r89aar7a64bjpf6x0zhdlli8n9jc"; - name = "kio-extras-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kio-extras-17.12.0.tar.xz"; + sha256 = "07jj8fhvyl84y8b9q4vc2lha4fin44qjr77iynif4l79g98ns5ls"; + name = "kio-extras-17.12.0.tar.xz"; }; }; kiriki = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz"; - sha256 = "1cbijn0358gpr21yfab84gybf5vqxwilwbhfl6nj8qmppp2bpjqd"; - name = "kiriki-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kiriki-17.12.0.tar.xz"; + sha256 = "0q7av2ff41vlnpb5p0zi1arzwc6568ddq98lypkkm376rjg47759"; + name = "kiriki-17.12.0.tar.xz"; }; }; kiten = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz"; - sha256 = "0v00q9hs94p5r6x7s7i12814pfydd5y1bzp6sm5x0vx1ixdnkx89"; - name = "kiten-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kiten-17.12.0.tar.xz"; + sha256 = "004x368gnw4x79q0g2c3xk4xj1qfqs9l9la46051kapbr96qkjgl"; + name = "kiten-17.12.0.tar.xz"; }; }; kjumpingcube = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz"; - sha256 = "13ifm6drw4m1dzssfalazmnsr5f8z9gla3aypb9ny1xm9ahlgfwh"; - name = "kjumpingcube-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kjumpingcube-17.12.0.tar.xz"; + sha256 = "12w7grdiddgk6k6qliw2n7b6smfw16ba4scmdy047ckfdajxm73f"; + name = "kjumpingcube-17.12.0.tar.xz"; }; }; kldap = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz"; - sha256 = "0bnx5fc48ppsykpqwjgsqjd7s4azgzk82k9xgaw566nxqqvgpzsv"; - name = "kldap-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kldap-17.12.0.tar.xz"; + sha256 = "18bx8fsamz6p791nmmgpd25rhy5zwb15hwkf0qsfyvxkygpw5jvv"; + name = "kldap-17.12.0.tar.xz"; }; }; kleopatra = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz"; - sha256 = "0vglphfxq37pxdrrchgzkdlzlzr18qlfwy9g64njyddnsv48pfx8"; - name = "kleopatra-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kleopatra-17.12.0.tar.xz"; + sha256 = "1dkgby8v7dxy4h69hm2j46ch3599drdj9p8x0da184d9isvjzyc2"; + name = "kleopatra-17.12.0.tar.xz"; }; }; klettres = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz"; - sha256 = "14jxbvil45hc2kqky7yhxrgzpv4094lk9ri0j05i1av6784s9555"; - name = "klettres-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/klettres-17.12.0.tar.xz"; + sha256 = "1wfihmsx6sb3d2d8y6m5v1x17sraw8ql63qjprf80nzdrg5c1hyf"; + name = "klettres-17.12.0.tar.xz"; }; }; klickety = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz"; - sha256 = "01hqf41m8pviziq1x562rd85357kkfgd0x0ba1vasimjddg6v6qa"; - name = "klickety-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/klickety-17.12.0.tar.xz"; + sha256 = "1s6bj19z9vvqcv8pwx5ja38mwpw05vkbfbfaay55y5ssxq8wvdfm"; + name = "klickety-17.12.0.tar.xz"; }; }; klines = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klines-17.08.3.tar.xz"; - sha256 = "1s0krcqbqii9fqrymm4bb9ssznzyv8bijk5lcngwgxs24igl0g4d"; - name = "klines-17.08.3.tar.xz"; - }; - }; - klinkstatus = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klinkstatus-17.08.3.tar.xz"; - sha256 = "0bv5ahcnss6ziccx9mmvf5bdsff9drjqpmq9ln51524bjn4x58ic"; - name = "klinkstatus-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/klines-17.12.0.tar.xz"; + sha256 = "1abwgyfm0qhwy07zbjs8pbq2s3m0kbwlmpfah3g4cvjq0b2i0wch"; + name = "klines-17.12.0.tar.xz"; }; }; kmag = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz"; - sha256 = "0dadzzrmd982y7apjk783wm5q302y03ydai74pzyqy0awnjdm09d"; - name = "kmag-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmag-17.12.0.tar.xz"; + sha256 = "0i8h8c4ajvri4chwl3whmbcikrqkx32ijgkxihlmfk1s1h3hiqj5"; + name = "kmag-17.12.0.tar.xz"; }; }; kmahjongg = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz"; - sha256 = "09j2pmqc66zi851fsl4ijrcgq3y35arx9272p6z07bg0z9ja5vgb"; - name = "kmahjongg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmahjongg-17.12.0.tar.xz"; + sha256 = "0cqgjnm12g7c5dagd6677a1bbcj8y4ccn38bv624zc8444nm3n6y"; + name = "kmahjongg-17.12.0.tar.xz"; }; }; kmail = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz"; - sha256 = "1ibpq0alnk70ha1smfyw8gc91k5q4x1gw7zddwgzw1pjr4v1bqdc"; - name = "kmail-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmail-17.12.0.tar.xz"; + sha256 = "1bykjx68d2fnspv0if8sqhgz3bg3fh0hhsmhsanrl5zkbswi2krp"; + name = "kmail-17.12.0.tar.xz"; }; }; kmail-account-wizard = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmail-account-wizard-17.08.3.tar.xz"; - sha256 = "0mkw6skpf9kc2h34ww85g18cljln77n5dsg5cyfyqc3i52m1halk"; - name = "kmail-account-wizard-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmail-account-wizard-17.12.0.tar.xz"; + sha256 = "0mz5jkxqn2vd5py1ndf9ly02a9ixmah6z360y021bhl55zdh96z6"; + name = "kmail-account-wizard-17.12.0.tar.xz"; }; }; kmailtransport = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz"; - sha256 = "0cfyzvsn5x03i6kprqm7y6j6qsfys4yz2s3f4wb5igpdm25nclq1"; - name = "kmailtransport-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmailtransport-17.12.0.tar.xz"; + sha256 = "06izygskzkgcz3aaadnd33dbk26n0nrk6nvy3bic7g1p7s26qf9m"; + name = "kmailtransport-17.12.0.tar.xz"; }; }; kmbox = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz"; - sha256 = "0mf0005fs15vgmmikdsa44ig4hxrnysl13mrn168crk96h3sk8qi"; - name = "kmbox-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmbox-17.12.0.tar.xz"; + sha256 = "1nwnygb483r9sfxa67g6s6z1ix4nwx6cy6jq2i7sbzcxzv7qyxga"; + name = "kmbox-17.12.0.tar.xz"; }; }; kmime = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz"; - sha256 = "17ziw8g1wdys4iy2yqavqy7wj4kw617m80fg77zlf1cscswhg23d"; - name = "kmime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmime-17.12.0.tar.xz"; + sha256 = "0fyfjc6l1jqs5m0pvk12714b5hjdkd4rsbk5b8i2pxddlqxa0m8x"; + name = "kmime-17.12.0.tar.xz"; }; }; kmines = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz"; - sha256 = "14b0klnlbxkvln3q9fliw6cijc2xmsfmvm6sfikdzzgj59jcylzp"; - name = "kmines-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmines-17.12.0.tar.xz"; + sha256 = "0cv0rby602c32zpcprp9fvx3w8pijzavsmmnwma6kk289bmw8klm"; + name = "kmines-17.12.0.tar.xz"; }; }; kmix = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz"; - sha256 = "0fd38banrbgpp8g5gz09w6wny8mdi9szvddl1rv7yx67zf112g67"; - name = "kmix-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmix-17.12.0.tar.xz"; + sha256 = "18g7hwz0p496bcvdxpa9n82wgs9a2xplrkk4jhx0svh2wd0zihj0"; + name = "kmix-17.12.0.tar.xz"; }; }; kmousetool = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz"; - sha256 = "0y2zavs442wpz438p1kyzrqlv9qgvxd4l5gw1pmmx8lkvjjdi91v"; - name = "kmousetool-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmousetool-17.12.0.tar.xz"; + sha256 = "0kzkpq2nc961pik8kw4cdd3k9wad40bczgaz9k5iwxxwwk3b8wl0"; + name = "kmousetool-17.12.0.tar.xz"; }; }; kmouth = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmouth-17.08.3.tar.xz"; - sha256 = "0gzc6apskfpvih7aap5mfv45q3pg70nfis1vh5ywidia36wbf26i"; - name = "kmouth-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmouth-17.12.0.tar.xz"; + sha256 = "1npzrfiddy5frnga20xiqblzfn0mk9xfdq60l2xi9wanlbbhfi2x"; + name = "kmouth-17.12.0.tar.xz"; }; }; kmplot = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz"; - sha256 = "1ann38zzzd5pds889mc5vw8xw80qlpm9l9nmkczkqyhkfvwxd605"; - name = "kmplot-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kmplot-17.12.0.tar.xz"; + sha256 = "1z8i1klj8irix7nylkqfchwryk1h5il7snlgmndcfkyd71yhb71k"; + name = "kmplot-17.12.0.tar.xz"; }; }; knavalbattle = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz"; - sha256 = "1zj6pki0v3p4xg25ivl45mb877p5xh47d066442pahkf8l3wnsh5"; - name = "knavalbattle-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/knavalbattle-17.12.0.tar.xz"; + sha256 = "1bw7l197690rq9m347nk79rrgdfyap436l01m45y9bkyk0lxmgk8"; + name = "knavalbattle-17.12.0.tar.xz"; }; }; knetwalk = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz"; - sha256 = "0i32f54z5hinafy1v5s1j8ahnbw30721lxa2mvh5qcbr21fan3mc"; - name = "knetwalk-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/knetwalk-17.12.0.tar.xz"; + sha256 = "0hax9p3lypaqqvvgyjp8082bvaz6fp8nsbgm0qicl55j5ah9gzjs"; + name = "knetwalk-17.12.0.tar.xz"; }; }; knotes = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz"; - sha256 = "0ly9gpji3nl3i53nzqd5z27li8qnc1asfv1d1kawchz077da02xy"; - name = "knotes-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/knotes-17.12.0.tar.xz"; + sha256 = "1awmn4drm0vb8ppabc9ljcwpbvrmvziib82ik46g5lsdg0bd1xl0"; + name = "knotes-17.12.0.tar.xz"; }; }; kolf = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kolf-17.08.3.tar.xz"; - sha256 = "1wc6x1hgkniwzb53bcph3alk0fxlb91s6j39blhync6713x8b4g0"; - name = "kolf-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kolf-17.12.0.tar.xz"; + sha256 = "03hxknch0mjwmmgjqgg1wn27mz3d4zrsppmajxkm1mafr517gx5n"; + name = "kolf-17.12.0.tar.xz"; }; }; kollision = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz"; - sha256 = "14ama8cfi4d7whgck0gywm7869gpargq1lrkq8ik4k914pharkzi"; - name = "kollision-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kollision-17.12.0.tar.xz"; + sha256 = "13wg2j3pdr5qlwp1hcqfxamxfdx6ppdr4ccvbabn6s8w7n73cm02"; + name = "kollision-17.12.0.tar.xz"; }; }; kolourpaint = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz"; - sha256 = "1y44q14f6brdmccnmf8143kjjqais8ps15z31dpx2935qzjxw8sc"; - name = "kolourpaint-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kolourpaint-17.12.0.tar.xz"; + sha256 = "1pcld1anafnb9s7dvm1kzr1wbhf9728z4v1pk44n9grqas8p3z5l"; + name = "kolourpaint-17.12.0.tar.xz"; }; }; kompare = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz"; - sha256 = "0fi3s02rsaa3xl7j69lq2qvg9jn9hxdp44ns89q94s06rqkbjyr1"; - name = "kompare-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kompare-17.12.0.tar.xz"; + sha256 = "1aiiw11g7ipfsil7wfaabqr1y9k31s3l1swhhx4chcdri2d00gwc"; + name = "kompare-17.12.0.tar.xz"; }; }; konqueror = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz"; - sha256 = "1b2hs0fp0a51y87dl8rnv47b8kzjylsps9nczgi8zsipg03z9ja7"; - name = "konqueror-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/konqueror-17.12.0.tar.xz"; + sha256 = "19ypj6kgawvn5jkz73l4j54lpjm9ldikl3i35nc1xp0pzgd6vkjy"; + name = "konqueror-17.12.0.tar.xz"; }; }; konquest = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz"; - sha256 = "1k5s9cvlsx3j2774i6p6xx2sfg75aafj9a4imvm7mzvn3gvmkm3q"; - name = "konquest-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/konquest-17.12.0.tar.xz"; + sha256 = "0p5d0bzzpnqnnqvxryn5l1a5gf3w50fihm777607q74mvx4m2h1l"; + name = "konquest-17.12.0.tar.xz"; }; }; konsole = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz"; - sha256 = "07v9nbikzpanpggglp07slkbn6h0cl2anz7735f9b0lg55fydv42"; - name = "konsole-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/konsole-17.12.0.tar.xz"; + sha256 = "0hazq3yjsw9f4vg9dksasvslhldcyn9zl17fn46ldw44dp9y5imd"; + name = "konsole-17.12.0.tar.xz"; }; }; kontact = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz"; - sha256 = "1hj6vgvn73bzf43ckk4cm24m1n0a4c9c6p14q95hbfbcp5bdra1i"; - name = "kontact-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kontact-17.12.0.tar.xz"; + sha256 = "0spryq6m9hvljn3s55ahlacsqymrf1yv149imhalkfr26h3zqsna"; + name = "kontact-17.12.0.tar.xz"; }; }; kontactinterface = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kontactinterface-17.08.3.tar.xz"; - sha256 = "1ncy0fz0jyklckimm9jjfv2j88aibk49ismz5z6xlasn44vn7l9c"; - name = "kontactinterface-17.08.3.tar.xz"; - }; - }; - kopete = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kopete-17.08.3.tar.xz"; - sha256 = "1v5gmh521si3zbxgcm9m4rcp0csqy52xgvpjpb8j7iq9m0fcqv7q"; - name = "kopete-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kontactinterface-17.12.0.tar.xz"; + sha256 = "15fhrq4hfxi84zw2gm0i1wq9inxxaaic64z71zvaw0wv4hf9js9b"; + name = "kontactinterface-17.12.0.tar.xz"; }; }; korganizer = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz"; - sha256 = "1nsj03h1r5mnz2dvdmydvqz2fspgw2ybs5z05gg0f903sq1gz80l"; - name = "korganizer-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/korganizer-17.12.0.tar.xz"; + sha256 = "0s7j2myr873rajmn49kd1lm99a7gcj65ajqz75l207cvni9z2ydl"; + name = "korganizer-17.12.0.tar.xz"; }; }; kpat = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz"; - sha256 = "0l5s5rrn67lbf8hjqyyxvxij935pb1fd9x9dlskxyc2w7n6acmn2"; - name = "kpat-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kpat-17.12.0.tar.xz"; + sha256 = "1zzhzsx6kpaqvawihyd8lascig1m0f5rh41b38jbvcc9ihfknwhp"; + name = "kpat-17.12.0.tar.xz"; }; }; kpimtextedit = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kpimtextedit-17.08.3.tar.xz"; - sha256 = "1xyfzvmsfikx2xnhgwx9wkdhvfq72f3mz67hlw2jsbm3ir889ysb"; - name = "kpimtextedit-17.08.3.tar.xz"; - }; - }; - kppp = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kppp-17.08.3.tar.xz"; - sha256 = "00y19x306r3pnax1b2cv8bndd6vq1qp30r1hrgw8npy5mm4mn8jw"; - name = "kppp-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kpimtextedit-17.12.0.tar.xz"; + sha256 = "07092z46r94hh5r5qxpwfqzinmaqnanv3ah220cckp8axv04njrm"; + name = "kpimtextedit-17.12.0.tar.xz"; }; }; kqtquickcharts = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz"; - sha256 = "0w8hlnhdgqrmad4ii07f9hsyx6vlaqnvlc54prnah1bqzymvc2ms"; - name = "kqtquickcharts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kqtquickcharts-17.12.0.tar.xz"; + sha256 = "02vf68nnixvsqg14gp5ddif20rp2b6ag1amr91zp8ymw9vpaqsfg"; + name = "kqtquickcharts-17.12.0.tar.xz"; }; }; krdc = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/krdc-17.08.3.tar.xz"; - sha256 = "13rmn1p495dzx49d1y22na25vrpzk9mcc2axg412pv038iphf8id"; - name = "krdc-17.08.3.tar.xz"; - }; - }; - kremotecontrol = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kremotecontrol-17.08.3.tar.xz"; - sha256 = "1p23q7bvppv8fabvpwi793zplb4kry8njczma7c4nya4mkdk9370"; - name = "kremotecontrol-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/krdc-17.12.0.tar.xz"; + sha256 = "07ggwr59y71bkkd83v2ilhm4vkn6fhwjki9svsm1f366x8fhsjx6"; + name = "krdc-17.12.0.tar.xz"; }; }; kreversi = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz"; - sha256 = "0ma0y1n38hw5rawzazlaqfa4vsawgvaq8j2pa5n7z23nwckh19wd"; - name = "kreversi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kreversi-17.12.0.tar.xz"; + sha256 = "0b4ibgyra929vy0ml2j8qrh731gbnrwzy213qsrj19ax7rdbg242"; + name = "kreversi-17.12.0.tar.xz"; }; }; krfb = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz"; - sha256 = "1k7rziw0l0bdjxi5i92w1zsjbakzbklc95dyn2jsnm36jljjqpv1"; - name = "krfb-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/krfb-17.12.0.tar.xz"; + sha256 = "10m6xsbs8qbzx9gsb754gydvnylrnq9d6kfbb4m2zz2fpqp4pf36"; + name = "krfb-17.12.0.tar.xz"; }; }; kross-interpreters = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kross-interpreters-17.08.3.tar.xz"; - sha256 = "1pqlm14xr9p18dfh8pczg8fjskpvzxh5s5n7nxj9q31yz6kbxzrb"; - name = "kross-interpreters-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kross-interpreters-17.12.0.tar.xz"; + sha256 = "1bzwq47dz00ap42z3060b7jnshjajscc3c0wzbdhy1a4dyw51845"; + name = "kross-interpreters-17.12.0.tar.xz"; }; }; kruler = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz"; - sha256 = "1qizjvysfnh5x3fa8hav3y9pyaiq8hpwi1grw9dd921cbb16cww4"; - name = "kruler-17.08.3.tar.xz"; - }; - }; - ksaneplugin = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksaneplugin-17.08.3.tar.xz"; - sha256 = "0y7f269wv0alcvx906nill92nzlld5b1sg6q3xki89b6b9fgliig"; - name = "ksaneplugin-17.08.3.tar.xz"; - }; - }; - kscd = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kscd-17.08.3.tar.xz"; - sha256 = "08r9zhp7d7xf8iyi56hvlm5vyjqrjpj9dc8ynda0n7hyngxrbvm0"; - name = "kscd-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kruler-17.12.0.tar.xz"; + sha256 = "1234ixmjvd193lhw5k5s56mp9mzazy3dkhr0gs8nnqxr3rnzk76j"; + name = "kruler-17.12.0.tar.xz"; }; }; kshisen = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz"; - sha256 = "18nwnxn7i0p2b78cxv8ppsl4lrzdm4ck6hqqdf738npli271shq0"; - name = "kshisen-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kshisen-17.12.0.tar.xz"; + sha256 = "0cibkb65sg0nrv8xld5x30jdbkbvz473hk3dsf6ag206cya21k4s"; + name = "kshisen-17.12.0.tar.xz"; }; }; ksirk = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksirk-17.08.3.tar.xz"; - sha256 = "1601fh93jcy7x622hpvdrb9ddb262n9ivakxli054cz2bq3dbpim"; - name = "ksirk-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ksirk-17.12.0.tar.xz"; + sha256 = "1jp15l6j1cds282vz4yr1c8aq33q9zim9plhk3l56i1pbqsiwm4j"; + name = "ksirk-17.12.0.tar.xz"; + }; + }; + ksmtp = { + version = "17.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.12.0/src/ksmtp-17.12.0.tar.xz"; + sha256 = "0kii3ikf18bqzyxzw48qymrafnwxz2761i9vgfbnsl55v96jwjyq"; + name = "ksmtp-17.12.0.tar.xz"; }; }; ksnakeduel = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz"; - sha256 = "1a7xki783799ala0zx1jngvhsky994sk32xyza2lfir5ym1w0pkm"; - name = "ksnakeduel-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ksnakeduel-17.12.0.tar.xz"; + sha256 = "0ial173raw00kv5l6ysb3y0s6fvazy9zvgmqllxsaqsbdc5pamk4"; + name = "ksnakeduel-17.12.0.tar.xz"; }; }; kspaceduel = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz"; - sha256 = "1wskg788mc51dh3hv0d7hrqyy14gnzzw2sqhc0pd65jj8hra7kh2"; - name = "kspaceduel-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kspaceduel-17.12.0.tar.xz"; + sha256 = "0azf2dq8mpabqq29fcmp660hvp5ziq1c63ypby4r60cw07a224qg"; + name = "kspaceduel-17.12.0.tar.xz"; }; }; ksquares = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksquares-17.08.3.tar.xz"; - sha256 = "04bc3ppiai39v8dq02r7nzr4nvpzjj90glg6qssxqyxwrz18kk20"; - name = "ksquares-17.08.3.tar.xz"; - }; - }; - kstars = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz"; - sha256 = "0i165snb4wnw2kzbhcawgwwqppgq5fmw23rqa4q2k3alaz9smcdn"; - name = "kstars-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ksquares-17.12.0.tar.xz"; + sha256 = "1lv1bxn6p5d08r7a4w03kr12z518xjr1v74vj0lmyhrx234kzbn4"; + name = "ksquares-17.12.0.tar.xz"; }; }; ksudoku = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz"; - sha256 = "1dmqss272z7s7vbh71zg7s5drn66a2yyrv53f34yk3d93mhk8dq2"; - name = "ksudoku-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ksudoku-17.12.0.tar.xz"; + sha256 = "0bwr93lc2fp25qdzz0d45zya9cqkxq0jmfmbncvz3j4229dlgz71"; + name = "ksudoku-17.12.0.tar.xz"; }; }; ksystemlog = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz"; - sha256 = "0smhbdpj2xf9q8l8cjhk4x80qq6apn6mmf7dna9hznp6nd6jrsgv"; - name = "ksystemlog-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ksystemlog-17.12.0.tar.xz"; + sha256 = "02i83i0ixkk9whlbbp5f0mk0ldgf8gw9sk0bxvab9hdj8k545im4"; + name = "ksystemlog-17.12.0.tar.xz"; }; }; kteatime = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz"; - sha256 = "0pp08b2rjz329kdaqq5a490r353n346ah0ag6wfxmpchqy11lr3r"; - name = "kteatime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kteatime-17.12.0.tar.xz"; + sha256 = "1ky9ajzlq67z2rqh2n8s6ynz5fhj96whi2bb56x0q4l9kcm777yc"; + name = "kteatime-17.12.0.tar.xz"; }; }; ktimer = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz"; - sha256 = "15k1rfih9k7zpcsdyiwl60jmp1w1svwb8c6cykjzqpc9acyfpba5"; - name = "ktimer-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktimer-17.12.0.tar.xz"; + sha256 = "13q7c6avhmjqb4ilpnd4sn8ddsxspdf7vrdnknb0g9fh8sjrfyqz"; + name = "ktimer-17.12.0.tar.xz"; }; }; ktnef = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz"; - sha256 = "0fh0ybb3nijhxhkwcmcygw413blkmra83az1jhkmlpp6q5459jin"; - name = "ktnef-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktnef-17.12.0.tar.xz"; + sha256 = "0vvl0lqqgfx9isizaciz6dvx7f913zkzqn4lzjsnbnhr19r3h5wj"; + name = "ktnef-17.12.0.tar.xz"; }; }; ktouch = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz"; - sha256 = "0z21wb82m3sds4sjkkadb48zxcfj1qbab07i3cs3g3a730zdj5ld"; - name = "ktouch-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktouch-17.12.0.tar.xz"; + sha256 = "089wy9apy2i3y4w83barfhwigcpp35idiav023wx6zy9dj63gl2p"; + name = "ktouch-17.12.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-accounts-kcm-17.08.3.tar.xz"; - sha256 = "17h75xkavyl2920j57nm6zp81l70ksyjndrrrqxv8clig1bqfc89"; - name = "ktp-accounts-kcm-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-accounts-kcm-17.12.0.tar.xz"; + sha256 = "0q840r44i0bwj7b55ck6id5v5vl3f18r86diaihqawy600k32f0r"; + name = "ktp-accounts-kcm-17.12.0.tar.xz"; }; }; ktp-approver = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-approver-17.08.3.tar.xz"; - sha256 = "0dvwwpy50ixylacrxnfh4aqpsbc4nfsqkwr358917w5mambfji42"; - name = "ktp-approver-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-approver-17.12.0.tar.xz"; + sha256 = "1ryyfnxksfvyfgpi4q0qzv1mdlrfbp9scbnxgi1br599wqxk4va9"; + name = "ktp-approver-17.12.0.tar.xz"; }; }; ktp-auth-handler = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-auth-handler-17.08.3.tar.xz"; - sha256 = "0pm0bvivwlaq083sql74qq5wrlm7wix1k9i4cr3fck73am9h526b"; - name = "ktp-auth-handler-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-auth-handler-17.12.0.tar.xz"; + sha256 = "1qjc2vh1533wh9pv634m9s6j9a0q5k0chvh1f1w2s0mrayhis4kq"; + name = "ktp-auth-handler-17.12.0.tar.xz"; }; }; ktp-call-ui = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-call-ui-17.08.3.tar.xz"; - sha256 = "1kwprh9g97hraywjcv2ppddaxh7cw6gsy4zs8mjvh0zpnn3cy7xm"; - name = "ktp-call-ui-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-call-ui-17.12.0.tar.xz"; + sha256 = "0qg2l3040ayi1znfqk8l1bpmnqknpjb5spmlyqgjmn5cf6xv7pgq"; + name = "ktp-call-ui-17.12.0.tar.xz"; }; }; ktp-common-internals = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-common-internals-17.08.3.tar.xz"; - sha256 = "10r5flyy4vph1x39dp2mskqksnf5h0qvskl31ln65vz9m8zrhq3w"; - name = "ktp-common-internals-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-common-internals-17.12.0.tar.xz"; + sha256 = "1ixsj8dr15zf9hxrmngrz4839yk4dvll0gj059yq2nigfzibmh8d"; + name = "ktp-common-internals-17.12.0.tar.xz"; }; }; ktp-contact-list = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-list-17.08.3.tar.xz"; - sha256 = "04j2swlqwzppxsbqnwyrz60lgi9l8d7x8hf4xmmhrv1al6vzmb5q"; - name = "ktp-contact-list-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-contact-list-17.12.0.tar.xz"; + sha256 = "1mx9cm6hh7k6n61wl9x1shmyl10am5y0kj7gz5df0p8p9fnwfqz9"; + name = "ktp-contact-list-17.12.0.tar.xz"; }; }; ktp-contact-runner = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-runner-17.08.3.tar.xz"; - sha256 = "1sh0arsy3z413ng0b89sc6a4rh2rnh50k2mhkrdzcvfbwlf74bhw"; - name = "ktp-contact-runner-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-contact-runner-17.12.0.tar.xz"; + sha256 = "14ljix2rbwq1n29hli2qy5kvnw058205ydq2bqif4w8v83wg1af6"; + name = "ktp-contact-runner-17.12.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-desktop-applets-17.08.3.tar.xz"; - sha256 = "03m834rh9v6ash8vm1cs2jpyxma6jaag61h5a51s3ykp0rgv984c"; - name = "ktp-desktop-applets-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-desktop-applets-17.12.0.tar.xz"; + sha256 = "1ns03f2zhmwqc4wigi5clykyyaydlikk92f6k7b42410v0s0vqvc"; + name = "ktp-desktop-applets-17.12.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-filetransfer-handler-17.08.3.tar.xz"; - sha256 = "0vpl977p9lv58p04v6f9v0g4fda7xkhdggf3n4sjnwhis3n0nnx6"; - name = "ktp-filetransfer-handler-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-filetransfer-handler-17.12.0.tar.xz"; + sha256 = "1pmvm5r1ik310cif954ka2l6abkr269akhwgk9s5ldpzgzc726b8"; + name = "ktp-filetransfer-handler-17.12.0.tar.xz"; }; }; ktp-kded-module = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-kded-module-17.08.3.tar.xz"; - sha256 = "0mzzbi50ad2z11wi77957fhmwmqnqhfwjll4s7bj4fq6i3kpncmb"; - name = "ktp-kded-module-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-kded-module-17.12.0.tar.xz"; + sha256 = "028jr1dfq3mpj0lmwhdb351dg50rqr1m5y8dyil3mgcgfvgda5cn"; + name = "ktp-kded-module-17.12.0.tar.xz"; }; }; ktp-send-file = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-send-file-17.08.3.tar.xz"; - sha256 = "1al9w5n0w6i3x0izylx2jviakj3j19izlys9j7phc2gnm99g8mfa"; - name = "ktp-send-file-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-send-file-17.12.0.tar.xz"; + sha256 = "0zsxs11zk1d5wni9nmf92mwy63c3b69l8964ph9hiqqr0gd3vqba"; + name = "ktp-send-file-17.12.0.tar.xz"; }; }; ktp-text-ui = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-text-ui-17.08.3.tar.xz"; - sha256 = "1ib9hskw3qdrpnb0caj12wqkzg0vh2i9wlx582zchn4k4hqkwsxw"; - name = "ktp-text-ui-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktp-text-ui-17.12.0.tar.xz"; + sha256 = "1lvc989l1lmgbfqk6z91cpj96lkhqlf75384qx3ynkmqpjrkyv41"; + name = "ktp-text-ui-17.12.0.tar.xz"; }; }; ktuberling = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz"; - sha256 = "1jvyg09c5458m066sd0x6p2z41rpgbdvkgmw1f6wiybqwxg82h43"; - name = "ktuberling-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/ktuberling-17.12.0.tar.xz"; + sha256 = "0wj6nf4zsvf65zyi15dcw7jzzznw03gxi07gjzv2ncak48i9si0v"; + name = "ktuberling-17.12.0.tar.xz"; }; }; kturtle = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz"; - sha256 = "1ral1y1s2jsc8zm1bwiliblywlpsb7q79cjqafz31r6cb72rkcs4"; - name = "kturtle-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kturtle-17.12.0.tar.xz"; + sha256 = "0qc7clrqc75xqs7iyl44qp2z6pswp7kmwdf55zwv4pq2phvssxvf"; + name = "kturtle-17.12.0.tar.xz"; }; }; kubrick = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz"; - sha256 = "02hzlkqrb55dc45zgqx3r58r7syb3kr2dfwws3s96j5i4q1bp5p8"; - name = "kubrick-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kubrick-17.12.0.tar.xz"; + sha256 = "0dd6g4kah0kvlavy5swiz1a81ms63wzwp045zliay5i4x1bf8jjj"; + name = "kubrick-17.12.0.tar.xz"; }; }; kwalletmanager = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz"; - sha256 = "1ggrswys6ip3lxj6qjy32i36rlmzn2cxddjildlb2b2hk6c3k36r"; - name = "kwalletmanager-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kwalletmanager-17.12.0.tar.xz"; + sha256 = "0jvbyyqqhz7gz2szwx2gb00xxgazczb52331s3sb1rscxb1dbmxq"; + name = "kwalletmanager-17.12.0.tar.xz"; }; }; kwave = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz"; - sha256 = "0gxmmz5ry6gjfrxwksrxvqyff8f3p807q5s4rcpfh975f10ixqqi"; - name = "kwave-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kwave-17.12.0.tar.xz"; + sha256 = "1iwpqnl92y3js4x43wkvxnhlc6ql8jkbacbj1qrlwxv3d8cm8rb9"; + name = "kwave-17.12.0.tar.xz"; }; }; kwordquiz = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz"; - sha256 = "0bzfil8pml6jmc0zgszxybyxvkdgzzq37l97z2qvhmjw8pfk0zsr"; - name = "kwordquiz-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/kwordquiz-17.12.0.tar.xz"; + sha256 = "1zb6y85bgwvc3z016bq7x687yfvs45kh7h3lj9g2r3bh4l14aggx"; + name = "kwordquiz-17.12.0.tar.xz"; }; }; libgravatar = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz"; - sha256 = "0xx9xik5xcg9gs2hjf0z24v7bqqf5qk8x0743qlspyc35i8jq7hx"; - name = "libgravatar-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libgravatar-17.12.0.tar.xz"; + sha256 = "1rnhvg2s622vpm9b2nvfxl16d2rm2vjjqd9g6k0jsdj15gd6i22q"; + name = "libgravatar-17.12.0.tar.xz"; }; }; libkcddb = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz"; - sha256 = "0yhs9acv87i8635dw79hpsiywgxcbnaa4vx0l95v50r3v2pknx7h"; - name = "libkcddb-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkcddb-17.12.0.tar.xz"; + sha256 = "0xr97hmqhnjlybhlr73j3p1i7skg17cbm0269rpwg52pqk7w1hg5"; + name = "libkcddb-17.12.0.tar.xz"; }; }; libkcompactdisc = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz"; - sha256 = "0r0w7qwi1pqcs9fv5rnpf7d2zjvaqd3yj2x12z2vc81qz4vrdr19"; - name = "libkcompactdisc-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkcompactdisc-17.12.0.tar.xz"; + sha256 = "1pz652n7rmyjf0m4i67y5wv423fnpif18vvqdbawhij58vh3cfxj"; + name = "libkcompactdisc-17.12.0.tar.xz"; }; }; libkdcraw = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz"; - sha256 = "0hnbphkdmz3yd0callcwk2bqnkr2i9ljck63rz6yn4adnfdclkad"; - name = "libkdcraw-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkdcraw-17.12.0.tar.xz"; + sha256 = "1w8gwvi42kin58dx7scsbg9wfmqi7917dvx4gi6s0k6m7arg4w97"; + name = "libkdcraw-17.12.0.tar.xz"; }; }; libkdegames = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz"; - sha256 = "1sc6y01z0alxdgrm3rlki6n5a3gblrim7cbxj9xbsghy6s8s3pn0"; - name = "libkdegames-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkdegames-17.12.0.tar.xz"; + sha256 = "0l1iwpngwsqs11scx2pbafkxgjazcj86qwc3fznrq0h3zg22zzxk"; + name = "libkdegames-17.12.0.tar.xz"; }; }; libkdepim = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz"; - sha256 = "19njszdhca7lk6cmkj4nnvj8zk7nakb9gq8bg34dqhhiq3nc6si5"; - name = "libkdepim-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkdepim-17.12.0.tar.xz"; + sha256 = "1dmbs48xfy50dmfyfkglphlakn3bg4ww2rqkbwv68qy6hwkj750m"; + name = "libkdepim-17.12.0.tar.xz"; }; }; libkeduvocdocument = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz"; - sha256 = "0q978wn4brcszlf47iqnc93fqgcsvfcw2292n2hapf0cv8j8vzbm"; - name = "libkeduvocdocument-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkeduvocdocument-17.12.0.tar.xz"; + sha256 = "1m9ff4qswjlczv7j5ravfagjw8dga5iw8x2d3mxyalgffc3810ab"; + name = "libkeduvocdocument-17.12.0.tar.xz"; }; }; libkexiv2 = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkexiv2-17.08.3.tar.xz"; - sha256 = "0j906k63j30sajb70kqglhz9lhai98bh9x2bcwma711b2f30q2r2"; - name = "libkexiv2-17.08.3.tar.xz"; - }; - }; - libkface = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkface-17.08.3.tar.xz"; - sha256 = "0im9k72rxpk17m8ckl06rvylsxwjhgh3yxji1visvxljwkdscbmx"; - name = "libkface-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkexiv2-17.12.0.tar.xz"; + sha256 = "0isqxj8c8inxdjs1gqvc1wv17nzvm8y9ga85n45417hxcfccrdrd"; + name = "libkexiv2-17.12.0.tar.xz"; }; }; libkgapi = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz"; - sha256 = "1yw00c16g2h59x5wzaaicv8b9dvdhbp0mqv49m8krnw07awh7isz"; - name = "libkgapi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkgapi-17.12.0.tar.xz"; + sha256 = "0nsn2kicdparjwqncian7v1b4m0jr5z99cc6ijycp3agg07lvppi"; + name = "libkgapi-17.12.0.tar.xz"; }; }; libkgeomap = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz"; - sha256 = "0k0ndgwwm78z8hybyi0clfpkvmrpaj9b3xyda57c410m73fbdr0m"; - name = "libkgeomap-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkgeomap-17.12.0.tar.xz"; + sha256 = "11mcqqcjmspjyskxd8r1vzrg2zcyx2cwdamwv40x4jmcx4g4nijp"; + name = "libkgeomap-17.12.0.tar.xz"; }; }; libkipi = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz"; - sha256 = "0c0bhw0wpm6y21wj15cs73150dh0vxddl4lypj3xjpknxspiv32x"; - name = "libkipi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkipi-17.12.0.tar.xz"; + sha256 = "0fmjjy49cl8qam1bm335fvm8mzn68dli6nnx1d3m4kxffrzzi9gy"; + name = "libkipi-17.12.0.tar.xz"; }; }; libkleo = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz"; - sha256 = "1nyf7c1q7dngk28852lkhz3h1cvi5xy4ydshkm376h32ps905yb7"; - name = "libkleo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkleo-17.12.0.tar.xz"; + sha256 = "0b15z81g6062qh9x7fqmn04gx7z7xkncbpf0ngp2m6795k38rp0s"; + name = "libkleo-17.12.0.tar.xz"; }; }; libkmahjongg = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz"; - sha256 = "1w7fzvp44dl74m5pl206mrwxpj3fh4fd0fwfinxps616jx1q76fd"; - name = "libkmahjongg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkmahjongg-17.12.0.tar.xz"; + sha256 = "0vg9041q5yp6ld7sn5pnzldxlci1kxzpq66vx4c67s81lpr3hqlm"; + name = "libkmahjongg-17.12.0.tar.xz"; }; }; libkomparediff2 = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz"; - sha256 = "01bd04av3jnsc2kxirfi4d8k2baaskdk2kasmbih1gml2mw9sbff"; - name = "libkomparediff2-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libkomparediff2-17.12.0.tar.xz"; + sha256 = "0ylhw5vj6frrffr27q4s5zidaxviggxwj592s3hxpy9np8avf7mq"; + name = "libkomparediff2-17.12.0.tar.xz"; }; }; libksane = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz"; - sha256 = "1skmqiw3j8jsdaj2haridslkx27wf55swjkzgjk4cxsk96j7y4ib"; - name = "libksane-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libksane-17.12.0.tar.xz"; + sha256 = "1qznn9s203ny37khg4lj8mpy9z3qblp8skh0lyw6s4wd46ni0vxw"; + name = "libksane-17.12.0.tar.xz"; }; }; libksieve = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz"; - sha256 = "1nphwghis0mmmb92nr4f5d364nd5jyi1has9dc1hx6qz8p0wphwg"; - name = "libksieve-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/libksieve-17.12.0.tar.xz"; + sha256 = "1yvs69c7lz5kqcnb16lq8sbykr22l0bmxsbgl7a1wzg3fqwnqlyn"; + name = "libksieve-17.12.0.tar.xz"; }; }; lokalize = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz"; - sha256 = "0d4ym1vif1ggdlbs2k3ralc6lsm81xnlfp3z3mlkvg0vv77sfbra"; - name = "lokalize-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/lokalize-17.12.0.tar.xz"; + sha256 = "189vrvdmavlnpk8cqyclwyqf2xml2fismfrncnh3nnaawr99mxmb"; + name = "lokalize-17.12.0.tar.xz"; }; }; lskat = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz"; - sha256 = "07vhmk03z2jw6mlfv5mdhzafcqa06skzm6ssk70y3whkwkck385b"; - name = "lskat-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/lskat-17.12.0.tar.xz"; + sha256 = "0bfp2h566xry428b77a8wz91w2hxd7jwjzfgvvzj4rjajrydkr1m"; + name = "lskat-17.12.0.tar.xz"; }; }; mailcommon = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz"; - sha256 = "1zgy8sjng40w8m0b8fdy62p9sng7nld84py1k8zjw8mzhqqzqxs5"; - name = "mailcommon-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/mailcommon-17.12.0.tar.xz"; + sha256 = "03jwf8g646wlxw5qxdcn4hghbrb7176zcchisky7mpb4cpkbl148"; + name = "mailcommon-17.12.0.tar.xz"; }; }; mailimporter = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz"; - sha256 = "0h3wsbca2lhw1zjv2l1q6fhdwnx9kznyiykcn7jgzsh6f7grzqa8"; - name = "mailimporter-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/mailimporter-17.12.0.tar.xz"; + sha256 = "18f2zp63y95f14b9bwqgq68q4s5lqa9kv0l5xq4mylk4cdsb76kx"; + name = "mailimporter-17.12.0.tar.xz"; }; }; marble = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/marble-17.08.3.tar.xz"; - sha256 = "0qmzy9b1gd40xzw4i978315dxf1ay1937wplb9nc670gmlrqnzy2"; - name = "marble-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/marble-17.12.0.tar.xz"; + sha256 = "0zqwyf2lmdsf1cc7c9ld8agmp7fd9rdh2v2jn0p2ghzm578d0r34"; + name = "marble-17.12.0.tar.xz"; }; }; mbox-importer = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/mbox-importer-17.08.3.tar.xz"; - sha256 = "1nlzjvzwp4jalqbql39q9lszfxg9cba5bcbi4wgiv580pyq38h28"; - name = "mbox-importer-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/mbox-importer-17.12.0.tar.xz"; + sha256 = "0zw6qslsr0rdhz3crq7h5ngaz0g0v6c12v7bz3749pm4pqd4wri9"; + name = "mbox-importer-17.12.0.tar.xz"; }; }; messagelib = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz"; - sha256 = "1nxi79dyavjvgn83bjjrdwg0ry298ib126dxyl7inx7qgc4nhddn"; - name = "messagelib-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/messagelib-17.12.0.tar.xz"; + sha256 = "1rz81bpf5s0nsf823l467p3dcyb7h746ipiv514frxddahh2kikz"; + name = "messagelib-17.12.0.tar.xz"; }; }; minuet = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz"; - sha256 = "1jg47mb5wnpw60is5zmdrqhjwsq6bnd5vw0pfiiw1arws50rv2h6"; - name = "minuet-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/minuet-17.12.0.tar.xz"; + sha256 = "12ih1x8dl7w581jkagp59l8430gd7iip6m4pj3gh79sldsy3hkiq"; + name = "minuet-17.12.0.tar.xz"; }; }; okteta = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz"; - sha256 = "1zs0g5mnlj2fd0wipxgajnvbl5s24a37v6zdkixck5fmvlj6g14v"; - name = "okteta-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/okteta-17.12.0.tar.xz"; + sha256 = "0zyhm8kbi064iics3f53k0g8z3j6kk9cy0cbmpn1bpwl481hkk7k"; + name = "okteta-17.12.0.tar.xz"; }; }; okular = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/okular-17.08.3.tar.xz"; - sha256 = "1zalj2v9fgxc50b339i3j4n3gpf87pjnnqbgvkmd041apsv6jbnk"; - name = "okular-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/okular-17.12.0.tar.xz"; + sha256 = "0czzh1djmmxmj8fa3sy3601i4mmd2hmnhsj1lmp5k6lkpmhyp505"; + name = "okular-17.12.0.tar.xz"; }; }; palapeli = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/palapeli-17.08.3.tar.xz"; - sha256 = "1i689gycqlpi83wfy9l2dqzdypaizdx7cx069fbm4akv8r4xfjfz"; - name = "palapeli-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/palapeli-17.12.0.tar.xz"; + sha256 = "1988z8ggchxbzqqrigybvx0hkpj0ikvzlzskk84s2wmm5nvvqwpq"; + name = "palapeli-17.12.0.tar.xz"; }; }; parley = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/parley-17.08.3.tar.xz"; - sha256 = "0crrf7k8p9rz72q4zfbyxxfza5dm0z4nhhc4jqafra8vvbjyja2j"; - name = "parley-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/parley-17.12.0.tar.xz"; + sha256 = "0qhx7wbk7wl6mdzv7arjidn80bagrxi4y8rpvylmpacn3skl1p55"; + name = "parley-17.12.0.tar.xz"; }; }; picmi = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz"; - sha256 = "0zj3ang96rwzpjr3y8lig1dhqxd2ipcs3q873plra0lxmlhnzq6b"; - name = "picmi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/picmi-17.12.0.tar.xz"; + sha256 = "04ykhzdwpgq34i7inqs9a29v9dkmnh9sj44vv5m97xqpsg64pkj8"; + name = "picmi-17.12.0.tar.xz"; }; }; pimcommon = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz"; - sha256 = "0d1avdhm78kfjvl8sybjqsmp7k1wl961bqlzgbxk9wq6411p9r8r"; - name = "pimcommon-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/pimcommon-17.12.0.tar.xz"; + sha256 = "1naxg9954vd0j7n4j9dyjwn3jbx6n1ngc3apm0gxr49b9m6shbfj"; + name = "pimcommon-17.12.0.tar.xz"; }; }; pim-data-exporter = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/pim-data-exporter-17.08.3.tar.xz"; - sha256 = "0afn6rjz7vmz9q16a487ssns6nj7sbqbz4ydbhh1i3c8xhlnxg1m"; - name = "pim-data-exporter-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/pim-data-exporter-17.12.0.tar.xz"; + sha256 = "09q7rwsnc0hinag48y54mfkw642nqgnvvw2dnzn8bvc76jvjy4xc"; + name = "pim-data-exporter-17.12.0.tar.xz"; }; }; pim-sieve-editor = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/pim-sieve-editor-17.08.3.tar.xz"; - sha256 = "0fw976hdrvw68025bs1bff47d4cs95ws7p4viacmz4na9m0cag7n"; - name = "pim-sieve-editor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/pim-sieve-editor-17.12.0.tar.xz"; + sha256 = "0mjs8daycp7g287hfidixw13g83pclsz5k22m7vx4swa8hnsw885"; + name = "pim-sieve-editor-17.12.0.tar.xz"; }; }; poxml = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz"; - sha256 = "0vgh77rdqp8pq5k20794fl8m12azx6r2pkl0rijmwar2ln5k0k25"; - name = "poxml-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/poxml-17.12.0.tar.xz"; + sha256 = "0v5ydzcpr4khbwwz9170ag7hdyqxsqamnhgr4nn4xhsdl3wxf36m"; + name = "poxml-17.12.0.tar.xz"; }; }; print-manager = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/print-manager-17.08.3.tar.xz"; - sha256 = "0ncda47pk225hn45rv1wwibn0s974mm4s5fpi54hyanba6ganll5"; - name = "print-manager-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/print-manager-17.12.0.tar.xz"; + sha256 = "1v43kmlbyvmm5s4yijqizypzjar9ang4czbm8zk4k1pspbwvqm9v"; + name = "print-manager-17.12.0.tar.xz"; }; }; rocs = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz"; - sha256 = "1nvwjxsfqccrig25m9qkivrjn302g6blb6h2p3q1qnlszcw8b9wd"; - name = "rocs-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/rocs-17.12.0.tar.xz"; + sha256 = "1ii2v9mhj42ydvgalc8xj1liy93xlf39bcc64vc6f7l76786kbvr"; + name = "rocs-17.12.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/signon-kwallet-extension-17.08.3.tar.xz"; - sha256 = "0hpalgz4xfd9qh5mxgrs638v0as4x0a5133caci6lwaydrhgwrxg"; - name = "signon-kwallet-extension-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/signon-kwallet-extension-17.12.0.tar.xz"; + sha256 = "1iv26ny02qamnyxk7r3m1fiyqqmxi75y65vavxqqngdqrx5h9s45"; + name = "signon-kwallet-extension-17.12.0.tar.xz"; }; }; spectacle = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz"; - sha256 = "18z0sqd38146nc73kmwvshjxl0wgm1fh4zzxai1hcp7yiipndzm6"; - name = "spectacle-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/spectacle-17.12.0.tar.xz"; + sha256 = "008j8nl26phr24329wqj9z4bw078bj81mpy267pwzaqf411xfgd5"; + name = "spectacle-17.12.0.tar.xz"; }; }; step = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/step-17.08.3.tar.xz"; - sha256 = "1gnsfn2iz2lax30pdyqvm6s5b8zjsn4gs031dlr1xgsd98c1xq87"; - name = "step-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/step-17.12.0.tar.xz"; + sha256 = "0krd8kl29sk1ib6kszhkz6328d3ap2fl7lw4hcycl1z0cnrpf1b0"; + name = "step-17.12.0.tar.xz"; }; }; svgpart = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz"; - sha256 = "07i3ny0bl1fjfia2rbrb7n4qycdpz4gjpvx6v540ghq58dy7nfgw"; - name = "svgpart-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/svgpart-17.12.0.tar.xz"; + sha256 = "0q157qnyl6sabd879200s1fp22qb3rc940pw70dyy03sd16vb0k0"; + name = "svgpart-17.12.0.tar.xz"; }; }; sweeper = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/sweeper-17.08.3.tar.xz"; - sha256 = "0jymkz024ywss8y2xpyndpr7pk89v7bbgr5anpnywfkgx3lv06xn"; - name = "sweeper-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/sweeper-17.12.0.tar.xz"; + sha256 = "0csccxd3pjw2ih2h4m168vkmiyyzvqzqx8pyhxjc2jgqkmqy0njj"; + name = "sweeper-17.12.0.tar.xz"; }; }; syndication = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz"; - sha256 = "0yakzq927prd9pd1g7gld90pz1cxjwzic2c2cw9bw17x19yr748h"; - name = "syndication-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/syndication-17.12.0.tar.xz"; + sha256 = "1cxbrckgpbzgj791c97840yy011x6vii0nzxd6sc7sp5sh8y2k6l"; + name = "syndication-17.12.0.tar.xz"; }; }; umbrello = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz"; - sha256 = "1g149nkp02b1sgsq83r0p3vfii8jsc4kx79znglcjlf20dg89j70"; - name = "umbrello-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/umbrello-17.12.0.tar.xz"; + sha256 = "1i6rvxgpk166gpjm91g1d87lhcswpfvsysa4jc1bmxw8qyzd6yc9"; + name = "umbrello-17.12.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.08.3"; + version = "17.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/zeroconf-ioslave-17.08.3.tar.xz"; - sha256 = "14prm7qjqh4xrgdxzbs8z8a8p2jjf2amcx7r1qx62fkhfbh6gw01"; - name = "zeroconf-ioslave-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.0/src/zeroconf-ioslave-17.12.0.tar.xz"; + sha256 = "07mxy2wg5f92zv2vcy72d2z73jfm0w6rzs2vlixsyzmig3v8azga"; + name = "zeroconf-ioslave-17.12.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix new file mode 100644 index 000000000000..9b6771a3925b --- /dev/null +++ b/pkgs/applications/misc/airspy/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub +, cmake , pkgconfig, libusb +}: + +let + version = "1.0.9"; +in + stdenv.mkDerivation { + name = "airspy-${version}"; + + src = fetchFromGitHub { + owner = "airspy"; + repo = "airspyone_host"; + rev = "v${version}"; + sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x"; + }; + + postPatch = '' + substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb ]; + + cmakeFlags = + lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/airspy/airspyone_host; + description = "Host tools and driver library for the AirSpy SDR"; + license = licenses.free; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ markuskowa ]; + }; + } diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix new file mode 100644 index 000000000000..56fc11a20e12 --- /dev/null +++ b/pkgs/applications/misc/airtame/default.nix @@ -0,0 +1,100 @@ +{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper +, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype +, gdk_pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite +, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender +, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264 +}: + +let libPath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + curl + dbus + expat + ffmpeg + fontconfig + freetype + gdk_pixbuf + glib + glibc + gnome2.GConf + gtk2 + libopus + nspr + nss + pango + stdenv.cc.cc + udev + x264 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libpulseaudio + libxcb +]; +in stdenv.mkDerivation rec { + pname = "airtame"; + version = "3.0.1"; + name = "${pname}-${version}"; + longName = "${pname}-application"; + + src = fetchurl { + url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz"; + sha256 = "1z5v9dwcvcmz190acm89kr4mngirha1v2jpvfzvisi0vidl2ba60"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + desktopItem = makeDesktopItem rec { + name = "airtame"; + exec = longName; + comment = "Airtame Streaming Client"; + desktopName = "Airtame"; + icon = name; + genericName = comment; + categories = "Application;Network;"; + }; + + installPhase = '' + opt="$out/opt/airtame" + mkdir -p "$opt" + cp -R . "$opt" + mkdir -p "$out/bin" + ln -s "$opt/${longName}" "$out/bin/" + mkdir -p "$out/share" + cp -r "${desktopItem}/share/applications" "$out/share/" + mkdir -p "$out/share/icons" + ln -s "$opt/icon.png" "$out/share/icons/airtame.png" + + # Flags and rpath are copied from launch-airtame.sh. + interp="$(< $NIX_CC/nix-support/dynamic-linker)" + vendorlib="$opt/resources/app.asar.unpacked/streamer/vendor/airtame-core/lib" + rpath="${libPath}:$opt:$vendorlib:$opt/resources/app.asar.unpacked/encryption/out/lib" + rm $vendorlib/libcurl.so* + find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \ + -exec patchelf --set-rpath "$rpath" {} \; + # The main binary also needs libudev which was removed by --shrink-rpath. + patchelf --set-interpreter "$interp" $opt/${longName} + wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals" + ''; + + dontPatchELF = true; + + meta = with stdenv.lib; { + homepage = https://airtame.com/download; + description = "Wireless streaming client for Airtame devices"; + license = licenses.unfree; + maintainers = with maintainers; [ thanegill ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index bb934ff4812c..7bfcc6e72c89 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -12,6 +12,7 @@ libXcursor, libXxf86vm, libXi, + libXrandr, xclip }: with rustPlatform; @@ -24,22 +25,23 @@ let libX11 libXcursor libXxf86vm + libXrandr libXi ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2017-11-12"; + version = "2017-12-29"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0096fzrfzj0a2n2n531r4b6c8rlfj5qc90d6i4iin5axalk3i1h4"; + sha256 = "0pk4b8kfxixmd9985v2fya1m7np8ggws8d9msw210drc0grwbfkd"; fetchSubmodules = true; }; - cargoSha256 = "10blch8pzk1zk3w27sbcszhcnq908xh1q55vqgy8iv5x47rpl02q"; + cargoSha256 = "0acj526cx4xl52vbcbd3hp1klh4p756j6alxqqz3x715zi2dqkzf"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 5abd8953a443..3a5fde287067 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,15 +1,15 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser, - cmake, python3 }: +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, + qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }: mkDerivation rec { name = "albert-${version}"; - version = "0.14.7"; + version = "0.14.14"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n"; + sha256 = "1skh709f4y4p0vqabvvysn6fgws2yq8izbwkib7rfjc357chhmi7"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 71196e919915..3d04b53dcde7 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://aa-project.sourceforge.net/bb; description = "AA-lib demo"; license = licenses.gpl2; - maintainers = maintainers.rnhmjoj; + maintainers = [ maintainers.rnhmjoj ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 3f22d1629e27..d4b07cb91dcd 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -1,20 +1,26 @@ -{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }: +{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }: stdenv.mkDerivation rec { name = "calcurse-${version}"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "http://calcurse.org/files/${name}.tar.gz"; - sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266"; + sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; }; - buildInputs = [ncurses gettext python3 ]; + buildInputs = [ ncurses gettext python3 ]; nativeBuildInputs = [ makeWrapper ]; + # Build Python environment with httplib2 for calcurse-caldav + pythonEnv = python3Packages.python.buildEnv.override { + extraLibs = [ python3Packages.httplib2 ]; + }; + propogatedBuildInputs = [ pythonEnv ]; + postInstall = '' - makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav - ''; + substituteInPlace $out/bin/calcurse-caldav --replace /usr/bin/python3 ${pythonEnv}/bin/python3 + ''; meta = with stdenv.lib; { description = "A calendar and scheduling application for the command line"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e548b944a8d4..14e9375cb794 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.12.0"; + version = "3.14.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq"; + sha256 = "1367jh82mhjjlvyd30mfz3qwscg60l0gimakvzpbkrah918kfk51"; }; patches = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ - apsw cssselect cssutils dateutil dns html5-parser lxml mechanize netifaces pillow + apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow python pyqt5 sip regex msgpack # the following are distributed with calibre, but we use upstream instead diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix deleted file mode 100644 index d90e8a6dba66..000000000000 --- a/pkgs/applications/misc/camlistore/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, go, fetchgit, git, buildGoPackage }: - -buildGoPackage rec { - name = "camlistore-${version}"; - version = "0.9"; - - src = fetchgit { - url = "https://github.com/camlistore/camlistore"; - rev = "refs/tags/${version}"; - sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya"; - leaveDotGit = true; - }; - - buildInputs = [ git ]; - - goPackagePath = ""; - buildPhase = '' - cd go/src/camlistore - go run make.go - ''; - - installPhase = '' - mkdir -p $bin/bin - rm bin/README - cp bin/* $bin/bin - ''; - - meta = with stdenv.lib; { - description = "A way of storing, syncing, sharing, modelling and backing up content"; - homepage = https://camlistore.org; - license = licenses.asl20; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix new file mode 100644 index 000000000000..ca7e332cc286 --- /dev/null +++ b/pkgs/applications/misc/ddgr/default.nix @@ -0,0 +1,46 @@ +{stdenv, fetchpatch, fetchFromGitHub, python3Packages}: + +stdenv.mkDerivation rec { + version = "1.1"; + name = "ddgr-${version}"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = "ddgr"; + rev = "v${version}"; + sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf"; + }; + + buildInputs = [ + (python3Packages.python.withPackages (ps: with ps; [ + requests + ])) + ]; + + patches = [ + (fetchpatch { + sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc"; + name = "Fix-zsh-completion.patch"; + url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch"; + }) + ]; + + makeFlags = "PREFIX=$(out)"; + + postInstall = '' + mkdir -p "$out/share/bash-completion/completions/" + cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/" + mkdir -p "$out/share/fish/vendor_completions.d/" + cp "auto-completion/fish/ddgr.fish" "$out/share/fish/vendor_completions.d/" + mkdir -p "$out/share/zsh/site-functions/" + cp "auto-completion/zsh/_ddgr" "$out/share/zsh/site-functions/" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/jarun/ddgr; + description = "Search DuckDuckGo from the terminal"; + license = licenses.gpl3; + maintainers = with maintainers; [ markus1189 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 7f38e801c4cb..12ceb0958f0d 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,31 +1,46 @@ -{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; - version = "2.6.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b"; + sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2"; }; - patchPhase = '' - substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" + patches = [ + # Do not build vendored zssh and vte + (fetchurl { + name = "remove-vendor.patch"; + url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c; + sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6"; + }) + ]; + + postPatch = '' + substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" + substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" ''; - nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ]; - buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ]; + nativeBuildInputs = [ + pkgconfig vala cmake gettext + # For setup hook + gobjectIntrospection + ]; + buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; - meta = { + meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; longDescription = '' - Deepin terminal, it sharpens your focus in the world of command line! - It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. + Deepin terminal, it sharpens your focus in the world of command line! + It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. ''; homepage = https://github.com/linuxdeepin/deepin-terminal/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index 0c9fa5ea2d27..924b95d8b6a9 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { name = "dmensamenu-${version}"; - version = "1.0.0"; + version = "1.1.1"; propagatedBuildInputs = [ requests @@ -12,8 +12,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "dotlambda"; repo = "dmensamenu"; - rev = "v${version}"; - sha256 = "05wbpmgjpm0ik9pcydj7r9w7i7bfpcij24bc4jljdwl9ilw62ixp"; + rev = version; + sha256 = "0gc23k2zbv9zfc0v27y4spiva8cizxavpzd5pch5qbawh2lak6a3"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix deleted file mode 100644 index 340e8f161647..000000000000 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ /dev/null @@ -1,34 +0,0 @@ -{stdenv, fetchurl #, libX11, libXinerama, enableXft, libXft, zlib -, swc, wld, wayland, libxkbcommon, pixman, fontconfig -}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "dmenu-wayland-${version}"; - version = "git-2017-04-07"; - rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70"; - - src = fetchurl { - url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz"; - sha256 = "0y1jvh2815c005ns0bsjxsmz82smw22n6jsfg2g03a1pacakp6ys"; - }; - - buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ]; - - postPatch = '' - sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run - ''; - - preConfigure = [ - ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk'' - ]; - - meta = { - description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 56c1a8168a82..21af05133bf8 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,24 +1,31 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages, qtbase }: -python2Packages.buildPythonApplication rec { - version = "2.9.4"; +let + + python = python3Packages.python; + +in + +python3Packages.buildPythonApplication rec { + version = "3.1.2"; name = "electron-cash-${version}"; src = fetchurl { - url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz"; + url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz"; # Verified using official SHA-1 and signature from # https://github.com/fyookball/keys-n-hashes - sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh"; + sha256 = "18h44jfbc2ksj34hdzgszvvq82xi28schl3wp3lkq9fjp7ny0mf3"; }; - propagatedBuildInputs = with python2Packages; [ - dns + propagatedBuildInputs = with python3Packages; [ + dnspython ecdsa - jsonrpclib + jsonrpclib-pelix + matplotlib pbkdf2 pyaes pycrypto - pyqt4 + pyqt5 pysocks qrcode requests @@ -29,18 +36,25 @@ python2Packages.buildPythonApplication rec { trezor ]; + postPatch = '' + # Remove pyqt5 check + sed -i '/pyqt5/d' setup.py + ''; + preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 icons.qrc -o gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; + doCheck = false; + postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out - rm -rf $out/lib/python2.7/site-packages/nix + mv $out/${python.sitePackages}/nix/store"/"*/share $out + rm -rf $out/${python.sitePackages}/nix substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u" @@ -60,6 +74,7 @@ python2Packages.buildPythonApplication rec { of the blockchain. ''; homepage = https://www.electroncash.org/; + platforms = platforms.linux; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; }; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index e7a5a1be1979..bde8d5b81e3e 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python2Packages; [ - dns + dnspython ecdsa pbkdf2 protobuf diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix index bb41f8665e57..10b2aacbf8cb 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum-ltc/default.nix @@ -1,33 +1,34 @@ { stdenv , fetchurl -, python2Packages +, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "2.6.4.2"; + version = "3.0.5.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "0sqcyk6n6kgaiinnwh6mzbbn4whk3ga59r5bw5rqmnnfqk1xdnb4"; + sha256 = "1acsgzmd83cz6ha5fw63mi7123fr6gbiq537p5lxxfs2i8zrl63r"; }; - propagatedBuildInputs = with python2Packages; [ - pyqt4 - slowaes + propagatedBuildInputs = with python3Packages; [ + pyaes ecdsa pbkdf2 requests qrcode - ltc_scrypt + py_scrypt + pyqt5 protobuf - dns - jsonrpclib + dnspython + jsonrpclib-pelix + pysocks ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 icons.qrc -o gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; @@ -47,7 +48,7 @@ python2Packages.buildPythonApplication rec { ''; homepage = https://electrum-ltc.org/; license = licenses.mit; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ asymmetric ]; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index abe8d0dde84b..caa050581bf7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3, python3Packages, zbar }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.9.3"; + version = "3.0.5"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2"; + sha256 = "06z0a5p1jg93jialphslip8d72q9yg3651qqaf494gs3h9kw1sv1"; }; - propagatedBuildInputs = with python2Packages; [ - dns + propagatedBuildInputs = with python3Packages; [ + dnspython ecdsa - jsonrpclib + jsonrpclib-pelix matplotlib pbkdf2 protobuf pyaes pycrypto - pyqt4 + pyqt5 pysocks qrcode requests @@ -35,21 +35,24 @@ python2Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 icons.qrc -o gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' gui/qt/icons_rc.py + sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py ''; postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out - rm -rf $out/lib/python2.7/site-packages/nix + mv $out/${python3.sitePackages}/nix/store"/"*/share $out + rm -rf $out/${python3.sitePackages}/nix substituteInPlace $out/share/applications/electrum.desktop \ --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; + doCheck = false; + doInstallCheck = true; installCheckPhase = '' $out/bin/electrum help >/dev/null diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 7248fe2c8754..d447e7f50d52 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.48"; + version = "0.2.50"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq"; + sha256 = "18x3s3jrph8k3pc75jgwkfqazygpsx93zjxx68zms58my17cybh1"; }; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch index 68a16b196fa3..0ed98ee947b2 100644 --- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch +++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch @@ -77,8 +77,8 @@ index 0000000..1bd9bb5 + + + -+ -+ ++ ++ + + + @@ -91,6 +91,7 @@ index 0000000..1bd9bb5 + + + ++ + + + diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 7bd876f1d4aa..aaaa7f3c214f 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: with stdenv.lib; stdenv.mkDerivation rec { - rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; - build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; + rev = "192dace49c2e5456ca235833ee9877e4b8b491cc"; + build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; + sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index add46f8871d5..ee16ba24ed46 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc +, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee + vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 6d67d3a340f5..8c63c8565781 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool, +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, - librsvg, vala_0_34, gnome3, wrapGAppsHook + librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig automake autoconf libtool file @@ -23,6 +22,8 @@ stdenv.mkDerivation rec { vala_0_34 gnome3.yelp_tools wrapGAppsHook + # For setup hook + gobjectIntrospection ]; buildInputs = [ diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix new file mode 100644 index 000000000000..67bb5feff8c7 --- /dev/null +++ b/pkgs/applications/misc/gcal/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, ncurses }: + +stdenv.mkDerivation rec { + name = "gcal-${version}"; + version = "4.1"; + + src = fetchurl { + url = "mirror://gnu/gcal/${name}.tar.xz"; + sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"; + }; + + enableParallelBuilding = true; + + buildInputs = [ ncurses ]; + + meta = { + description = "Program for calculating and printing calendars"; + longDescription = '' + Gcal is the GNU version of the trusty old cal(1). Gcal is a + program for calculating and printing calendars. Gcal displays + hybrid and proleptic Julian and Gregorian calendar sheets. It + also displays holiday lists for many countries around the globe. + ''; + homepage = https://www.gnu.org/software/gcal/; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index b6bb3c2fd83d..7fd3db860dfb 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -6,11 +6,11 @@ assert withBuildColors -> ncurses != null; stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.7"; + version = "0.2.8"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq"; + sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98"; }; preConfigure = '' diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix index 2fd64d02f18b..355ca0e95449 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd -, makeWrapper, hackrf +, makeWrapper, hackrf, airspy , pythonSupport ? true, python, swig }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf + cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 358d9dff44a6..efd3bfe73dd9 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + + # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm' + enableParallelBuilding = false; + meta = { description = "Performance software for cyclists, runners and triathletes"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index df8cb71d6f9e..52903a1f8014 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -6,7 +6,7 @@ let arch = if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.system == "i686-linux" then "i386" - else abort "Unsupported architecture"; + else throw "Unsupported system ${stdenv.system}"; sha256 = if arch == "amd64" then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index dc771fc2d5e4..c82e5026ff18 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python }: -pythonPackages.buildPythonApplication rec { - version = "0.4.2"; - name = "haxor-news-${version}"; +with python.pkgs; - src = fetchurl { - url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz"; - sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs"; +buildPythonApplication rec { + pname = "haxor-news"; + version = "0.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ click colorama requests @@ -18,6 +20,12 @@ pythonPackages.buildPythonApplication rec { six ]; + checkInputs = [ mock ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests -v + ''; + meta = with stdenv.lib; { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0dfc725b9ea6..86b806a916c3 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.29"; + version = "0.32.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33"; + sha256 = "0k62sg9rvr4aqzh1r60m456cw8mj6kxjpri2nnj4c2dxmvll8qhr"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 35faf6b57047..6c870833d1af 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,3 +1,4 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "github.com/BurntSushi/toml"; @@ -13,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "b938d81255b5473c57635324295cb0fe398c7a58"; - sha256 = "0d44lrg04g9nibhdlagwq9n8g5ka1784pm0jzyl6cfpq8nc1ppj8"; + rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969"; + sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f"; }; } { @@ -22,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/urlesc"; - rev = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5"; - sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } { @@ -31,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "b0295f66bdb7c61d54906003d7649185794e21b4"; - sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis"; + rev = "c9f612c1940a4951cd2b55811744632a7b3b3bb2"; + sha256 = "0s1mzb175s96adxfx5vhyazpzfq9j4dzx4sr4n8gj7r8afkqys8h"; }; } { @@ -49,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/chaseadamsio/goorgeous"; - rev = "098da33fde5f9220736531b3cb26a2dec86a8367"; - sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k"; + rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f"; + sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; }; } { @@ -58,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "23709d0847197db6021a51fdb193e66e9222d4e7"; - sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f"; + rev = "8d868be6e9bf9d5350910bab97a050e49887600f"; + sha256 = "0vy096wzkq1z59in1if486k0adaj1idvma0ax9z1igh9qpq53vd9"; }; } { @@ -80,13 +81,22 @@ sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; }; } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283"; + sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll"; + }; + } { goPackagePath = "github.com/dlclark/regexp2"; fetch = { type = "git"; url = "https://github.com/dlclark/regexp2"; - rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957"; - sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1"; + sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2"; }; } { @@ -94,17 +104,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448"; - sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a"; - }; - } - { - goPackagePath = "github.com/fortytw2/leaktest"; - fetch = { - type = "git"; - url = "https://github.com/fortytw2/leaktest"; - rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513"; - sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz"; + rev = "cdade1c073850f4ffc70a829e31235ea6892853b"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } { @@ -121,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"; - sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi"; + rev = "d965e9adc66deebadcc7d0c6c7598e2a4baa7838"; + sha256 = "0ka8pvby06farlji7pixlrk3zb962qp5xarvy2vxnfrdzlarv7xb"; }; } { @@ -148,17 +149,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; - sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; }; } { @@ -166,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "c24611cae00c16858e611ef77226dd2f7502759f"; - sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1"; + rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; + sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; }; } { @@ -184,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/kyokomi/emoji"; - rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17"; - sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh"; + rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734"; + sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } { @@ -193,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; - sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; + rev = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"; + sha256 = "0cnvcd4q88nvxk3q9617dcis2kng2xxsx3iivi5xs8azk290lpyy"; }; } { @@ -202,8 +194,17 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "6cacb66d100482ef7cc366289ccb156020e57e76"; - sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2"; + rev = "a12c3aec81a6a938bf584a4bac567afed9256586"; + sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; }; } { @@ -211,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"; - sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; + rev = "057eb9e3ae87944c038036d046101dec0c56e21f"; + sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; }; } { @@ -220,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + rev = "06020f85339e21b2478f756a78e295255ffa4d6a"; + sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9"; }; } { @@ -229,8 +230,17 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24"; - sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i"; + rev = "aa0ce51472e0a9982717fd19cf02cb08b1e433aa"; + sha256 = "0355fxpd69wnw56m6dak8k7rlw3q36bql8algg3jkjnxjpgfii4p"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "65fec0d89a572b4367094e2058d3ebe667de3b60"; + sha256 = "116waspmr33dqq3zxj2msnqp2f5v2b6ihk3rxqj7gz25rmcxh5wp"; }; } { @@ -238,8 +248,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "69d355db5304c0f7f809a2edc054553e7142f016"; - sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm"; + rev = "0131db6d737cfbbfb678f8b7d92e55e27ce46224"; + sha256 = "10sz1bh45346wdv8i3nffdmpfh8fb6xd0b3r474cs2mk961pw73v"; }; } { @@ -247,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; - sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; + rev = "6d1ef893fcb01b4f50cb6e57ed7df3e2e627b6b2"; + sha256 = "13p2xq5624b9j2f6j6j76j1h4l2lvmh7w6vcv2f5xsvzjy779r27"; }; } { @@ -256,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; - sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; + rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } { @@ -265,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; - sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; + rev = "57afd63c68602b63ed976de00dd066ccb3c319db"; + sha256 = "0jf9v16m7k46j3mgw469yilhs5p3i32qvzi5954cqyigs6zzqbnk"; }; } { @@ -283,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "34594c771f2c18301dc152640ad40ece28795373"; - sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38"; + rev = "ccaecb155a2177302cb56cae929251a256d0f646"; + sha256 = "1zm89akryx6x0vzvn50736z732gdm3jsx5898annr0zr1cfpf443"; }; } { @@ -301,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "0efa5202c04663c757d84f90f5219c1250baf94f"; - sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs"; + rev = "12bd96e66386c1960ab0f74ced1362f66f552f7b"; + sha256 = "1abvqd1dl3m7mxv44wvl0vwd50l6qpndzrxk28vyb77x41rc8b2g"; }; } { @@ -319,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + rev = "4c012f6dcd9546820e378d0bdda4d8fc772cdfea"; + sha256 = "0plmm67lkm25ir0lczwh7hmanyilrs1vxmbp8a0dyr282ji1dqm5"; }; } { @@ -328,17 +338,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7"; - sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "05e8a0eda380579888eb53c394909df027f06991"; - sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; + rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"; + sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc"; }; } { @@ -355,8 +356,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d"; - sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r"; + rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"; + sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s"; }; } { @@ -364,8 +365,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; - sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; + rev = "d866cfc389cec985d6fda2859936a575a55a3ab6"; + sha256 = "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; + sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; }; } { @@ -373,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695"; - sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n"; + rev = "83801418e1b59fb1880e363299581ee543af32ca"; + sha256 = "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji"; }; } { @@ -382,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; - sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; + rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3"; + sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; }; } { @@ -391,8 +401,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; - sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; + rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5"; + sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; }; } ] diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix new file mode 100644 index 000000000000..d39d734dd7b9 --- /dev/null +++ b/pkgs/applications/misc/icesl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, mesa, libSM, libXext, dialog, makeWrapper }: +let + lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE mesa libSM libXext ]; +in +stdenv.mkDerivation rec { + name = "iceSL-${version}"; + version = "2.1.10"; + + src = if stdenv.system == "x86_64-linux" then fetchzip { + url = "https://gforge.inria.fr/frs/download.php/file/37268/icesl${version}-amd64.zip"; + sha256 = "0dv3mq6wy46xk9blzzmgbdxpsjdaxid3zadfrysxlhmgl7zb2cn2"; + } else if stdenv.system == "i686-linux" then fetchzip { + url = "https://gforge.inria.fr/frs/download.php/file/37267/icesl${version}-i386.zip"; + sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr"; + } else throw "Unsupported architecture"; + + buildInputs = [ makeWrapper ]; + installPhase = '' + cp -r ./ $out + mkdir $out/oldbin + mv $out/bin/IceSL-slicer $out/oldbin/IceSL-slicer + runHook postInstall + ''; + + postInstall = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lpath}" \ + $out/oldbin/IceSL-slicer + makeWrapper $out/oldbin/IceSL-slicer $out/bin/icesl --prefix PATH : ${dialog}/bin + ''; + + meta = with lib; { + description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing."; + homepage = http://shapeforge.loria.fr/icesl/index.html; + license = licenses.inria-icesl; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ mgttlinger ]; + }; +} diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index af67db3f654a..2efd0ee969f1 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,13 @@ stdenv.mkDerivation rec { name = "ipmicfg-${version}"; - version = "1.27.0"; - buildVersion = "170620"; + version = "1.27.1"; + buildVersion = "170901"; src = fetchzip { url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5"; + sha256 = "11xhzw36pg4has8857pypf44cni8m2mg8qsqi1s4bfjbxlfgxgwk"; + extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; installPhase = '' diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 9896fd15b85c..6b4762c0de47 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A wrapper for dmenu that recognize .desktop files"; homepage = "https://github.com/enkore/j4-dmenu-desktop"; license = licenses.gpl3; - maintainer = with maintainers; [ ericsagnes ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ ericsagnes ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index f3661030a2ba..ad8b7b262e55 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -11,7 +11,7 @@ bundlerEnv rec { meta = with lib; { description = "Simple, blog aware, static site generator"; - homepage = http://jekyllrb.com/; + homepage = https://jekyllrb.com/; license = licenses.mit; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 1beff54ba3e7..39f555794765 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "1gml2g711pr6wakznlxjrlmz8kylkv0ydpvv0jx2y5qczp3rwk3a"; + sha256 = "13bmvg9kqjng8jqc3xiif587l05ygk5b3k9xn2lq8yxcwxi9p30v"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 46263f7d83b8..b908941d2bc9 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13053"; + version = "13265"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6"; + sha256 = "0mmpxmf17lw1j1m1gfz2jrm3qj2416zgbwgcy7xbvn6qcd8k7dr5"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 015ef8760648..1cab20baef15 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig -, zlib, libpng +, zlib, libpng, openjpeg , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf @@ -40,11 +40,7 @@ stdenv.mkDerivation rec { # Patches from previous 1.10a version in nixpkgs patches = [ # Compatibility with new openjpeg - (fetchpatch { - name = "mupdf-1.9a-openjpeg-2.1.1.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099"; - sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75"; - }) + ./load-jpx.patch (fetchurl { name = "CVE-2017-5896.patch"; @@ -64,6 +60,14 @@ stdenv.mkDerivation rec { # Don't remove mujs because upstream version is incompatible rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} ''; + postPatch = let + # OpenJPEG version is hardcoded in package source + openJpegVersion = with stdenv; + lib.concatStringsSep "." (lib.lists.take 2 + (lib.splitString "." (lib.getVersion openjpeg))); + in '' + sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c + ''; }); leptonica_modded = leptonica.overrideAttrs (attrs: { prePatch = '' diff --git a/pkgs/applications/misc/k2pdfopt/load-jpx.patch b/pkgs/applications/misc/k2pdfopt/load-jpx.patch new file mode 100644 index 000000000000..02a3799d040a --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/load-jpx.patch @@ -0,0 +1,29 @@ +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -484,12 +484,16 @@ + /* Without the definition of OPJ_STATIC, compilation fails on windows + * due to the use of __stdcall. We believe it is required on some + * linux toolchains too. */ ++#ifdef __cplusplus ++extern "C" ++{ + #define OPJ_STATIC + #ifndef _MSC_VER + #define OPJ_HAVE_STDINT_H + #endif ++#endif + +-#include ++#include + + /* OpenJPEG does not provide a safe mechanism to intercept + * allocations. In the latest version all allocations go +@@ -971,4 +975,8 @@ + fz_drop_pixmap(ctx, img); + } + ++#ifdef __cplusplus ++} ++#endif ++ + #endif /* HAVE_LURATECH */ diff --git a/pkgs/applications/misc/keepassx/cmake.patch b/pkgs/applications/misc/keepassx/cmake.patch new file mode 100644 index 000000000000..4ddf8b2e7e99 --- /dev/null +++ b/pkgs/applications/misc/keepassx/cmake.patch @@ -0,0 +1,18 @@ +Fix "No known features for CXX compiler", see +https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at +https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,10 +20,10 @@ if(NOT CMAKE_BUILD_TYPE) + FORCE) + endif() + +-project(KeePassXC) +- + cmake_minimum_required(VERSION 3.1.0) + ++project(KeePassXC) ++ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + # Support Visual Studio Code diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 72d9c7d2fb5d..2f08fbd5fc7a 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, - cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras +{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools +, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras , withKeePassHTTP ? true }: @@ -7,17 +7,19 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn"; + sha256 = "0q913v2ka6p7jr7c4w9fq8aqh5v6nxqgcv9h7zllk5p0amsf8d80"; }; - cmakeFlags = [ - "-DWITH_GUI_TESTS=ON" + patches = [ ./cmake.patch ./darwin.patch ]; + + cmakeFlags = [ + "-DWITH_GUI_TESTS=ON" "-DWITH_XC_AUTOTYPE=ON" "-DWITH_XC_YUBIKEY=ON" ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); @@ -28,13 +30,22 @@ stdenv.mkDerivation rec { make test ARGS+="-E testgui --output-on-failure" ''; - buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ]; + nativeBuildInputs = [ cmake makeWrapper qttools ]; + + buildInputs = [ libgcrypt zlib qtbase libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ]; + + postInstall = optionalString stdenv.isDarwin '' + # Make it work without Qt in PATH. + wrapProgram $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; meta = { - description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2."; - homepage = https://github.com/keepassxreboot/keepassxc; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ]; - platforms = with stdenv.lib.platforms; linux; + description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; + longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI and via CLI. Includes optional http-interface to allow browser-integration with plugins like PassIFox (https://github.com/pfn/passifox)."; + homepage = https://keepassxc.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ s1lvester jonafato ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch new file mode 100644 index 000000000000..85fc49e36365 --- /dev/null +++ b/pkgs/applications/misc/keepassx/darwin.patch @@ -0,0 +1,52 @@ +Remove the use of macdeployqt to avoid copying dependencies and +reduce installation size from 90 MB to 9 MB. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,8 +188,8 @@ else() + set(PROGNAME keepassxc) + endif() + +-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local") +- set(CMAKE_INSTALL_PREFIX "/Applications") ++if(APPLE AND WITH_APP_BUNDLE) ++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + endif() + + if(MINGW) +@@ -198,7 +198,7 @@ if(MINGW) + set(PLUGIN_INSTALL_DIR ".") + set(DATA_INSTALL_DIR "share") + elseif(APPLE AND WITH_APP_BUNDLE) +- set(CLI_INSTALL_DIR "/usr/local/bin") ++ set(CLI_INSTALL_DIR "../bin") + set(BIN_INSTALL_DIR ".") + set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns") + set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5255186..0175983 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -282,11 +282,6 @@ if(APPLE AND WITH_APP_BUNDLE) + if(NOT DEFINED QT_BINARY_DIR) + set(QT_BINARY_DIR "/usr/local/opt/qt5/bin" CACHE PATH "QT binary folder") + endif() +- add_custom_command(TARGET ${PROGNAME} +- POST_BUILD +- COMMAND ${QT_BINARY_DIR}/macdeployqt ${PROGNAME}.app +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src +- COMMENT "Deploying app bundle") + endif() + + if(MINGW) +diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt +index ac93de0..03d502e 100644 +--- a/src/autotype/mac/CMakeLists.txt ++++ b/src/autotype/mac/CMakeLists.txt +@@ -16,7 +16,6 @@ if(WITH_APP_BUNDLE) + add_custom_command(TARGET keepassx-autotype-cocoa + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} +- COMMAND ${QT_BINARY_DIR}/macdeployqt ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src + COMMENT "Deploying autotype plugin") + else() diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix deleted file mode 100644 index b12c9fe25510..000000000000 --- a/pkgs/applications/misc/kgocode/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } : - -stdenv.mkDerivation rec { - name = "kgocode-0.0.1"; - - buildInputs = [ cmake kdelibs4 automoc4 ]; - - src = fetchgit { - url = https://bitbucket.org/lucashnegri/kgocode.git; - rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6"; - sha256 = "10q4nvx3wz5wl3wwpfprz26j4x59s41bpdgafbg6604im58hklal"; - }; - - meta = with stdenv.lib; { - description = "Go code completion for Kate, KDevelop and others"; - longDescription = '' - A plugin for KTextEditor (Kate, KDevelop, among others) that provides - basic code completion for the Go programming language. - Uses gocode as completion provider. - ''; - homepage = https://bitbucket.org/lucashnegri/kgocode/overview; - maintainers = with maintainers; [ qknight ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index c0db798c56e7..bd671a6c90de 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification }: +{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext }: with python3Packages; buildPythonApplication rec { - version = "0.5.0"; + version = "0.6.0"; name = "kitty-${version}"; format = "other"; @@ -10,10 +10,10 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1w202rsgswagb3kiqbwg4xixcglip2hhz6wj1qx9x2whi4zl1l68"; + sha256 = "1p86gry91m4kicy79fc1qfr0hcsd5xnvxzmm4q956x883h6h766r"; }; - buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz ]; + buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext ]; nativeBuildInputs = [ pkgconfig ]; @@ -38,6 +38,7 @@ buildPythonApplication rec { homepage = https://github.com/kovidgoyal/kitty; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; + platforms = platforms.linux; maintainers = with maintainers; [ tex ]; }; } diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index f3bb825cbf74..e2290105c925 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -3,6 +3,7 @@ , fetchurl , intltool , python3Packages +, gobjectIntrospection , gtk3 , dbus , libwnck3 @@ -22,7 +23,11 @@ buildPythonApplication rec { sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; }; - nativeBuildInputs = [ wrapGAppsHook intltool ]; + nativeBuildInputs = [ + wrapGAppsHook intltool + # For setup hook + gobjectIntrospection + ]; buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix new file mode 100644 index 000000000000..a514b0ff63dd --- /dev/null +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte +, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +}: + +let version = "0.3.1"; in + +stdenv.mkDerivation rec { + name = "lxterminal-${version}"; + + src = fetchurl { + url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; + sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c"; + }; + + configureFlags = [ + "--enable-man" + ]; + + nativeBuildInputs = [ + automake autoconf intltool pkgconfig + libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs + ]; + + buildInputs = [ gtk2 vte ]; + + patches = [ + ./respect-xml-catalog-files-var.patch + ]; + + preConfigure = '' + ./autogen.sh + ''; + + doCheck = true; + + meta = { + description = "The standard terminal emulator of LXDE"; + longDescription = '' + LXTerminal is the standard terminal emulator of LXDE. The terminal is a + desktop-independent VTE-based terminal emulator for LXDE without any + unnecessary dependencies. + ''; + homepage = https://wiki.lxde.org/en/LXTerminal; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.velovix ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch new file mode 100644 index 000000000000..598f506118f2 --- /dev/null +++ b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch @@ -0,0 +1,15 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index be626c5..b449b1b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 8f18f166d4a3..602d4a032efd 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "a graphical mass renaming program for files and folders"; homepage = "https://github.com/metamorphose/metamorphose2"; license = with licenses; gpl3Plus; - maintainer = with maintainers; [ ramkromberg ]; + maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index 24a8b0c46a64..953c4c1d9a94 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let - version = "1.0.0"; + version = "1.1.4"; in stdenv.mkDerivation { name = "multimon-ng-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; - rev = "4cc984f35f859539c94aa56d3fc6218a6de51148"; + rev = "${version}"; sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga"; }; diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch new file mode 100644 index 000000000000..e0c7d6a7a676 --- /dev/null +++ b/pkgs/applications/misc/mupdf/darwin.patch @@ -0,0 +1,35 @@ +diff --git a/Makerules b/Makerules +--- a/Makerules ++++ b/Makerules +@@ -81,22 +81,10 @@ HAVE_GLUT ?= yes + SYS_GLUT_CFLAGS := -Wno-deprecated-declarations + SYS_GLUT_LIBS := -framework GLUT -framework OpenGL + +-CC = xcrun cc +-AR = xcrun ar +-LD = xcrun ld +-RANLIB_CMD = xcrun ranlib $@ +- +-# Linux uses pkg-config for system libraries. +-else ifeq "$(OS)" "Linux" +- + HAVE_PTHREAD := yes + SYS_PTHREAD_CFLAGS := + SYS_PTHREAD_LIBS := -lpthread + +-HAVE_GLUT := yes +-SYS_GLUT_CFLAGS := +-SYS_GLUT_LIBS := -lglut -lGL +- + ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" + HAVE_LIBCRYPTO := yes + SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) +@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl) + SYS_CURL_DEPS += $(shell pkg-config --libs openssl) + endif + endif +-SYS_CURL_DEPS += -lpthread -lrt ++SYS_CURL_DEPS += -lpthread + + ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" + HAVE_X11 := yes diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9dcba11b3faf..75d8463cf7f8 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,7 +1,8 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig -, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg -, enableX11 ? true, libX11, libXext +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +, jbig2dec, libjpeg , darwin +, enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl +, enableGL ? true, freeglut, mesa_glu }: let @@ -13,64 +14,28 @@ let in stdenv.mkDerivation rec { - version = "1.11"; + version = "1.12.0"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510"; + sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw"; }; patches = [ # Compatibility with new openjpeg (fetchpatch { - name = "mupdf-1.11-openjpeg-version.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=c19349f42838e4dca02e564b97e0a5ab3e1b943f"; - sha256 = "0sx7jq84sr8bj6sg2ahg9cdgqz8dh4w6r0ah2yil8vrsznn4la8r"; + name = "mupdf-1.12-openjpeg-version.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306"; + sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; }) + ] - (fetchurl { - name = "mupdf-1.11-CVE-2017-6060.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614"; - sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc"; - }) + # Use shared libraries to decrease size + ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch - (fetchpatch { - name = "mupdf-1.11-shared_libs-1.patch"; - url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch"; - sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14685.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a"; - sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14686.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1"; - sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14687.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28"; - sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-15587.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8"; - sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-15369.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=c2663e51238ec8256da7fc61ad580db891d9fe9a"; - sha256 = "0xx2mrbjcymi3gh0l3cq81m6bygp9dv79v1kyrbcvpl5z6wgl71y"; - }) - ]; + ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + ; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c @@ -78,9 +43,15 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ] - ++ lib.optionals enableX11 [ libX11 libXext ] - ++ lib.optionals enableCurl [ curl openssl ]; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut mesa_glu ] + ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] + ++ lib.optionals enableCurl [ curl openssl ] + ++ lib.optionals enableGL ( + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] + else + [ freeglut mesa_glu ]) + ; outputs = [ "bin" "dev" "out" "man" "doc" ]; preConfigure = '' @@ -123,6 +94,6 @@ in stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ viric vrthra fpletz ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch new file mode 100644 index 000000000000..b39f005ed74a --- /dev/null +++ b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch @@ -0,0 +1,41 @@ +--- mupdf-1.12.0-source.orig/Makefile 2017-12-13 15:00:30.000000000 +0100 ++++ mupdf-1.12.0-source/Makefile 2017-12-31 00:05:23.003277481 +0100 +@@ -14,7 +14,7 @@ + # Do not specify CFLAGS or LIBS on the make invocation line - specify + # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that + # set a variable that was set on the command line. +-CFLAGS += $(XCFLAGS) -Iinclude ++CFLAGS += $(XCFLAGS) -Iinclude -fPIC + LIBS += $(XLIBS) -lm + + LIBS += $(FREETYPE_LIBS) +@@ -312,9 +312,9 @@ + + # --- Library --- + +-MUPDF_LIB = $(OUT)/libmupdf.a +-THIRD_LIB = $(OUT)/libmupdfthird.a +-THREAD_LIB = $(OUT)/libmuthreads.a ++MUPDF_LIB = $(OUT)/libmupdf.so ++THIRD_LIB = $(OUT)/libmupdfthird.so ++THREAD_LIB = $(OUT)/libmuthreads.so + + MUPDF_OBJ := \ + $(FITZ_OBJ) \ +@@ -343,11 +343,14 @@ + + THREAD_OBJ := $(THREAD_OBJ) + +-$(MUPDF_LIB) : $(MUPDF_OBJ) ++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined + $(THIRD_LIB) : $(THIRD_OBJ) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined + $(THREAD_LIB) : $(THREAD_OBJ) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread + +-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) ++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) + + # --- Tools and Apps --- + diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix new file mode 100644 index 000000000000..f1211851b4c6 --- /dev/null +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, + autoconf, automake, libtool, cmake, + rtl-sdr, libao, fftwFloat +} : +let + src_faad2 = fetchFromGitHub { + owner = "dsvensson"; + repo = "faad2"; + rev = "b7aa099fd3220b71180ed2b0bc19dc6209a1b418"; + sha256 = "0pcw2x9rjgkf5g6irql1j4m5xjb4lxj6468z8v603921bnir71mf"; + }; + +in stdenv.mkDerivation { + name = "nrsc5-20171129"; + + src = fetchFromGitHub { + owner = "theori-io"; + repo = "nrsc5"; + rev = "f87beeed96f12ce6aa4789ac1d45761cec28d2db"; + sha256 = "03d5k59125qrjsm1naj9pd0nfzwi008l9n30p9q4g5abgqi5nc8v"; + }; + + postUnpack = '' + export srcRoot=`pwd` + export faadSrc="$srcRoot/faad2-prefix/src/faad2_external" + mkdir -p $faadSrc + cp -r ${src_faad2}/* $faadSrc + chmod -R u+w $faadSrc + ''; + + postPatch = '' + sed -i '/GIT_REPOSITORY/d' CMakeLists.txt + sed -i '/GIT_TAG/d' CMakeLists.txt + sed -i "s:set (FAAD2_PREFIX .*):set (FAAD2_PREFIX \"$srcRoot/faad2-prefix\"):" CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake autoconf automake libtool ]; + buildInputs = [ rtl-sdr libao fftwFloat ]; + + cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/theori-io/nrsc5; + description = "HD-Radio decoder for RTL-SDR"; + platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + }; +} + diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index a6d40c75c1c0..972fbfb7b072 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -101,7 +101,7 @@ in pythonPackages.buildPythonApplication rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = http://octoprint.org/; + homepage = https://octoprint.org/; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 9db6042e60f6..499653b14359 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A framework for controlling entertainment lighting equipment."; maintainers = [ maintainers.globin ]; - licenses = with licenses; [ lgpl21 gpl2Plus ]; + license = with licenses; [ lgpl21 gpl2Plus ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix new file mode 100644 index 000000000000..a78b98a58cb3 --- /dev/null +++ b/pkgs/applications/misc/onboard/default.nix @@ -0,0 +1,156 @@ +{ fetchurl +, stdenv +, aspellWithDicts +, at_spi2_core ? null +, atspiSupport ? true +, bash +, glib +, glibcLocales +, gnome3 +, gobjectIntrospection +, gsettings_desktop_schemas +, gtk3 +, hunspell +, hunspellDicts +, hunspellWithDicts +, intltool +, isocodes +, libcanberra_gtk3 +, libudev +, libxkbcommon +, pkgconfig +, procps +, python3 +, wrapGAppsHook +, xorg +, yelp +}: + +let + customHunspell = hunspellWithDicts [hunspellDicts.en-us]; + majorVersion = "1.4"; + version = "${majorVersion}.1"; +in python3.pkgs.buildPythonApplication rec { + name = "onboard-${version}"; + src = fetchurl { + url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz"; + sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865"; + }; + + patches = [ + # Allow loading hunspell dictionaries installed in NixOS system path + ./hunspell-use-xdg-datadirs.patch + ]; + + # For tests + LC_ALL = "en_US.UTF-8"; + doCheck = false; + checkInputs = [ + # for Onboard.SpellChecker.aspell_cmd doctests + (aspellWithDicts (dicts: with dicts; [ en ])) + + # for Onboard.SpellChecker.hunspell_cmd doctests + customHunspell + + # for Onboard.SpellChecker.hunspell doctests + hunspellDicts.en-us + hunspellDicts.es-es + hunspellDicts.it-it + + python3.pkgs.nose + ]; + + propagatedBuildInputs = [ + glib + python3 + python3.pkgs.dbus-python + python3.pkgs.distutils_extra + python3.pkgs.pyatspi + python3.pkgs.pycairo + python3.pkgs.pygobject3 + python3.pkgs.systemd + ]; + + buildInputs = [ + bash + gnome3.dconf + gsettings_desktop_schemas + gtk3 + hunspell + isocodes + libcanberra_gtk3 + libudev + libxkbcommon + wrapGAppsHook + xorg.libXtst + xorg.libxkbfile + ] ++ stdenv.lib.optional atspiSupport at_spi2_core; + + nativeBuildInputs = [ + glibcLocales + intltool + pkgconfig + ]; + + propagatedUserEnvPkgs = [ + gnome3.dconf + ]; + + preBuild = '' + # Unnecessary file, has been removed upstream + # https://github.com/NixOS/nixpkgs/pull/24986#issuecomment-296114062 + rm -r Onboard/pypredict/attic + + substituteInPlace ./scripts/sokSettings.py \ + --replace "#!/usr/bin/python3" "" \ + --replace "PYTHON_EXECUTABLE," "\"$out/bin/onboard-settings\"" \ + --replace '"-cfrom Onboard.settings import Settings\ns = Settings(False)"' "" + + chmod -x ./scripts/sokSettings.py + + patchShebangs . + + substituteInPlace ./Onboard/LanguageSupport.py \ + --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./Onboard/Indicator.py \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./gnome/Onboard_Indicator@onboard.org/extension.js \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./Onboard/SpellChecker.py \ + --replace "/usr/lib" "$out/lib" + + substituteInPlace ./data/org.onboard.Onboard.service \ + --replace "/usr/bin" "$out/bin" + + substituteInPlace ./Onboard/utils.py \ + --replace "/usr/share" "$out/share" + substituteInPlace ./onboard-defaults.conf.example \ + --replace "/usr/share" "$out/share" + substituteInPlace ./Onboard/Config.py \ + --replace "/usr/share/onboard" "$out/share/onboard" + + substituteInPlace ./Onboard/WordSuggestions.py \ + --replace "/usr/bin" "$out/bin" + + # killall is dangerous on non-gnu platforms. Use pkill instead. + substituteInPlace ./setup.py \ + --replace '"killall",' '"${procps}/bin/pkill", "-x",' + ''; + + postInstall = '' + cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override + + glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + + meta = { + homepage = https://launchpad.net/onboard; + description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users."; + maintainers = with stdenv.lib.maintainers; [ johnramsden ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch new file mode 100644 index 000000000000..2463c8d5f5ac --- /dev/null +++ b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch @@ -0,0 +1,20 @@ +diff --git a/Onboard/SpellChecker.py b/Onboard/SpellChecker.py +index 6a92757..46e755e 100644 +--- a/Onboard/SpellChecker.py ++++ b/Onboard/SpellChecker.py +@@ -506,6 +506,10 @@ class hunspell(SCBackend): + if dicpath: + paths.extend(dicpath.split(pathsep)) + ++ datadirs = os.getenv("XDG_DATA_DIRS") ++ if datadirs: ++ paths.extend(map(lambda datadir: os.path.join(datadir, 'hunspell'), datadirs.split(pathsep))) ++ + paths.extend(LIBDIRS) + + home = os.getenv("HOME") +@@ -723,4 +727,3 @@ class aspell_cmd(SCBackend): + _logger.error(_format("Failed to execute '{}', {}", \ + " ".join(args), e)) + return [id for id in dict_ids if id] +- diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index a3770715532f..4655b059b339 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "http://www.daidouji.com/oneko/"; license = licenses.publicDomain; maintainers = [ maintainers.xaverdh ]; - meta.platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix new file mode 100644 index 000000000000..fc7fd95bbb95 --- /dev/null +++ b/pkgs/applications/misc/orca/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication +, autoreconfHook, wrapGAppsHook +, intltool, yelp_tools, itstool, libxmlxx3 +, python, pygobject3, gtk3, gnome3, substituteAll +, at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg +, xkbcomp, gsettings_desktop_schemas, liblouis +, speechd, brltty, setproctitle, gst_all_1, gst-python +}: + +with lib; +let + version = "3.26.0"; + majorVersion = builtins.concatStringsSep "." (take 2 (splitString "." version)); +in buildPythonApplication rec { + name = "orca-${version}"; + + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/orca/${majorVersion}/${name}.tar.xz"; + sha256 = "0xk5k9cbswymma60nrfj00dl97wypx59c107fb1hwi75gm0i07a7"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xkbcomp = "${xkbcomp}/bin/xkbcomp"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 + intltool yelp_tools itstool + ]; + + propagatedBuildInputs = [ + pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle + ]; + + buildInputs = [ + python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + + # Run intltoolize to create po/Makefile.in.in + preConfigure = '' + intltoolize + ''; + + meta = { + homepage = https://wiki.gnome.org/Projects/Orca; + description = "Screen reader"; + longDescription = '' + A free, open source, flexible and extensible screen reader that provides + access to the graphical desktop via speech and refreshable braille. + It works with applications and toolkits that support the Assistive + Technology Service Provider Interface (AT-SPI). That includes the GNOME + Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and + WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. + + Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. + ''; + maintainers = with maintainers; [ berce ] ++ gnome3.maintainers; + license = licenses.lgpl21; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch new file mode 100644 index 000000000000..d3e77773f28f --- /dev/null +++ b/pkgs/applications/misc/orca/fix-paths.patch @@ -0,0 +1,29 @@ +--- a/src/orca/orca.py ++++ b/src/orca/orca.py +@@ -239,7 +239,7 @@ + + def _setXmodmap(xkbmap): + """Set the keyboard map using xkbcomp.""" +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(xkbmap) + +@@ -297,7 +297,7 @@ + """ + + global _originalXmodmap +- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-']) ++ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-']) + + def _restoreXmodmap(keyList=[]): + """Restore the original xmodmap values for the keys in keyList. +@@ -309,7 +309,7 @@ + + global _capsLockCleared + _capsLockCleared = False +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(_originalXmodmap) + diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 8e0fc6137210..515127e12ebb 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.7"; + version = "4.1"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c"; + sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96"; }; - nativeBuildInputs = [ cmake pkgconfig vala ]; + nativeBuildInputs = [ + cmake pkgconfig vala + # For setup hook + gobjectIntrospection + ]; buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler libpthreadstubs makeWrapper librsvg pcre ]; diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index ad2ab147340e..d55c7a2af12b 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { pname = "pell"; - version = "0.0.2"; + version = "0.0.4"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; repo = pname; - rev = "ec14de0a9b666433954184167bf3b82cf21193f8"; - sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9"; + rev = "f251625ece6bb5517227970287119e7d2dfcea8b"; + sha256 = "0k8m1lv2kyrs8fylxmbgxg3jn65g57frf2bndc82gkr5svwb554a"; }; installPhase = '' mkdir -p $out/bin mkdir -p $out/share cp pell $out/bin - cp resources/notification.mp3 $out/share + cp resources/online.mp3 $out/share + cp resources/offline.mp3 $out/share chmod +x $out/bin/pell ''; @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/pell --replace "/usr/bin/env scsh" "${scsh}/bin/scsh" substituteInPlace $out/bin/pell --replace "(play " "(${sox}/bin/play " substituteInPlace $out/bin/pell --replace "(notify-send " "(${libnotify}/bin/notify-send " - substituteInPlace $out/bin/pell --replace "/usr/share/pell/notification.mp3" "$out/share/notification.mp3" + substituteInPlace $out/bin/pell --replace "/usr/share/pell/online.mp3" "$out/share/online.mp3" + substituteInPlace $out/bin/pell --replace "/usr/share/pell/offline.mp3" "$out/share/offline.mp3" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix new file mode 100644 index 000000000000..3b64cf4aa6c0 --- /dev/null +++ b/pkgs/applications/misc/perkeep/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, go_1_8, fetchzip, git }: + +stdenv.mkDerivation rec { + name = "perkeep-${version}"; + version = "20170505"; + + src = fetchzip { + url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip"; + sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; + }; + + buildInputs = [ git go_1_8 ]; + + goPackagePath = ""; + buildPhase = '' + go run make.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; + homepage = https://perkeep.org; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 3f39a356312e..44650d001e34 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -48,7 +48,7 @@ let ld32 = if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}"; + else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ]; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index e88a49740745..a3b87fd34f68 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -21,11 +21,11 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.0.5"; + version = "3.1.0"; src = fetchgit { url = "https://github.com/jaagr/polybar"; - rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d"; - sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn"; + rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e"; + sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy"; }; meta = with stdenv.lib; { @@ -39,14 +39,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.afldcr ]; platforms = platforms.unix; }; - # This patch should be removed with next stable release. - patches = [ - (fetchpatch { - name = "polybar-remove-curlbuild.patch"; - url = "https://github.com/jaagr/polybar/commit/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch"; - sha256 = "14xr65vsjvd51hzg9linj09w0nnixgn26dh9lqxy25bxachcyzxy"; - }) - ]; buildInputs = [ cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index b62c6b77cac3..cd3a46ab09ba 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -3,7 +3,14 @@ stdenv.mkDerivation { name = "procmail-3.22"; - patches = [ ./CVE-2014-3618.patch ]; + patches = [ + ./CVE-2014-3618.patch + (fetchurl { + url = https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30; + sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; + name = "CVE-2017-16844"; + }) + ]; # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index abb1fb596fac..af74ea570ab3 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://wpitchoune.net/ptask/; description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; - maintainer = [ maintainers.spacefrogg ]; + maintainers = [ maintainers.spacefrogg ]; }; } diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 7330dfa4f199..bc09d0b4d0ac 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }: +{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }: stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.9.1"; + version = "1.10.0"; - src = fetchFromBitbucket { - owner = "maproom"; - repo = "qmapshack"; - rev = "V%20${version}"; - sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr"; + src = fetchurl { + url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; + sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw"; }; nativeBuildInputs = [ cmake ]; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home; description = "Plan your next outdoor trip"; license = licenses.gpl3; - maintainter = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix index 932d8156a79a..49993f2f7ea7 100644 --- a/pkgs/applications/misc/qmetro/default.nix +++ b/pkgs/applications/misc/qmetro/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Worldwide transit maps viewer"; license = licenses.gpl3; - maintainter = with maintainers; [ orivej ]; + maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index d300e411c942..e03dd65b9eb3 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,32 +2,29 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.1.6"; + version = "1.2.1"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j"; + sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8"; }; + patches = [ ./hidpi.patch ]; + buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ makeWrapper qmake ]; - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - installPhase = '' - mkdir $out/bin - mv $out/qtpass $out/bin - install -D {,$out/share/applications/}qtpass.desktop - install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg - runHook postInstall + postPatch = '' + substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main" + substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src" ''; postInstall = '' + install -D qtpass.desktop $out/share/applications/qtpass.desktop + install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg wrapProgram $out/bin/qtpass \ --suffix PATH : ${git}/bin \ --suffix PATH : ${gnupg}/bin \ diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch new file mode 100644 index 000000000000..629bcbb5baca --- /dev/null +++ b/pkgs/applications/misc/qtpass/hidpi.patch @@ -0,0 +1,13 @@ +diff --git a/main/main.cpp b/main/main.cpp +index 8a18409c..1cddd911 100644 +--- a/main/main.cpp ++++ b/main/main.cpp +@@ -35,7 +35,7 @@ + * @return + */ + int main(int argc, char *argv[]) { +- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); ++ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QString text = ""; + for (int i = 1; i < argc; ++i) { + if (i > 1) diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index ca65e4bf7f8e..169d6951d455 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -76,7 +76,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; - homepage = http://redisdesktop.com/; + homepage = https://redisdesktop.com/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 7ad8a85a419c..57cdfd08d5b0 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -11,33 +11,26 @@ let url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab"; }; - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html name = "rescuetime-2.10.0.1322"; inherit src; buildInputs = [ dpkg makeWrapper ]; + # avoid https://github.com/NixOS/patchelf/issues/99 + dontStrip = true; unpackPhase = '' mkdir pkg dpkg-deb -x $src pkg sourceRoot=pkg ''; - installPhase = let - - lib = p: stdenv.lib.makeLibraryPath [ p ]; - - in '' + installPhase = '' mkdir -p $out/bin cp usr/bin/rescuetime $out/bin ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [ qt4 libXtst libXext libX11 libXScrnSaver ]}" \ $out/bin/rescuetime - - wrapProgram $out/bin/rescuetime \ - --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1 ''; meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 877990861fd7..b63a41bb9156 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { homepage = https://github.com/neeasade/xst; description = "Simple terminal fork that can load config from Xresources"; license = licenses.mit; - maintainers = maintainers.vyp; + maintainers = [ maintainers.vyp ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 051b67bc972c..376ea9e293aa 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake , curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib -, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit +, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: let - version = "4.7.2"; + version = "4.7.5"; libdc = stdenv.mkDerivation rec { name = "libdivecomputer-ssrf-${version}"; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; - sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r"; + sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -32,24 +32,25 @@ let googlemaps = stdenv.mkDerivation rec { name = "googlemaps-${version}"; - version = "2017-09-17"; + version = "2017-12-18"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35"; - sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84"; + rev = "79f3511d60dc9640de02a5f24656094c8982b26d"; + sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtlocation ]; + buildInputs = [ qtbase qtlocation libXcomposite ]; pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; installPhase = '' - mkdir $out $(dirname ${pluginsSubdir}) - mv plugins ${pluginsSubdir} + mkdir -p $out $(dirname ${pluginsSubdir}) + mkdir -p ${pluginsSubdir} + mv *.so ${pluginsSubdir} mv lib $out/ ''; @@ -69,7 +70,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; - sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp"; + sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82"; }; buildInputs = [ diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 2533014c5607..13f3fa98d56d 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,35 +1,37 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_23, hicolor_icon_theme +, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection }: -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "synapse-0.2.99.1"; +let + version = "0.2.99.2"; +in stdenv.mkDerivation rec { + name = "synapse-${version}"; src = fetchurl { - url = "https://launchpad.net/synapse-project/0.3/0.2.99.1/+download/${name}.tar.xz"; - sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220"; + url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; + sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig intltool vala_0_34 + # For setup hook + gobjectIntrospection + ]; buildInputs = [ - intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist - vala_0_23 hicolor_icon_theme + glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist + hicolor_icon_theme ]; - meta = { - longDescription = '' - Semantic launcher written in Vala that you can use to start applications - as well as find and access relevant documents and files by making use of - the Zeitgeist engine - ''; - description = '' - Semantic launcher to start applications and find relevant files - ''; - homepage = https://launchpad.net/synapse-project; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ mahe ]; - platforms = with stdenv.lib.platforms; all; + meta = with stdenv.lib; { + longDescription = '' + Semantic launcher written in Vala that you can use to start applications + as well as find and access relevant documents and files by making use of + the Zeitgeist engine + ''; + description = "Semantic launcher to start applications and find relevant files"; + homepage = https://launchpad.net/synapse-project; + license = licenses.gpl3; + maintainers = with maintainers; [ mahe ]; + platforms = with platforms; all; }; } diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 3959ad88ece9..e4b1d7f8c1bc 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; - homepage = http://gnometerminator.blogspot.no/p/introduction.html; + homepage = https://gnometerminator.blogspot.no/p/introduction.html; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor globin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index cf99304473c1..46276bbb03fb 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -3,16 +3,19 @@ }: let - version = "12"; + version = "13"; termite = stdenv.mkDerivation { name = "termite-${version}"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "0s6dyg3vcqk5qcx90bs24wdnd3p56rdjdcanx4pcxvp6ksjl61jz"; + sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; }; + # https://github.com/thestinger/termite/pull/516 + patches = [ ./url_regexp_trailing.patch ]; + postPatch = "sed '1i#include ' -i termite.cc"; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/misc/termite/url_regexp_trailing.patch new file mode 100644 index 000000000000..96deaa073d71 --- /dev/null +++ b/pkgs/applications/misc/termite/url_regexp_trailing.patch @@ -0,0 +1,27 @@ +Based on https://github.com/thestinger/termite/pull/516 +Modified to apply to v13 + +From 65a454ffa8e681f3f14729cba7c42e1570a85e8a Mon Sep 17 00:00:00 2001 +From: Paul Baecher +Date: Thu, 7 Sep 2017 22:58:51 +0200 +Subject: [PATCH] Do not match punctuation at the end of URLs + +Punctuation at the end of URLs is most likely part of natural language +or markup (for example in Markdown). Do not match it as part of the URL. +--- + url_regex.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/url_regex.hh b/url_regex.hh +index 2ec6be8..3039b53 100644 +--- a/url_regex.hh ++++ b/url_regex.hh +@@ -9,7 +9,7 @@ + #define PORT "(?:\\:[[:digit:]]{1,5})?" + #define SCHEME "(?:[[:alpha:]][+-.[:alnum:]]*:)" + #define USERPASS USERCHARS_CLASS "+(?:\\:" PASSCHARS_CLASS "+)?" +-#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*)?" ++#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*(?(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - ---- a/gpu/ipc/common/mailbox_struct_traits.h -+++ b/gpu/ipc/common/mailbox_struct_traits.h -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; ---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -@@ -134,7 +134,7 @@ struct StructTraits { - static base::span matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( ---- a/services/viz/public/cpp/compositing/quads_struct_traits.h -+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h -@@ -284,7 +284,7 @@ - - static base::span vertex_opacity(const cc::DrawQuad& input) { - const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const cc::DrawQuad& input) { ---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp -+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp -@@ -480,7 +480,7 @@ WebString AccessControlErrorString( - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch deleted file mode 100644 index ec37a2816d51..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index c80724d..052ce37 100644 ---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -36,19 +36,19 @@ namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific --// functions to juggle the ucontext and user structures into minidump format. -+// functions to juggle the ucontext_t and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; - #elif _MIPS_SIM == _ABIO32 -diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index b6e77b4..2de80b7 100644 ---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -39,23 +39,23 @@ - - namespace google_breakpad { - --// Wraps platform-dependent implementations of accessors to ucontext structs. -+// Wraps platform-dependent implementations of accessors to ucontext_t structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - -- // Juggle a arch-specific ucontext into a minidump format -+ // Juggle a arch-specific ucontext_t into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc -index 586d84e..05936d2 100644 ---- a/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/breakpad/src/client/linux/handler/exception_handler.cc -@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { - // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); -+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, - sizeof(g_crash_context_.float_state)); -@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h -index daba57e..25598a2 100644 ---- a/breakpad/src/client/linux/handler/exception_handler.h -+++ b/breakpad/src/client/linux/handler/exception_handler.h -@@ -191,11 +191,11 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. - // In case of MIPS Linux FP state is already part of struct -- // ucontext so 'float_state' is not required. -+ // ucontext_t so 'float_state' is not required. - fpstate_t float_state; - #endif - }; -diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -index 3764eec..80ad5c4 100644 ---- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -+++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -@@ -593,7 +593,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -index d11ba6e..c716143 100644 ---- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -+++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -@@ -1323,7 +1323,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch deleted file mode 100644 index 6cfd08d58c23..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options): - - write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h', - { -+ 'ENABLE_LOCATION_SOURCE': 'false', - 'ENABLE_PROFILING': 'false', - 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false' - }) -@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options): - - write_gn_ninja(os.path.join(tempdir, 'build.ninja'), - root_gen_dir, options) -- cmd = ['ninja', '-C', tempdir] -+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err'] - if options.verbose: - cmd.append('-v') - -@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/metrics/bucket_ranges.cc', - 'base/metrics/field_trial.cc', - 'base/metrics/field_trial_param_associator.cc', -+ 'base/metrics/field_trial_params.cc', - 'base/metrics/histogram.cc', - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', -@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/task_scheduler/scheduler_lock_impl.cc', - 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc', - 'base/task_scheduler/scheduler_worker.cc', -+ 'base/task_scheduler/scheduler_worker_pool.cc', - 'base/task_scheduler/scheduler_worker_pool_impl.cc', - 'base/task_scheduler/scheduler_worker_pool_params.cc', - 'base/task_scheduler/scheduler_worker_stack.cc', -@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/third_party/icu/icu_utf.cc', - 'base/third_party/nspr/prtime.cc', - 'base/threading/post_task_and_reply_impl.cc', -+ 'base/threading/scoped_blocking_call.cc', - 'base/threading/sequence_local_storage_map.cc', - 'base/threading/sequenced_task_runner_handle.cc', - 'base/threading/sequenced_worker_pool.cc', -@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/unguessable_token.cc', - 'base/value_iterators.cc', - 'base/values.cc', -- 'base/value_iterators.cc', - 'base/vlog.cc', - ]) - -@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options): - static_libraries['base']['sources'].extend([ - 'base/memory/shared_memory_handle_posix.cc', - 'base/memory/shared_memory_posix.cc', -- 'base/memory/shared_memory_tracker.cc', - 'base/nix/xdg_util.cc', - 'base/process/internal_linux.cc', - 'base/process/memory_linux.cc', -@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options): - cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args] - check_call(cmd) - -- cmd = ['ninja', '-C', build_dir] -+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err'] - if options.verbose: - cmd.append('-v') - cmd.append('gn') diff --git a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch deleted file mode 100644 index f1207439bb4d..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py 2017-11-07 23:06:09.000000000 +0000 -+++ b/tools/gn/bootstrap/bootstrap.py 2017-11-08 12:17:16.569216182 +0000 -@@ -481,6 +481,7 @@ - 'base/metrics/sample_vector.cc', - 'base/metrics/sparse_histogram.cc', - 'base/metrics/statistics_recorder.cc', -+ 'base/observer_list_threadsafe.cc', - 'base/path_service.cc', - 'base/pending_task.cc', - 'base/pickle.cc', - diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index d9adad1189f8..fa42c2f3b115 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.187"; + version = "28.0.0.137"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "102z9aflm0a29klc26jch3wl4y8hdrxzqdqvf5yj0bnibx3hwpsy"; + sha256 = "1776jjv2abzrwhgff8c75wm9dh3gfsihv9c5vzllhdys21zvravy"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 6e3ba922d25f..b15bc16c89dd 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1pk6ssvriqmckf61lafkbwyy98ylpaz0mq3g0zrifbhxzwkk01ni"; - sha256bin64 = "0svdxgszy377hm3lzys90xj8qna93r4xz3d89sy086c9sq1ncsr0"; - version = "63.0.3239.40"; + sha256 = "1mkschqjdn3n3709qkxha1zs626vhh33dp80gi3h6hhk8w0gx4sb"; + sha256bin64 = "05hyfm9j127mprj2wjrq3m9qm4zp3bny40164vscr6vkfxvmjh03"; + version = "64.0.3282.71"; }; dev = { - sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x"; - sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg"; - version = "64.0.3260.2"; + sha256 = "1b7f1bs9i7dhrccssn5zk4s62sfpmkj8b4w6aq8g4jbyg7hw9pql"; + sha256bin64 = "0lp8m62p8h60hi8h5nskcjdh6k8vq4g00xbq5limg7d6pgc0vyyz"; + version = "65.0.3311.3"; }; stable = { - sha256 = "1m2qjm4x789s3hx255gmmihqrqfx8f608fap3khsp2phgck4vg6a"; - sha256bin64 = "1wxszymlv2y1dk4f0hpgq9b86fzqb7x8q87rfbq7dvfj8g4vipz1"; - version = "62.0.3202.94"; + sha256 = "139x3cbc5pa14x69493ic8i2ank12c9fwiq6pqm11aps88n6ri44"; + sha256bin64 = "03r97jg1fcb23k1xg5qnw5hp5p9m8anyx346nchbas63rfn439km"; + version = "63.0.3239.132"; }; } diff --git a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch new file mode 100644 index 000000000000..347fb8e12877 --- /dev/null +++ b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch @@ -0,0 +1,35 @@ +From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001 +From: Sam Parkinson +Date: Tue, 26 Dec 2017 14:46:27 +1100 +Subject: [PATCH] Extend the python path; rather than replacing it + +Some distros (i.e. NixOS) require the special PYTHONPATH, so that +the web extension has access to the python packages it wants (i.e. gi). + +Previously, the PYTHONPATH was replaced with the web extension path; +meaning it would crash on NixOS. This instead prepends the web +extension path to the PYTHONPATH. +--- + eolie/application.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/eolie/application.py b/eolie/application.py +index 3c21542..bed4e55 100644 +--- a/eolie/application.py ++++ b/eolie/application.py +@@ -340,7 +340,11 @@ class Application(Gtk.Application): + self.settings = Settings.new() + + # Init extensions +- GLib.setenv("PYTHONPATH", self.__extension_dir, True) ++ current_path = GLib.getenv("PYTHONPATH") ++ new_path = self.__extension_dir ++ if current_path: ++ new_path = new_path + ':' + current_path ++ GLib.setenv("PYTHONPATH", new_path, True) + + # Create favicon path + if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR): +-- +2.15.0 + diff --git a/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch new file mode 100644 index 000000000000..770cd8afa9ef --- /dev/null +++ b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch @@ -0,0 +1,23 @@ +From a79d2dcd1b6275904193454fb9d68614813929f3 Mon Sep 17 00:00:00 2001 +From: Sam Parkinson +Date: Mon, 27 Nov 2017 11:17:35 +1100 +Subject: [PATCH] Remove post install script - handle in nix config instead + +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index fc45296..2227f1f 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,5 +53,3 @@ configure_file( + configuration: conf, + install_dir: bindir + ) +- +-meson.add_install_script('meson_post_install.py') +-- +2.15.0 + + diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix new file mode 100644 index 000000000000..e41783ddf5ba --- /dev/null +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook +, git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3 +, gtkspell3, libsecret, python36, python36Packages, webkitgtk }: + +stdenv.mkDerivation rec { + name = "eolie-${version}"; + version = "0.9.16"; + + src = fetchgit { + url = "https://gitlab.gnome.org/gnumdk/eolie"; + rev = version; + sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b"; + }; + + nativeBuildInputs = [ + intltool + itstool + meson + ninja + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + git # required to download ad blocking DB + glib_networking + gsettings_desktop_schemas + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + gtk3 + gtkspell3 + libsecret + python36 + python36Packages.pygobject3 + python36Packages.pycairo + python36Packages.dateutil + python36Packages.dbus-python + python36Packages.beautifulsoup4 + python36Packages.pycrypto + python36Packages.requests + webkitgtk + ]; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + enableParallelBuilding = true; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + patches = [ + ./0001-Remove-post-install-script-handle-in-nix-config-inst.patch + ./0001-Extend-the-python-path-rather-than-replacing-it.patch + ]; + + meta = with stdenv.lib; { + description = "A new GNOME web browser"; + homepage = https://gitlab.gnome.org/gnumdk/eolie; + license = licenses.gpl3; + maintainers = [ maintainers.samdroid-apps ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 82b5ce080e50..deac6e272230 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b8"; + version = "58.0b15"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ach/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ach/firefox-58.0b15.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "923c63db4bc252a2740b035765c820af86b64f0bef5204806d5f871fd63e7b847389bdaa9745b2548710ae20e1623d51b8b2709c6c6b11d35ea2bcc8b8f7fb5b"; + sha512 = "5397865cdb1db5996ddc2e6b3d21380d56d8a6372b6b9733ede452e54fe5fec73b1cc12749e85c36bc7169a28ad6e4df278c4d8f9a3021f9c4622fb38fd36f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/af/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/af/firefox-58.0b15.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "9a6bd31d0469639dff730db1ddc3a9683019563b90a29b262d7edc5ccd8cf079bfb0901ae370b033188d13d8762878cb1d18b85e8acb33e66cf98ba64ce98faa"; + sha512 = "cd18983a0b397435ace96b79645d3b8b994f25001b59aacb53ca20fe223e243151f3cdd4d0b1f8f68b8c87cdc747e98d0c1835ee37610d674f26c481764b531d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/an/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/an/firefox-58.0b15.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "a372f896ce03d6a2e76b091c3bb401f69704e1e54287e116e2c8708481d01f28568f406cfe6210c1e61bd58f4d7b8833e51cb3120af94047dff5fe60055c601e"; + sha512 = "80773287f69ec0c2012877887816ba0ff5cc447fe463aaa077c7753c7f50a66c8b23ff096a872eb3c9ce625cd2226ee11f11640f8ad0f1ab92f1137984355eca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ar/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ar/firefox-58.0b15.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "94bcc54caa36e2bd296862d4725577d65ec8c38c53bdd4fc264922854b95a695a272aeb9956350440980b41f37bc662f17a72ffcb5631ecf43b37d1769850378"; + sha512 = "9abe954a8cd68c57586d45759f1390ab24cb8371bf153053125f532e93a8646fcb5fd798009032ae6ec5852f0c524202a2140532276cd59d6580839c47fb3616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/as/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/as/firefox-58.0b15.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b2420cc943ead5f314adb1f24fd2d344c75d233670e2a80acfed47a8aba7cb8b1edaaea8725366b9ed88959625cf5cf8498d8a891ddc85f2c3f353b0b519a5d4"; + sha512 = "f6bc470fda85afe00b175f2da26ba7fd63139f22fecda62a2e3bd8a7b327bbe73cba727dd6df4092295f2d819a219471e37135ba418d84db296d230561067084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ast/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ast/firefox-58.0b15.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a25723bdbeb1d228426b225afec40bd83848aeef5ea24b755af8bdf95739b997b21e6a1d47c28bb5ad66a73d202947a3e82be00ff826242a02dbb32de2bd1bfd"; + sha512 = "1c5245a594d909935a3e406fe8dfbd5e53b55fa08ad4973609bffe80a964554a69cc05f3d70f88ae55574535b5c2a367883298676995cddce99e4c5f0c2abb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/az/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/az/firefox-58.0b15.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "55a761f2b000931cb20b609697099cd16e2e5490f39a7a434a72cc3d98dbbbbcbc71e2e2a21806f025904219405008f8d3cfa19ffa1025071dab50c634f2f2bc"; + sha512 = "4e9cdb529b4cd91a23a07d573d215f0f7ca47b7820cf1bc1f4fb0a05e963af674eda9ee61cfeeca18a8e6d20bb0bece1d6bd20a780e86330b1d3e9462c232744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/be/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/be/firefox-58.0b15.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "7a66f13d9b88cf24fa45793dd52671dd6cd89c7f9a9872788187773a9feeea0ff8bb6bcd87a4fcf1cd4a6377095d8644289b7a1c3a21bfc24932aca127bacaf2"; + sha512 = "fbfef089f40514779051d60fa1ff1b245d4f91a31cf25f960cfdb7fa08ae78299d340191b2b71d472a3a97b228f8b53fd2afa116157952e415a4737573acef09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bg/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bg/firefox-58.0b15.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a4548c0648299a31c4708183bdbeac0ad91e885d027e37651c89cec2fe17aa50faf3371db78125f1d141eb4b511783e42e4f16a55a9ef85ab6586cfcc29ffac8"; + sha512 = "0a06d47b02792540627142bb029aa3f099dcfa4facaaa77a3982d1c5cfc3b58ff946cd94448bf6ca11dd1bff0fe3496a411aa7e3f241c02c1fa5b24d4a8b9d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bn-BD/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bn-BD/firefox-58.0b15.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "0bf256f3ce4b5a930c014344fcedf396c28ab45d3e375825eea6b10961e5e3788bc87b069518ead46aba0c6d3ec3815582b4f66617394f00e1dceaaca7cf8c65"; + sha512 = "cb78b30d32280b14c0ddfebcd02ca29d106173b3e3e590347b183a2e66fc03c607ccbace0754fc7713f7c7aadc431399e003229ac0b39d2b990d3cce85803ca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bn-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bn-IN/firefox-58.0b15.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c22d92171dc452068bdac7030921a950c783def99c5fe6f6712bcdeaeab9f515ccb13213e9e7330db44277ff59844be8d38a729429f65e2dcfed88be47d866a1"; + sha512 = "25e1dd45b294ff707b64966a3cd0262d253bcdfa0b8cc5c3fd4ccdb1bb457fb2699a2bc6a1ac1707ced941dbd1cf0dd0e3474604d897a776b2cefb71d8a4f8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/br/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/br/firefox-58.0b15.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "76d0e7accc70ecf4a0120c922df8922dc44263493d2b6630c37094cb96b65ff663a6a139cd12db68f31ec6b1ffac09cdcf125c368017e22eeb3fe4b0d17e0362"; + sha512 = "3f08b36c87414d380f5104acb3a296dd56d8c54073d34d3fbbb1df384c138c0e58187e948358df2d634026f01f38dafaa59c108dc0b9d81d9ef05b0c388e18ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bs/firefox-58.0b15.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e9484befe104cd5c186bfa97a23e50a541b822fb9383093421be8f7905be09d64d84d0c8ecf2eab3a9bdeebe1cc8b18340ad7ad08127d89abc37439c292c9bb1"; + sha512 = "6770f5016ed7cb162b8dd5cf76d9a076e3299eb8f67839e495bfc4057987b375f9eb15d536df6f92405eddaa00cab9c9970076e3b4774bac28593a4800d3187b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ca/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ca/firefox-58.0b15.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "22e245a41be90d4508c5afcf72caabeabfe6510861c4dcada0aba5f47a542334261448963987f7fb1f0f632606ab8d99da473bb8134af53016c71736a59e1501"; + sha512 = "69f2f14f5d15cbdb5a2dc5ff4035f783f5533315cc9bca67aae74e31691ce07f5e63e86f458cb7df28609fec547f5bbdaaddfa13ab776592d99136c175a16ecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/cak/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cak/firefox-58.0b15.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ad4eff6b70302b1885e5423cf1f86677979260fdda38bc8db0f56329ae5338d2982694b327de0be9e89910896668b3e335de9ba61c01d3e622c09ae18cb2b729"; + sha512 = "6c95305b1db952de2c23f887ac878f31c2b07a9f4daec30d1e59df54b05d730d6def93b679c61e84e647267863e0ac1457428220e7926c5b828a2ae963b6d75b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/cs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cs/firefox-58.0b15.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4ab0bab66b868e2f5e2c0bf30a96e433d7482358b09f9334191b749b7070ce785d4f4d590122e483745b1a305befeea0fcebbd92cfa18c2bcb2809c22b690b71"; + sha512 = "54e520b6bd4d15648ced14ac2700258c6338180a87d8493d314a4c843024e1fb062d4dc2e9f4f143063e037d375849e9c2c2c53e56c0b2c539a4254278a06a4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/cy/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cy/firefox-58.0b15.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "39e37dc32e5a06894de494d6857455dcd371f8935a0ce37a7d4b843a2fb9cb5b8a7873b8bddf5d4ffbd864e0e6150bdc0b5ce3805b0ec98b5cea4a99a2168118"; + sha512 = "569f6c5a554265ecbafb195d2f943d6bed7ef6eb5865e45474e3217e4d5ba13d5036bf86cc3d9fae6e5e2149caa26737c0d0b99c4ef8b244590ecfae612a0c2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/da/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/da/firefox-58.0b15.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "66040fad8bfac9eaf320d947aa9af192c9df7fc38f9481ec06f9086eecb484d7c14fd52a19dfc1899b6bcd783c39b8b401ab61aebe8da3cf925ff39dc8f779f8"; + sha512 = "dc2b4e6d1bfe80984b99aec27ccd1274decd5397fb216b69b7ad3845f824c4c52956cd2f5766b11d28b9765f8355ab73973acdf029b76415575a20674e95f1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/de/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/de/firefox-58.0b15.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "661ff66987b0d8d34b767f50a1da458e3141ebe0ef530a2b98c9d7f086cc09f7c670d33ad3f251b107a751331ec5174ba7adb2f9c3cb91151f377b6403552045"; + sha512 = "2f7508107dedc8afc517b420e2776186fcbda37c24273ca1f2602702bfbeeb59e7fbea8a160bd337430bccd96af7dcd22b2eb7b55e88c5b001d9c2fc0d9e0f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/dsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/dsb/firefox-58.0b15.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "aa37410b780dc6d27aa79d68cd77c9dab97d96c234d95327531c25d0689280b6e622c7c7c327401f087c34b26a16fdd765227cbdbd1f475ae337ef59e4d05bd0"; + sha512 = "a9fa820fef23f0eabe9e37ff8db3aa7e5908b31ec65dfe4d8fbfaede47258454b4f5d1b8571bd255c2d25f9b176f07d64f24ee69a7acde6a210a13a08dcb7be2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/el/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/el/firefox-58.0b15.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "068129735aa03c0395e2062b26f5145e38dd9899d0e3e9bcc20b18ee8159c80efcf831ffca8b87bdf3902319f324529e5699e5f310a82dd51260878955672886"; + sha512 = "16bd5066d01c117f16d88e080e046dc2c21bccbabcf9a3f598ab990cb4408e095e2d6fa3b649bf16bcca8f7e1c7067d6b9b7099509bc809942437eb1841200dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/en-GB/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-GB/firefox-58.0b15.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "fc5b304743e78ecec9648a6d239113d9d40f98f0ccc357a1dc3ea11c7073b7f8b98a344cb0b4c10c6225fb18b5e1630af71548c147d4bf173d7e2624bd9125b9"; + sha512 = "33d06b44192402fc9290f8ec8d9ae124f5ca195f499d145235355e1db928b0ddbd44933cb797968f6d683d05664dbe4b417a47d6e719ef8f4a42fc4aa5ea9a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/en-US/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-US/firefox-58.0b15.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "0aa20d21b3f0265bce64a3e1c9bcf306815a77b8b103c1c258cc8915588d5ea2395ec2d133b97f626fefa6493b336d19ccded6d4261e335b0462912cb9e88eea"; + sha512 = "d5f198f4acf984b3d83b2eaa44811902a2d5965a665276b887990ed0ee49c1d6e1e0a8f82ac69a2aa7a17fc016e311a6ba9aefccfe1ed62f283be59476a82312"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/en-ZA/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-ZA/firefox-58.0b15.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "13bf9ddd1f704323d732cd6820b37a4220bd1b689e146b98923505b3841733c1e301d7f2dc843d52f1e3030b6e263674fdb4b41845513777c802ff958c7166f7"; + sha512 = "7e1a7fc8f875e5ab9f195bb8df413f454660c0c38897ae36973a4494b40c2a4e4c0360ee344f1cd3480eea2b98e5432df0e84ea710063815f62a2e690b1afd11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/eo/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/eo/firefox-58.0b15.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0788e522b8462c00989cce2a3f4e35acbb03b5e6211d991d8c29f9103c083e348115d65e8938ec2f3fe7824cdfcdc57154c56bc09aa0fc9c4aec6eb10d1ca761"; + sha512 = "11d9f0b8ce3c6d8aa1e0c35ce1e6aa69ebbedef7c0e8e548f19556cf6c86c8af11763a2bda200d6f05ea91134c8b79bc8a29e99ee5209c0bd741f5bf996922d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-AR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-AR/firefox-58.0b15.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "cfbe36f97a2629f91939b0ee5ea76684d51ba5b6aa2a31428f946904fbde21bd3dfc7d411f0a5d84f640913cf07b91129ae313606d76195ce17882eab14cbcb1"; + sha512 = "316af39537f733d8524e91448b16efc38f180368905a461f38b2107836732ccc2d8496e6b43975ce07c75652bff97dfa26fce982abafef94996d7d5e0ea92dbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-CL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-CL/firefox-58.0b15.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "bc3bf6207fa3a48dfadcf5274d1baa603756600eb71c6aab332dbac97eb3050d487d6c8a95cfe67e9273dc18139ede152975d050d73927636875a21b322143ef"; + sha512 = "3ac1229c932f5a73c99129a63419aef394522d8dbbc419567ba1631aa49c7d1012fcc963c7d678ff284b00775ac125e97ac07a4421b869920e62e7897136142f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-ES/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-ES/firefox-58.0b15.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "992d99c5f3b631149d4ba86b5e7b47ab27a4ac4ea82addcbaabe1466d3b007777b4bec93b38100104aa68976ee11e9d753926d8b6227237684005f33af4cfcc8"; + sha512 = "21e16839bc530f174ed6325e643a9ee9fe8bbcf8718b785265039eb61a3bc5f0d03b75425b65cc815b261a4f759639df02095998e715f67ae4ff801659e2f651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-MX/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-MX/firefox-58.0b15.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "25870412e846f169fbf609b0900b208727fe0e6adbe1719fb6384079a5d5629696fa45d26dc646bb493ca798adc0a10a999ee1c4611976a2d97ca8c3ab1e0f1c"; + sha512 = "642247a3e96c4d6bf5fa865e3377852611057c72e0894b6bfca18fa9ae1d8a8e0ec27b28494b45a3cb093cf229ce9eb7bceebc640afd70380ed1f65ce5202ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/et/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/et/firefox-58.0b15.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6c0002889c3fc9c98e7dbcb0eeb3f294916e8386a56d72b78707c8dfb8decfc1c3be2301d5e8ddefad8b6ced90a48c4e6edc00fa632a0e0d2e16894241b1230b"; + sha512 = "6c11847f25acf36ae76a2c47ac094bf5724dbecfbc7c8d9844caa3e2f86327eb2b01f64448875a3fee3d8c32fc16ecd16f8cd0a7e9aab6bba48012767d113665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/eu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/eu/firefox-58.0b15.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4b13c45b8386757b2c5a03ff4ca00766d1151ae7bb354da5f40758450ef81e79c894a385d8859f6bbc825be85ea462b73113233ad2ffc555de4f46643dec51ca"; + sha512 = "08229454895d7eea9b0a1df103a443e29e488cfc25c0844075b7ffbdf221ac85ea2905fe37e61292b5c8abed4e4ea946ee2edb2030f7ece27eaf5680fccf4ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fa/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fa/firefox-58.0b15.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "b6dfef8e581027303becc027787b4fdda099a65320cc1f2ffe13b7e20e1a6fe5c0e122a8a6cd4154f41cfe1bdb9de1362e8a8bec15d455792c240977c0260c36"; + sha512 = "5dc0de2a76d1577a56162c5598b882bef03fdece5f7e0eb0d44501eed2f5bf52455499735c376b2a68e5b599406854cc4d0a27e6c74de3b62e8f50f0c084243b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ff/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ff/firefox-58.0b15.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b1df5b9e5a31f37926d25f1ddc2c8bf27c0235863a1ff5de1774cf0f2baf16a58875839756d99376e3f127800f73073432a4bbe5f2a11216598b004d0a464393"; + sha512 = "9324770ddf0a62811acafeb0dbef37fae7a16fd10f8dfb5c75e450d674f8c0f8fc15429d753d24a68cdbded44a859d3e7fffa3933f623859de015575c91ac45a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fi/firefox-58.0b15.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "7afc8a19fc92180f415a8df1ebc81ae29fa9207a5758f3540fbfd0bbf1f8ff358d390a6dcd5702bd6c0e9ff14468cf61617fbf2b1139ea5c079bf5427a32dd64"; + sha512 = "f9b1870be74aacc8757436b4b806a626a0fcbc6dac77f2eb5e37fb3000ae1c5e174ef27432b3974cca9f2917940e682819e2cf92a98d83de640913c30b2f0190"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fr/firefox-58.0b15.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aff3a8988e7a06c1adf9e386ed8ab0a37d0f8b64f81f1a551d13554e2b6782df20fc5b846c6174e9464f15d64472a2bcb7f250c97c0eb724061efca3e26f6f7c"; + sha512 = "b47de97c83c160faf799f0c9b33a9b2ac25e56a6ba58c0d987bd94be47979cbdfa9264cc18912b6c0f12e7919209e8dae05415dfe6a4d4cd510043479516dca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fy-NL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fy-NL/firefox-58.0b15.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5bea6fb654f8f6bf4fea0dac192656eb85c6f39f956a98791284592f5d7fd97d866f9f1d4b1c68a23dbab99bdc3042e43a3b2108afacd035f2b5be5f0faa1db8"; + sha512 = "387375313e5d7920bf05feeaf76591bbd30e1e5c6c84a455a2d76f1c32c4a28a0e6bf3a1a9143844b199977cacdc444bb44d62fbe18b3a7d94ec3362c51ee48e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ga-IE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ga-IE/firefox-58.0b15.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "e61e814913793b463d803c776b757b7bf75cd5901fe655fe983be4359753e02591bc60a69c2f7144aaf8a8597f8061515b26fb655f0ff86f265e75c29990357a"; + sha512 = "5e0f9e33547acaedf6a27608fad1e9bc8e5444a04fc9267070dd327235a9e5a9faab6809b86d72243fdd5c6d3c0246b6129b7620e851fcea75d2914eef7db48e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gd/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gd/firefox-58.0b15.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "648c23369858dae251d6b77882b3ee2dc7fb629dbb663aded2194397c2f7be7844b16a81524fe2b5424a607e537c0c5a89628832a29c12b8963ea3b1ee3803fd"; + sha512 = "ed93968c6a6e4d231ff6d0ec9205248e4e8a755a5fdaefcf77a972bd4d37938293363395469bf7ac70fa3a7e8b7dfba65a5add59438e68e6d0f7cca48096dae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gl/firefox-58.0b15.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "552bffe8e151bf24e87a70cf7b521b19331160997bc60aeaa545742f87b937b8d39d1ffd349bdba1ad18d5658756df3545640bb2cd550493b05dc7e8e8ee570f"; + sha512 = "0273d8338fc36d759c2b87109891565dcdb409df7b42c4e31e1509cb1b517fd6930ea4b4ef8ee1281d5374c8b77aea6c50ea6db5866542d2bd11346ea165c797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gn/firefox-58.0b15.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "335bcafc85932a4f0dd4cadd5df423b718815aa88f65768bc3357a4c212cda16e0d92b8877179a5bd7732bb4e603c1cf9c88fe0e79ffb4ef5a28dbef86ba2abc"; + sha512 = "78af73aa9ef4ddb183cccb9da3d080bff18db20f38fbc8e58e410765b350e1bcf51810994e3af26288e020ef8a1fb1b324a67b71a744a83a762d7dec3d5f3c88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gu-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gu-IN/firefox-58.0b15.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "af83f3246aa54664baa010eb112749f3c2ddefce08ad4259fed8772205534c93c9826b165b70bca316b1fbb314b08787168c27c522d14a46267174bd9b1bda62"; + sha512 = "8c89b46da45861490a9c54a6cc65cb9e306be3d3d479a583f54f79d659824856c4dddc88c8631043457b3414a15eb80535d2c44ea2b5518eacc521db782e243d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/he/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/he/firefox-58.0b15.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fec8303acc73f8521496dcb60f830aa41bbd0ad8b3c34022d38ef0e904b76973fb285f56d01e2611988bb41e8c26966d07ed98883f110377450648feaebd1d9a"; + sha512 = "6a857b7f4c4efecebf360fc065ee8d6a7754daa918efccfe54c09a8d04a8501ca25fa0909cfe10db2003d530cb7ffad68d996757d11d5706acb91bfb7793826d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hi-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hi-IN/firefox-58.0b15.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "03a46f38c02d98e192e623159c9d8c46be97b17e90566b95f5f60b6e037570abca9d3953a0b26ba63e3b8e5b61d783e8b77f0e6cf334f6438ae1e0c132aa4bb1"; + sha512 = "9c55430b0c1e7ec85da9cf8dc6e682284e8b1d1a815a40bf381cd2e07fde6690097d75bcf17461d9cf932280ec09671fce2156953e426f7de3a3d80cadf6f2cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hr/firefox-58.0b15.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "27d92e45a4c515abed0f4dcb66a510a1858c317834547de7d737aa400ae93602f06bcbee0c44afaf37070ff0c61cdcfbba012ccf26857a7a035cd22b7bccb506"; + sha512 = "360dd1fbe26fee13295fc24b8b30dc32f5d06b8a43529aca19b2df03073e8a9fd56afbb687179b5d96c558a8a6b75b770dba0c26d1e19adc31d7780d7113ad18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hsb/firefox-58.0b15.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1b8ce20bf6b79b7c99036bce309058eb9077126815a3774cc2c005991fc7be77466661a2bd2678024570322221da44eb07ab0503e2c654a8e42e127b39b7c0af"; + sha512 = "0db06e66a0d73b669dfedf3202d142ee5eedc75bf30b0852a1a14b410cc0a4090d8a05db956607fd65d09136806f864b0b1e7f444aad589e63b8679deff6fad9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hu/firefox-58.0b15.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ef396521906d741b3dae5652838afdac0b618de90b711f2c6d822d70ea1ba74346381657a260c85f8cd5636f33f4ebf819e5007b0942ea1b359df612001e9472"; + sha512 = "3c5433ce133318afb9634f23bb42912cf49a063fbcc7c4a16747314cf3b3569c30ca38148755c8e3a0f11fdd923c4e6fd5a67f5a32b8ba9ca78b168f1d666c5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hy-AM/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hy-AM/firefox-58.0b15.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "be883f31ae0b015d5e159de599ff0c510122e3160f0d7305702b36f835578be85445ef8dcc468d3abe8cd0f9469c763727fe6b49eb0983b67ff8724607867973"; + sha512 = "76254c7c907f9b9c767af642fc70a0393b077a07fcd458031938c8961a0e00329be6082052f367e4ee5f652a527711cf7e6e0f9ac10c6c076d29f5a44468415d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/id/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/id/firefox-58.0b15.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3c094628732fd3b6af02e895a63c0b3b9f81626ceea674899e3cbba33e64ae7f6a89896f088b25ce9e2e9c1329c272dbeec65ba14e3c46ee3a12d91c1cabda71"; + sha512 = "269fc012fdcd2509da13b30fe5f7e2f6774ce7aa6bc43ab8001d584e68d389f5a058f74419d095fb90db426de03eaaeb75ce87b92b09e30dd6f2d7ad6ac895f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/is/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/is/firefox-58.0b15.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0d0e51f0246b84ade26bc320bfe60f08c5f6bf7f898836646ff02fdeac020b8111d287c80a68cdf177f4b111dc72933077a509144a164e3cb04ad9380a84e37e"; + sha512 = "bcbf0ec6331ba7f4de5c80612e90fbfa9c13b31e450e95081501a4178d1067baed01f2fbf746e14b8705846aab78ff851c101525e065501c769c7bfb1ae3426a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/it/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/it/firefox-58.0b15.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9adc4949df0322f39ecbb3bfab75ab27326186657519fcdbc668e84df445c4f739eb175e3d6169707059723023e13655022a90683f4d6349ac12d6c8a94e4863"; + sha512 = "2fd518dce248a6127fd10204d9477fa698a7c3277674e034b89f7490123a3f2bd12ba5823e8a87065b238b0d480e2c772e915a802a893cf398b72ec84d01f87b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ja/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ja/firefox-58.0b15.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a8f3d230eddc13f817c57985496714cdd1fc238ec9a86f528e4d91217a15250d6c0467c0d000d728bb5f6c3ab986a2e1ec74f6c6b8f6531958a063b3cdf1bf8b"; + sha512 = "8bcb7686bd8d64f338d3ac7ae11dc70a062842c079b8cbbdd65ee53dd5a216f343a1aa8b83124ded57839248ccec384006bc513d1478601cb5ebd048add336b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ka/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ka/firefox-58.0b15.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9a15a435981f6f13d54eb24ceac1c46fb34f3c1f98b6f7c66f3805ad6b66c22c64415f826f276f8b8e7e685e1004928f6c39d18f34706d2e553411f81c40a3fb"; + sha512 = "63a1ab4ee92b26a9a730b6772be54ce6edd64c5d42ec420bbcb4867d1247021781c983b382ab6346d99019f8c430fd12208a199c0b90507043195b3522891c81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/kab/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kab/firefox-58.0b15.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e733e3eee75ba734e7a58eb7fff4209dc907a2ffa8d01de6d41a3389f9be4f2127970406385281ec817a1d0e4a5ccc9eed3aa6a39812f98b72c8eadc29f6a238"; + sha512 = "93016e490d87de09dc18434fa1488069649cce5218dfe4f75bd3ee09807a8ecef9e1f0875fda2e8fa28e887a42fbf289ba1d73503a7f0e879e58c07212743899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/kk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kk/firefox-58.0b15.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e25484bdf28e66a44b092ebc4c1dce4b1b10e21b30243721d06add9c39299feb9ab0a71b1ea0b7e1d257d6a9f87d815a87db97c73ac06373a92917132e12f713"; + sha512 = "2ec047b1300ba3af57516c861e294c47641d394d507e20769037536280538837dff96bbaa65873789134a59e3af4d97b42b8ff125630b4d82fe887af591b0793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/km/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/km/firefox-58.0b15.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "61c2565015bec74fcd4920dd1d5e46abc6fbb407b1493ce9cd44983d31387a6f20f1fd009e9dfb371ac6fa10c03e4ad4be7638ef5b203ef373d40f8bf8893edd"; + sha512 = "34b96630d2f67cf8d8893bddafac6a72e400e8df2324337384a45a76eae97245a0c4f122c47be7814395f03dce163fcd6f355f0431fb2b8aa7092e1c064008b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/kn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kn/firefox-58.0b15.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ef1758d4982fd5d27b1a58d55c6ae24f6b160a2ff36338dab6acd5b1f8baefb4576313e34e55e31e6e00f1c6e502788b5a5c3f0d6a1f61c22c4f6d676c16dfef"; + sha512 = "8074b6d8c9a5673c3247d6d294e1f85afef4ba31d8cbe7ec3b456387c2692319a515d4cbba7336efc58e064cba2b2847ed4378b62e389a80c76f2e0efd9d8347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ko/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ko/firefox-58.0b15.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "10ec9f9fdeb60fc42b8ec1c212fbd539204948138f0b095c331cfd1870c2379fa584fb40cc41b0ea9aafba5429f76e58cc19029b7033c216d9bc9335a90f388d"; + sha512 = "cf55fb2eb1f1699890f5eeab0570303c2a87d433ad07747a4987b496fe18edf82995eb1856ab16295f4683c90889378cf7ad1a32394ca45dc0245958ed57d2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/lij/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lij/firefox-58.0b15.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "24ef4572938af3122fc987ff575d5d3017a678c3d554579d4d41627a24208bc3fc7a244fba1f00e808dc0ca09804ac1ff04c717c20f8fcb087a537c02a702243"; + sha512 = "e0db3342bad86b5244c474be5299b47965a75ac981ce78bfecde8880141b4f02ba61a8bd7d43489d847d2f3dc4f74ad68861af97cea70e414422c66449a9f12e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/lt/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lt/firefox-58.0b15.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "40296a228d1b8a464a92ac8111661d210c239cde400cbcdf661d6a356882b8c31176b847bf9dd59683e047862d867d357646d4aa0e9fddf2ba88c2de6154b87c"; + sha512 = "facd732a0b87714e8ef310aa55038ba2c3e1aa497b107d210915bb7ca648171508b5a245baa7551dfbaa7e22e4481d7413cf17591067e373667e8b35f4cd7265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/lv/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lv/firefox-58.0b15.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a48b9f2bf0fe43dc3ea115b30a99ac2d8555e75f9ae2d4443bbbc30c3726a9b822a55374b7d105e3037c36e52f95a4e970c3cab0ae76e6cc52120d49022b618c"; + sha512 = "a9b0f10f534f673cd0aa8823c139f713f724762be2f7575e0ed89323c814b894ad0c550dbf2cdf311ae1d3cd87d8e5905ebb953ede9031974cf8c306ee1184da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/mai/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mai/firefox-58.0b15.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8187483dd28701aa7ca71690b336c28dfa75a51f88ae0b66947a2b4e48e17ba5b0f21ec9191b990fe4c2b31500a2abfc5fb6af6956faa4d0ab7e1b55a1330220"; + sha512 = "28a9553559b6297a8b6a5bd04eeb02a125bcbae55e8a230e3a540d4abf93f9ca1d699eabbcf193838810a69348bd4250f948f6b55393ab4e69d21ecf976d52f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/mk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mk/firefox-58.0b15.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "d5fcedda34bf04cc6f5bc67218851d56d7ce35776e3220f320e00991fe0fdae70dcfc2c2f05dcc007c601857e48f9ecd9b123128db4c2f0973a7624d3556ca7b"; + sha512 = "44b1b419700c2ee0c81f2962866dc2f6f4ae694d600f2ca2373110508c24bc65ebd2128cb305a2a8c854f791e69c5db38ff862f9c12e15753fe4880139f911d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ml/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ml/firefox-58.0b15.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "0c0d2a6a24bb64206770af711a5d0eca882dbbe4e8ac984adce94ce5471049bed43873f8399f4a0a88d37e49494f1beea28142207ec8a8cb8608dc1300205fb7"; + sha512 = "fa63d35f37b95884b08022405376f2e1c2d0fb50b4297c6238ee5f0fe77925caef6c8353943515079ab9fa4e5c9de095a1d4aa4cf6dc35f4038cc1de04739c3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/mr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mr/firefox-58.0b15.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "c2490552fe67d5619f12b8abda195fa07228ec7cad8293861a6a0e398dac257fcaaf2ef8dd05c6adc19be7929a6f2e19522a0c0a36b8d698216bf46ab8f0bd86"; + sha512 = "81a2bad8f1ee56746fc4ecf2bdc526dfbd151536f9bece02fe40a4e6b88b4c2cad7f9b56b2e346339b1574a7f5efbd6d57f968dba1d6b3b2b771537884f95170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ms/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ms/firefox-58.0b15.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1d37dd0c7b5af3c3321a8ed1d00d5c6cdcadb5e32a90984f0f8c059ba2c379f9fe8b0abc8e185e3272b018ce84183c033bbcb493ba95880ad105a5a5875f9267"; + sha512 = "a4515567ed399774c2c1cd8bf746533431c098bfda720afbf49c33119b156802cb3125536832a0867481522a4b5d0dc109323e9540838fcb41be7f3411f57d7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/my/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/my/firefox-58.0b15.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "44e0b38e2624e651fc3a42ccd49583852c2942e1d831bacad7cb37c5ff51db02f0edb43ee8c2f221626da6ee012837dbcb92f7b479b72775649aabde8d2f23c1"; + sha512 = "a7eafb22eac502c7eca0b2d8ac1374f4ba7d644d06853f403560114d5d5d72f9682777315f76cf573453603383f37626a68ba5cf726a8f836220db13d57c2172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/nb-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nb-NO/firefox-58.0b15.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "b6da0d21770551fadaa0e5a5c322941c9fef1d2aa3a1d376c54cda36d108e0a5fae50f33a6cca27e50d6f01daa45a07fab67c07e7ea7ae12db75b1c99e993378"; + sha512 = "aa77822565e69f1852fe097d19a5fc3370e2876643f076020e07fd66b034418f1e012e167a8ecf87267268424788b1dc81264c748832a9529a4a879ffb90f23a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ne-NP/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ne-NP/firefox-58.0b15.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "bd50ddc9124569ee68dba6ff957c759a27062a94d6d7633143b9cbccdf2d1fcb93388c72fb7283f7399131b320699bfdac9584ffb6b8d0b2c6f7c78315601e4b"; + sha512 = "1972a57e7c81d1f1de662178c07365b6b6c35fe6678a2841f1eff24a83a6f8d4ef1517b47434225f892231d754561890444117ed2c2be420b812b5ad166d8597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/nl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nl/firefox-58.0b15.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "83dcb0eed351afee0c4a3138a6d5677c2c5f30e24e9b8f424e6000d73fda221b3652b1879754f2b7c9fb9dc06f97d687909845cc0dbccfeb864789f3143cabfd"; + sha512 = "4f25f0319b35384062dda85314c40f1328d553e752478ee9a053900dfa6140e0d8d4e5aae2989cf76b9dcf5d3ecc6304cab3250752c778c6c5f64d901ffb5f2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/nn-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nn-NO/firefox-58.0b15.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e73637d4800987aa4314bd0157bd7d271f2c210af693337005f325930b839d5d45b5384b11466eb429bfbbc818e131836661dee6bd916860a1ee46ed0f7ec6c3"; + sha512 = "3f3c214ff210b1d8c27c4cac0de5b674d24a730ea9a10a269f974cb63b8e29880f9711b8d316f9eee35a64ea6e9b500587e4acd895c9a33e87ca539b65688b84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/or/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/or/firefox-58.0b15.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "5794cf2649f9a4564854101f3bb0e3841142217fbabbc6078bdd2ea318c9ae0067fa1a298040c6f07d6b9c9447e882d4f4b9962aa48e6db193ce3bed8dd467dd"; + sha512 = "9736e52bd129be199ba6867dd0a8b3a9d0313384fe9a7b77b21c96dbcb3080c3e98e8f74c3981262a045575d194d4d6968690da6b2056984e32b3a333142fc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pa-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pa-IN/firefox-58.0b15.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "04e01b4a361a1a9e42ccb5f1c2ddc3032205d3a3eec25815a6bf5fb0b503062942e428668cfc4e0562b07a30d2b05939324fa31255b6c1a5f34db8a7d3b860bf"; + sha512 = "4806337d20414df52afaf27d452f141016fb32693a278f25488e7e92c781b4c1048c51d80c62a372f351fe83270d5cc9f9429d603a5165ff59d040beac9d53fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pl/firefox-58.0b15.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "410f502a9799da40912ea288e5599434aca3c6a6475be90ef7007e2313dbb1987e48ab42a256a63542717400de1223850cf910db8a9cf7cc9494ac8a5248c7dc"; + sha512 = "e4b7e3cc62f53c2ab97d60d45f9b5a45ca141b64493fb72068dd0f1253c0c5663d7218a01e37b28e69112d0ea998b2388f8cdc74c8051c25e478cdb2c2247907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pt-BR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pt-BR/firefox-58.0b15.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "54b26b5c216e95269153d8c06f1d6ef9702fddfe4eb1a1f9c818527f48959088569ba87394b1c1cf40ad04713392e3725b001936636c4be9c9835c8c832bc276"; + sha512 = "d4a66667175f7616c8e3f9c422eafc4022b8070f4c11c40c589f7e19b20b9cbd1770f8068a2eca79066085368b29027c860b8b06f086795bdf0a0cd164cf79f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pt-PT/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pt-PT/firefox-58.0b15.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "9ebfe643010f56e115cd9414215515038ddc7ab8328716d1296743afe4334014efa66cbbb91f824894b2d8bd541c46724cafed9c2780c5204ce44a0d86c6baff"; + sha512 = "ba2118d9060a7c8f85e4a59c37a850de0c82cf6e5ac7bb057efb86791596c8423a3a27912d9f2839934009cb962ebeb8c3c5b1aa63daf115c48dd2431c0cc8bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/rm/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/rm/firefox-58.0b15.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c80040682d738530a380cddb87504fd4aaf2553eced632802ef57cbec5f0c984d5bf5dc167be62c58dcd98a67520896af4a69cb27cf178881cd55ae3bafc8431"; + sha512 = "9952f5c19f6c96d87a9a73ac72717b1906a2389cd92e3f2644d5f93f3c81b408d61ede7a68928ee7e6d740ac9166a02018d7eae490dd8e22bdb1e9321bc6343a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ro/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ro/firefox-58.0b15.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "1edf351afed7e04343d5807975207d9a2ce8424d180c131a4836cfc71d743a95688ce8f5f62f50e7bbae73ca0d9209292f0f2402de362509c6b028bfb70d7c33"; + sha512 = "62ecc8abdb3f2e9ef7f10a0763b2fc8dc59d5b3c55bd45633d07c03a3ffd969b57e649c3509b1e2a1fb8dfca0b4060f6dabf85d124d485f879e5debff9e6624c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ru/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ru/firefox-58.0b15.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a667fa5a91a6e229628b9bd9ef75877f4ea9e2d7e51af0486ef9a22ef470fc3661b6b7b2bae5c35e79912b8584e7fc40f83327f34774a5688f213dfb9ae98aca"; + sha512 = "50b693b131504e10541261ebc97d1e22aba10a357d3653eb6803d9c5b57bbd89d948847876e36ffed17c435241dd56b1308ca52a08737fb97c1800f278f5230b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/si/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/si/firefox-58.0b15.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "27eb234f6543794310cc28778fdf32b22a466d71c78c751c7a72f0665a50d6b6daafcfb7def5e703d0967e1d44d20b70a6c50c7d62a087a5d698ae85cd1e5732"; + sha512 = "65d702e4ba5f0763042dd37abfd70c330c5d96eb6fc73e5a747809ba0fabe692691293784f17e60628217cf70747d98eea4fb790c5bc062c017949f4861585a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sk/firefox-58.0b15.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "88e83315aa23c2ed1de9b9875da1deec5ede8b2d4bb2e333f6e755c342c0643e6ad76416486067e3780bd80c912cdb47e15f1919f15c8b99ab5f3237d22e789e"; + sha512 = "b0dfa69307262f464d95d4713f165bf89d6f8afb482642f0b2b7838d3201a0fc141ef8fe6efaae25d398e7ad36e60c0a36fcb3fe364f1bbe4ad641a88fca1d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sl/firefox-58.0b15.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d7a3716a0590a1736ca16a43f34a860dde13f657bc5b15e480c9d522d4c7f96a2197e73505e87b1f0d15bd87b074d82c8a68b214d4afa56364b67c641a675b31"; + sha512 = "b02f4d80c4c54da5c2f22609687acd3e6b9b2c0691071ea374f873c9619d68274bd6556265d4c2ba3ff4df5d54be61629faa512e6fc5d1f7f1892cc0fbe29867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/son/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/son/firefox-58.0b15.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "eaefafee07aa2a07e25071f81ad5cc906144f84d46c59999d897f411d68ff825136f85c614b54f5c6a800d3222054762ff11401e10443a6729e27739880c6208"; + sha512 = "4d18ea890da9dd8b55254eb397aed5a369450fd2a287adfe6519d2199b89b6d4250491fd816fb8593e1e707636c91bf1e44319eb93c0b0839dad647b8aaea327"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sq/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sq/firefox-58.0b15.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f78b537858e76932b7f1f45288e5e36fadcda47921f82a9b9749bae99d571b17c54484c628958b7d0226bf108fe684aef8a30d91fec6a7468ac9d35e6c67c8ac"; + sha512 = "05ddd15040570d4ff5ee3734d967c3857084cf8dbee6dc450dc7b17adcbb1aab3487802944269c12e6b3c1467a68be7fe50efbdb3eadcaf16566eccec10c9336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sr/firefox-58.0b15.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b07653765cd822840152350789a99072d8dd61eeaa82dcd7d86262beb21bc884d18cbf4b0fef6fd328558a0e64c40d770cdf7e158310a96cee222ed618bee8e9"; + sha512 = "4f431f3600ae21015a86251cce00ec8732cc1ba4c7d7ca474f45d8dc5b4c2d9723ee43b160258fc488e472681dcc52784c2b78a82b622df47c1e30f4d1385d06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sv-SE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sv-SE/firefox-58.0b15.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "0795a3119d11bdd426370430435b75ecbf3ccd3f956ffa4c65d99202e18861e80a5c7541753e493ec722c0fff742f4e2ed42a1299fc6d3e18b3de4fedb36df28"; + sha512 = "e7536a9d8ff4296d5de9202a3978bcc8c93c6c1d3c38c8517ef1c54522b9dc7bf7ca5e472b17173fa2243f1a279481ee8dbd2bd4433e5aaf7fe3d2b537386175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ta/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ta/firefox-58.0b15.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "829b117c2fbd45d415a619a507010f2fe33153f7f21c1d73e4c29e8734347b8960fb3bcbfb96529062ddac47ee081f9225b688bf5c1f07078484fd50c848d6ac"; + sha512 = "a25cf590f7d69c292db0dc2833448fa4aa60625a2aabe6c0da4feba4ec3f6e47c5efb10283cbe94e9e0961d77d8703c2c66c2f06974dcc6bfdab4b756d70d92a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/te/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/te/firefox-58.0b15.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "9813e932c1c84e90c2888c4f96ab0cad129969df470da0136722ac23ef0fe16ff0b8a14c87449b8ca166cd745f753369e54dafd689c09b8a7371d4855aa50b95"; + sha512 = "9f112b1236f4b83d5d127d7ed64c238d2a71ab9285157663c8465846e4002bc301cb2e907cdaeb1f724a12bceb8e9d452835c33db75171cee0cc145f10e8cf4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/th/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/th/firefox-58.0b15.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6e11aafa7029a23354b5088857f9a79b43872dcf0666c11ea3e15c1f4cd1a0d8c64bbda6a942d1606ab8d2fc17500e03a561dfafbb102ae6ccf3e0d55e93959e"; + sha512 = "52e25c19f93bbfa2a0690ebf855c428ced8b4511342e1befaeb234b3da788f7d9931e68ed8677fc824d3310aacdfb1f22e0af92d6638f6273e4acc0872df32f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/tr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/tr/firefox-58.0b15.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9c153dac318b7ae68c0a7da6cd91d92147d034f9036db68d9c83b3aa94b4975b51f6266663053a9afd16af0c40683e81def6d1b4b8ae212dd1aaf217450b7357"; + sha512 = "aea1383de1813fe8b2ad42e9613479954207f828fb3f7a10d7fe524c4b3fbf27ed6c1e2c710cbdf6526e1c869b44bb42e3319d15eb7ceb38a937eb9bc828ed3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/uk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/uk/firefox-58.0b15.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "f943b5cacc76bd6be55014de0ce8becab63e59f49ff7351ea1add60cb1f421f4fc2d23bc88a72810c60cb0ec3b5540f35b87227a093234b135da96b3de294c5d"; + sha512 = "21de13497599337af0c3bd0c507922400eb55282bcb9a6e517863c708a7147f5222f85dc9b47a6483fd4919c0b4aa0099b9f3da6fe048dd70e16d595893a177f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ur/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ur/firefox-58.0b15.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2309c79150071f22f12776050e2faa837ed7e45e9db60a628e93799fe7ff12c8c8225e281cba911cebe411e5224add41442b687af1836b32a8eabe0041bd704f"; + sha512 = "fc0dee731ad7e17c8eca3c4bd1e38dc5d6226fbac74a3c5892434a74d3ce42648231963dd02ddd2f8661e9d6f46087ef351d91897f7c6eed9bfdfc51a7f09dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/uz/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/uz/firefox-58.0b15.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "cf588642dfd6b2ff28087c150fa146287428adefdfccdf072abd6b5216917291d5ea882079ffc06e43ccd33e5d57767f3a08cfcb1e9c73e28651059ee5e4ae63"; + sha512 = "52553dfaadc88f0e19275a093109e05064f166a66f390f11840c8cbb7b8c5bd933f4caecd895a21353d8186f6f9a45b26fda831455809da48fd3e8da650e0de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/vi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/vi/firefox-58.0b15.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c7716a437ed449c4e1a7ad737e90a750ea23ea612a54ebadc28944e3dc413797edf27756194cf51a62229c2030233d4ffbdaa6361b0765fe183d47c80eb6f9f8"; + sha512 = "f944fe926faa407aeb0322f937b0e665aca61e5776f2c01c786be0b0c285095f8c17d1d4fcdb432ae3e984483afcd197a79450327dd8755906a778e3d8787094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/xh/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/xh/firefox-58.0b15.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "821d6f5f3524e15cf0a7bab517d23c10438d6786084a3eb895bce713676feaa0f8b966333f99ddb6e41b5f8bb3320f78a525ea07fd39307d62c6dd395534b2ba"; + sha512 = "42a4eacdf7c9429de2048a538e32af26b1ab41ad7452f52749ebb76d66cd7cbaf6504d2abd638b1ffa3e63744e6926cb00d7f0f44d63e75710ac67e2280e106d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/zh-CN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/zh-CN/firefox-58.0b15.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ed41eac4e685ae785f83c148100b6e6da8c426790d8169e2f50287773c104d571f8af9bf4b0c56945ceb295ef811dc3142fac9c7edcdd58dd8f7e0c75e26b494"; + sha512 = "8c0a1aaec3f1636fba572c61a7d94d334dd061e09c72a802953ef32c01c8ca16a9d61b04f46798e39f0d4aebf92c57860cb0572d41376513fd16c6b9429788cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/zh-TW/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/zh-TW/firefox-58.0b15.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f6fc4aa7d15a90fe1d2dcf9491c43cd39171e04ce1cc0808a697735cec07208aca310d895b7ff5fb4e02e680ef225fa8cf78ffdb647d8d82ef46180678a15632"; + sha512 = "1647cddfe766af88e11fba9811c91c821390e849698aaae122c4ed9ae3d285d0e4af784333d7a0ff061c333cadb63ab3a250fbfa6ed4da07959e2261f4d518d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ach/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ach/firefox-58.0b15.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "17816bf735cf0ed093dae243d8e3a0a58a95b16d1b96a9ca797a86ba3174b00089341dbbeacd74407d1d462899a4a70d5ca090fcc1ece0f34b8db87707101089"; + sha512 = "217583245d5ea137c8ffb8768cc964903da67cdaa9d1e923a73a954bb1ab8d748fb78cadbfc209e83eacd06e0de7bee8f6fb11d7c8fdc7a361c98a978d7f03c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/af/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/af/firefox-58.0b15.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "f02f3260ed73bc102c1463435957f5448cdaf40b433f249c1e74a77c1ff16f4752f26aaee8d706d98a29f38b1057e8d06f211a4254536ea6545ec3f482ea0e44"; + sha512 = "e30d3903433b84bd7bc47ee61a2a06353193a6c8a6bfe9b23cf11231bec7fa7643d55126ad045d8f17606cd336cbcf59651ebccf1c9da115d85d6516a169b85c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/an/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/an/firefox-58.0b15.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3bdbdc47a9428fe3bceb43162904caba174429203487ab3710f865b4b0e9e3964bd0d7b20e32da92b93a7e01f23c090b7cbea3af9837ec0b57621099a88d7ac8"; + sha512 = "232bcd3756981493f26ae1cdab7f2ee2a315963f135e73a8d810acec495d934e5b5ce8d7692a6aff3e6893fd02f67364d4ffbb580f05e113642ae82f1406013f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ar/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ar/firefox-58.0b15.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ab306f81b20e8dc57d81f5c35368f0b31a3d1a784e4bad6a984d78288e2e61a41eb02866ea87121a909a12aab778d858ab96d776106078ffcf7e32f726dd6f11"; + sha512 = "088a81bf11b6bd12e22a6121762d7084a0da829456736ebc4a45953740219329e347492851b5103a7599ec265becf9ab217b67f652b84381f0aea03224b67bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/as/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/as/firefox-58.0b15.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2e465ea31136debd7670e02d47bb392ba93e393dd0c58ac3a51217ea3fe472ff39267aa16cd21fcbe1f391e4a9b4b1b4fea252dfac268741bf7315344f8f521c"; + sha512 = "b009fcf6e470b0b9bb3c95841834491d303a9f8cb1059a91256c969db7da0f5a7e8b38196d3735481e77442904135be636b43576cf73bc2dc218867db3213f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ast/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ast/firefox-58.0b15.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "dc4fc559b7ed7bd6399300047ecce47b97d36479d332b81d02449d12996113246c2651717455a3e3514e14e960917b678cd2228ac58744bfc16087813ae36c07"; + sha512 = "1a461da268478b31a16a8995c7b1974367750c214b6cdade6810a6fceaca5ca20ef5f886d1fc634605e00022121fd0eb6350cf19f12a6016b2f1e45c00236d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/az/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/az/firefox-58.0b15.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "46968cc00a06b38747297fe5efeb656f459be06ab583697b1ce25f8ad080e2d73a9b28312712af030208567fd9099ffa55ea6e936130d42c1ef54562a296ab66"; + sha512 = "58fade178475698e43757c9cf47e4d72ed86e35bc67e017369786a79dd5656b8731749fb1afe17b90613ac4ce53c60a32458e3fcdc86cf638c2f30dd9d108f83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/be/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/be/firefox-58.0b15.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "17b377b2d9d7d5d8791d06f3f35036eae5019270c39537fe4f712bcc5b1ddea17e35c5e43c15a5c25457082ea7dc7c456d94a088beb868a8fa3c9a11e948f517"; + sha512 = "ecb6cf9917f3c6790ce0137a7fc9e4ae9f2f6c1a24a9a4d91d6ea6c3c6c541f8d40f95e38132213a31cc83c87f5798dcbc95c72e9deebed6deb73dadedc50ec1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bg/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bg/firefox-58.0b15.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "59327840726711229bc6f82d244ac75dfe457fc23aea19f964793745c771be67984652ef933c869d65fda57f40c8034e215ba4b6a953f66ae32f264bb5cd7b55"; + sha512 = "d2258b93e05ffcdf7a9012458537addb378819abaeabd2026d12cfa4b34dd3faed388d5eb8dfaf32761b2406c6f72279b0970c2e35bfd74a373e9f7db53a0578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bn-BD/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bn-BD/firefox-58.0b15.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "d4dbfd8b735453fded37db464ff9a8eecf49c767d52cfd9faa7c1bf59326c594dd090a82cf5f226283c713d95f91fcf621420801e642bc53c3a1f64ffd087fcc"; + sha512 = "8f3ec4491225c56659143ba787703c54ca869128d4cac331573506d4707b28fa200d0a6d560c90184d881a61d98f40d8919a6d30d6ce4b5ee42dcd77b7124864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bn-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bn-IN/firefox-58.0b15.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "243f956066c691a4c0917719e37ac45912bc2c8a1a2df92383896d22f5fd4369a596754268317ead8537e3e0a368b484217083921419cadc40bb19ee5f10648f"; + sha512 = "c6bb046180d5e3ed0e4198cb293eaa049c27bce27a3f6780a97b8c90fe95ea7ec69cb23427dd53ab6d736ee0862a3054f0b66333544e80fa9e027731c95f54e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/br/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/br/firefox-58.0b15.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c1c948b72c345ba22bb5454ad97856d32d70acdfe82f117286597878439334a90020d558c8674cae5d7c9686e2b69968cfa397252c872ada02e9105424a98144"; + sha512 = "a7f3d646b7a3e77cfe1817ec4751e324fcf94397e5327610c9153df45808033fa2a55062a0cebe52fe9b9e4f86db55317e974247d6fe7820774334cd9652bc60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bs/firefox-58.0b15.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4e500e3be9d3cbe72f555bda52a60dedee82283224f6274b936c0d8b87c7e4bb037f05d0f0fa8e53e4064b25f480345f77c91d77ebe3ec28f17b66dd09b484cc"; + sha512 = "e5a92e807c272e16f10018e2ab46896e8b152942418396983527caab01a00d0aa4b666ce0841a08504ab8094abcee28125bb90f35c6b323cd5f90af57f25bf7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ca/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ca/firefox-58.0b15.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ed8c046cbbd5d7b3957438f510ff4e59fbfe3d2e619e6078f635d106dcbd18a435a619da0aea195b3732e89be73aa176b3ba98a0daf73a6943401d03b78fbbe1"; + sha512 = "3bb8573e229d6aab4fa03da2cfcf9ed52603706cfd5255885e60af53ad56e2981b50163de284647f64afc1ee499517dcf97f67532487d028ee6d654fa5d52088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/cak/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cak/firefox-58.0b15.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "85066e0c6ff9cdf12a95789c7bc9a4eaf75e23ca87924274e84ac54aaccb54fa09255f0e513b80163189a50dcc603931dcad95864763eec9f7738e6ea0438ce4"; + sha512 = "cc67e759368964bcea2ca87a2330c1ba5f54b24756c5a9ea371428679cf856b475e404bb509c673b4b7f603023850319ae62bee46fe32bdc27d862c4a94e189f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/cs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cs/firefox-58.0b15.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "aec6fa674b85182d55ca3d37d82a8fd5f751a16c0be55039098f92e536cc49475d7a4da223f6c505bb8d62e805f147050d4a307fc967ee5fc4be3af113dc516b"; + sha512 = "329c4d5ef00c3176d49cd5db0ba810c68cb4ebfec1748232f76ec016cf3a96d4aa964024a5469f40693b7347f64feaccb94e1a5d971bec96cd5cdd202328505d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/cy/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cy/firefox-58.0b15.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "d63ebd3fd90b712ecabb73da4c0613ce72d727e8293de266dd235e50342376856ea9654b8326a75c2cd76fec1baebedebcc873d27e37cbafc9417c6d318ce89c"; + sha512 = "67ccbe48b9764391a592d7cfe8862b3bbe8c51b34af79506470d05a8c92098dc067dbcd5fff0f2f0bdcb1b8019f178ddaaef4b164465e4c5b22d40d078aafe6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/da/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/da/firefox-58.0b15.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "65acdc35e15ac4180bab980d3ca4ef4a66b24ebf6ab5e2a617d7cdde7489250a07e20e0769ed0336119e8736dd5f17382991305b025dc0cc406cef135bb6414a"; + sha512 = "0bb1b55c94a7c227631c2fa55fc0ec94aaf0b5efc173d8c23b32a592760732839b4f7d19d64a8ad92e7bd327cff129936aa5142a48fd3a7e19e5b87a006fd75c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/de/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/de/firefox-58.0b15.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "af8be4c16ab58d70875915d9a2d0823042c1cecd0de167ae7918114850e0b5fd0ecbe4a6640c20dcc9c82f2f25d432c6f416437db17dd5550cecf4e1c2a0999f"; + sha512 = "7371cb1a4990eb13efb649a25594da67fb46c29b8cf2e0e69c3621bce7c18ae84978a8d39e2d3fe8d2cff1d48e2ad00d38354ddca32f0e2dcd5b4a2f88c59059"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/dsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/dsb/firefox-58.0b15.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9a33b692c610791060568db4a0c6566dcbc436bde310c3589a518644c61fc85e424661ee0cfb94836e3f36f3eb4b13f011ea788096f96277eafdd7f4a9a431cd"; + sha512 = "7eb9a2d00d5417287af53ed3ad3ee472fac42b4c338e78e7c8deb2cb11abd2b8373deb569d1ce2fe84ba328ec0b6273eec5be20654ddd65a1eb14fa9da4a5f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/el/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/el/firefox-58.0b15.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "eb0436998d08cd8951f537ddbea697ddb349cbc8777913e27038894a787fe31f5295125b89b099b53e319ecd225bd032898aa7871a6dffe964320f55230bcec5"; + sha512 = "2ab0e13eef9cf4de5057a04b275c948006a1c328bc4bf65f224c3d9176350a0bf963e152619aca784d9867d359d8c622e3865bc6419fcba7ce48bc294488dd4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/en-GB/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-GB/firefox-58.0b15.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "afe351df0edd62c459f6730c96d96abd7dc3dabbb7776f1c7035b2e58bf13ebf4aab2c148478a6bea4e0c9777757485cdd739b040f26ea260c0bc97de0e531b0"; + sha512 = "191b5f4db9ef476701045cf660607f4be4acf1823e5b765a355324565b928572e4ea7aacc822405e7b9edc1e4ab33a56e7b4f2cbc231b20a559eb89fea171f7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/en-US/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-US/firefox-58.0b15.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "dbb858c163f6fecd58267dc9c7556af0e87bdd0c5b5ce68421239b2a3ccc60d19d49b92a186a0c3c8113e941040c49358c991d916a9ac41f31d7ddcc59c8c2b1"; + sha512 = "0599ff0b37fb79b378b01368834d22e76139d67e54cf3655d829aec75c1ac095744f6f171e7559c3b409ad2faa1c8b47b81ef6a9ff90bf9b1dc4122abc382d7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/en-ZA/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-ZA/firefox-58.0b15.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "751ea8ea74d02efa866604d28e65bc0a7c6006b6627e44f9853a24b8018d6672b254b218efc674bee926942c790830a26d6e90bc5edd7c34a1640a613f4d14ab"; + sha512 = "e6d927b28adf2ec1978a50f4d6e9986b28006df165ab4f4901c8d5916541f0b51ada03e82403687e73e5e6dcc0b9f517cd33879d91f363dcc0f1cd799ec9cb6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/eo/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/eo/firefox-58.0b15.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "8791e1afc830fb6c77bacce9427c96eb1573aaf2c74496c2fdb2f7263ff9d4adb80a5d2f2dcdcb9287bc6df7dbfa1ccef12a9ec81be29194d6abe909eec203f3"; + sha512 = "1f6c6618ef2c108e5fef0a288eb70e519ff8456cf12d348a167eb208842fd4cf2523d72e44b778f9210218a2853aad1fe305f332dacdc498e0cbc2f4b7fd50d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-AR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-AR/firefox-58.0b15.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "adca758881a62929db99644a38fa6b0b5e58b6003ae61ecf0a8b3053b2ae4dcfe622d81cba07babf6d07be6f4fadeda12805829f44b18f3945654a999ba8689c"; + sha512 = "60c2d315fc692bcfd682990ea3be4933e5bb185174b0c2260e56d4e7a437dc5405e3141bfcde3f177006c858c240934cd71834a0ec5403f33c7a0bc195592088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-CL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-CL/firefox-58.0b15.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "2d6c98393903b48a43e2990839e6701a7a5228f9eb940ea0619227a18bc172e9f35f3616ca6016312052c8547f81fcd2cbdd32649cab2e52a8522081f502c741"; + sha512 = "b3b65a0e58096393750e71445188b32962a3c31770be40f6fbeb63ba42823153243eca9e303592dc93f568f8fdb88caa274ecabb037ed3421bb0429f94c3ee1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-ES/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-ES/firefox-58.0b15.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "feaa976b250d3c214273cd19384012a1ba75c30974e4d4ea1ef488679f1c7c078f3b2bd226ca8eee51fc11ed7774425eea27903f7891556ca29ee0bd1ae46c51"; + sha512 = "a4d8c6f01d0f51fc247df700aed8d19b3472e775feff089d06c320c96a2bc1a13a033ca839aa7e5f4fa4c2705a7fb6d70d189b9f0add202ab5157483d22148ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-MX/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-MX/firefox-58.0b15.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "43f3362e18b1f67f73c2cec0646f6d96e6a57a55707d7146b8a1a7974601a4c59379059ad76c6f74daf02241afee2c0ee673e9d8fb02998f0f2eef8ae9c77cc7"; + sha512 = "d6fa67f36d1c80224cacba3d95536a82c690b6cc09b6caa8791d4f0500bac4b77d74e8c6461d1e626d4f7c81e2284b270a5fcd734ccfd6e4011ba1a69c69f8be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/et/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/et/firefox-58.0b15.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8b71d6a4ea77714852084b7ab27301caedf646901e8aab58ee32f1d5fba54332440ce3129d0b298f0b9fe9233433078a49798d834ba4e9e90aefc23b63090069"; + sha512 = "56df0cb1be0d862f0b3c5f2a5c7d00eef39bdd86cc7c4c2ef6f91ac5814d07f9a03d0218a8304056b5d5457ef248a4c2c7b211cacb70bef6c4c5e9c25294ed75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/eu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/eu/firefox-58.0b15.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "76dcd315555ae398a594e28a443cacba5077ec7a2747f249ef2558cb69a970fb7b3195ab1589dc3610b8bc172bac34672ae2846b5d9acb5e33cd26d5834791d0"; + sha512 = "844ba990bf98b4650e44b386d4d620ead2e049d954b9f74ed3f8d2b6544c304b2afbff794865db0a41aa5749ab6d6e69c3907a000dd46e2582a00527091d0c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fa/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fa/firefox-58.0b15.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "71f49c27778473ba3ec25dce48787fd88ba36083e0313dba28e6c32c7fcc907f63b54d6d2676351e40b784267dbe7111860a7d05e4600856eaac796fc869e425"; + sha512 = "3925f349e9b67233b034888f6c2d37e4830ca4bf3fd9810fc7585f6af6318c4f743a1e6691bac44559ce53bef599eb22e54d8c36f10bafa7a21e57325b25ad36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ff/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ff/firefox-58.0b15.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8ce6fd45ad4dd4987e7b4d59431bfae2a89460665ab3e5797b3d2855d90aafcab33f44ba4579ae0968428e98a1c0cd45dec33d86c7975724816675c5f7eb2c7f"; + sha512 = "e31047b7420650a30136310587cd4d66089b99dbfa6291ac15f03377d37abaa3ccbbbd9f5fc1937fe70e4cbc38dbec24f1358ec2da2db54b5ce1af4871d32ac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fi/firefox-58.0b15.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "30c08c8a6bbd5cc4f7812133e87967fd6347dec159f0f54a9826a3aca753091d7152015548e84bdd959f3cb0a9baaed8f6be15e1cfbe9bba3dae06bb94fd8a8e"; + sha512 = "287f2e50c912aadb35238a6a1f5a32851b5cac1c3061c6f641022baa8dcc03e7b0f738df9bcbc9b82c9f89fd67828f3b0bc949eef2e25be8920065d402e9a45d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fr/firefox-58.0b15.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "cec0bc3a0973a8319ba4551d988a5372f32da697c7f4acff7321fe8780f51a465378cff218497772ea0dc3f981ff6a9d71b773f8c14ea950145971a31f7ab942"; + sha512 = "2b21101b761ec0a8974e3782e9210983612126a2ed42e2020e256b2a4352406ea310dc62f54ec1069bf5b66853207bab024f1fd3ec06ea205336100766626014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fy-NL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fy-NL/firefox-58.0b15.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "da95f899461b6a794a32a4ea28643c856d8496d2256b29e33a22435602f06293e3ce8e0756960ea752440030147c1044c112ff7b5f0e793d1ab11555fa1cae64"; + sha512 = "3e25c7b274235adc0d59106bd662d9c8710863c7e95738b6afa2973df999d7c8c01eb2c465473b26cdc2869cf2f9f4a05deaf88aecd125e2338a77a3602bd042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ga-IE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ga-IE/firefox-58.0b15.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e7704282593eb5bae1975de9ba423d53be4cc57824c96b8457abe204a7f563719cfa80dfa6edd5db6433904083e60079510f3e03c03871c6feff168d7e83c349"; + sha512 = "c301e3e3facaf2dba4ca4ed17318a7f21350a9d190235ca99bbcdefd4460e53d984d3c91a05564fba56f4cc76795742659b0882ae116de166a46ef6e6b0dd2c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gd/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gd/firefox-58.0b15.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b33bb4630a397a53a0872a801a9662640f3dd985df174658bd3bde118c55f0890e8b9984597b27c7c0921e3ec92b39a0f560e8f3f650524c3a669cf3c16ce411"; + sha512 = "6252be06dcc137835059318dcc32af9bec179e57378b9f8e03eba8284f8f48cf79b40f3eb76bf6b0f46e78a5cafd765763985f4f375024b189818f5bd85c67b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gl/firefox-58.0b15.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "32761dab5c83088fabf18a8e9b803fce43641debab68bab5f7395c56fac5ff721db691492f2323cda2735e0b124201a47b76663b2a93a6db745ac839ec53e27e"; + sha512 = "b1640a8ed2a8d2452affdbd33eeed8160ee0b76d7fb99bd7258e38c17f1e22b63210f167c266db00fea65ae0b2233d49f057065d1fdfeb023e479804f1dc670e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gn/firefox-58.0b15.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "3c8f0699ef2794d84421696efe543ea0fbbfc4e95ca8b82840af00f7774884eb90301b0f0f43ef930cea5b83bf56cf6818e1c6f8cc7c808db193a5ee47ffcdf0"; + sha512 = "6cc98743312f1b92a66f4e514ebab0851eacc7c19cec7581116c01f4450194d9f1c81b822f4dcd5841c68e9bb786e93dc7f00aceffa4888e42329bfdec951776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gu-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gu-IN/firefox-58.0b15.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "dc5d788b3a821fabf51bd6e6efbdd7998618d8057ef1568787426ef833c68cd5fd961143c6892f5fce24aeec66c6cc4ae14035ce5e6ac847433be82d54eadccc"; + sha512 = "be4beccf01a95245eb2dd6d587f2cd70e6eb0050f5dd65eb24c723f3a4979ba1de1d8e87aaad44b67aa216f69f7f3785391f279f9e657eb10d808891e182033f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/he/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/he/firefox-58.0b15.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e9339246e997c0b06a10c47209ac677a08fe4e288fb844b79ad48743c7e21a1ae0d38ba6e6cc7227760699d61c58d75fdf39c61a7ad72daea0e44f8593745364"; + sha512 = "fadbce135e17f62edc2ce5004ef12ffae5a4a18d7c80b785f85d49da9640a874ac41eb1fb15423257dbd7fda9fb14d19e5740e6b1796b15cfae62e13c471046f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hi-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hi-IN/firefox-58.0b15.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5b991acadb7fa0d2e0c2156f9e6ca6eca0ac8cc0bd601c20fbf4cbad2bf4fbec834f671846e7df50e96857df2a72893f03a02a0b2c57a0051813230179afe56e"; + sha512 = "f00f0ad1d2b2c1d1451167b8877db6c0fef26d00fa7673ca462cc673a34e6e5f6134912f1e655b39d8fd657faed41e627db0c6d713aecb374b2680d6fd6f3669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hr/firefox-58.0b15.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7cda125f1b2ad172d8c23fc8b71b240ea5838041345184fec0e4219b922036a285f8c3678104b52d6d1d48cf818c9cce5c6f568445792267c85daaa2de170c5b"; + sha512 = "014ef528395616b30dafc7e1527c7465a6d6eb2764830d06e62fcb2c9e0a72b9f9707718d92205cfb8e0d917516fbee3d01e27d33a59fc2b90ed45cb940c384e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hsb/firefox-58.0b15.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "6dde50394e80b215a219cc439538177a64e2ee0c8e73b2a094e84ea7d88113ef7efcaf20ebf0015e7aa1a78dc6c8b9d948591680a9ed31cc7cab6fdbf78d2e92"; + sha512 = "82aca0cfe0ba91391190a51183ad7cf9301079cd0ec4dfb86d952cc919967b7cad7e63c2b09931e94c52984b9a2547ee206ff86ecbaae064806a22125c0efb51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hu/firefox-58.0b15.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "952daadafafd1e52272583c72e3a34cd54b9f426957d7eb2cbe18889d4afe12ba55c11cbb1ede5b338b0d34e83f1e9f79350d672c56092040f2baf1965468589"; + sha512 = "0df88ca565fbc1826c757371ba8fb902d1c383b11e56fc28043764e0e6d6a10b99ac024066b0b194326e2dcc0ca174b80fec4a9116652c11ed7dbb1761baad5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hy-AM/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hy-AM/firefox-58.0b15.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "dab726869c730af3a7b62c1dd3a7323ec092e82a494094c291c0852bcacb7334ff65880608463bc0ede6e75e62fb9de81c537d918018c525e9f210c766717b56"; + sha512 = "59532269538fcac690dc26f3292986516284f7a2eb2094f8148eae16d4b4c98fbf5131d6a839b9fe1d5d432426811bf3352846c447c0f03c61cdbb414e5a5c91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/id/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/id/firefox-58.0b15.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7b61acc863c183e0c372b7456135ae0642301e647f080be4eb5d6e996fd3b41a697baef74dd04eaad9be1558da9d6a34a45a4a96ba0491658d5165dcaa15eb01"; + sha512 = "0b528982ee68c523ab641c379cad911cbe4f7e3e3938cf4851ef53d087fa4f2c80bb1973214044d887bc27cd93cbf824a36d5a1107b7a421b0b4588095c1c981"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/is/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/is/firefox-58.0b15.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "3619c223e5bbc84ec8203482bf912f1f02075cf6d1e76041bab6e7a0d80f81eb556f2e0d09a34c8de86c058a9b466a104a18ae15a98f9debdb21196ba84e034b"; + sha512 = "7b1ab16b5aeb9377bedec101447f7693a5c84ed1d4cc8a9e866ccc52274576ccfd74e74fc675c46f44f6651f82905161124d261e17fc05ad2ce223a1a953f439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/it/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/it/firefox-58.0b15.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0e6a2c84710afa1c7e47fdc66c21885b1bd3bbab355b70f611c499faadaebdf461c9cb8bd9dd61a11294b6bb2f782b95608edbaadce8ca9f8604992b9d779daf"; + sha512 = "d266d71c691c8574d4031f81b9e4dda0c2dc1e411a434450c899377857ab571fa3c4ce32cae3bd025eeaf326ac937c9c5e7df79f4c0d7a31bf0f464e15d7a2bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ja/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ja/firefox-58.0b15.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "802d6c96510fc1325a4d9bd419a63a85bae402faf2ec4fa211e68c2ffe869f5c184c46f6c1d1a7cd6482816ff6a2cf01ac8e5f15908b35fbe44df8b11caae140"; + sha512 = "2100b5ed142f0f2b755c00573f2a5347cfff7cd17c1547058dc590627d07538ddcee8a8a0ca1e1afd0ec875a9ca11d44828b3f7aac54f03d9f24c7112bbe3936"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ka/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ka/firefox-58.0b15.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4b2b066872341946ff53a58773ad6145ceae526242e19b488529582128e42388e9eeca73a4a5cbd87ba913c4cb1e5dec768bb615400ea367a371da6c507e0bf2"; + sha512 = "9b2b5662ce1ec38d4c580aa2df99516333508b7b54cc15ca26f4ca9ddc21ffdff724d5cd952fe560bf89778b8a07d7b71233cb88a58007fe770bd6d060425d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/kab/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kab/firefox-58.0b15.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "8544138682e31d51fd3841c1401772833b503ff81d3d8cc36d29428c22879828dff2d871dea3d4429031f2f4d96cd2252e399dde375fa372d1d2872f88e8f355"; + sha512 = "4e4661c562037675177850f4da6192f7e15d08e0afd7c5302f9cf122f0b23db3c8cd33815d589202075b5b43abc1f4c161fb7b0b4155cb56cdf8e7666306350f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/kk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kk/firefox-58.0b15.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e2bbaeef3c943123d4834d008e5ab2784029154d6d7badf5bab1c9ca467061cf16c96a25731d294d242f339886aef5fb228afd2d9b1bf9840e257795fca42dd6"; + sha512 = "f3e08a21642564a25e7e2ebe8c8cd46da095898e86c85ec2b0fcb434af57e66f51d2eb9c0b2018bed0e80ad79da244f77eb48307f12bfe23464e0959d846d8dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/km/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/km/firefox-58.0b15.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "75eaf02491bccbdb51b12d7125f8b87de99da0d7299db409a6c3a2ad8bbb06f011d7212c9ef20ec08bf89e6396f125925108da57b58b25d28dce6849fc458b95"; + sha512 = "34771be4fdfd50a22d8cc9211e5240704bd8481b96af3bb8a2035d7acbc8c0b6fd16f54a76586469105b5bd35149936563a7a99ba394f09eb3e1ee80fe02b0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/kn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kn/firefox-58.0b15.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b42cadaf16c599a7006ecd4b1660ece01381c8c0a5eda2e03525497d682e663f55926c92e189514019067d4e832b7a56b72d8e1f463a8a6803b00ae3ed836c0a"; + sha512 = "4d6847ac04a6dbdaee05add22341837f9b2a6feadf1df8c4287804d8a4ec4d06016920fad35a7c3b8da2a1ba5c6e32ee0e3eb0086ff8606a420cdc6fa763f860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ko/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ko/firefox-58.0b15.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d9871a012c55425cbecc6db31862774b082ed3d9295f2675c4465d5b301cb61870f06330b0eb0a38f3eec69fd6adfe9f4b84b65a24d0509fc59a9f500884eca2"; + sha512 = "7a8ed93baeb9d1927a8cac124a8ed70c4c47075e5b35f06116ef975504a11b4054c580f12ad34f14f76adf7ff70094f3b39fbf2b48f5dfc0c1e94f383746fc4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/lij/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lij/firefox-58.0b15.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "3b26556d53e935ae5ae02a9555226282ebf552e5caa15c77bc4c0249a3f158324e108602e2b253fcd64205d20b7a116b3ef0423296d62106e772e254edc18a28"; + sha512 = "37c4fe4de38926120f77bc7b926dacd31de5ac490177498dc6cf6eba59150cf67a29adbb224837cb17091c5539325507644c5ebe352d2da2c42c75a62b0302a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/lt/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lt/firefox-58.0b15.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9512c5ea9cbfadff84c23434547f3500f1a5add614652dfe21e6bb107cedb58606f90e4511b0bb843a9811d5df36e3c4b3d72290dfd177fe9c8df9a0d7d2e19d"; + sha512 = "033735df43d8c8bf84bad8e32a71852462c4d305f9e768b845a2d9ca917692b2bba48a0ed416c19132f89e7044f166577f85737f07ef65699cfea7b6e6b2207f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/lv/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lv/firefox-58.0b15.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "57d14db83f4ebc4cef05bd0d63c480665e95223a277a1357f5a311be0d95be822d48a99c4df72d82dac79d1625ac5f3eec195ca04cb835ed853350f40bf1583e"; + sha512 = "c91e2303c67d87cb9d15a789321e55d29f232f1c165c8852ed3650edb466ec7fffa10a19ac260c9a95a76f40beb575228c6ca9eae50aec3d62653c33a7b6b1fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/mai/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mai/firefox-58.0b15.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "d7c49cb93e06d8a623d9537cb8e529d0b14e0aa97b15d8d924ec5341ff58bcfb29e7395d50712ebe98f8d4396b9e089308f85585ac3de07101add7aa5075b882"; + sha512 = "5fbc1bef91b528b8cfc2660a79ab17dc9c1ac97aec061508caff5e7fef1e976b3cacc3490f3d9600a9990f24bd5b0334f6745cd4c2a4ed1c9b3ccaa9764c6090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/mk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mk/firefox-58.0b15.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "cba52bd2eba6d0f6e3f8f18fb35c8ae95ae3d90a55607982bf02b0b84621ded98836a2fe7230ee05969885cf9e980b5da735ef5999e2d3745ae744c7957ff628"; + sha512 = "582cafa6ffe662ea12bb12d08b6491a837643f63569ff50bddaade14fc544843d482b08541a1dc349647ca82ad3a8f185984108ba6876c0aa9b7bce791aa8b7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ml/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ml/firefox-58.0b15.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "2ae1b940673166766aa250a7dc27e25cd64878b38620764735a68d748bf9bc8ab6d5fbe9504b5160d331ffac3283a16bed0e65d57c2283b7f36956d4fe536fd1"; + sha512 = "4cf3e39bb4ba34a32799ec5a229fb16b8b0a7d8cac77a0a93004569d7cb0f662b8a9ea9903d0aab07784272324e25ccc6c246a3e873a7a422c00451ed1cc8e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/mr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mr/firefox-58.0b15.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "0a9d2e71476330c7964690bbeff9c79c3a81f5087e9714cc91529daf48806cf4b7e0ae0477eedeb7c4a026e38ae715a188d779e4ae3d7753cc0c06ea06ad7f90"; + sha512 = "d5e95e2d0aaf5a9a91a68f2fa219bdbcaf77ea4d9770032db5f6a890b4c936354392b41dc9f9a04754e67c9fe124d06d1ed2085562d3d5c6f37d8709f01a7e3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ms/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ms/firefox-58.0b15.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a79e5d7978df3df564019367b83ba8229c6eb6dd6c4e8dfe8083ca4bbbfc14c3b7b23a681e418fc99e86a80ef54081de02aa3074a3d183f5548ba63b7d24b415"; + sha512 = "5ff77e3680ffe601af02b1a8f58d6676d1bb4870ca51d928eb9cf5f3cb3ea6ee483812b9af3603f3ed13ba22a50cd8b22991afa57c5979b9265a98861f261a89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/my/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/my/firefox-58.0b15.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "ab8d928d5a842982e2dd2a6ac91f009982350ce0660b0dd06650d482b31b450a44b3c2059beeba6d27fbd73718617168539e95037e821fde56a94969618d35d5"; + sha512 = "0ea1bc7848c0c3264db529441431ebaa8e2009f9f0ea42682e35999b9ab972a8ed5526b84ac23104ab9fc5e4940a62d34522c2eae7d7321cffffadc966121c90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/nb-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nb-NO/firefox-58.0b15.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e322595f370879fb86de879cc726080bcea5cb0e437963cf4ede716e6185517b9709142cb9f63809af47065fe76e7c08f7e981594aabefe55db9a797bb164f37"; + sha512 = "0d53378a740955f7ef2edc8cb9c48a394b447d8909e6cb4d1dc13ebf9985df99a95347021d1060e8df44884d6b96cb41dd08be0d204ab5ddce31b12eed7b65ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ne-NP/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ne-NP/firefox-58.0b15.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f35f333916bd04a1a19b15e1609e1e7cdad3b83af4d0da6d5f4a819c0a6abc269db1eb09fd91392c1141d9ffe8bb7008dd0784227637f07edc0c84e61a752c22"; + sha512 = "9003e5b525f50a1f5f6838f63f8e8be25aba8f80c02af4d32ed125416ac81ad79605c7d15c42e809485be5f490a2363d9ba7cb8ded31e2862c4fabf526cbf870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/nl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nl/firefox-58.0b15.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4c5f6f8215142db4c609206e1bbaa00c63a7c32e594b4fae4b083a58bf759c0b49206e97cbbed60d0bcb48433fbe842e6361937f10c301add3312e90c9ac4add"; + sha512 = "126600e3b1f8689f426c8f50a40a8ce4e81d37d4715a9a52628c14c8b9163eecf7f8dc87bec09d876a2cd73438aa0ef8e2d049d10a8e58a09d509f6d0daae3f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/nn-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nn-NO/firefox-58.0b15.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "726e9a725317fa9b802f43cce56a46e33a091b39b0eb8803234ad491b1b708618da7d771c6e885c82f55b259d901dbcfdd4cd445ca7f5ae8a841d77cd364c2e8"; + sha512 = "9890964178203055ce3db56d2b6b3b271b951f29598bb97a86e88ec58d1e0b9f6d71c20e6e129e5294a1023b5fd0ca54b669b8e8684d888687bfdecf1f729ece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/or/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/or/firefox-58.0b15.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "723bdc3a6aaa3edc5a81a52175b2d0abd57a9ea4c2edece31b0a408aad527ffcc42721ba4152a31f2be2975197d66da12a5c97db37421c9d821d122ef1d512a5"; + sha512 = "5fae0bfd002c36f260bcd1ee868b10d422c55afd59012389897b9bcfb573c97669af838c43985cf4013448ce3db17ac9f8289a152edabcbaf4de48ab05dce8bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pa-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pa-IN/firefox-58.0b15.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ba5d3556eb972dc7aa5bc380160bd040fcd15d3785c9169b594118ac6bf6a4b17d131ba2ae9eb0866b504ad342cce1f982506ba72194db2e6b3c5b5c363cf6f5"; + sha512 = "10dbea6ae21ea10dae7846f16ed5530466bb30bd8bc864e6a81e2dd9d2918dc589138989938c4781a31983a14fb3fa23460c3555fe35deec36f20c73eb1bbc5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pl/firefox-58.0b15.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "7339214b75c8407df9fd53b4022c8989c78e1f4cc033c6d7c9b1e59ba15d0db7b7c0d96c0d534a146d9c6522a60988b9e52970723bb9ca70e704b3cbf0e7080f"; + sha512 = "39c25f849d01942c3c457e3da71f201abbd7f0d6de44dd6526e63ac4e27d1dc58833363b9cb1f2160abdee3856653baf6dcf35853923742d0ed90d4e8ec673f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pt-BR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pt-BR/firefox-58.0b15.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "02056e9df5826d4b61af90c85a040f7eb7e04879c4388a44bf428c81ef867683dd7f25a3eb6618d00014ae334475d8ce87e42f3f76d22e11ad90c4440ddc4bc6"; + sha512 = "5cd3c37463cdafc8b56bebaf0d4ca1a592af9f366d9a418b5f2ab6dbdbe59427474b3e8fb489706444fca07a13ab27a10d9781ec30278e4d87193ae9fec12a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pt-PT/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pt-PT/firefox-58.0b15.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "834a1c81bf6bdcce54bd9d03a60e3c5ca732036d792a01a9dabeb74d91a7d7b3069e6a7a47c4c17e49beaef2487cb1dffdf335d64c2e17755320831f0bfc1af1"; + sha512 = "d9ed06e17293216dfc23b064524d64fc7c6776843d3be89278b4edcb979c11cfd517daf82021fa31bf69b1c9678b1b41be5c535eaa46e3f29c02fcf2c392757f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/rm/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/rm/firefox-58.0b15.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "52da3e8177e85929e29358d24810ff906d0919aea3d8714686179eccff0ede8ecfcd296d16093ba8effce91b787c4cc778495d4fc5dda37eeda6156db1efc310"; + sha512 = "8f2680d27eba876f2075e471c9b5b4625833f58829ce5ff3e61e9ab9bc269d7350dc95b6725f85e17b02ac36afe435fd4882c42ecce42b23089c645c1ca28262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ro/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ro/firefox-58.0b15.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e2bc8229a07bcfbe1688ae747b5a86c1a08cf2a28e2b60a66bead92f3a6044e2545c2a3aea48b9adda53874d75095b3c6c799d8ef0e105daebf8332ad754aefe"; + sha512 = "e37b53786083c851c7996e6b936be908a03c26716e8697699c9980ea5da96c242d10b1d1da23df43e77c417f32bcd302b645ac0cb146389908dea8aa51d007c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ru/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ru/firefox-58.0b15.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "bbe2647f02f7ea4c13b85dbe093fd6262391b371e8662ee4248f76cc473fdaa8197e900949a99c4e74ddae97fd53ee297ee7b44c984b2ca536c0f91d0c615d4b"; + sha512 = "66c7933ea20f122159faea020959d016e75b1c3a5be1de406fe14a6ff285218f1ddaafe4ae8348e4fe3bbdb918e13564480f9f5ef5661f26667e2f7908931c62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/si/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/si/firefox-58.0b15.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2244b5df74eed93c9b5efdecf32528e8da35efba75005371884137ba67f4716c09dddb40855d725a3c04f32c6d9bc2c9f7063fc26f280f9f3e6bcdaabb212aa1"; + sha512 = "2f468691aadd1d324eb83130cfa7d5853907aa5bfd0a00b628257ff5fd91c18b80328b546419746fed8726976430ded774de6fb37e02b1fa9f954eb65f20f94f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sk/firefox-58.0b15.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fcbe3b310044eab2ed333b3119e269b97267a94367e374c6219ee73ea0861e8f7013d9289704a79f687a15926516fee1ceb478419fec417754c901fdd440aa51"; + sha512 = "85914a2ea3d5c6a432665503454f70943c2aee893a9d4f62a45e3a3141c23e5aee9d5e04bbb7b2588921cd649b5e55b88df693689cf97144bf806b017718c809"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sl/firefox-58.0b15.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "242435a769bbab34f3a20ff870fb9c156217973e8194b07cc0031a1b8b9ef0bbca33b3a65e6534662d21e34170944e2602ae8fba8357a42d09ff76ddbdb83711"; + sha512 = "63c749783d06259127dcd29f95e404fe7b59810ee0ec6a4d53385197aca8c2b58425e3a74791f9ee3b2d157e25d5a0063a11c8be716584c4c1989d31bc3dc0fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/son/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/son/firefox-58.0b15.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "dda8473e2f42dd804bdd1e45fef7fe795f71c61fe45c495d29f8c19b274054537fbeaa4cebb970030a19b3f11599d3e5f1361f4a43c86c7a800b29a3adc33027"; + sha512 = "e7eed20a0b10d7e6a6d6f29262781f1228d5212581270ffcbda601c7f2ecbdda89c983347d5674aba7a0f4ba6edbb401bdab870ca80438ec9064042c693d3282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sq/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sq/firefox-58.0b15.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c11d427280dc9a82cbca357bf356ce12f1f5d08e1d2bfffddcf3547396b7f198ad51936c999223424afca5d952b474a9306f8b8a4e0f3e885d6ca1efb28757dc"; + sha512 = "4957b51cf2cf3cb889674137e7b5482fac02889a5982a9d26c7dc422317a47f3e973ddbe09f9973ee2fa6cbc0f4468d937d57ea2238f36a339fee3826d13d723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sr/firefox-58.0b15.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "00f5d6131437443acecb2046f580913427c7495b12474d20e08935bb0b1553018c65fedf035c733d557a5368ff7f926eb0461236397cfa5f05d9b22bd516554f"; + sha512 = "5e38cdcde20b5ffa32f546d122eb68e704ab83c8e631bbc332a049f18c7713c12e87a077038e1f8d4f1c9b393d4765e3052eb5a2932832ff11ad5d0c59e7476f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sv-SE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sv-SE/firefox-58.0b15.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "0427a9f50c9e965de50ee60a169e18d9fab6a4c6eef501d97a7a6dac4b41f0ca44e088a3d40b147134856375d31077d837faddd73fb29595a4ea2329bdb9fa44"; + sha512 = "aa938c6e3fde146d2daaf54a73cdd71b9ab3c2a0bd5ec93af0dc5f5dd2d6f21dbe1ee2081df32922509d043801cf81164e58f10aea5bf1dfc440a656828213d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ta/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ta/firefox-58.0b15.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2020ea9d45bec7bf45ea6edb5dd4449f0a06cd6e136d6632b7b62ca2f4b16b74b8c563e25fce5d0632c5b6d6c302564c5c9110f51203a95a46924aaec14593f6"; + sha512 = "fe67d505b86d4baf8cb7ecd7fedbdd76b04838854c163f0f85fb61f3d48e8f43fc0b8e30595aef6094cf399c6b9450f056ee52dcc6af1a967befcf291cd24cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/te/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/te/firefox-58.0b15.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "91198bd9c6a75eabbd5d2e6e8b2bcae9fa6ff95c2c96cb53b2659a3340c2cb4355abce05db307fa10734ef5dfb5bce5a6b8738f5ca1e9f45de35604ba745d256"; + sha512 = "ab5618e77cb8d81f01cf18d1aaa4a5cc56f7ef5b0311631dbf7fc3d65bfd191d692f6bf163ba55cbae495a14cc4472a66fca6a21c839b80cb295f87730de0256"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/th/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/th/firefox-58.0b15.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d266ea6b688e7b1174a5a1b2300f51177ac62fb45dfa8f6dd2b9ff80febb6587aad39122a5a26ca61b0f647e259adf31a771d08ae96a863f2e476ec00717a91a"; + sha512 = "e4af930d960eb69edff3e00b8e1d38b358dc5881f5a41b1216098c13b64524cd8dde62fd30f8b8dcb52a71a6c245a2b02e253e79675c09b1525501ec105ab370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/tr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/tr/firefox-58.0b15.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "f5450e6b6aaeb15e207e585110412136e2a222b3353ff1f5d34c2c9e1e05146711f8d383bf7dd6c1b32309f4a4c79cf5fdedebc7e1b26269a5b46da6f1bcca28"; + sha512 = "882b5a340a31f936243dcc4c995f87c4f9a0b232c693b52b4e18a39adc0665788161520880a51c521941bdcd7356b15bf12bc32bb60301e40f160130cb56bc13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/uk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/uk/firefox-58.0b15.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4a79223c3eaaac901870ee4057f9e06c96d21c0ba56576006650eaf470704040b8ce1e3202478797edf3f11175f6a9c369fcd39437770c30ef6eb2a851a83c2e"; + sha512 = "7273f65835638020452ebe07bf6ad0b6582cc1b6e9abbc48a0a6848e388b374ba466b7632e7f2ab127cbb6bddd0dd016c585bc9847b48fcc75c05f500f6ba400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ur/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ur/firefox-58.0b15.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "6701f250564f33603a52a93efe71b13e0233b2b4097ee7c76b5b575702c6b664a226e9da5434198cee3bae9168279ecf2718f6a9df4382c4a87a7673e930b711"; + sha512 = "cdb12e5f42880c360bc727642e9ef1e4a874d93a67ffdb804cddcf77500f0d448bff8e8da4647ca649f4a568fc54f6fef1a462ed423f4f8f58eef36b2aab1916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/uz/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/uz/firefox-58.0b15.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "7c99ae0618aeb2618e3aec1685cc76f965b9a101fccdd4cce2c6d9dc05be17f1e61f5651a8ae3e9b128b90a53452e6e5de066c2c6386dc27ac921212dbb66130"; + sha512 = "db698d0a807f8e42b45325ef2c8ce91752e223de967b69fdc03bd681a92b2fb4aaffe83ced210a2bd9486d025d5bac5982c9018a7ecb85bd7fe1c1f98aeb2317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/vi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/vi/firefox-58.0b15.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "13bf63bf2fa35e5a1590fbfcdb4eec5b82da52467222a77dfea46a046c5f8c5a2a1431c7998d83ff2c17e9b9efae1813ea0a0f815933cd72c3e5f5d420c98822"; + sha512 = "c33667f93a1bb20844d1ab4e94328356a2187881dcb66084ff52d2c284c5ab6cddf7fe1ad281ff03a5fec45dc8defe77710985add796d879e7a3d66c180d5cec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/xh/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/xh/firefox-58.0b15.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7d1ca71659c864e8b9b6ebd755fac0092dec587d8270fe47a74e71d94d79e03dd503a5d465112092cd42405f2ce57aba0d3c7dc79bc64fce84be3264801e7094"; + sha512 = "ba5f855be2cc56385cf821ceabee45eafbb528e1f7900ba24719fb68ed0bcb82a1b54566b82df6af05cfac6886e999588ddfaf2d952527eb092af685273cea2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/zh-CN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/zh-CN/firefox-58.0b15.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c3bb1b02e625d232a00591a651acc2f375f01fb0f0481141315ea1b9e93473ea85cea25a1154077b76f6e408330595d7053268c2048dc08802a89537eea3102c"; + sha512 = "b4a5984c8043f1c2156f241bea5fabf20a878cc3b437b4c42fe7cd8f220526569a8d13a0d69ed8d4bff77b13037080264a6684118c462cdf4af756accdbc5e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/zh-TW/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/zh-TW/firefox-58.0b15.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e22f9478666e677036ecd2fb3febde4f12727794a49b12a55456132d67f0ed735c3bea3ee0486c81fed8f432ad0f57d301c1dd245f324d785d5e368494165018"; + sha512 = "62cb4b3e2d80387a01d3ce380f0c11e60058180a8d31b462612bd3c0a254a4cc7a54b0c3aa1f2cbcf6082421a142cc3ac7d224853aa763dfe592f790ada4e4fa"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 751abf3d755b..6188997f7c53 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b8"; + version = "58.0b15"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ach/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ach/firefox-58.0b15.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "374faea01685a09e506c68649c15990fc8f3b274e2e0c9e8ba6d939e7ce32adae3ce9ff98a5f853b6b3b61b21fb0cb30dc340241a439990d70282ce55c07d2c4"; + sha512 = "5f45451e3c6bda0a244fba3165336e63356d8d1328a111caeaf87fee565d6f4349e6dee4a6f12e10f350a351adc16d5b7c02807528cd2a1d700bc12fa82f5f94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/af/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/af/firefox-58.0b15.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "1dedf4685c2ee74b6389654172308c92c0054666010e54920d98194a3a37b40f19254f6502eab7c5ca3152475c9dcefd242f8ef2b016494ff8afd1692c45aad9"; + sha512 = "0766f3ebd914c2c9090bdb4308034919b73d448b63bf3af6ff0758c0fdc8727ff0894fbfd5aa90bd6179fa07fe6483eabda1a23a8b480aec06bc016e30ac5004"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/an/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/an/firefox-58.0b15.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "bac65ad1954e171393aa9c5cdec78d753b5699707b79ea0225ca045f36d341802e9481fac996e4fe153a81ad8f0b0f4c31ddf3b2b1b2773e90e5c1ab1e473802"; + sha512 = "cb0b48aceb07f6963ff2c3cef2488c7fc3c13db9b142da555ffe7e7535e3d4bebad102eee515968163db72238d6ae182ead1cf06d023070f3d7e758256ea317a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ar/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ar/firefox-58.0b15.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "6cacd3d76eb0307ad612e8e7eaafd16a4166c53508cb6b2abc04fda258f5435a20240db03529d5791afa0494ea5b68bb206454ad0abb23d64c83d1acfa6eb84c"; + sha512 = "1728cc93196e1d3bc1f6894faacf522c84ec5c6a1b6ee92e1d3b2216344c7e8e836a43b224267676999b8953d7c947b181688f7edbb093626978ad64e120ec8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/as/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/as/firefox-58.0b15.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "e49d8f97842c7b23e066b3085215463df6aaeb6cc5ae8459648aa06ac81964f071c71c4702969f83e2b6ddf67167e2d920e2051cd919943b38775fa66b707315"; + sha512 = "31f649a7aa494c6503129c5cf84917d6cf5bcab3aca7258d654b1ca451144fe77962e85f96515dfb6640b53db02b39bede04f9554b53beb82ba7c8876b2fac11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ast/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ast/firefox-58.0b15.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "151b6c5f9126dbfb9bdddf8cce3b86fe11764a0294531740a68b547e4dde1da5152b4a61f3cb0b40c25e638788af6adbb939087e08355a0a4cb9b67b0ce3fd30"; + sha512 = "8dec2578c4fa48dd54d3348aa0141434335e2b3723c107d38f52f77a9f6ed9f591753a3db133d2e806c9c5ae1e26560cd8fce3adea253af21950aff0d70faaf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/az/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/az/firefox-58.0b15.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "f55b86f87f54aafce4a53e5c5e833c900a8e1e368c0a923f9767e13c401931b3fdcda27b19dd6b8686368a06dfc61cf922515643e1d2c02aeb7472c371a76b75"; + sha512 = "857a83e79b80509012554577c84fbefd471929ced8328938246bfc8521c2064fa806d1dad500012e9d4a5827ebf19ecf7d4b525fcb12468779a8dbb98fd2a64a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/be/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/be/firefox-58.0b15.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b72099047fe2b814bf6ba37a261627678009f1627f16235365c669ef92d6ebc007b8fe94484fdcaed0a5c7a0fdcbb23743bd50b0242fb416d2ff92775aad64b5"; + sha512 = "bb156950372b518c92c6c46e8c99eecdbdf0639780a9f73985a3070562cd1f9690b278fa5acbd710330f5de47b799a38eaea45e9f99d2801bc3f156852b7ff9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bg/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bg/firefox-58.0b15.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "13e44eb7e4db8e8e63c52d50318fe484691436bb96f8ab202370a4e521d75059c3f836c8c25cd95a29fdf368b819e8a7d67b80c5ba23821ffc7ff3f932e9cb3a"; + sha512 = "1b25f238754ea4c4798b1270874a7a8d33c35adc011a55187e82f8b77d290e3fc5bf97430622aba8ea155faccab83c99d4d2c66b49f4f2304293260604879aa3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bn-BD/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bn-BD/firefox-58.0b15.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "b5456db45f852b8da545a66eb697793a59527083bdffce50d520aecab650d909bc37d24ac461ac8cbd45980bcddc9d27d8eb1346151fbefd10fc4d6821323ab9"; + sha512 = "372978404f4c60dee651d31d7ed62d08629d9c71f774f52845af62ccea4c53ef9b6346acd59e0b2dda0e874378324c87de1f298e3c83318c73710bb9015f2588"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bn-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bn-IN/firefox-58.0b15.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "2db1811f35f64341a9840812eac61dfa7687cf030044441ccca94ffabc10b8acaceee47e5b6b2498ab2ac8bdcbad43837b28466b8e332783ab5dc25ea42ca8e3"; + sha512 = "b49a4e86e59a425e02e02f916285fa8004e6bca3badfa269a4ebe25b4548c053ec32b195c59eac6cff2b9d34c966e46df0d51d79f0a95e2366991c10e02f4a38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/br/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/br/firefox-58.0b15.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "373deebbe9778c3f8007baed0e1b0816174c98c1f08a5a1c8deabad0ac61aa1bd7d568254feaa8ff7ec250d4c8fc56fdfb30d8d7c758276d16e982eb641f8eea"; + sha512 = "151120faf5408a4e6ac7d4513ad4094e3e816d8b2ccbf71880cc5381f0ed5db2442a5e915809121a37663a726ffc7cd7d708138ad064ee34a01e8b4dcd46a2d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bs/firefox-58.0b15.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "8a8370537e076452bfb31817375ea13841722c2125c30af6df732f12455ec590e0d6eacaa7d04dca1b4e46b02d2d051d4d83825b5ecf69048f5c706232be2393"; + sha512 = "efecbe8eb985fb8dc670f495928bba2bd14fe90f3961f2ceaccc7ccc0f95428c7895422433392c0197907918db8a47525d3978716ee98d9e28c905c86611cc9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ca/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ca/firefox-58.0b15.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "75d0c63a7176bfc26dc19735a0540d0f65b5e8d06af94163f39e588186f713510ed6b3788e3229b9135dc28f200f4116bdf0028452d4146a3cfbc36a11d8a0d0"; + sha512 = "8344243260a556097b39151c7a30ca9a3995464a7714c59a29f6e4c8d403747c1c42b3599e2119a0d95beee57b16ecf5d5b0617ed9c01ac4c1d9a3ca99cbbabe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/cak/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cak/firefox-58.0b15.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "c7d8776a1521bc7183c7d988bb8d2539902a93bfecf931ba51a33336920c7c20be87cfb8fcba310f3f8970567053d98b134e28c9bcbdcc1050f54e47fee731e4"; + sha512 = "59410e166e2bc7e6b33cd7dfb4874afb10c1370b5111c8eddc2a1b8f850a758b5069c96a9f8a9ef2b3a8542f5f2bee1e9317f9de348d9cef71d7b3afbeec7f64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/cs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cs/firefox-58.0b15.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2f20f2c1d6d45fc70b132909fee29551cd52624b7bae5984ce32c9f138b01dd4a591d982d6e25da69a9c812c7ec0e5e940d5b8bef17c2ae4edf44a6f0c77b23f"; + sha512 = "36ae810e289df49c7f7510c53e0bfb271b9db8911f3bb035d5c6f3c6a05b3086311267987a0ff1b26f65df8f712c3088225cd8da403ede3872b160b20dc7d8f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/cy/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cy/firefox-58.0b15.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6f6a75f9464126d03cfbd1978ab1eb5bd447762f580b688b2fd1df8813cb95725393c982191da67943df743c5083e3bc1aa79db3961fc9d1fbf7cf00a1dfd224"; + sha512 = "3c0bafbdf540788fcb6853b983fb1f333288364565ea4a521439e011687c4eaede93433fa11e156592b3bc665ba30987e74a99792af642a08a526d3364112f47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/da/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/da/firefox-58.0b15.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "aced21c9628cac4da0c8441da22ac63f6958f3499bdf4c10a18f5b826cad0a4c165ed5e4465e6d56b319e0002b8f13da86de0874d38ff08644490eee22b685e1"; + sha512 = "9881bb8fe03243c876b12e84561d92b9b44455b4a533eae382101d052a76012be5ffedcf978bb26f5bc1fd16bd51dba8d7d8e2fb63577824fe654e3010b0f600"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/de/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/de/firefox-58.0b15.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "74ea14fe715b6f618431a59207d1758b2aa80843a6e476989342c16c8fac03d6a79c13310bd81128e40c4c9de352f1271ac2260ab99517fa685e0313e6f121c1"; + sha512 = "ca0d7bec2d061d7d199394f4a91671eae4a39242b839045dbe2423943b5b5547c1f71145aee4b4661bacd58df30e7128ef54a4ccfd3262de81b4e7b28e747cef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/dsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/dsb/firefox-58.0b15.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "bf2f10ebb34cb5741b417b1537fe3023ab896bf6e6654bdb8feffd4a0e5377b4027e6dc550da4ecd0e51c03ece13923501bc7eb9aa6102056757f2dc9dfadfd1"; + sha512 = "8e94787316bfe887def6a6147b2eabd2840d3908eb24b6fdbc5d3d18432fc331144b895dafb2152a20bde11f45c3ed961bf57143a7ff0d65bf205fee5a0d882f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/el/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/el/firefox-58.0b15.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "32ad277d0b5403028c6b7ae3da8bada79d7b6eef9475332f98555eb10ffe5ed2a9a4b3c49789528563b180876224d48c594601844ba048158daed8e23bfdad24"; + sha512 = "d216e8c19e805bf7bc3bed1a0e2be4677c6ac1bcf478ac9ed483555fb930775f2e75fa5a24ddb7298ae0f0ce3387bbab65d9ed18c6422a574d688c48801c31e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/en-GB/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-GB/firefox-58.0b15.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "fcd070e453e7fe95aaccc6478ad1ae120231ad5b44628b7926ee23c239af8b03fec70c7fafe6669d19f0c3c5649104cdc31420f6c8dacc6077aba6939e64502b"; + sha512 = "db5eba83f1e360f4a328cc44932589efdead7bb9dac03d3e24244ee5134456b149d879510bbbd762d5a64dbe2a965a39a7e2e10d8517a9276ad6f0e430101387"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/en-US/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-US/firefox-58.0b15.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "24f90c33ebf850f55574547ca696d46ef05fea3257d563e838f3b6d0c37f3b0c3a7c470e36c35784167bfe3666bc20c35ed56155ce5f037468896b2885a02179"; + sha512 = "92c7745f480aa31141d47fdea7efaa67488add079b406f9f8f8b9f5a6cb066763dad197fc9bac4f31fe395c0d8c4870cd82b3f3fbd67dfadb811cf16ec6cae6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/en-ZA/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-ZA/firefox-58.0b15.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "eb796022cf608001a75871ca71402027ef4d8e0299d878fb0d72c63a51f6a6eb7bc7411230351446a0e43c7911464765f704aae93364d46454ef72f2375bf930"; + sha512 = "74ed9e4e0f19818a909b60b1d9ac6e4339c55e4be2d1ff69c68e9efe35619e775fd8fe9675df3b7d32b2fceaac4e4b7828c3e0c219284da712c50e097d6e6ce6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/eo/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/eo/firefox-58.0b15.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ae0710bc6e5aae7485825bfd5e361ea3b79e77d8134b0a2886ac43e9c0a5e8971cc8ee925a0f93a8047d58dc6e4d821730054f375f62fe449430e2d4de6ae485"; + sha512 = "24f181bd168cffcfbd100f1e8e0a653e87f6558b2bb86740acbc1cb572899b23c96d36d05297420cb7fe691180eb2eb5ce27f44a7d7566c43da499a81f294d59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-AR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-AR/firefox-58.0b15.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5c2be15711edecf69a741aefc94ab0f537991ad30991a2b5bcb4c349532a6af319b3400b6b0d2e9bbefd70c2497584f10595de0a428c59f5cc6f6d09a9eafdca"; + sha512 = "ae9a27c1bd1029881b8c671621573a3567524d90ad908ed41bec01fdf20633c779a4d5d7071d6adb46ad9dfeeffda24fe1fec68043d61325af4b54ae69a4c7ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-CL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-CL/firefox-58.0b15.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "76d46741a0649526df0f952458e1681dfab814824a849b949f3d863e99f053d456b2f3c6507c40536e9feb2ab0c34438be6636ee55fb61056eb5de6faf5b20ac"; + sha512 = "1b83ea05e646fc9cce6680f6213d7fda11bb215cbfcffb3a658b86400d532f87ff2634ef9ce41800f9c2e52f996d043db24568eec2e1bd600e3269a1a594f3e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-ES/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-ES/firefox-58.0b15.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b8deadffe58e187bb4ffd690bc8394a41ec7c4d1d38046108a16890404ff2a7c2b70fd38499e62e5949f8d31d33d9222200217ad487d6414b5658c87c928edd0"; + sha512 = "fb71902fd787c132a796928235e5c5d9f2a5321c1d0d39796560df7ec5de4c4b9afd2b8fb8fc110231ba48b90ceaa2435d27b9e0a4901b7ec0fe311637bd667b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-MX/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-MX/firefox-58.0b15.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "deec9e5d9e290d69aceb76d7b38f958cf4bbfc64f64bce865d46bb04b35d516780abe3b53bb984c496218f0d834932d9b87e3ce2dd5e224e6eaa08114ebc4af1"; + sha512 = "bf2fa28f6236fe3d0412184281dbeafee1312c73c7e4e8198dea6826bb02104f6612de2cee58dd06892b97545ed21806222cb3dd1c6376cbc84c0614617ba062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/et/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/et/firefox-58.0b15.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5587499ee0cdf1f6dc70477c9bff0e74c5817e7fe49ca998af74e385bb6d9a8362542169c4d34d8bc6911687ebce9a0bb4992aead8a85de82a0b290c82622873"; + sha512 = "42de2023547ffcb44b523da8dd6b03882508a4afdc2958cd652895517679d2b87e153120de501dfc9898f7ddebf99e9807ddbf74c874c0182d3c0b0de3c9bf2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/eu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/eu/firefox-58.0b15.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "dee02859040e8da81deb5498e6a5a5d9814b08ba0f73f0772d41f8641fd0887917c979c3cc2ffcf354842043b03b9fe2e844e5524103e55962d85cd6ed0fba06"; + sha512 = "5920709355e1873c8c809ecabac2a5435050fb4449d1bd6efb565f0a3b0f54b80792e31ee4edccb5c280fa19a673ce0ab5f54ee7267856b19ecc1e6df0b48b97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fa/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fa/firefox-58.0b15.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "bdf707d278d68031ee2e490401a357161c07eb178f65babfbe5a7df2a8ecf4660ba2e2cc4c46f01c092948a8c5d8917805a6c1bdf4dfc3f66482abe31e00ec08"; + sha512 = "70ca3fa3345c551bb64f1d5dc8aa536d8879eb3bdfc089ed58603401550fefa479d13451c134a797f779cecb63d8d2e2e8e5c5d32115284c5f715e933a9a9a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ff/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ff/firefox-58.0b15.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2f7e1e7e989a26c185e8c7a25c83c3f138c24c035aacc1b68ced1304e87842813f6366003c9b5cfcea775a4e0e9672f994dacdb07b5ae9b72d7e296c77a80dc4"; + sha512 = "7edd5c4a088d9d546a070385d2fc06231792150e3079722c24d3936b84899ca15b548bf47528a7e5795470447716ca4e7457c252f0338e87f93180d1fdf055b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fi/firefox-58.0b15.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "49b04a1dcfd25571227e2df5008658460223ce5a99e838040f9b708e4787a54842ac2e0847c7a2fa5d03175eadb6b1b99ed42a1557cfdc87b2b765773d4fff4c"; + sha512 = "01e080b851846efe29583f5e5feef0474d24b44072007cb7336a639b0b590388e80aa7213db3a2ddec2a019722c606d26398711c4516f97bff5af4b33ecf72bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fr/firefox-58.0b15.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "63d68d7cfd59fa6280ad5f4eb98d19714ee37abab9d7480509f836ab59dfb82dd8eb35ea40019eea2dff3569da0e4db499494acd81c4d854954dc829c38ae614"; + sha512 = "8cd3b3f21bc16dd125d74073a83095111972d963bce5f0c46e53dbb82124ae27b13d18f75269a8e689e0ddb95bae8042e412ef5ffe85257cd46f098cde811ba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fy-NL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fy-NL/firefox-58.0b15.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c5aabebd94ee53dc1be189f34874a3739b959cf68de3e580684ff8c34f3d8b85408bc76000d026445b5e68ac01dd1c82b12adb7c1ab64b6cd6ef56559e578508"; + sha512 = "b55dcc12e3b7d8c7227fa490a87375de279df2053847c9609dc168a89a1012aff268373011fac397c655fff39f2bd47d0634f0086adc2d1f6a26ce4b2aa45a59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ga-IE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ga-IE/firefox-58.0b15.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b920d3e352848a6bce70288a01cdb5065679e3db6613adb86853de5be42ccafa525c7d00ce143119572b7717411250ebc7e1ca71382d0f47918df9e239e8ba97"; + sha512 = "8563b91045395bbf2b267b7c1821b5a413802d1b738f769a10cb1d962c6b7e43ef8d3119fa17aae69d2833403d027bdda09f1766757717575f74d89b72106b42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gd/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gd/firefox-58.0b15.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9e236bdf7a23c6bacfacadf3f0413e67a00c6efaeac065d99bc865a75b888c14d37660fce6e6a9fb1e01789f429dad69c0fede66c89e215e0380918118ed2b24"; + sha512 = "da416b1433044d32e3d935ba20fda52b10eccd3074f1015e17e7f3acd68d1993e8bcab39dabbb4d5dd820aca9838f2646b669ab027a75f6cb4cad1d442889ff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gl/firefox-58.0b15.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "53e52194563e58328ba587adbf3e9dbe897ab207fc3c3ad00263bb09380b335591a00f0633f6efb8e25ccb48dc72041f01b1e384d7552514e76337c1fbc487d5"; + sha512 = "ea61a7d5e2b5ca4f6dc84aaccf9121aad5809eedac424d6c960724ba742708e17805ead7b567b3522ad4c8517c7632e05afe0afd39de61a4344ec3dc415d03f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gn/firefox-58.0b15.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a2ac0d6c8c295c7c3f4f306d1ac4b55007a70090fb693d2e6b873057734d6b7fbeb2c0624ca42c466182656025b815f42bd16f22bbd9f4d7884cb2959559aeb1"; + sha512 = "5cf347e0ea276634114dcd35bf49b47c57d86fc8bfe3f1a87b2eef93fddf272f35113e76a65340f61f03b525f01782aef42e2539d9db9a3fc55d6a3582127892"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gu-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gu-IN/firefox-58.0b15.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "9002e67486e672ccc4602e3915f351b91c3ad62e5ff04ae008c04f5116fe7ec1c9cd98acf037a0e7a7a11b48ce0a327e43ad2e49e12b361084cd445837fab47a"; + sha512 = "7d54b897c513a1ab865cf663dff5a1722b0b73715c4c195e41102c0165bc55e4fe1ea0c5f5438d719a2c6fc334876c055201b01c04e4072d5df5e2ea65e5de0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/he/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/he/firefox-58.0b15.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a4d8a61f6709b37ebf2e0077146496af69a7dd54002f2261eb896539d24194ef3bae321d2ae4261b2cfbe68f06468d6e7cccd9e9ab1c748e44bb7b69aa45dab4"; + sha512 = "1963638a0d39db6b60cfe7d8a9e0556ca4923307469c1ff75c6603ae8a528fb57efe74d239ab730b8602d4e974b91d9af5cbab9fac06b6fd6d7fe7b0646f5cd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hi-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hi-IN/firefox-58.0b15.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "33d014b4ce41d63e0a28b41feb37d07a8088dd105f7bcf2006fef4069735aff64abc126b627754a1290691ec8d5a6e716254d06cd4983a04fdeefde801b03e05"; + sha512 = "e3f8d5de30533e2c4054d7716b6742906f648059b5718e2efc7d4f1c7b78c6a68eefe9ed96326c5580a2faa499349f3a96e3abde0a0a841d39c13488ede701e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hr/firefox-58.0b15.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "9fe426d0cc38794a1a08df2b14bfd893348798d699e1861ec977bd2131f72790c5aeefa5c3576a2a6f3bd460e3f5800d33ef4ac867828bd32e5a2c3cbb8eb5ed"; + sha512 = "f2018fb0b5ba5001c63ecd0ef6074e8a1b7016425c1f1bb03e2ecc394e6c2c5e8961b5a53810ed1ea6e1a1e2329653a2d810bc996f786084d1b1381114e94eff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hsb/firefox-58.0b15.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "19bce4bf9c6a8c33519e4943f0ca2874538e9d5da86790329973f970817b54a36b9a2a0474267340ac29c6c3433da700a122dd07b0b72939c83d258dcc320c94"; + sha512 = "5e87e5fcaf378d5e25421e05315d6e20482670c1c6d659acced5a5db26078ae36f8de8c1a5c5efae35a5658ff7137930292506daa56fc6511ff592be621ede0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hu/firefox-58.0b15.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "707b6866b17393d74117fbd9cbf779f4f41d5f79372aa96ee894299218f2454fd06d5286f1057571eebed474b06614fe52347df9f27bf47f23c432d234976964"; + sha512 = "b1bd4af70370b4af4a43b383805d492699746cdb07501e56f078800e4913eff2df641c775b850b1e3bebb8338eb91b5d6306f9ac1dc16965c139a1aa4a379f72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hy-AM/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hy-AM/firefox-58.0b15.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9dc546d19d77daf0092acad3ef48c7699d1a46270284448056d3793fa68e409d8335d92a105b3cd3219a6dcef5b11583cc45f5a4a8d27761c0e2475eaa101a4f"; + sha512 = "b2d563bb7814db8bd0b6191832d5fa525b32821bfdc28a759c7245999fc7df70484bb22013dc1f40e467c24dac752c6a6bc8616af0c226c9983f24877ceffc40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/id/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/id/firefox-58.0b15.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3c080d50966d5821b24acd6181443fe4c5095a8dbd1b2cc7cf550c5e5a191a2ba1a78f02a9c1323045445ddd88e28cc3e3328fb07e08ae0ccf40f2335b1205c9"; + sha512 = "5b62d1040b77ce3c2e0a5fee2a4216a0272c4cefd7ab2b8377133375a633b87ab29c06a481294acb0cd0976bf8d61382aa183c078f3b762137a6750eee9fddf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/is/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/is/firefox-58.0b15.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "30b3a169fa8dfbc7ebe1402f7a28c7104c0b03ec5f038596257a5344649b35579cea31f7649203e1db95755903bfed81b095de622aa18f5901c4b3f8ba64bcc7"; + sha512 = "5d30ef6381800fc14e71d101f612be404fd3ea4696ec19a62fa7fbfe3ea3b729169120cfb625bc3ca49f698238aea37131e2bc8a056942b79d026cbcacce5525"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/it/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/it/firefox-58.0b15.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f39586f05c3d696a2c22c183e37d498d4192af0b33fe0ae4f534a304d7fe03a745000b6b2686ffc21bfd7dd2abec1f68927515959a2f90ec29186b4050b459f5"; + sha512 = "ee435c2c9bc9c5eb69077832ee2119792db3c3845d37fbe3df47f3c93cd7772eebc65439286c55f76b9820fe97184218cb2370a436c9f2873698ff6e53491fe3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ja/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ja/firefox-58.0b15.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "81e9d91d20d547436060f5ac048d7445aae010843d2d91a60489c05f193a6da82d0acd198ecf76afea76e62c56972d420041ef716cf0f6799f1a77f7ff766556"; + sha512 = "44681aa65715dca2a05aace26bcc3b05e8152b07f44017314caf11cf0bef9c017f4522880b85c1c859a684d92b6f653e0c822358635344949ed9964add31e4f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ka/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ka/firefox-58.0b15.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "f43e6203a352632d040a7bea1744ab8c5c02e027b4d07286616d612474ae8addee8ed5e70242f15e8a3e1e309d25b047e462e498bc98a50bcada1572e99f8fc3"; + sha512 = "e2f9069563f433c6b8c96158821336090c513121d117705e07511b27565a159bef17eca62c82394c0fbda40e6e1d330fb976492b96b7160c4ba797ed5162e435"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/kab/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kab/firefox-58.0b15.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "bc6fc3920ed2cd1a16291c3ccc198035f1a98bc900088224b4341a1a720e172288a6fc74f587d39c2f2aa74e791b4b814c1f73b09886b93ecbf70dfee164491f"; + sha512 = "7447556d7e0b24a693bcbd2deacda7acd55bc2b8d3e1ae50eba1b099fc9371438ff177629cac10fda9a071d0c4cfb3d5a9247a9a26e9983287a004cfd9759538"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/kk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kk/firefox-58.0b15.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "46aca65821be029de46698bba961a761994ca657a965896c199fa7f6c43666de30f3997094d373d5c42e74afb5b440390198cdb3b9ff6d50a51968ad083c88c1"; + sha512 = "0d51d10675e1e4bdfbb0d950e01765c4444ca321de8b4d4b9de5e491b092ff6228da38c104bd7aeb1313ef869b4e7f44e624ee5aadbda0181df17fb5fed7821e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/km/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/km/firefox-58.0b15.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e7ada1b9746bdeaeeaa5250e00c72940c17b0a7e3b2c420a6e4b2aff29af4e2eecf2acaf6d9ab80ef7bf6d53e20e5a2e8d5ae4e66c50fc1275e5b0b045b5a73b"; + sha512 = "39c765359fa3682e24e4274c8d57cbbf85757e46de0752a3fa245f25083d4696bd04bf0a3c77a909513223e71f98034706b8a430f1421f79bc8c5c45e9ee2c54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/kn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kn/firefox-58.0b15.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "5125cfa77abfd6a40fc940e20e628d8f8af8efed989f2555a6353e56150beee54b0d6c4527853d974782c9017556c67d8c875b54d6e3955e7f610489ad7c005a"; + sha512 = "4978c88d069114919049f6912d7992daee1c6d6c1e4c8badff395102a70a3b7bd287be952f1d13a17a338ed84fa2ce60c8c0c6af90d9f20717b0a13c4d982ae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ko/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ko/firefox-58.0b15.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b3dd52fd00e4e5e46ca272982538c88c6698491a0cf66b2cefa83eadf5ed15bca946c75ca8a459965989b09b5910331a77a239213ea310f0368992c9467ae04e"; + sha512 = "abbb991b9794b8b3ddd6f5ad6fee318917c3eaf983bee9314b57077e10843867f9ec51011af0a6f60698bd89a48a412c99480f5e8220e1f9290c5a894025a46b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/lij/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lij/firefox-58.0b15.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "6c6009cb4eaa607e106adf5809e506cfbc7ec5ed742cf343c945ef89422595f41290e68ae272e73a403ab1d198c46527a05efe7cac2b72e2d83acc79af96657e"; + sha512 = "56d4003a4a3cea35040caba319a12c8d651c8d3c2f78828e61da734d5b2c219283285b80d4a05ffd3879cc1082c91e8182ee8b02af5d278c23dbd930dbd19643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/lt/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lt/firefox-58.0b15.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "eccb0272b5b2bbc5679909ca2acff50f9c472505aa75f15d9df650c67a3f0f4a783b830a564e69b85cb846a30250586dd65189f9c7b27f02e67497fc8e4f51bc"; + sha512 = "4b05b042c880e0ec84891545c8610c0dbb9a6b68a7f711226fbbc32f07dad8f6a2b58d74cac35fc70d8ba797771bb0d8de54f2b7fca6cf94efe2aa78d409a609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/lv/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lv/firefox-58.0b15.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c97a68438fba75d3f254782ca569c62eef6cb03fa3334abb4dc4f9a2c80594af9511b1b43b5c787f11227e7203d20312a90e6b64049a89b9ae4ce0fab51958b5"; + sha512 = "ed21534a306ee94b831c126be09d66a4716f03548af68db292bfc6d05620cbb08fc428f4c09b098b3544d7ac80275ad74302067064052b3e4873b3d96e9f2acd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/mai/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mai/firefox-58.0b15.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "2920d54db388ab2460c88998c0425e8bd0f0d34e42f935b3e2183f91a517d4d2ba447b2e23404377d4c7137287d8b052b66dcaf59f4bcbfba288d3b27608eeb4"; + sha512 = "2c6869b152e7cf381e1dfe97e3b279eeec8aeb6e4270e0658ffdef8c4753620c92eeeb75892698f55c438191e4da6c0c34db82ae8f1148ff7ff3a3c3a35823bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/mk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mk/firefox-58.0b15.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "ae03a8d6bd67a2a0dc8368014a0fd1a19913473779b8de4b827c0784e003ba76971d4209e03641ab776b3b6ce1ca5e32a8cd6f6719dcd3a0f1d9875f7f3ae040"; + sha512 = "a1f6342e77952dc98165ba6ddc5ecec0136010df94e4c8b56cba2c84ac98d9d3f2808a4aa22f62cfb6b82568b1079409e4a3a38f723238dd063a2c78c542f564"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ml/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ml/firefox-58.0b15.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "fc9a3ac3d78e79f2fa67cb0b62ffbe73fe640e51356d800c63b75a44f5722c20b4b79b19a37f6f374c5d8777201a7499fdcbde8466ab40e6d8bf1bcdb819df1e"; + sha512 = "627e4d2e377b49aba9914ac0b9770e177b2d7f9cba2e31a69b4abe3cc0bd994a8f3c13ee1bce79dec41be933efcc80976356a92069559a3a17bc47060c23a3f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/mr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mr/firefox-58.0b15.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "1c7eca59d851aeedd98789625ff29de57cfdbac9b4a51c0416944178bef29777e32a3a04f29eba0cf91fdf5455c6315d314f75f2705e37332b0f83949977e167"; + sha512 = "a3228719d54631e88cd7896c4dae4b224c151215130a406930792e65829ccff6370168c26b1cb1064a4904127518d7a6396e9f62a293d7599712cb0ef643e1ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ms/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ms/firefox-58.0b15.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "eb085583d536d6408435eb81ad28ca9c267671ae17a09ca388d290d633db2bc6108c43e2291fbf12d344ce246eae402349a7e606dc6ea35d1a87441ea6111a73"; + sha512 = "113e85e78f3bb8f276aff510d4cd8940493d6933cd5c4ee1bfb3cfe9824a877185fcd6e2f21d916b29889387c01888a8d552868686ca5fc6290860fc14397e8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/my/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/my/firefox-58.0b15.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "f29675503c1dac871f8870a891d52c180d1adc6ee66a5a6935d6db92f66ebd4ec8dd699d1625b5f5ce0eebdedd51aceb0060d1378ac2afd0364a7ba1de670848"; + sha512 = "40e5686a312ff47d88668d1143fa579d44eca31003b08936b11560f4b399c859c569a461e45a537059ecef17409a5a161cc1b7ef0181f988b1ece49bfeccee0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/nb-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nb-NO/firefox-58.0b15.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "78676ec7bbe66030f3b6e32b0a2d8f0f1feda446797eeb244ba2bd01bc595f53160321e9dcdae5b309c94c7cec542e44da3ba6820af86578f8a4203926ca07ce"; + sha512 = "5cfe30e510299240023027864fc54e5ae0c6ea227feae118b2e68573b0a47b1f823057ecdddf887b0a9544972f7430b467e117d9dbcf75a712c6f704960d6f34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ne-NP/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ne-NP/firefox-58.0b15.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "4bbcafad86f06a72ea3c9e97ad86e7fcd6d0cb15813adae7ce1551f7bfad1919fb5fdec61a74886ca04fa01b4ddb74538d71134659ac0ba298eb399b43e8b8f6"; + sha512 = "b5dcf09607b1307418df90868d1ef9ddec2a9a3f212caa9e10a1a0cadd16fc00591b275e7449a33c6cc527639d4d3244effc551d4dcdb8458a05c9544002ebdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/nl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nl/firefox-58.0b15.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d9c98d3033ef409d9a0cbafe18f520cda798544b79eb276056f918990b85dfacf5b2a666b3068014d26726c7c5909cb7e6995cd8843e39fc18377f70c6d5f3dd"; + sha512 = "5a7f2ed01833cab7c842c1ff769ca200579d02b24140e409203b039b3079d75a26faac85e6ed3d8b836808e2c0b78242657cc1d08d1a8837a26a3de599ffb5fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/nn-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nn-NO/firefox-58.0b15.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5e25d90a50df3be1e1a5ad9fbdbf46f3f21a051a06175fb17025bf169be21dcf0ef9c8e76d95d8f1937104e458d81780d5d13da90ca378f3002a779e1117cd93"; + sha512 = "9f9a1047c106c3a94693b62a953d3467592373776dfb65f2edd8d21e9ddc880ed1e653755f7cc3d7e828e77ade67399d6cd91eea21f216a69ffe1f7275f217cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/or/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/or/firefox-58.0b15.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "92e9c1cec809ef3848c4eca34c3650ac48264c96d701c0751b932d9cb5e96d25db2e0bfefc180474cb0539bee8b3bb342f4f73b03792ff31a8b5bedda43bd043"; + sha512 = "d2ff687eb536faa2c04c9c2329609ca2b8149fbba69104660fef1f2c983819da206d6f3976592175ea6a2f0debbf7c6f52dabd0f7d5ec4a0c4c79a34b99e56d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pa-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pa-IN/firefox-58.0b15.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "449cf09182235406b72ef3658cec68a44b20a53eedc16d1798124c42138e788526db848822d2db05cb2cc43cc9cd4a00111f9872e74aaf1b4fdd20e94475ecb4"; + sha512 = "2e1823126cb95ba1e397430c5cac4fedab93fa340c3c1b759bed8198abca37076dbe40ce5bc8e5901a307c4377cd9d6356984ed6e058f22048efbafb833fb76a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pl/firefox-58.0b15.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e110aed2110edbf0746fd8af1365a176e1df84038c4fd5f6d31c555248af8abfed762a5f175e824330bd895140c6cfa0df1547a7cc0456bfca3bf67da7914fb6"; + sha512 = "e6fa41fb0780acd1531f025b31fab48440b6e5b4b4aa2220a77a2ac2aa40e26adf6454b495f61dbb4fa19c30904533ec4beeb5e87bfd03fee5fb048c8a0632b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pt-BR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pt-BR/firefox-58.0b15.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e8bbffaaac4326d28bcacfbc50acd5e0ecd07620049676b2558012923f8614d3ca1edd38c63cf80803c675270db5a8936479e0baff032a04fbd1aa53b5c67592"; + sha512 = "355dd4ebdd0c1e1e6af018607473869183a892d638e0e86124f5463fd2d25170b9edc3cd7bfcef672cdaaa74cef5700dd1c3868b6cd9019761a4a0d1065ac3a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pt-PT/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pt-PT/firefox-58.0b15.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "450e95b1adebac340ccad5473222701c80e01ca73fc34f216f150f58db87fee610185d4a9dce9dd6c02f9d9022ec685d793fb2919563cc252bb428100db38756"; + sha512 = "afe2e095fc5bdce1a5637907523f9ac097695392aaf496f34d77438974262853273b9b122518d27d67e30330f5abd54b02cbad19afe4f254d6928f235cd77cb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/rm/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/rm/firefox-58.0b15.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ee0260e50c8cbd8ab3685beea8283c1e3f1b14509ef117ff3a4d7cff6dbcba370cab5ab81714374e54332af7df696705bb8d72f998800d900b594ab2592c7fe5"; + sha512 = "666e3ff130699c8ed50d06a43c82fc7c1afcd5336bc29738272914acdc5a9d3750977d45570c37ea58a6b117b772d7c2de1997272ad37630c8eaddcaf3a94492"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ro/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ro/firefox-58.0b15.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bb012d26dc2e83c8fbf23fb1e006207802edd545243eca02934b424243441ef9f0cda77e044d203bbecabf29fce021e44dd697d8a23d78d312fe35b1fb7cb740"; + sha512 = "bdafd6443acf92fb17295a140c3fe1ecf7c792d8d592745c271c710c1a7118185b4c0d40c8630a0f363e60acecba942448a7e07e018a869ab5381ded6c2abe3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ru/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ru/firefox-58.0b15.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "153870f69b37e88827be0ac443957d4e5d3be8fceb45b90ab515ae8b1caff2d819c6505f9491b5f2b529020755c1f21f25b28fefda13467cee439ad86f8a22fa"; + sha512 = "c11352e47be8b8492876c57535392e2cf5f9c3dd0ef0ab9792afcaf31cb5cc33fef38911c495369c1ab47b6ad331aa9df876401b57c010e6eb7f0fd3fc972930"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/si/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/si/firefox-58.0b15.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "68d0e175b8476cf90cf6314df86f454728cce0cfbbc7ee0a9dd7a7b27dcb8d92781b195fd2b7f8dafffd9b1beb127fbb854c5855c89119270e77dea7ae6901b7"; + sha512 = "b84c48da9c61e5770fb231a632cc135aadae4e8631f13d93f46715633c510c75e9584de9892b02683471b40bbc33642da296242ad5560a708ef9e83258a5c9df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sk/firefox-58.0b15.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e3dc52dfd8f33aab4450fcd60843ef9c8c8e428bc29616b2e4219ae1501f12791a7eb8c4b3b89ee84bf1119d35d650e4a40326dda89e3e40054561c7a0826ddc"; + sha512 = "5d5a6d4b95e44838d58178cc1854c2195bed7b1243b355b568d53d8ef9e88e8173e5e56bf68af1f9a050ea0a0f4b6396cacc158e86b3dbf60d3cb092ab9dcc97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sl/firefox-58.0b15.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b80036624f112a1726cc20c8cc116553f2eb8e1fd18165fae1b51b1299180027474f927ab54ac2cb54b62346132ef9ba6226e7d1c3f68128652c00c6e4c89574"; + sha512 = "6c5132b3afde69ac5583ea8e36f513c718b2e79a7c0fe28d39a3cf44ba94ad5851088983806977f9035a26c2f56e1388f6d3ecc505abb023d1ecd82c027154bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/son/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/son/firefox-58.0b15.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "9da34f34b05d49df4fffd410df74ad3483f85717ee4ec8680d3ca9691cc1a6a7fc41c67f4b0f581f7295f4ee4f2bec2b586a2fb1d26b6c1a73d63330220cde0f"; + sha512 = "7b6945574a142c73d2cedddc207d1ef9c2e49816f0bd9ebe278ef52e4340627fa17d317c70020872ff01f475ff641196f8c2c1a34b6438866e84eb6c5b1407d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sq/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sq/firefox-58.0b15.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f313862c0b64513691cce8c83cdc62360c144abe54fd78b0f517e08dce6226452c6767f7901a6826c3c0be560b7a1ec3df2ea6326655f316f3f14776319c7c7a"; + sha512 = "c738c5d3fe217e21ec8ee42c79b7dde9c12e948efd70298df75e720b2af380da301520f1aeb433270efc81dbcd61a38371601f0a30ad91bec04e4ac2c7c8700e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sr/firefox-58.0b15.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3349bb915250fbfb48f1e6cb57efa3edd9d11ceb1a691bf0eb655120c1e0e74ca272857457d4768a319fa32f7e9e0e671045902aa9c8b4ceaedd6aa5c5c9a9b6"; + sha512 = "09c3b2e3a46d69dff83f95babc31204af6bfa2360d6e970e2398ec22c6754fa6bbd4431ece822004a120c23b8a38c354e665dbad6b313c90013d36b216ccfb9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sv-SE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sv-SE/firefox-58.0b15.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "31140c5058ee05eab6af01f554e4a5dac5aa2cb28de0752b1a3a1b6e8c3283ffc74a0eea922f5466b145f025730adcefd7c971a686749ce5151f28d4f530f0f5"; + sha512 = "7e10ccf0ee053128d81560549a9ae4a08fa4a02a79c233cbc1e3ab520cfe1f1ac75eec0535754dc43e4390ab32d889427004ea9edc78b9bfba14a66818372c48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ta/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ta/firefox-58.0b15.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b0812ce6f871921cbdb77330f0375bafa6ac6e96a9d518024e2658c5c60e6b3fb966c845a8e02a900ab81e9fa945d7a26b482be48bd90359f261edb3d7a50451"; + sha512 = "3ba269ced4f8ada49cf88ab06a574f36da86c3c144b8fa9a4f687807688b7abc1e684016e34eb95cf31965fc6b427905bd717354e9d3ccd3349ce15f9f692f76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/te/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/te/firefox-58.0b15.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e3a225641b69aefc8382674209845901cc952846e132ca6a26d221ac2d82dbfe2716342fb2516c7cebdd75b21536dd1d5806970f450c7be517fab470e26d6db1"; + sha512 = "9330e1c258b53a9ef9767e2b3a5874ef48815890a69d40c879dece79ac08e2d8f22a5fa2335329408520119b4c76c7642cadbf8378cf3c7bbc6f179da9c02228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/th/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/th/firefox-58.0b15.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "430f4e2c2985fd7cbd22912821133d93a06e7cf1b34ed6d5adaa643d7446fe669928b3192503ed0fe6a91ff0b032551efb514caf4cd7af665e692224867d12b9"; + sha512 = "541a504d4f672a25465d626059bd50423eaae443bdee0727e4d5c074f2d94adbe07d6dfa0997c3fde904ed136ed0db24be34d00c94ca50d23caf9414b8fd1c75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/tr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/tr/firefox-58.0b15.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9b347dc72aa07fa2da560bdf2a06cb5202359a4be65f88ff68f93714a386f8d49783111972fc8635abba13f54bf32bfa321740dbc3b4e0250847c48aaa1f27aa"; + sha512 = "bfb1a3096a12a28e6303c97d4d970e67eb5695faf5bc63f48edc89343106d1f6c7edb8f2b8e47ef50c0762de43767a6c1a2773a5a9eb749834eee064c1530d78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/uk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/uk/firefox-58.0b15.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4e08a07529ed00fc9d0a48412c04a8007d6c5d96c7e1c133df9ee87c181203daa498606888156c16d67530e623dbc335c502ab95e088fa3728ed89f2cbc8a577"; + sha512 = "e9c0257bdd73d4b7316cd2af2fef0619de7ebc35b7e296a6dbc3bba5a6f9083e1fd4746b54ff6b52e8327934de04f1afc29f0a2eaae2832602f0beea3c838b65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ur/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ur/firefox-58.0b15.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "486ac7e11a1a3f01e27eecf5f642cd6bb86e0dbf40b098372b5c11fc067f0e445349fd79d4071a24ff64674b233c7bac86e26bac377feea3f1963282c4d2cee6"; + sha512 = "218703e174c4e7a7ae9a2df094dfafc062b1b34408383f96ff57ae6098c9135a280e480884b17fdaf93194a55f9c830083f06e1741bf9db494e69455ad237d53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/uz/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/uz/firefox-58.0b15.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4c65d71de48f339d647002c8671970d7116ca8d6baa1a3cb84dcc960ca2eae68b794e570887242d90f825cf4f4b6da4a0c0ba42f755958cf29e871287e7e5953"; + sha512 = "dbe9ffce9a7ea307d087ba914fc83cee5ba624b97cb68f5079f2951e7cedd42dddda2d0d139448506b9760e21ad0052993dd045072acb921277747e276a1ff0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/vi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/vi/firefox-58.0b15.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "075bdc79734d18d5ebd09e642b298c46fadf9734bc22bc40f497a3446cbefde70dca8fc70426f1424d1b655311b7d90708924e618a1333f977dd6fb78a372257"; + sha512 = "3e44d51a2b071ad7103046af3d7d0fd4c17f7e57a67ce1e5547d8a817026d41360fbba5e9de8d2e234a9ce8a8c02fe5e868f14aa36ecc0ce6f2b42bc5137062a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/xh/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/xh/firefox-58.0b15.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "88b392f4c40b9130f317c614671c851f27aa7eeb5f38e89098dacb8e52775cc6dcd03c91da8c6b68be6acf4ce25b5a8f8dd5ee012633f2bdad9e604ccb016a1e"; + sha512 = "5eb838d48f16fb16d08abe3eed4b17c24bdb2b8aa5d9e21c0f055f0353e0e567af4aec840291e7e882ed0b29bfd7c17a0cd20858a06bbd850a8b2e2c2f92feb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/zh-CN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/zh-CN/firefox-58.0b15.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ea160ce37ba24aad62e065a4988b57a6799b66a927f5599b7c82e8a483db2337968b44399f6b4f0feeb2b4effb654ec949c7a83f5643d619cb09b321d51617a6"; + sha512 = "9c5769eee60e5506cd26278323541a4d12b6bc5cf1df43379ada8a6e3f6fd724c2acdb0fc157906ec8e5c25f7f8e8aea4757c9a0f4c4b3b39abdd583f3881d3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/zh-TW/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/zh-TW/firefox-58.0b15.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5bb8293e1f5b2f70967e0147507fdffffcc0a8bc0c21725f37fcc268ac504cb8715f4409a91538db4381c480e482445dbd35bf0e8101d830726b466afd7c1106"; + sha512 = "4fa81789df000057f25fc57bbc0aa5a9222a7e6727fd9b2226686b95072cb1f0e381e9dec0741b11199cf29c180e40e53bb405aad57a445e3f311a1d98ba7f8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ach/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ach/firefox-58.0b15.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7fce304767b6facfe05da980aa05537e9292e5552717061b9195a4443dc4d642d50ad81d2b4225385b85890f788c3aec392840601a59927d823ae8f194cb1199"; + sha512 = "d0080a29b07af0ac0f97fa74a5baf5095050c9647181dc11cd2e11dc9dd11f21d4a70b3ed3cce97adca6ff33e541694c95373bb257957e447f269007edfb349b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/af/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/af/firefox-58.0b15.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "02a44569602c4ea62c529901b5873dce212f13657d9352062d19475e15a25fedf9a9ce3b7610f7b3a66c4f50b04125f4bb6bf2af310f859f08c3f7cef56cf46a"; + sha512 = "7b717d6c776aa85ccadbde1c97197c6390319a9e52cc773500f1b2d9aeb4d87f8fb24cb40ec8a1cf03e07f37bb6c353991acceee8658ef6bde2727ca89797e18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/an/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/an/firefox-58.0b15.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f30ee1dde96b7a1c304b13666b28817261efb2b50d4d62be37eeb777b2b176596bc7c31e47a59be123254bc55fdcef270981906c6d50b8dd0eed22ed25780b5d"; + sha512 = "182f472da76add125a45efa28aef4da9f8c0bde22eb8aeb1aa23d7e22f9beca7b8f013862fa6da61cdffda3764b57ef57262dff3d6ac7a8be97cf5a60a1d7fc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ar/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ar/firefox-58.0b15.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a5ce815f6232b54c85e44ca749e65866326fbe92375380a578d5e1362d7d48d3dcb03da5e42f57b1941ee329749603288176e6bb6642d7cb25ef966f2a653386"; + sha512 = "0363f67250087481702b535f4e6ba475fdbe87ea13bc8f3dbd324a5fec6fa0c3513902160f8a71fb7be8d7798bd37319827261de7f1199bda849b735a429cd7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/as/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/as/firefox-58.0b15.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "e633ea8f164b10d622f9859808c1b6b26267b7090bcf33aa3ba06f1c0e1fc1e40f38b598187ad9e51c6297018a5dc62d4e972451579e08396b7f2c3b7589f971"; + sha512 = "19bac3ed7fb19378104bfcd8367beadad65a0e274bb631317114f8399119d8570cf8499ed28aec089438aa82a7fbbf868f9fbc4dac2594f83452923e898a4a04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ast/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ast/firefox-58.0b15.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "51830b9577e626b250cd81cfe7aa629709b6e23247bdb2119e921e4be4a7e17d4d27bf8e469753a93795e0165c7096c3d7d8c01ab58d7f8f6f4d27108eaf80db"; + sha512 = "b8cd86f8a698c1555181344babf8622dfc2581113abc83a793c76805141495a62f52ebba758fbd6f2026732e9234b3c677f59b9950a009d040353e24ab56f51d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/az/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/az/firefox-58.0b15.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0a1e390daa07f02b021ba5d46f105b141b5abd4555c15ca90c31128d1bd4c0a5625a47a9dbf52e18ebdd1a16f023d1bda9fe530344fcb24bdc0e3ae975371a43"; + sha512 = "f4f0d456680ba0978e0bde5547af4dc74747b7cd42a1b9276d68f6bf56ffdc66c6bdba7508f7b410493e47c71dfdd4ff2b87497575a388beac2dc0798ed8b3b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/be/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/be/firefox-58.0b15.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e21c4b3127deb05dd118d22bf63443c248ab24657e315ccab798315b2ca407b7e1fbee771c4a98a63d3dd6d1784c3279ad111e044ec90557f7b4059cb5e20ad3"; + sha512 = "31b117154f8304a98261a2103b1387b36c47badec3f4a0836d2d808bed6dc9ed39b956bed1b540918371d583d7ddaf0005e34f0a2d43d8dc548d5a68c19c5957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bg/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bg/firefox-58.0b15.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bdaaf9b02e1a3c6cbf624a59172b1efbc5c4e72d75044c5e73d049031fcd5133af7abe1ad9588c911fe44cc63e2ae12fb21c6dc675678ea264a33dfdecdbc3d8"; + sha512 = "fbceeb960575eb0592c56f2dcf534e70f3a78a0a34efc004a982f642ce48491649fb267a3155e833b9a17d760e74035b8175c73beaa9b2b2440bd59b623e96c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bn-BD/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bn-BD/firefox-58.0b15.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "d4ea8ac0f18e9254236d43b2f09c33d0e79e6dd0e321d2f005185092e818991ad2604e87b33a0650c4a1d50cb9937b7888df374d1fe2dc39cc5e00bf9f9d6244"; + sha512 = "97da1cd550613370123ee4cf348b458b93c13d5fb5b53568bc0a85fe9c7894492755380b519bf43bb6f4125d4029274b6b960f369c13e277f797fbb8e6836cc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bn-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bn-IN/firefox-58.0b15.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b3d207f402ca1163b252184b8d299139fdbae742a087d8c78b720b7ea9176748e0d0521a9992429902f5557b13313c1be3222a814e26063a2a36e5fa33a7d0cc"; + sha512 = "fccf32b2d1bc54cf638a1c52a03efd3ba407277f704667906fae70d3a429ceca8307e576ab13c084bcfa11cab372ccb765c342128d9c9caf015757cc32632215"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/br/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/br/firefox-58.0b15.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b824d31d7d1e4b1253bbd1b29d19af2d2dc0a683c4464b4e1c923f291f958515328fffb6daebb47a2046aba6482374e378b212c50356093d34767fe0e4791c39"; + sha512 = "1cdbf2df7bf071a66bf4e3e9c7986fd38200d26106b7d8258fd434af477cd62e950243bf211d7fd613ec5aac20137a13a4e46e9ee38c38e427fa173dc2f8a02d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bs/firefox-58.0b15.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "b6edd609833be3a3f90026f29611e0d03eec7e6f0bb4b6ff829939e8d16fb1f76466af9a29cd82765cd0d96b680b82d27b69223d218783e2007e5c3787f98bd2"; + sha512 = "4f2476835f57a96f069623b983b3a09ee48f043047c9778290d6756cedd4b87d6e9f95176a5a3910b69062ddfe4b37ec122d35c27cb612a70cc8093bff191821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ca/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ca/firefox-58.0b15.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "6740794258c3d5c643badeceaa29826cc6f2dee2185ad50d681669a3f9dbacfccfe4b6c98a8082909dd93212fb8a55e959263dbb46033e14d8fb3641f1199c0a"; + sha512 = "c95813a496f6693e721d51834ba73a8153bb123639645bc2fd21921850774973c3eeda187fa5893802b38630f2f8f3c8a839c468a87a92ca2584f176f9962ab9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/cak/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cak/firefox-58.0b15.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "69d46516de61aab66add21637415621a6dca7fddb599124375f158c6bbcf838da3560fa643d21b1347b1fb2d87720a4c991805ceba8ce2958a41eefd8f76c39e"; + sha512 = "c3f20e2d74d032c9b2c8d90e4988730ce8eace5e8adf9c5643541ca23a1bf9500e28edb18b1b2a14d219edf5b6561701c17bb38f98e3ef778a78b4d3e52846c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/cs/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cs/firefox-58.0b15.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "38506b02c175d199f3c86c1573e81476334c063806c49d2b5815538ae50d1d47c3e649d2a701288dfc88eadd07ea71e6a7ab56ddacaa1844f0fd0403bbc76927"; + sha512 = "a2624eff32c09ea55a46951422df4a42a12c3f81db8c14c4661b76c4dbd353bcb68b42b8ded349b32b99b04fce4d0143ccdff7c58972cec098ed46d3c334c5f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/cy/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cy/firefox-58.0b15.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "aa3af4704b08c3e9dc7680d83968254d6df5fa27974dcc60ee35e43bd4be8314126fbfb4617d9fe4897dfb6dc3968e2e45cad3e1cb4389331b27af8047ebc1ff"; + sha512 = "f8890e21bb3c771cd635dca89789abd2315cad1dfa9459c46694e59acc09e274195aa0f9c267450ac09fafab5f6d7a30fbca7b2430c717206f8cddb0203f89c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/da/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/da/firefox-58.0b15.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "995e0c8eea4836bbcaa9566e99c753d7f7e7b86a4038bab652a3a911621f6bbd967a7f1006296579d95dd24beb80eb5a36f2c7fc44129acd2a8fd0ac2f867c93"; + sha512 = "752567ce90e3b832bd33a990f743d92995856bee9edfe0de92f7bacf2188f1714bbfb13c88a2eed03b9ab928f5923c33065933b5a71a14da113f179abe8a64f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/de/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/de/firefox-58.0b15.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "307e32b542150247e9a5c82bfac481d9d7ff04b13a3533154f427cdce8598edf0e540c9348c110a1326bb25636aadcc626da09834b6c02e2fe304db4ff5ab973"; + sha512 = "5704fe4279251a58434ddcf43d3a4e84d2b773adf82c865dc553df9e13a3f645aa5ede0290eaaba4c5f86d55fda0b8ae92ce52f9af7a3777a3adf1d997314fe5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/dsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/dsb/firefox-58.0b15.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a5abd9031b76ad734f8ffacece37a474454d2d1ef3fc434258645087e5b76c8f1b699254919b6ad1f6c386467e80ba49e58a81a8481874d30ef80a9a64770afb"; + sha512 = "a3a540ee34cd22ea0bba8091ba65ce635799404e88ed1adee9d89e0aa632edc70688fc28307b538b61cb32bd376137f129007f932aed32d4a4967d145d39572c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/el/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/el/firefox-58.0b15.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "9e044abb0b6dc02f1e7ac5e1a34252223fb73e0bb5adf33ad3dfa2a8543e5061e831a7543e8071cf7f0f958e7f12d86c9fa9839c75446750ba1b42f3c15a97f4"; + sha512 = "a23afba5a1400bb877dd98631912ed005e8006805c0c0d10fca1bd8f47c704a398f4cba7b52bd2f6815246c067fc89d18213ec6ff2e353e71db8af22646cbb94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/en-GB/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-GB/firefox-58.0b15.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "6e008a305467832697d0918de1fb0199ef33909771a07ff7523c9183efac8ce3e7caa09d9de041dcb5fb2bdc2d8e9a9f6c4aad00ec631173d9862e191dd3176d"; + sha512 = "ad1a216d2f05ec9c5d69b335f3c9cc2f0c36cb1a5882ca344e74d5cfaf80c5a0fe4e020b957a3623d5430913859a6301f602b3104f2b91dc11b1783cb7c33c3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/en-US/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-US/firefox-58.0b15.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c30763c3e918bbcf78a060c68115d96a575d10084e7375069229598e60b47460ff91fe052423782307eb145e8e77dcc30dbd55a5681bc8db6c7f1a12390dacd8"; + sha512 = "942f87d29a4c599ac7fb68bf5ba558f8dfc220f766c0103becf319dee1465b40f81d47833390fa004e38c57bff7a2202aae40c787c7a59072c4423b9ae33aa15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/en-ZA/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-ZA/firefox-58.0b15.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "982fe322f95e89bf77477ebc09dc3a8730b11b27a886b9907dcbd722645d8000d8ce9e7d02c008d494efb23d29c8be50605619f4be1d3c29ab3c4f710bb03257"; + sha512 = "4526bdcadfb31701d82145c96edf8bced38ebe4248fb952c3482e30f1e9e673f300a9c3c2f8f4c21ce32b16f9ed471ce6e63d67483c1c9c5e52a27c421e6267b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/eo/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/eo/firefox-58.0b15.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ed4584bcfc1da9ecfdde42fa187aa3bbf0b7bc6d1ce59e2710d99ad5312523511a362b71c6c44501df23fa2b58cae505eb231e7a73ad9996ee9a431342a5d81e"; + sha512 = "b75e5a1dadeee3104de6467806196f6eba4dca12eacdbc3bd1de9c6aecc922a89fba081a931a6655ff24f0087945397a8c0ff89e82bc4ce1359ed9d124be8163"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-AR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-AR/firefox-58.0b15.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3fe479a5bac3145fad6e435df5a56348015b34edb5bbddad7cd127c6b901a42481267d6174a27e3a36f63a24f76026cd85509c2f46001233f2969f9cbc220cd0"; + sha512 = "a4b11acea9dc2105cb9e14d8714f9a66cabcd6e0a34684f74b27e004b42dea33a549e4d6ba427a7e65a5119c722ede3616d04d08660ae5b8eff4aa8b8a4d5b6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-CL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-CL/firefox-58.0b15.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "d22b201f29c727c0d2b77f135e7361d236ea80265641c42bff39427b83f9fce38b604a4d9f4ae3c354620ded5af7156bfd6e7bbdb69ed8c4f5fc7c19b6e80b22"; + sha512 = "4f493a379dfbb53bf46e9724da396ce03460ed803eb12752453b11f7149d11aa5873efbc9f3ef22fa17f026dbf591861af8374de349bef91dbc1777468157f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-ES/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-ES/firefox-58.0b15.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cd7e6cb57ef8026a18a0afc761181da08b7a85677f0f188fc333a80533ca10873817d2cf712222bf453fe654a45ecfb959614f31043316006ddb19a8cd89e3f2"; + sha512 = "f76995efaca241ada26d2e5e87f45a86197e0230baa15e26271fcfedb05bceef94e4bb2980a3911b877b1bdef8de4aa060df1758729b31fcb3b80767b65cbd9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-MX/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-MX/firefox-58.0b15.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "986f52e6f316e2241243d1b5c5a5f1ab092e3ed1e0f8e979fe3dd260bbe588d7ed8259c2925a0834d579dae83d7b77d14746e36692f3de0a99d56e60f0e6bfe4"; + sha512 = "a9d2e7187746ea3a970987caf2e31b949080a9a66f3baf472ce75f3bd81979a7f936ffc43915fad9bcd4914853adc6b0bd509d23413814ee32be31f254ff27d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/et/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/et/firefox-58.0b15.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ef2552aa3cc790d52aa8efd108a324f6c7e9778ebc2e23db860a43607e8df4104035f312017f5b2662f6b7cde57d5f71924e27241920de0ebd492e4347ccbc10"; + sha512 = "7dfced36d543e99fb027caa1df40fcc0859be2c0e48759d25b9d66fe0729242acc8d5df15e21fa6c55ae7b1d7bcdf6a57ef0698ba1c83bc44cc6502d6c1e7b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/eu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/eu/firefox-58.0b15.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "587001cf35189fef0bb334bd20e5e48ccab185ec661a8a0510c2dbd199be297d853a243238ac74d50be63d63049432935b2e0c692ba019770a94a02e90cc90d9"; + sha512 = "0b9de898cfaaf162ccbb0c4563df00243d11888d4143726d2b68aa53c5bbd32916958ba0f712ab02007d476bc466791cd257769a18d7106c958b6cadeddc5eca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fa/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fa/firefox-58.0b15.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "feb046ef7b75a530aefa83dde1ae6cb6b0ef814fddffc138117c3fa441a8cdd8115c070835d5633d9464ef1586e33e349404894f391d48a8c7401779d52de296"; + sha512 = "629e52dc8f1470cb7613b679465ea5db5152bc35fbe4fcdd054dde862ddcc2c65434d99d53416ae348c4f00e0404636cbbc557842267060e4b4a2b3b6b3d26f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ff/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ff/firefox-58.0b15.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "902b90793fb917c2aabbdabdfe3296b4c22dedf4953bd1e5be7db5a78d17341c4cfd03dcd3f58c9ea41725a96af7db0b629b43fb70adb24950a4f4a1c99e5902"; + sha512 = "c370338497641010b7cfcd59518c87726bd74252837c1bd28d978a56fc65c411ee243d620e010e3b5331242943eb4e7b0d5b620123685d469380d897e9fb5604"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fi/firefox-58.0b15.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3ab3c17534ecd1472a17ce27282740cb13975ef80bcee27d23bd34bd955a56e538896f0738fc3dcdba6aa7537cc63276c573ffc0dd93d3661c445ea11cd52029"; + sha512 = "602ce02a962083eb1d8b67b3e271febfd16e3a01bac50a037a44a79223836b70f66cbec9329a31eda7c8fe72dc5b6ed582166ee1bb910a1eac7fc638185896fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fr/firefox-58.0b15.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "dbeb851bf96f41e0e4b32267fa1f7e3a1b560f8f54073356062157b14db958277f34ae30261e7d778933c9b61988ef6af351d1292b84b2721ec8fc2fa80ed82e"; + sha512 = "81211cce231f674d2fc01c4b6a775892abea8fc5285ec6f7b50cde63d0448a1e7e60ac6526c9e51ce0decff5b4708b6cbbf3e31b495396a4a6b87611b903711f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fy-NL/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fy-NL/firefox-58.0b15.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "222745250b976a2c885f6c9a8f23d7d0d9cb457b0f53338bfb805d1446d0e18b79b8f17b70335ada01ed8825a0ea557896bad842efed4bcee7e2c9f76e7ef6ad"; + sha512 = "8c7d8347177e8d57a6c93be6fca4d98e62ed0edbffd48bbd8c1b2bb688f6cd5d861990942359b8ddd4841cfff78c14c783252f55a2c9d9c70fa7e6f7806f6a4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ga-IE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ga-IE/firefox-58.0b15.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e6dbe4b2a680a0994ef80f1c319b8f9aab815507f7e27e23d77e05e7c8831f03b9cf60ecb5c13921c14c9bae1f6931b1cc159e97b075293788f60266820cc92b"; + sha512 = "85661d0aea3cf181a27e07269242752d712ae73b5e172fc762f9bf7a75aaabb767450bf6da05304810048d3f4604f1a62372f73f59ac41b7cd6f6a377de8d7b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gd/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gd/firefox-58.0b15.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "662ee89e75d95214fe8e2363264decfe99d3de26bb5586a06c87680d6504f3c95554c9d686c692af73156e0e370b3c5e048bad4a53e13a237a529ed2d58822e1"; + sha512 = "ce5fc8a2532a3a7648e4029dec08be5cdca5d5c7b1b146b1c1ebe89a7f4b5737cc103ae37dda9a39f41099e33cdd5bb02b98dbf342bf7504a7cfb7f07b371881"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gl/firefox-58.0b15.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "05074492e5f713fa3860342ff4d35e5d73ed866eb4137dd3c2eae8abb34642c5c6c0f631bcb78801ce3e21e1cfcaee566615971876a46a00859eeab7cf64bf72"; + sha512 = "e0b578e746409cf5615578bdd12187b2835276d385bbc8f6616d9acea3e170c606f590c83380e22436df10cc8ee750e26844e19117ee5287492530725bb03083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gn/firefox-58.0b15.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9b699be162abd7b3a8f2555cb59cf5ef9b2563260c3f8a29dd89a2bb34c6cbe2894d958169f0598af027d1769d3c13ef1489b9e226f79da3a6cdaf62d7908322"; + sha512 = "4caa21cf4abc8377b900f4a860afb634affe5af96492a71c820bf6cdc47362d729626f4d3e61999dc479bae6aac2262820e89a0c6347bc9a1bc42c3c3b90ee54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gu-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gu-IN/firefox-58.0b15.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "77768a2e05f6050deb3f91059aeebc6c5c60309e215583c5d6089340237844794d21dd8357cacd9028fb30bff37ba465c3922e6186bb944d30296ed7a4f6a0dc"; + sha512 = "c8d0a2538e0e7fe0a89d2fbf78bb8d7c238d3cb0205a014a5ffd86b193a08f8aeea69d326af75421968770a02bc7c42e2cc9eb45c2d864ff75296976c2579639"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/he/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/he/firefox-58.0b15.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0c54279050f11a2ab4e1956e628eeae4bca37a4cca98d2e4b5eb6eeaf168ef73860ba33ca4596f29118d061da1842d6e93f41248fba344172ea95148e696e9f0"; + sha512 = "2935084bc4325774aa0c2019c905920c265b569c75eab883e5bb22765deffe1d5bd1ca5affd92fc8c2375f32b969072c247f821e6675911d6df3b9f6ca46dbc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hi-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hi-IN/firefox-58.0b15.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ee4338f5b1753e7d34f53fa2cb5d512788c24721d31c03830b43f8e454b86bba19af18f5eca7dd7adbcb3022e9d86d780823764b48201093373f1f56f575ad06"; + sha512 = "6b86451451357a03b1f317266f7ea9e31850e3dabe4d9b163098837fd02bb8ea3259b9d8455880bc5277e79657f6d803aa001abac5840c1f2f476b27088477cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hr/firefox-58.0b15.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "75d83bf8dcb8218f1e47d5c5c7c8bfc88dfcd320286f98ab8209afbd7b6da78e5951c05d3756c55c5b2960b8a7cbda86c741d0174b0db47016ee7dc004cb7301"; + sha512 = "a2339794b3ec17a9f77ce4fc51cee56508ce0b3002ffe1e9f2dba5e9f0c154b75e2f9b0728d2fc1775e031ab364f754f225eea018f22bc5ef002214a4dc80e1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hsb/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hsb/firefox-58.0b15.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "60458900ff198445c9b39a2aed75a2544ea50a5c4e5733dab7c37147ee95ee109ec0e9736358870b21d4ed4c88a8b7ba216e8e1cf1ba709b71badaa61d639f0a"; + sha512 = "dad69a26aa1a9976bd436c2964250d0e6ef2cea32a4880324ac44079c9884b2d7128ca7e9efc87e8f031621e19f76bb244f669e6de29be8df2e7e20c5f5cd4d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hu/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hu/firefox-58.0b15.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8a5820924873af45a203637255fb82882f52f07fe4c17e7b1b1eb3bc3c58440a85adf57bd2419f9511472247d397030b0d9cb65fe37621ffbbe31df22213676f"; + sha512 = "6e12ba7ba5fbd54e523162722b7000e00bba63ec9c905067dd4a2812fa1d480d78f8d6fa5624f08c94819c597a7757c43ca88736160c3e62a19e0c36b7144e3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hy-AM/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hy-AM/firefox-58.0b15.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0892145b190bfdacb88b64020b51bcb158b71f70d9a0b2b88e938262cd833db3301fabbd2ead90d1fa31193573a4378a36a898f1a30cb993849567e3739966cf"; + sha512 = "8b94251356906404aeb35b317f43153b4474bbe0f53e7c2e4441fc9a2dc2234fb8c6997dc39420017a25f18ee2d8ac3d28c9106753f72e8082e3a40af0f717c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/id/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/id/firefox-58.0b15.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4408d3333ccccc3306b0afca9473352fd8e6c8d426541b8950fe8500dfce97ad3d6274aa1b5421d46c79cc323c3616482d75dbec528b394f12a80b63ab9781d3"; + sha512 = "a88ecdafdb7fb61d0b477deca2e608df16dfc1fb52a0ae34d0571ae4195e9c2b633db19c78e7aa254cd48e9184706844c02a22c553f9d721a5ebc48392335535"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/is/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/is/firefox-58.0b15.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0e7ce993d73b99d081248bbd3e8c7cfa72a1b760d2bdc2bd2b6f16bca0e024db53bea5fc04f0deb338c1a0be25bd9bb37200fbfbaabeaed6bfe68ef526d5694a"; + sha512 = "0f91699f4c94b17a8ab855b5b0c1723305d4c397bb17394235d916ad80911db6bced2c6acc62634accdba913621cab4b99dbf87bc8e0f0249015b2d3a5eab495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/it/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/it/firefox-58.0b15.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "829b917bc196380e13ca0983f5d11fa932c99b5f8e17adcbe9504730f5ef5fc90c0e9e26b3f9c23e8e970693d3726ed02ac7c294a7a3e2394aac1a64d65b62cb"; + sha512 = "696ef6f4e71e72a79fa9472d32c33fc71d021bc25812829b53a4e67f61b833046e637af263c6177ba356aac9218a7375ef01f75a87a9f040ec7c5b15c3aa7b07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ja/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ja/firefox-58.0b15.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c082f40d3a6b563948b262d7690396e6de3fca21c83dcc0206a6251db08e66563bd957de29e8e38b0a7d70062565c796f238fccb21fc8a757eef46d3d8922459"; + sha512 = "bbf682c758c8e900c8fbf566933537d3b893b56d2948302f44531a9929738d3308bf9ca99bf40d02b2b2e3a53b460694ff36d81abb29a652c7bb4e5314daf462"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ka/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ka/firefox-58.0b15.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8bf2d31f2d19b946d70a7b317064697e053744f206a1e83e209542a110616c5a258d2ce71e3279dcabba8f0326e3d7609d17f77c96271717fa85834b409d1572"; + sha512 = "6d55eee1b9e297a062e5eda6cc9a6c420b1539138001a01458cebe6b650c18bbe52f5eeef7397b90ead2ddeed045d9e670d701062ee4126a2b3e29542bdd460e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/kab/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kab/firefox-58.0b15.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b578eab0eadaa5d360e949d6aeff519aa3624b43c227c0daddd0c622d032ee64c38d9b1a98cefbda76a02ebc43200c306dffece36fa779b2bd711191149c186a"; + sha512 = "c2b1bcda181a1b26a5ba10653f6e3a88a80bceef4fdf5a77e1a57499d1d768fa52c9793dbe04fa1e7208e4274db80f270929f8d3e2d3f45238e05e7c3cdc5f94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/kk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kk/firefox-58.0b15.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "9e6fb9b330009621ab52957d45bed20d4230ebe24fca2a08713908130031a9c9eb2d24c8bc915787a058fb407ce0208195ac7901f848137f5482ff267c69fa69"; + sha512 = "b28fc41e8d91a7088d1e526ca7d6ddd415629f1ad16635e2dc029ed76e16d837b4862696a38336cf258540584657adf9be1c6245007bad84f6eee90c104f047d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/km/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/km/firefox-58.0b15.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "dd461641d80fc997d4521064d821ddb69de2366555f2155d499b251781ed684616e8c74e80780e27ebddb746c5372af656b95dd121b0ba8fdd6c563fd5542ece"; + sha512 = "866ece013c86f0fc7d7bb6a6d9026ac64587d2f41551c9303cdb6a58622482b2412146a37acd80679c979efcd5ef8e17e18775df2fe4b480074317f0d43a4820"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/kn/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kn/firefox-58.0b15.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "52990812004f6c6791cc1634e39056cf4e1d20678019ce7ec031bbad2ef6099ec4a467ba5d7a1eb9e8ff2ade22d2784595af6a880e9aa1c75425ce6694134e97"; + sha512 = "fded1e77fafbd2075ba60f80269dbbbba07e35296f8298664c06c6dfe0787baee3538584c31781e87666b1ef073004074590339d2a61bc1ae4f23992dcb35ff3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ko/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ko/firefox-58.0b15.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "52c4e48950f40e98ec56c856a2c286a77e23a1a68bce09d7659c4405afdc162a6dfde71a41ffe1ed66c05ec45be0f6535cc9661e288fa6f0dcf58d1e3cd8cfc7"; + sha512 = "40be6d5b4e2358e0d08c4d651ba2b91f94bf94c9cd768ca4d147a07581b928d9d4aa5e66d8dab68a7fbad38b252f48677958c6a66e206045f9ae94fbf0932486"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/lij/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lij/firefox-58.0b15.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e47252c7d8d632f29d9d17ac418b274927a298098bd18538aa02675cc5aaea9355ada2d7028571c04deb56378240de8ceeeb7738861404316cfb31a07278d0c7"; + sha512 = "b991ca90152d8e423042b268dc88bd8f35515a27aac6ab5b642b901fc03b02365edf7d0a58a939deea696368ff2769c15b45c98769be27edce561f22094e5dec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/lt/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lt/firefox-58.0b15.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "34ac3613499d2c15919319eb7de3727789a0090ed6d2aaaaeba1e3d52216be8f166f058c3fafe27c653101e2189ad26a19253be21241bc28f77232094ae5d6c7"; + sha512 = "73f020b0b3958cb7f6db3da70f976dc8ef64828f7cae29d1994c04f4542885fa6389239d5a7c41f8beccd90cdcccd14dc42036cac5e34a3cbf812296edf6d49b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/lv/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lv/firefox-58.0b15.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "4ca180448670e8b89912102a93bee7f61aa3ac8fdf9478df0e16dcb0e9079c8a51caa303ff645d56adc496c47f262f644f82d31b26446d63077b82929a2d8217"; + sha512 = "35f0aa92ead5ebed9d38688adc6ab2a9e8c9945f46bc29adccb6ba6d7007980f60343869ba65a997e04bd9fbe68b6ef78719ca771359144b73514e6d23e457f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/mai/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mai/firefox-58.0b15.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "e1c9c019499ca17d1d8b506337c89fbce52c02300dea831ac7827e366a318feee526998d8e87ad7572022dd0608c92ef9fabc88e6e21bea1e9b41465a4877e5a"; + sha512 = "79ffb596ae7afa9ab68923b4782efea6701d61463f4d200e93db9cdbd9cc13a20ba4fabdafc3f734a9d84df4c2a88400d976f77411adc22de3e11a8fc202eb20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/mk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mk/firefox-58.0b15.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "90b989e803f087915ff6012747587038c134638131065c3f4ea76da96afe34553c6cf39e59e13a071d744822d080aa54a77a8461cc978278c8a0a94da59f8816"; + sha512 = "077715dd9bd5b1dd6135816449f21ba8c0d4e4812c847604e92ba103aa009e6eaaea9b12a2adeac753cea1175a1fdc0100b63d2748451c52d8aeedb8af0ccb2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ml/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ml/firefox-58.0b15.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "6556704d29e990655a14abc0dc60fe74f4f21a380f04b1877d1ae0259c40b47badff06ead1f4903ddb0e576add5a9daf2da99e4ccf332c80d62b5966cc8fbafb"; + sha512 = "0294862b42dbc96d66f5095bed5aa7439f79a58bff7051bd7182e27c4a73b6f101c3bf2b6966d0b525eab1433973d9972f01a33f3074f318464596af31712a55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/mr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mr/firefox-58.0b15.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1ee03a9f3596ed3368cfbfa784e48adb85939e422f5b2790f645332625cd675585849d9d08a1bbf7b2594e68ee79b6dfe5e6e5abb7f0c8d375ac5b9502637ef9"; + sha512 = "05c8c0d20f303854ce062c5a1696a5b94e796f97a4e4ac45971ee7bea6177418e54281077e962366fa95fcb77d35a5d1aac014d27c9fc1aa28c90c2fbd8bfe95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ms/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ms/firefox-58.0b15.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ae9724e6d7d283bf53e2f8cca4bb98562a3a48011d47f2cac3dd46e2f96f68db219f44ea6e93aaf0d6728d839c7d7b307ac2448a88d0bfd96e8cf8f772e77388"; + sha512 = "7a9fb16b6ecd9722eb79a09015b33e6c15683cccee8b2a278acc177e988da1eb4686324cdecd47bede2913a9b0e88640654338d92252213825c0ae2b6bc8e12b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/my/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/my/firefox-58.0b15.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "775336ef849c4536447a847a2cb0a3a0383f1e00d894383d47de1d4d8e5f1e87452b614688da2ad921790998cef10c49f2250d58855141fd5bb6c7c13fa682c1"; + sha512 = "5e4e9715cd7e9b5d2cb59da9828c0dbc38263373af15c64faadfe160cbc0400596b899cbbf7b8721044f2c279e7a328074ea95044848ca818a3507bb63640e0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/nb-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nb-NO/firefox-58.0b15.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "51c1e9f27b64637c01eb5fcb19f3dcb25ec9441e657d02f41da14213dd786dc1ddda35f0f5e72f435a005c923bd8017e2f880e616d496237ae69d6a7cd5bc8ad"; + sha512 = "da6c123ae24be4b20048fb57746391add06ab9d856c0e4a76d5e0dbfa427f356937ee624e0f1f9158d3451c5ea9b0ecb02422860e0b0f7b214db92207d7a7863"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ne-NP/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ne-NP/firefox-58.0b15.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "0135f4224f3b357fd665f316ecf19155b0b0daaa3f2603c83735b19be75518434b24427c902fd8a0b0485ba467ffdaf92d75d944ad0447efa76ec0b930fb58c4"; + sha512 = "2fbf5fa855537303fc0b97ee7a97647f47b554fe3f96754c43ce4ca426e310bc34a1afc87823898cf840cc28a6be91f9200b90e0db5ec7c258ffaca1f9526dff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/nl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nl/firefox-58.0b15.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0e056465a51e3bfa5d2014d7ed39e5a1cae8922c7c0706b158fe187b9fc4897d0c21d927508a6d72b5b6c58d0e95e1c12020e826ccf84d74acfae541074e9f58"; + sha512 = "44c6c8b927c311c797571eb7003a426403d7162af50d35b41d001a36d4e058497229415faa296466c53c4921906ef5399e8b4215f5d967ee5764fbdd37ac4473"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/nn-NO/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nn-NO/firefox-58.0b15.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "885eae50ccf5d2185e195f1f17d09c70914a5472781b93867515ba784468c91e7ce86428696552d6451eff846c6dfc3486ffd88f16dab4a28e91119ef5e0b77c"; + sha512 = "2c5e2402aa1d39e51660154d6a6b596b577e54b81fe9c348b90649a4cb22288239c848bf7cf484f3f85e7afe868c5f8d613a95dfca812afc59b1bec91e299ee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/or/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/or/firefox-58.0b15.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f95da946fbb6e334a14ac7af863d004ba06c6ce3e202e26587783aaaaf55eb12a2fafa5e07b76706cf1042c7dc258a4774eb5fafaf94039367dde8387da88b98"; + sha512 = "5626ce9e7ceb5d0e70dfb5f549f8bf4ab4398edf96e4adfeff06f85c307daad21e075c48df849bcc242dec52ff3a64da12f8af05b0aa475b50a3e9637832d3ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pa-IN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pa-IN/firefox-58.0b15.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "694e6148d330fb83d4a763980813e720afcba7323eb5e07acb5f3cee7964422dee722471538cc2c6f094532446fdfdf4ec79942cc91636690c997c68abb21613"; + sha512 = "8e0aeedc13e102ef9b4a2aa7858b5b88ef4a21ca00882f1cd3e86506449e4b2e1e1f036d587987be8002b59ae459acfb5f884c53428540261019341f63b86a0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pl/firefox-58.0b15.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "7180e587c52f1c4a1b0ec7dc09c1e450f0f4395f445180d0bca110613f2675f9c6be6ed46a604eee27a316e82a7749e89ccba7fae02ca46074f99adea38e291a"; + sha512 = "f9f9cad94ca986d67b17bd894d6b5ca5de564da3642abca8b66a1263d5ebfc3ec3462eb8a3a397c6f6667677885d9351ef81a7d1c55e15b7404cd3e3b2dcef49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pt-BR/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pt-BR/firefox-58.0b15.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fbc966148be235c9c1df7487575d7853148e792395f7e6650034224bb06764567569af9646a929a1b844325f38703e8544f35b60c5e74f173287d03b8de6cb85"; + sha512 = "4f385b8af555fd701c3bc93514a8712939b70b4fcb8d0a08c4cc9c514e68cad63033d1c4516751a6c79d622971e1dd22ae16bc26dd5471a216f6e2d0447a4695"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pt-PT/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pt-PT/firefox-58.0b15.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "55ad79f74fc4fb704cc38a417bc0f4973e70ab2948753206ccde71ba54db7889f1080c00db54c95ab84caa8e4691c4558ddcaa5f7f995123637f0d1ac62cfddf"; + sha512 = "d469ba354fb6127e8321664889683821f8c5e41318c5dc6346021c4f0137dd9a8810b8bf4134c808f2a91a50f05d4a0eaca1b52ccc9f691cd5c694ef6fc856b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/rm/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/rm/firefox-58.0b15.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "ca0a8dd18d5dbab7fcbd01ccd5bee10d563426758c71cbb9bbd2c5799ba83cc3560480ae1db2a422d158d8a31ae75278ae00cc12feff8437ec85eb49f77e67f5"; + sha512 = "aaa079966f9396da2771c8f04c2990854677085c872bb57d9b605c2c61be0e0917020916469db4e4e1b7e082529cdb4dba046e282cfc64345f59c1c11980aeb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ro/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ro/firefox-58.0b15.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c46c6f08ff9b4b5a4fd0c156e4881b4ad9071237c9e082c0b1bc5df14b38a16e6aba25c9211d35a7450d88de4131d088af60d5fef6017292a60940e596d334fb"; + sha512 = "67aa56b44b75412371151524bcb5564eeb0a3b1e47068435a08f9ed4ab5b593e4e5e051a18b84fefc19996942aa8ad729ad5fbbe671b52ac84907d1a2898c8d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ru/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ru/firefox-58.0b15.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7fdd19072f73a9dc06e15fe2df53387810731ff43e6b42debf242d1150bb883891e84a48c584e7da426585cc389fcf8ee45f0f993c7d33a74e92cd995c909d5f"; + sha512 = "9d86946969beddba87dd75fef29214ec3ef3f1d6880b408c49905859bb4ca2e86b89bb06c842cd1b798677ce621a898dfad18d1d121bfae835f4c143a495ad0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/si/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/si/firefox-58.0b15.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fe7368ca563ece56d2c490bd81ce025dc38f7911f171045f7347cb0ee4499476b0abe7b05e7a4cabe0337d2c84d79f401b8b0a6142f5b9112179f3bc896093ec"; + sha512 = "2e307742bec245219eddb26f213306462dddb8ec9b590bb21cfd4c7452b89e763f6408cc4ac1d37abc99ba8ecc2185429a4273ffeb694a11acab7427b3930216"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sk/firefox-58.0b15.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f3ff69bbf62fb392d0f5471e0b58c59e8e1c0fe012c7c6c008b57937c378cd49943d4570e595f0b81ffc15f07e3275a34bfd3435ade2862e4d1c4d1a2d51465a"; + sha512 = "d00816519c0cc00e9223446ff00a2c5eb7b23d24b3b5da6c6c1729fb5c4f333e1195a4a9c13f59b46a22666984e38c56e0d9d22963133441cd76322fbb3c7adf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sl/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sl/firefox-58.0b15.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7dfbc29f33c617f032b40ba1bee3432638423c9dacf7a7b5d7ed8db4aaaf6493be732a69089de72c47cab96d3b0d9a87fc09ddb69b1f80022c1a899ed4c2fe40"; + sha512 = "bcc84e96c1a1d4f2635fd9148b3a3320410b52a54ed2fd292052fc8d642a8ad38eff3d89909fe37230d9587771f28395f39599d5f8ab8b9d00b2c8b2935974e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/son/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/son/firefox-58.0b15.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a102f6ec429cc6975a601cfdc409a616bee1eca92a809a3c290ce082f392dde4f070771f746830a98c9c31f59032466ae031f8934ef85ce7aa47391cc4044379"; + sha512 = "c9ec2407ddd109bfa059dcff2340a76d04d40021d3cc180966133894e567b54a9feed823ad13e7a4d8e5aba2b85e955a7a48d574a98eac0b26b53d0864d56145"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sq/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sq/firefox-58.0b15.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "71cbad5d4a5fa9f984a6ac678614bb354e64c207f7c92da7b5104f96d5c1ae4397a1c2b97be279bd6d284f143ef8071c12625631c85ad704de193ab33e33944b"; + sha512 = "7f459584f85b0d9791bd48a29663567f0303753dc388f1b2f46566efe71ed9bff120c25f97dd840437f148c7af6a829d7bd1379b22d636249955d571f8ead721"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sr/firefox-58.0b15.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c033e14e76d1a81b28fa52f3ee2b9981f3fb6cd5611a20e4a420c4dec8f41c266be2610aa59002f595bd8d2f0d93c0ee2324abb4a8da7b1763aa979896497391"; + sha512 = "3122fc1479fdab93fc0e10b6973dc0a48f38e3b114af471236ec795b4a69f4f4822314f77d71d891f0463e02fa4ee2bd7acbbc68a0af3cbd2c37e12965b09132"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sv-SE/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sv-SE/firefox-58.0b15.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "69ec3be256ff406552b7d2e0af2fb8f7dad5dc7e4b40d8019f4c68638cb1e00ca3c0884a85a3e4072382c2c328e247ef327e4bfcba1f4718eec265eae59da0b4"; + sha512 = "7e522a556353f4838090866c0ad8e2957e0b027fb61dcb749d036a231e478427d6702628d273ddd30d233187a5d1ca1e827bf638dd7f913d48755170802d839f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ta/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ta/firefox-58.0b15.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "358ad3f50a99dc4dcd67b9a05096e9d329b27d57f571f3c2c8fb6b2025f63a2c73613e5e6b6c45aea9e3f8ba6e0205d960859fbdefcf417f17ec04e3154e96d2"; + sha512 = "bf6fc95a9dde89fe99865726d9c54615093d09f1684e493b248cbed9876cd7088ec8f967d9dc90d8592073d6c7f7ddf11bbc7ce528fa624853ef53e31576af48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/te/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/te/firefox-58.0b15.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8345d466d13fbdb85c0a015a5ce938ef2895b8974ea822846723af3442cf554e18f68864b27ffb24f38b22b2539222e571f6920bbebb8939e282e2944ae9d47a"; + sha512 = "dbba2f55271ed55734834a0f661ba7ebba4619128b117d7e5792c3bfd21abca7b817dd11052d2d26a4c21e7af4bb41cb4abb163dfe13c0b3703d1bc352185ffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/th/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/th/firefox-58.0b15.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f224c6b77a9cfa5db2d02752847b46f136e83e226e91e72043737088bd0291a87cb6717dcbe1c78f19b41a418a3ab98faf4e868bf6f544775b983f302e937fec"; + sha512 = "f45281dd8ad0daf82d630e446c6a87947c860c27a05faa201292acc3169b296410263394bc4faa21328319d4309bda6b36fad7bb74ab16ee920597e12cee56de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/tr/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/tr/firefox-58.0b15.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b041be8eae147a5cfbeebd31448daebb4d9a7256438875ca177f64c7bbcf636393c0f2b1ffb152c13c737e26d4252881e3b0db06c891d2e87db0003e69573449"; + sha512 = "486d03fb17ce51edc8b805395e3b837f19e8de2b21d504b6c53209badddc01144398dba93b1dc83c8ea75b14b1284d708f7f70e870453ac30179c6ba66e46ae5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/uk/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/uk/firefox-58.0b15.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "0be0b5d572890f1d31011814316c33af826d11fcf6de7634112dd14a1aeda1035a0211603f2cbeb773267d32b1658c7a97c9d78d251a8382bc8e96a5adb019d0"; + sha512 = "4b050532e8bf7ee04fea4ec9190ffa59fae5969e75b5287b4cc036d68061a9892aa99cd9f5527563206b79bf4527684d85a82e80891d190f391c64c236a22222"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ur/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ur/firefox-58.0b15.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "80540f2298ac600216f254046c17964aab5347f187207a5b99ddaf7482bccf565fb901e829e368c163065ee0b900aba12386eac0323a26290e99ced4fd5329e6"; + sha512 = "060e555027a13fad246e2ca01f590c0b4ecc886949e4592ff9438aad529d21f0ca1d00dd4671c2d76efaf4285f5938ea27600b9aa5c4f9273c57dd286de21701"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/uz/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/uz/firefox-58.0b15.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "91c77ab033c34d4a5f075faf3cd3f89d5e0d5e5951942196cd231a1b9dfb54013b332c70ab513eb4cf1160da3cb794583892a1e07a232c45c2cc233ed6d89b29"; + sha512 = "73841dc4be445337bf80a4bfcb74c681c997d69d053d453121ece75a5a91bbfb474ddc3c232d707833a5b39722bbd4b83c319066f73a9493908e77ac87723aa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/vi/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/vi/firefox-58.0b15.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "af409ea05056919f79b22a6604f010d70e7b5fe16abda639176eac1d82077a460ea0621657ca80414402c5dd1b734e00dfc93b47806657b3a04d8834c4602dfb"; + sha512 = "e866cd2d760899f42e818cb5ca68cc3770d71eac92b30adabdef1fcabee1794f36f5687a2ef2350a987686c2a6ce644c820640825fa26ce604b636235bd99b2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/xh/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/xh/firefox-58.0b15.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "5170e4b062aaa6023a68f04725c65a4209aed0863f801a99bf89e09d32a55bd4847e193b173ebdf51902cbcb5e4139b56be3724dee1ebb05a36d0420cfc5ea64"; + sha512 = "9e7bedb054fa367ed8ece1c43d66b70d2184bcf759d344457bece9d515325d0b22f3359b85bbcbc72889a72b39397a94f0f48e730da8f0e779f8cf9fe97147ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/zh-CN/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/zh-CN/firefox-58.0b15.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0112299c1f1b4707dc29b1849483c4786f6242eb146cf42f0c4d79f3df73175e5f55266257a2e8c22d3419c9585c7311023ee16bc2fbc2ac7a690b4625153295"; + sha512 = "14d3ba252d92777a8e8a935091b4d1288f561d19ce94f0220c70c1327276e2f230abe99983bf2de8e8043cfb101f6698aa64bc701e29f666792b733e0dadcbd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/zh-TW/firefox-58.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/zh-TW/firefox-58.0b15.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "74ba02d4069d5c47c1c1d4e66fc364f7136c86e4c144c5bbe6d8cbbc243bce9a1bec4ab56facb1378a7d7ee32e79657cb23a28a12dc69a56b74a9d6c2aa08957"; + sha512 = "78bac26c0d360f3e60a3b0cd2b7c9b4642d0351f47322d20adc4df815fb466149fd98710314c38c9681115a30a9226f792049bf00b1b8020abeb665e1729d89e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 274fb8f13447..c56d30a3ccb8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0.1"; + version = "57.0.4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ach/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ach/firefox-57.0.4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "b98a06b55d43f7a8e8c6acc9ca303bfcb9fc331929199ccff1eafcc9be486ea2848fdca977bebfcd999c81bab7cede0d85edd0f3d3c0147958fda318b4259de0"; + sha512 = "44b5cd0112f6d6a8577b831b55bff2df34ed86e7ba6e16f54d2ec8a738453b27fcd4cb0d2f1c6d64ebdf9492ab2d0dedf15e3a50c16eb1701e24ed7293708ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/af/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/af/firefox-57.0.4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e414c270ee2213577dd9049ab711e33f151dd87a3e3345ddd5abd16e413f4b510c6beecce5837908e2221894ad86d1bc3f22c1c5a67a606a8d112a24f0eee089"; + sha512 = "734b6f164ec97e366f5e747c2bdd104f48c33d39f4467438da9eb9483d285688040cd508e864d9e451a9cae3907b4cbf0738489c3697ea38dfbf5d8186b85068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/an/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/an/firefox-57.0.4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2766735ef82c7a2df8e822a1e433789f6e5708f42f7b4bcea008f7926b7312bc44860fb4c6a90afd1b2ad8de251d49139ecbe05b8900d60a0c58f29caffa62ab"; + sha512 = "1be1776853195dd56b83ed4e35ba96f263a72ba009311c48e59ed42b3206a3b9052805fa7573f7064307763396a3b10b44744dc38f11d767ea67c450aa33e129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ar/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ar/firefox-57.0.4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e3ac3271fa93d8f05a0a953cc127e4d3bcf1f032168c372938b3eeba72fe070bc4d67f0027af690559232b6078337d48b3ec0426d3063df1316f669c9763f1be"; + sha512 = "87ead011bce9035004af52e6f25b1606d3061cd425c0deb19de91f166ac793b0d8689440aab6e45f469426ee4deddcfc5a9f4872f92121e404c4e69cc50eb22e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/as/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/as/firefox-57.0.4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "e41bb2bfb0335355b3d09929df578c3081277cf08d7e1390d47ac88480c966160064eb1d55395845a000e88c5cec32450ea24c8c440a7d6d7ce284c2833964e0"; + sha512 = "0cef33747c17bf4646aec1d231269ca2198009038ac2b666edabe2b85333c375c18e249402ce201683d5145292057ee38082ef81d92304ce34d8fb31e5d240cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ast/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ast/firefox-57.0.4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "2da56588bf6d6cbb54d20a46b95f36ab75edfc98b74bd0bb13cabce7758c396e5c3bb4e0c1fa4400a0248c7415a0848b823b83b8231c9fcd11e66c00ad9608ef"; + sha512 = "ee98e03759f85a3a52571b83c4fd9eb43bc655bb17735197a6cf30b894f1875ca1905e5807cdece521f24d7ded98118ac0c157b9c981720d80bba208d67f423b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/az/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/az/firefox-57.0.4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "e4e3058c415c65bba21fca8b0fe078782631e4f8c3ff3aad91cd0b461bb76d614fa89880b51dfc698236b397195922138d9b5bc79e81bab4fa689e850514be9d"; + sha512 = "78fdbdeb6ac24450f0c6a52e308edbb31f1cc2c6950fc25295315c4be953cf35e3ba220c8f8b9994be055d963f6a2f55775b743161c71e24552fd5882dcf0b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/be/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/be/firefox-57.0.4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3299c58454a9b31a70beb5e2a422ea067d58655eeead6ff9c03edc224a369dc5cd7cf165e9821d6d9cc5a18eb3ddf28829728308cdf7e7345e9d77159b99380f"; + sha512 = "07248a7ddf23657647d6e3f154be6325e04cc30b02a724a0b4c2c159060b7c11c2ebe4d7c4bd09313d1b37eea7e1bc45c666b9e19ae7d01e8e10f6392a70aa04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bg/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bg/firefox-57.0.4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "091410e6edcd21f3cb2858b3b56908cd8c490bcbe4bc97298c0a5a0abf44f88a05968164511302aac866665045e5bb0fd21ff9d26f52f0ffec4a68312aa440d0"; + sha512 = "6a05d69ec9e607bd1c7e48b882e90f2069522f99b8397c4daffe70d7e0ac2012287db2cf78d71df1a7e4f20ceaea1de86c61b857986cd3f785b4c55574346340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bn-BD/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-BD/firefox-57.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "572bc4cb51992645fd6343bb43b1b32ecc10354250bd68952e519e8c5f1c174e9d5edf3d7e1edc5a080de0b479cb6c8871dca8f8536791d999f1de00379cfd77"; + sha512 = "441f56cc7eb513e20a89732745c1d3f56d82bccf09f2903d9f07547a018ec31fc95bf5b56b9875cba08f44bf5d9af0afb6314f72c5c4eb0f6546e06a6115fb4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bn-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-IN/firefox-57.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "3f8ee9adc708fdbb30a996f17bcc9e05ca99c0cc65eabcae3c77440d909cee88151269cb9c7bd03117a71371ace7ad09dad0d0c71a6bbb70a366f5a427c5527b"; + sha512 = "eded452d957d9bcc6c65e716e1271cc130ac76897a166f2507628e99b50d99dd970265e4e5ff276d509fcf2026d3c95f4ddbd7b0b09144495bd483af724c9636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/br/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/br/firefox-57.0.4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "6421a181eb95d6510d4e81d4dde5b5dfa1f52065ea8aae2074978e22310bcd1ee97d1133021022e4cdebe12cc8aad0e440bdc4baa752504e48dd42e77235a572"; + sha512 = "7ccf63c946299241612875d220c613887dbd4cfe5db019db4a2626df2ad6de8c00564bcf28aba66566eb26cdaa5cd7ae15eb5c6a37d7959663609581c617dd0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bs/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bs/firefox-57.0.4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "99b45a418aea334c58ef3e6ea520c1b0376a7fb12da2d635b35117052c40b3d603f52165b88ad00b7c647554939dcada70b8771f60c76cada729e1a864b9ad7d"; + sha512 = "de319c64ef4a008d30dd1bd26e32c17a7fc5ed73a74af2029807004ee98393adeaba06ac9f02687e359ea0c41a5ec176630fc1cec1b87fbf789d2da68549dd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ca/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ca/firefox-57.0.4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "845e4de26819bae1cfb327c44c8e15aa5f96e0d3502e8ca9f3820d6a3f92be3c26adc5728d36d14991812e94207abd3e2a59801006defb59a0c362082838efd7"; + sha512 = "f90f57a74a082e1015d04e4992d3137d6cd92d15ad304a2eedd3c293babba3c4a2f352512c0d3971478cd3df353d29f9ae3b1fc09ffed19cc3c7ab4475129371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/cak/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cak/firefox-57.0.4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "91c595b26f4f8c7505d760b88d2c194a5fcff3f15ef7f5de6bbe69094e6e8144e0d27075eefa7d5c0850e9bde9b76cdcf50e251dd82c7d3ea743e5408886d24c"; + sha512 = "0bf057c37cb1bfbad87dc79386dc13eca311399ddf1deaa625ba920c72f690f01e20ce3cf0d7d1afeb016e2f27c96dff405c1b168aa83bed0615e55f1eb259c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/cs/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cs/firefox-57.0.4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c293daccd96a4d5f41ea38e18ce9119624b58ee6f6fb3fd1ec78e78cb440a58010368024bde08a209b65bf7e7f24303c967572f89db0abd9451bcf02d730bc87"; + sha512 = "609d94b2e7e920a70c2774c3ac9531c7b97492401a7860e43c3a8b0ff8870d9c51955dcc0eb9ab4f12eece415338e6a8a1f08f55f4c5ce5f15def081d03d783b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/cy/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cy/firefox-57.0.4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0f0b41d26323659c412c718bbb6bb493fe71a6d61a52eee17754ae4c7ad462a0cb5f56106854454e82a2521adf5fd65801f15b4eda17664c6ea81a79611ca8e8"; + sha512 = "c77903916d9cbb55eaaf6220dd8a1a101c90a338fc3c9b289cbdb1c0e2080dd9a839b00575e38014ddce4478f53711cd31834d6dc94deb517b0a3e8e674df7e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/da/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/da/firefox-57.0.4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "799428869a6b1ae2ead7aa8fdc4c2bfdfd596abda537812e28f48847481851f0d5d4fb457ef99ec32791a430c0a1754bb9955eb8be748211ebb1a935adac503b"; + sha512 = "69486cfe520e313485eec89f64b446de50a87d5f94ff6bc76412c61c898177b0f7ff969bbcd7daca3bbde648394e2f82b2cd50be933f5ab6168157d18156d8da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/de/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/de/firefox-57.0.4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "1f826477c733bfb4b1e7b8e490edc4d17e0ff607217857c089faca68f1e4cfd045cddcb108b4aeb19f64111299e662003ed8db9eb3a842b7ed87238166094c7c"; + sha512 = "c85ac2270f30c9516df4a1331df5fe4a28c79787a12e306185b78c30a0b74d655c1cfa3e2b17ea17acb5ae28e47dc1235948deb6eba1a8d744f6a3864806c869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/dsb/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/dsb/firefox-57.0.4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "0a6c1a7811aa7796dfa75249336f8b1c10ed6768cc92f573a8684c7b256a9f274cf10b3f466924800c9f78f480eba3744564472a9ad7636e286809d19b39cd57"; + sha512 = "24b96b1db0e5f5f1a20e63d80dc69e309daaccddc0327b40fc8aae20a2e18f2698bfa50d3dbbd8268b54d3e92ab5a07ce1fa04de8c4dee31dc261109274728cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/el/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/el/firefox-57.0.4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "bcdf4e2c8dba0157eed7fbb27110ee177c129c5c5c54884d064b1c19ddcdcc53e6c8e22165ee13cda3ba7a35d3679a09e019d44738d20a25272ec2a849403010"; + sha512 = "f22348ac3448a39472e427714136c51648f5bbf6979a402838b0c11dedb090b4c16397841cee5b2dc142fe942517386db0063ddc0e4b317e911110548a7805a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/en-GB/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-GB/firefox-57.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1987c0598885adcbd292bfca5d79bb107724e5dcda92416e06d01635c54ae55283547a65fa1bc0c0df9534b09c2da9fdee42617c4afc608b1d519064e9d4184c"; + sha512 = "6f53f1aa5f788f4b05135b610e117fb368c100053620f8283d39a9bad6e9710978b7ebc638514a04fbb3025407fe728b3be4a80d2708ba0aadfa11485e012e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/en-US/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-US/firefox-57.0.4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "44abb10806a486a58aac7d97fc5d2c36bb93a4a2a5350f121b08828ab7a01831162703c3e623d2b550956de287c9dcc6417aaf0e68ea7124c30483a3ab103fd9"; + sha512 = "c6e9841fa901f78593d5bd60c3c4616e9a8dff696a5b812bcc4fed52287fe7db6c7bfef85a7433f08b3b940de6418aaf1c7c90dde6cff1cc6c7e0efe439e0ddd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/en-ZA/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-ZA/firefox-57.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "efffecd63430f61d94e8e06436ee0831a502849ace4991109c0520fabd053fbc81f16dd63d499c2b225c2dd7a71fdc51d68a1efaa8b90dfa96a65b89165bffd1"; + sha512 = "a980707b6b773c0e34f385ddce1be8c4ef3d5a378601ba3aa40890fb247a666cb8253aad8a64859527a7becc9925124c9eac1e13a19a932158aaa953bbe158ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/eo/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eo/firefox-57.0.4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "60f713c6d739c2602c9699b356b645481e347f43a76adaa4836756b03bf536f1d359c7f6e025deeddd457007a44ea5bad9b1ead90af9ab5a2467703cd30a8ade"; + sha512 = "6b23c8ddcd84c96993b4cf7f256df3485871e170068db563e5d0c649abd8e3b5869cbe8732d3a97e1927f45c7c8c18d697fdebab4ec1bef7de78496d06c1c0f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-AR/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-AR/firefox-57.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e4dc9a067a5cdfad9e1528be6071e67e425fdc7ad0d395d4e86f19db6356bae3191b7d3be32c43ddc7fe3a887a0242e26a6072c7a1bab37020ec49f9f5cca245"; + sha512 = "985149e873bdeccffd6be63b35a56b3f93d3dc35cf04b055af8dafff68ce82bfb752a0d48e3ab43a9b197d15cc11748243bd2e9537a42f59c27a7868c2b95546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-CL/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-CL/firefox-57.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "739670dad0bf99bb4adf2437bd76d87f9099e724edd2ce97a76835b980b5390bd72a3e77aa261e3787846a1e2a046c27dee912386a0ff5d6710ff9d2bf6b2d08"; + sha512 = "4ec591554411410fb90215dfa229fe207bc3303a1bc68c4fc8894390386c07ebf958fcc894f2d17a9876c2da9b8424a00a62fd828921fa575ce0b0aeb037ea4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-ES/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-ES/firefox-57.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "5c0a3a5e047792edf0f98d3b3c5a7ce0af0a47df0bdee82a2c20b684d6802c0f33a3f5be436747647acfbbd9984378a7a81f4e82455ca4ac971cdb2a65da3858"; + sha512 = "751741292c0794916be2636b42d03671d408b5e1675544c44238cb28131e64eae07b9524b57e5cebcd491ac80960d2d60619a641f94d333b5622ab8cda812e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-MX/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-MX/firefox-57.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "57060bbc7cc53d8b11df426a98fa887197c9a4ff0b3377119ab3ae6b7042428109660e02ff2002476bdea6ef53a8417665e9d5150b3be7ec7bd312895c1fb07a"; + sha512 = "b54419f6cd1d7bbbcee875cdcfc06b9b6d053a1f320e47ef575c6d11ee3dcdef0937adcd6889e0b45c592e51547b66e09ceaa9ddbbd901aac6fdba0aa09df9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/et/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/et/firefox-57.0.4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "eeeacd6e9ba7a698c7644489af9bf39b32a1b1eb99cb5a714e331962b8852f10f4db0bf95554778853c8c56fd1f6fda74d5677e3548252f1c822c531e66f9c13"; + sha512 = "fcbf4c77a053abbcf0e071edeec310db34a195c9b1d07fe75ada0dbee71854631756a148b9fb36aba96865c462b3efb6c5c6689cf094430c6b9704a2e3e57294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/eu/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eu/firefox-57.0.4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c67ca8a2448e54b1b55c797a08d0d6c1c99709038077ab5497d322a4754dc41dbfce1c46ad26ad9ce8113a608eb7354fba441ecd747beb097c31a00fd7d869ed"; + sha512 = "6930dd5dba3b9d75d1ed998ee079a06b4222e130b7456851b2be8353d29bfc883439617a0bdbfadbf027a1c14d987b5ef4e15419190cc67c54d88d942f2ada42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fa/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fa/firefox-57.0.4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "3ab647639452291bc353824322edbf25720b05378769f6ad038f7e2012f148d158e916aef067befcc471c56495061c8e429c07867c704d71e1bda864d60e0adc"; + sha512 = "967abdce15e37d3cad52a5eb6a3e929b0ef0c6c8e43d803c88c20b649dfae3ecc980ba64f0ebdf140938627e857a86d1cd4884a4db682bdb4c9601e6cf1b3efa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ff/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ff/firefox-57.0.4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "a336ae6bde99dc668f62e3910419e7916f439a7ddaeaeffc650723ac20218dbff7a8929622fff43c1d409c7e54db6047034b53cf937f819fbdac018e3e461a71"; + sha512 = "28ee8f395cd3d214cc67068a1421b466dfba935cc63f9156c258556c89ec74ca70d21bcaa627f4ed7bbe372fd1577b77e03230b2f031ff26e72c87b8889cad93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fi/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fi/firefox-57.0.4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8697094c8bffdfde8c921e12617aa1b493962ed1794aaf9d15ea53943244b4aea007fe3a54c28f5e2b611f3d11635f4fb0b7391f6c8a3d23eb8d3c3945b72455"; + sha512 = "bb3eff25215b09cd7789e80161b06c7a6e3929036895a9bd9d949b94233bfa98056ba2123602f06b2d7572857371390bb887c50c2c1a37c641b20e250b083a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fr/firefox-57.0.4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b1eb6b13b204d9273c14302e5486dff516b00d67b2c40bd8cbd13abf2d8925fd2429adbf650c89c0106dd3d74ef145a073ff69bd587524a373ddf3e0caa072de"; + sha512 = "facac474073bcfceae7f1a1b8554e807136c277f31abc999b2abe33f2dd6f365cbe6549a5f9542982c3f5b80f42fc1c7e361a5402f74e359170c24570671802f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fy-NL/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fy-NL/firefox-57.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "f900630803facb35837054d2134a1e6bc72fab5fe57e68d8e34c9436f8ce9acf34041f64140d2bed3a6214b7a6eadb3d34d4a91408db729f6e466a89a751850a"; + sha512 = "84deb0e23a3d6a56cb2e52958c7ec4a650ed32a0302d51ba0f9b02f9f6d7f974402c7445d51a7be4cb22be0bf582af377653e2944829cc075a01804727bf0387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ga-IE/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ga-IE/firefox-57.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2b6afdb01faedd8456a6e76911ee28909cd6e5f0ad9406c540645867c9080fcf0df3f5d41b39d5d28cf329ec9dbb44e2f57044a7c9db6bbfb608cd7ed25b4cb4"; + sha512 = "41ca5151a5d76314255a9f772ae7483d8c67df84a5511ad78cb951c6d11c8b0b78d43f19d3047ddd8add13706303335058adc4be7779dbe3bfa5b3b60a1929ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gd/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gd/firefox-57.0.4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5a643a7cdbc9a3b97aa78cc6bcf815f78820fe03edc14c8c0cb960a8023a4805ebd44d5a26f64163e265facf3e41b5496c488f4b0735154704747034b11a4913"; + sha512 = "020921ef0e372eb1a9cff8c71133668f6a708436027a5d163188b8d2928fc8a264ffe5f7a1cbc40e109a711ed4a8bec26c333c29c84d4cef6c1985fdfa54a0f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gl/firefox-57.0.4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "53cb8814f1a1984e4ec19d89cf9a15b5f3438904c0346cf68288cd30a3dcfaae5095f29a38b85fcbf89f65ce6f9dc707c9c289c5619500e6ca0333f7c06045cd"; + sha512 = "40d1131d2f2a365bfa0432b8deefa8c705b508419ae3e1b764500fbe67cbe38ed9a9813031e37ccae2e835d1f9d6b6c18edab829bb24f0658a6885f197d108d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gn/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gn/firefox-57.0.4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c760e2f00d8f444024c6e8ca6125f1aa348f4207a8d43a2dd2bf03fe014236ad6eb5f781cd5e475acb73390e93f3c6d9ce66add2acd02a42913115d417c6ca34"; + sha512 = "fc16f7ae512a49f5af381e3952b9af0772393c1e0b917d3d946a8565733dd8ae9187bb1101bd9604a4e860b8e4d001ad3bbd8c3ec023207cca28e91f6ead19bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gu-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gu-IN/firefox-57.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "911019fe7509cef2f1af15536db0a6fda5570a369c48b778960971f6c85ce5c6957765b2475a3f078e8ef674a8dafe74f44383f2fc77579d436313a408010067"; + sha512 = "693dca0183d8dc7962a4505925abb40d286b86fae206ad2c88153ceff02138e756a61615d9043bd65fe9a60ab990d5a79f2bd0fcce784c361488c3047282be17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/he/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/he/firefox-57.0.4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "098f14d72c2524f205022ea7b76c36396cd9f7fc64b46a7ffd1d1a8a7511ae89ced577651d69caa4a92e2e800d72243b0516c52e50cf852f34f44a6942eb7e23"; + sha512 = "75c52bd15a6c3b7254981b82f9d5f0b9aaa43d2346bd1376913f6974b63d9f6929ef92fda0916103c643ecaa7f235b4268ecd956a4194ae41048d794029605d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hi-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hi-IN/firefox-57.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7676ec73396ad6c110ed97a23a90f9b2ef9336bf819615bf947e5c46d728fcf8e4073754b5560fd25133092de56be30c9cffcb00765415fcc6e22c4fde621b17"; + sha512 = "752852c1295153ceea9d55e49afcdd185ca34f31d38dc2a85252f5ef2b0dacd9a6b3a1828ed0d88314574241157dd90d1da33c6d19fe25d1180ee959bbd8ccf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hr/firefox-57.0.4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6beb75b752cd51ea9dd96358709e982f504d1424ccde6e5ab0a9cca2e1e99282e6ac2e3d5a768c3bcb15f4eff316d32201db23d07321e0824d0de8793c0cb949"; + sha512 = "01b29494db80f9483334bfe23d62859aa16dcd918b1acf308d765b9864304616182195d2c10e6ced4c7f1709ab2d5a3c5485614506ce727fefb2187b82a28895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hsb/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hsb/firefox-57.0.4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8d3cb7c80c4f0b2abdaed55dc7a3053a9425804a9ea325f582c185583166113362dd064a411e48074925855677b4c093d7f45d1b7665ba977c8d4f802aa03881"; + sha512 = "efb189a9daa8335e8d2b2b31194d808edcfc0f8b607a227daf0b74ae456600b7ecfc9fdb1340a17cdb6913735ade2eaccd552603737c4c9bf3abdd99bf438d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hu/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hu/firefox-57.0.4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "78f278cef9217d9e9a87d404c89279af348558538ba59079db00969e6ad5e38573ce26474c3a53edfa838f023d83ec39c8e0a2c8f6b176b45d439e32b0328a82"; + sha512 = "4d6a08d3ea1cf72261aaffb7c1887fac28ee68f6e1bb5a540967164a4f7294f0a378b0cfe3dba867a5adfd21e4df3478a9bd5be057ce923c53fee39fdcbced4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hy-AM/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hy-AM/firefox-57.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a59eeb602b1dff769919f0c1f588bcf4c71c487e3c6d68f86dca5a03d9ae63fa5e0cab1ad884f2ffad7a6eca1e8c47d4309a065131b9c0fdae961f585819a22d"; + sha512 = "c68660b7e1482e46ad66c86623d9252466b15eaa3d2c848392985db2932624e3d953ee48d6eab39c42dcafda174713fa148aab41cf04ff63db38eba563303c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/id/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/id/firefox-57.0.4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e79f42b028fe2c291f9d405564fde0b4b9571b7a3985eac56028c684b455a3c627a596ca7c4820a53a9c1131713e7658990aaaf47c77f7ec6d850c55a033a1ac"; + sha512 = "c93a02327cb8679b65c9770d6105bfdb6ad3bca90191f3d0fb1a5a35d3bfb1d4616ea54f3af5aeb76449de973d4acad0873e37674524d90010cb830247189652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/is/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/is/firefox-57.0.4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1b505648ba5459e1df251f676c2c55b656f6c879119a8c64a46954d0597cd11b4de8f8f52b9a995ff689573feaeec808300cf9a49379cc2e7184339035958a20"; + sha512 = "b7961afc123a574e656e98eb7b6f819517d3658a36303af89d36f03c9a32137984e047e4021d30d137294f41930645a62f5dfc06456ade330942a880aa4381a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/it/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/it/firefox-57.0.4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f0a399c409db1e8f787b657ab801db9aa2f47f57e98437177a6a38ece6279371e610a3d83e5311f23d021d3f5a67d0d4bc61c9dee63d20240699410206028731"; + sha512 = "7ee154c376146c40828375072f0c5ecc652eff04f8df644a25f106963fb1ba6973aaa7e7d5b27918672fa42069d91d4207e8f779d684cb342c29d56a1a020ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ja/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ja/firefox-57.0.4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8d77723a2212c38fd1fc0671984f25ba1b8d1fbf877ae4cece67d528a5ba29e0281b7a8c4ab00150b47f21f63651ee5c187819ee14048c76aa728924ae644f36"; + sha512 = "ff5ccae9fedb3366319a6ee2afeb849720ef9aab9a25700e15871b01addb1bd18d6a1ce655e0ef0adf4a1f826f81b85ee2a3e21161e554b5a2e9050f72c13786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ka/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ka/firefox-57.0.4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "695aadfb2918f3bbd1317d8fc6aa36dd7a938e9bc790a89494a5a49848116836aade5c7df4c845aac6c465c44fdff42c5ad0904c9189caa5ee82009b53840582"; + sha512 = "fe165e0c5d4204209ee9a647272c73c28344bd16343338ae6b8261dca2b5ae4d05b7fc6cbd3a7b3871e693706b7e73a3b7ef3dcf40ee4dceabaeac12d5398a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/kab/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kab/firefox-57.0.4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "baacebdde792367f36d0fb62d3c5d65360704b178ade590089fd46b3972d7e5757f5c18bbf2c810b12cdf7ebaf61e7520f437b4e36f02f010385efd59da9f75b"; + sha512 = "294d0980cc5f9d7feb628c797d260024d786e919d2872f3f5695ba7e4fbabdbfbe9bf5c7327645ad99771aae8902fb3fa6d6e5de1eb56746b32b36a24564501c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/kk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kk/firefox-57.0.4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "544d96b4d18d3f5a86f0e4dbb3bbfaca80a2595c49edaf843dc4120044fd9b0b632ccbd4a0412889c4077913f3afd2e807372b56116a6f73dd7a035080e16e87"; + sha512 = "221497e9d38f2068f38ab37efd8818cfcb3f6281ada16436d7ed22be0c02806a0188ba5be52220ee632e575989e76fbf57263182281bf0bf736f203f6a048bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/km/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/km/firefox-57.0.4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fc5f1b62e91eb2ef33f0fab875956cf5d386420d08d56261aa9724ac209c474a233eaa6f30708090de3eae0baa6c5b2577cfd98f94eaf4a044dd2174407d13f4"; + sha512 = "cce416868cfc51aaa334bc1fa5d7102177024bec64d98cc1034fd1741290876d4ab2244bb49befaaf7e198a4401e43b3010894226fbdf838aa3b8b8282577ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/kn/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kn/firefox-57.0.4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1d444fa0eee8493d425c4f18d0b8f935650a9c3e8ba662552e2469e14ddb49e2e42a7ce313c79f5ad857f063cffff1493b76138c6719d075752b55188c60d1f6"; + sha512 = "6f1039c079af325b6190e1a0396192270adc3aba374e7cfe2cb2deb39b86fe07d605c9a3d3b063c91abb8ec6348c324c419c212bcb79735ce8ccdb7ce4608fbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ko/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ko/firefox-57.0.4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ad7ebabeaa0ffc5231f2aba35c96a8aa7e05ea085782799807a4c96b01598814d96d1ecdb40984bdfa946a2b0400039b81cb8eb33f42caed80a60a99b931df8f"; + sha512 = "425b023e7eecb9f550fdf96c544faf21aadd04388a4b57fc28cf9e43f82d58dd957983046399592b21099039bb5976d691512a93f4c1a94bc384126b8667e19f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/lij/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lij/firefox-57.0.4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "0ad6eafc2fba94d1333688ac3433eb2f08bbd7733f9db9a633af00800a3a27f7f987cfeefd949b26335f617e769450140ec939614f378b1fc6a1a95ca1812b99"; + sha512 = "2410a21d6158314076474318c2be450cb3b3397ffc5a9e9e8391218b16116371e2816c6fb1684b3fc3589a7a9834874bec01a2af39331dd592fe9fe54a3f90f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/lt/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lt/firefox-57.0.4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0563b0494e7a0ddd506f3d5500127f130dd170643ac77aeb38cb5855c4d9f39f27882bac594054d89346ae9db4bbb1b7d89a56888de9d15fb8649d00991cfc02"; + sha512 = "78ec1d96aeee8f610c2637be20284fe85913cd885a46ecd3965ee0a8f62770307200e33505bbe67e192c38769d4614682536394186ad488b51593a7f6c7151f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/lv/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lv/firefox-57.0.4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0bfe9edf3f372cb0c3106e728a123acb76169dff80cbc55b450191c0d07df201698469fe56df92b068d0fe6ac308e302695bc96ac06dba5c9214bf8246e93744"; + sha512 = "9a257cc93498e256c9b0a12ad8b8922cf749fdda789197285f0d1910eb50b3d601da46806dd50a4510ea3b3fb8e8f4e494ef87d1e5db2208993a9e3ed59e57e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/mai/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mai/firefox-57.0.4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "24f332802f6ebde8efb28de1390f9036eb5a226247b8e11ef0b7c06e2d7299cd1b4770837d197a0aa98872985194cb13498c045813d362e32853d990e3f6d27c"; + sha512 = "bfd02ab5efb92205dc649afb65263b15ff46e7fd0d32c560ec3977ea18d420c89782fae63596571155ae7a77a59a5c2e9d25a41d18b845e502784bfa264638a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/mk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mk/firefox-57.0.4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3cc4da8c95dd51d1a4f996edc6b408e7b3231809d0e7b6fbc1abf7fddad6337d898319e57c2282042ca4968c804e5d7c572f2101a5065fe9a158dd394fd539e9"; + sha512 = "29d5b2edae82aeea218625ed9175455bd3a3928886035e55f60b6d5fb717d632769ed57023b4e6d944d22e03c5169eb2887c09ee4c682a6882a5bf298ee0af23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ml/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ml/firefox-57.0.4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "f7c19e1b1cc7328f5dc9f2f468ee948c4b8f93515b527f805a981eb55edb0c4554940297eec9b8138f0437fde10624a048a7f24a0195d13d7ffc661d54d2a37d"; + sha512 = "f247d859982459d3438310fd9d3c86ad1cb7448238a71dd81f0c8712b31da1fe27adf1821e7e91d52e68212d70826d11bd3728ad3642a206574cd278df734b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/mr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mr/firefox-57.0.4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "144b404bb7b7511008a48ed88ea87bfbed2b2befad7a885c74c0213c0ebc9bbfcf9b5f44607cb6a11c58d9dd033bf7ca2b7f8358896896a47e59245781b80af1"; + sha512 = "63654388432e076ae5d28cffb969213cf875894b94354f652d40891d63dd0a25e6175c3b51417ba5b760a85584bce85457d742829603dee9084c4c21469aa02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ms/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ms/firefox-57.0.4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "68ea8dfdc0dc60085f9c59ba25738f8a28fc1ff7bf5055f6e60706184dbeeab5ab777a9b8278e6cedb8fcfce3ac8542566c9e5f1905021a279e7afc7bfda7e75"; + sha512 = "bbaeecbb9d2f6d7a881f219120d9f3769abd5713a8d38a1cffac2dc3dcd7849b49098df20dcd84812bf4f3a55e70ca1199cc15e67ab248f4c5ab9d2ea91cfcc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/my/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/my/firefox-57.0.4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b74ad06a52d973e906c6e4b96c4fd6ededa3db34bb9dce373178729c77eb53ebc8dd452075ad7ba5f57780dddeaca5bd0021743dcda4f7cc570d8626835dac72"; + sha512 = "882e00804181821783617db75170650d5d8f36db1d32fa183a7d1ffbf04dbd7a7b2c9405520bc09973af800f8d5aa9859ead7f298fb9a18c2c0ffb0f18ab3542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/nb-NO/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nb-NO/firefox-57.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "68a8762950b04f0c24462df6b2b0567742cad591d26e86f5a7656712ed71e04afcb190bb6d190a38734ee3df5f2735ac4713e6e3a7015d0bf4b5226c23039182"; + sha512 = "5203d4a39f9a3ea14d262ca13d2e940d8381337cbb1e9d92773d3ae086d9853bb3b5e9d9bee550655b15ac2cd6f0fbb3d6ee52a836e94cf6b133f6924d6eee83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/nl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nl/firefox-57.0.4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "1fa33fb50a11a570f5a4207c797f79df28740f9b811c02517240c981518526bcc2614cb65f9c68745648009482e8e40087c5774401c00ead9da37e94c7cbdfd7"; + sha512 = "4ec42e236d0fd252300d2785f865e9d1991ba5230a5621798c74bd2802220ddaeacdb43ae44fdd365dee79e7e4b97cb50597713acc603c72c630aa0f409cc5c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/nn-NO/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nn-NO/firefox-57.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "cc15f9bf97d99907f51bb060faea940eb4ac89081d3eea3bfd619a385e9e1dc9e0fc66f354676dc0066b5000a9ec5edb676a9cd5dade0cd88bc7139e62bbf25c"; + sha512 = "4a50223708c6a45869981bebdeb8b5192b3541eb54e57e29e60671d436e12ce688943936761a9033b03d069a3c09ee1cd5a2265c0173c30f581710a35f559e89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/or/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/or/firefox-57.0.4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "0996fae40051db7e587ec4bacae0c30311676e837534d52c2cab793925ec2724038497d2c6005df6c2466bafef507ab6de562f177c99ea4a19f0d3669de173ea"; + sha512 = "6439073c29b4d930a0b2365824bfdda5e1ae3ceadde8f1949c4eba55e9aee9f15a22ec7293e1c8dd7a5f0ec63914f8054d688dd3fafbbd70e6e9473821a482f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pa-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pa-IN/firefox-57.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "442e86074d56f595bcdf3d7956a71fcfeba673aeaad9bb441faa4d235922503f2ea89b987731dacd3b1d7747b658e62efd8356f4e005b950d580badf90fadcd8"; + sha512 = "ee2ba2085c389d70312390926f523e9e39d030d5b0b261088fe9b0dcd752fc1560b80817844d60835a38ddc49df315aa9575cd5091ce346a97e5634f810ff4e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pl/firefox-57.0.4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2d3554aa3403fa8b8c7ed972432bc1a78d47c054aafc3acd3c7d78d716bec3851c8d8c17b548053f705c9b62b0cdebbf7514fa6ff18bf6fe744093bdfb525e55"; + sha512 = "b2c4b4ac6b2b70834787efab3bf6670ba4b9e378a3ea7a206877778a32a7acc51efc32376d8f358adf9f7756e0c784e436003b8f16366741c6c7f346344352c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pt-BR/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-BR/firefox-57.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "100cf68e95f4b9e67db063a9ff50107fb57e8d6872a1259e85944320bed4604d236ac066d60e8ebda46195207290e251d5a5be88be894bddf6f3b8f0887e52e1"; + sha512 = "3acee98821d5f24f8ead9f27233fa22372e2b5d36bad52616b5a59705992f816ef6b4cec3e2add96a76f3e50fbffca762fc88445b5fba12f058ba06fb3c7ba6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pt-PT/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-PT/firefox-57.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b0be537f63a19ffd1afe5f3c08a890b2d7e9799a8dfb3a06e3bab1ea8c36c6bca6d62d83de1774f78073886b63f6dcc51cab1039efbf34a40b48ff195e470bbd"; + sha512 = "16ba9337bf8de3061d2d7fc9b609b02a61e7e33e5bacf5dc31f2b76bb281f8b298534f68b8bce4d5adfe87b0a18b660f71bf81bf556625b35a118630f2ef0d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/rm/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/rm/firefox-57.0.4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "973211fc29e85643e4e0657793404e86bf9e0045db8504a547d5ae10f0f0373ebdfac78243342b966dd7e33827e537c13d566cf9b38d9c6ba0a7b65fa22207e0"; + sha512 = "433b965bb97d00e81071d1732941021166088b55bada961f8dfb1bb1c8831f0df7f2b89879e52f992c781b33ed68e2fb6058c9ae71fc6827459ea3a854ff7af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ro/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ro/firefox-57.0.4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dbad9d651eb5ce4140ee2fffb10189c238d055eceadd31ee8321bef86ea4aacbe1ace3e33c72ce4a25b8ea81e8d6bcb1e7703cb076fa746c3c0c6d00feaf83ea"; + sha512 = "749c7351f99abe43f073eaf32fec454ff27e725e28eb6f2cb094570d1bde4fd772cca4f05ad3ca83803542c3d85dd2fe60c274c92a8339ab1b619e7fdfda7675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ru/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ru/firefox-57.0.4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ab0dc0e12f8334ec076379a1831209434a7c232ee8a63442d55d3cb63505fb9760268a4fcfafab9fe802b38a37faebdda67493cbd769521f80208532dcbdc253"; + sha512 = "430c7afe325707be3618d717bff3d9e5b39edf82b786d0060fe6f6df18d8c9145848f4a1e1daf61b4da83b548dc95d4e5766ec4c882a2cd016e934d7c179791e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/si/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/si/firefox-57.0.4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "28667037738047daf790f0ca029ba4a5edf2a84372f982cb738c31e5a5dcc3c85fa84d952ceb0e07fffe4654623b547889d30ca932cc03529daa9beef21822bc"; + sha512 = "452c3fcc5466e49c6e56192476d0957aeb60328ac2d5b9284204f50b07dee7a4835f287cc86a52476160da38f68212ad2508aa4599b8c2824190017fe3567764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sk/firefox-57.0.4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "651ff7ee6173ce9deba68d9e9327e56933cf32be8e07268e744bc8cb1954d90162b83d20fb2b10d380ab0a78669d9b23216b4a3e23672077b7f222db3f9367db"; + sha512 = "cb67db6707e32c44eba532323ea16c55146a53621ed1c37a50f963ac3b4e66040a028defc175a16a0d4c0986fe67c966c56b5ee19db042e1aa93c92517e42761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sl/firefox-57.0.4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f621e765b44175a447486db5c3934a15274ead2721ad01ce9ad1a502a515954a64f670ba6e245d9f3f168e67e10c3193ab6baf498c1eda187761e4eb9c486aec"; + sha512 = "f0269fbb62113370d23ef2ac9e26e602ec6457991e4b98335ddbb2df1e632604bccee27420ec4ff7910f936ac7518f7320ddc875c0bb3b95634ffed3cae5121a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/son/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/son/firefox-57.0.4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "4dec9f2d9581cfd88cc49a3855a0cee3b8ed2db95252c6c872a7a538bb50c4db11e51a55b1e443f7af13035ff18cbc8d7df21d80e9cdb1587a6d5298720bce73"; + sha512 = "1b5c3c0d2cb42eb985d6c05ea6454b5880c2cf33a6c46d7993ea8793027a9d1414373a14cd756f2e991d2f744ff87972cf7c050390dd4dd7a497e5ead3ef29c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sq/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sq/firefox-57.0.4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "36fe9146c47098496f433816f4e3928b883d5ca308284b1d70db2998d8f1df28baf50cbd9f071a0e6c7faeda9862037267999ff8fc1194da05bd15ccbe0ab055"; + sha512 = "646bccefc4e52e823d099521b75d6796905d1ae1241ca2f0066996ca4e3a70fae901c8f890b821694699f101dfbcfcfea1cb7c7cb6de048bd896a62ea20e1348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sr/firefox-57.0.4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "ca83d9c745eb6aae3e66b3388c7068e8bd82ca0628d4c9e202cb98732c2986bec50d580371f672c36750b5d13d790a1d44fc9c5fc0ad8602ffe53ec73c5d5554"; + sha512 = "15ae853a20c97c380f3f6280d370a821461c462b2af5496416c81fcb1c47a0cbd0bcb80eaa0f017dabcf630f42a886dd72e6d5738305b599f24c5320180650e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sv-SE/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sv-SE/firefox-57.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "39a802072d0afbc6140b28d6738a9d0e15b949d6a59f48b59a3e028b3bcaef82cbef519580213169ac14cbd85302fc5da10ca224cfc435c6c5f5eb7136f7cbc8"; + sha512 = "2dc41cfc4cacebdaee4ebda94064bf9e2cf7e66a95b57e66936b69c7420302d0c3100c5101646b91438493016521b45fa378913b463fc55abc7681a34e24c4d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ta/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ta/firefox-57.0.4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a76568bd01cd7e03df7cb7dbf6e3ecc0a115d4a91cba5d3278bb9f5ce39141ae272aa5064cd77a8767a8e76ab433973130c80efed6e77ab122cbedac1cbe9e63"; + sha512 = "9f1fb4fef04e8a5944bed3293b190845e668431bf6fe214166ec3bd2dd7dbe328ab8ff904627788b80a0c1d663f37662c47a07c5f8a3818a8d2a509a4648b72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/te/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/te/firefox-57.0.4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0a518b4b23bb554b389c96c60e4689905b85dfece7f085abb7205dc25e191526d96b0879b8bd98760424c17ea267108fb87bd8c3e4129f45e3ac5815c9c83f5f"; + sha512 = "a874ea926cf495a26fd1fd621686f0a123e3cbd67e51699c34e4e5874c30c98f6e36739f2b214d6abbc483bdc0fa202a1d5153078fe69fe9d20b4a3a517dcd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/th/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/th/firefox-57.0.4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "85acc9fd795f5d27ec6cfaa73b5a5a8cf76a6955fb35ca3721864f2ad06736d3bc3b24388a4ff861e3c8102561dace4c3f5dedc352a83c1c916d254ac28f74af"; + sha512 = "dca7e779ca59b49f51198860541a6e0034ab132de0781ae76cbb0688ed0b9d4277ba6200d22020720abf0bab25326783eda0560f1c2fa0b912a50cb9afbf5ce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/tr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/tr/firefox-57.0.4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "b1ab6744adce98723fafc28200ec8e37249cfcd524391cdfde548a6d5f9daec25e60367c49f923cdb6f620edbfcf6d82d49049f865807b76c5d654fd412595ba"; + sha512 = "459051cee1bd3df7d9f2606006edcc134d701e9bae614b2baba6538b2fb738da5e671b7b79e65ee6996e5a35df45d285d9e354b635b12d860c926e0a167bf20e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/uk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uk/firefox-57.0.4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "fd529013373900280e69832f07d3bd91808c30ba10d1b2d2978e0bbfda9963a1a239bbf08ab8ba65c6e9c313ca7abe4adccea778cdff34a5e07d521a96814452"; + sha512 = "f3354ce8c703a3d204ebb1370aa561be7fd1fabcc7361a8f270156ca62863c04f74ef2acd25f56adb5c50a19f0256f1956a2cb38c25402ba046cc59b1096d35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ur/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ur/firefox-57.0.4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "c246b71729e6182d2c400bb0389e47c56fb64ad32363f381a28da1648f8d923c79c0305c2d177336c720b8421209565d7744041a503e8959816090ab153b9cf0"; + sha512 = "42f0d747bd8c5b3fe53a436472ccbd223ab9a23782065af2d4784e5ed075caf95cc0c4eb060fa1a2b11ade6dc12b99dc4ab497eba1339e2b8ddd99dbb5d286f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/uz/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uz/firefox-57.0.4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "d9b2a157897ade2657f268fefe5a77daecbebb1f4c038405be5945d79a249c54a1f2a4e0b5a035116b10947decc59228adf2c0b1bb5497fd27da91fe967b4883"; + sha512 = "476a632365c53ce0c72503bfb7dfe9166c6a4cc389dc7b174823b9dff1717c9ffa91f95eb975ecbe13135d39b90c3f18d96a5a08501eaf32ceafba0c2203b990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/vi/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/vi/firefox-57.0.4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "18f117aba4161b155ed33baa00f48d41752bc1c0438d6ce1c3b773b4c817adb611b2e0fba25fa5dd957c78df9e97e2af65adad5e63418ca5279e66995a1d7a00"; + sha512 = "8f8146925562109cc1e21a6146203b16306931f03fd1451f679f3d345e589626669f35d5028b4189d175cec3b7c652a3d863cebbb521b72d9a04dd77e65a2c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/xh/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/xh/firefox-57.0.4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c4c061b60e73424371a0d7b58e923c2687c6de8c48c5517edd7f0ea84bee8b4d1786cf2141bad0c289619c31e52ee0685708f4279f4de3684e775e8b9a95fb07"; + sha512 = "b382942e20e4188b4ade8417d5e1d036e81dba87ad0e5250c0fd3e43fcac5134b11f02e4220ecafd5b1fcf2a7fd12d44efb595251fe8e9a9b48a93400f264632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/zh-CN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-CN/firefox-57.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "cb3918d0f69a40eacf8b0cf525b7a58952c73fa6de113a02b7e3941f53579440d97f6888363a15a17673aeffdf16df124661053e2df3b560b97208871750a61e"; + sha512 = "9fabab7faff2a166a001c91d65953c6dc80150ab6548c72bc180dcb87aba485b2d06efebf5518f43b740909616b1ac04de57e17bd60fc3e7843e4c7e54b63259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/zh-TW/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-TW/firefox-57.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f9f596bedef10fc958b1d8c99b5120c72da014ca561c6942bc7ae99baed9e59200257f8f1bb9b39613f02b2f7c45ff26009814459fa8834bbf5f11b3c82502f5"; + sha512 = "a334f4904ff329ddea28cf1eb4416d0c665a8099b20673d40792f2bb653fa09f60b6efc09b6d22c25f8bbafc0aa1e1aed6615f1377da37f6f843adade51d881b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ach/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ach/firefox-57.0.4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f5b5bb281aa4221e781032b571e36fdf5caf7a713bb7856cb4257532fbe955037b31598854f0cd8ba1485fb28142d5c85755f129cb6ff18b3f33601f32414e5a"; + sha512 = "1bf24191ae24fb8bd553c97d2ce2bd9599f84b2b6d57162a5619821c3312e7671aa04fefece26aeb0786c48d5fb934b79adab513f3ab382ec1e71f44d7a3835e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/af/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/af/firefox-57.0.4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4658bfe340cea1300fe523574917639cfbfd0d3bd1429b2af30b6894d3924784df35d0d27ff9085f07ea698685206f9c08bd1d7bf1ec84d4b8d136bed679e819"; + sha512 = "6fa02d454c375af8661826b23c0220d9dc402331c8739a8b09e2e4583dbc0d9d6e742f65509f69bdad2882265c51a956892a04b8d75f3885b722b0688eb87ab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/an/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/an/firefox-57.0.4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f92b3e572f24b7ab858d55e972a184359569504084e542829d44b4c868789ba372934f00022fd05489242b5c9571d9284d263b7f4276ba24ac04c7e1930d1c22"; + sha512 = "c75a7318937244cd8f227f05b8cd8b13c948312fd692040125fea3bf3b8100e7c0912e0f4edd67ac7c9425e4a333ad091a8ddcd29acb9f045d4a0459f9d35342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ar/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ar/firefox-57.0.4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "0500e6d73b68c248c4cebed4a5df1e44b137b972f03ce67098dc8f46dc5067c7b7572031d0599acc4b840ae0bb9f1f1fd49fb051c16067fc4c267c22b45b3401"; + sha512 = "baa36a5936edea572d6ffad24c968538baf5ec888be09c8ee8179993f0088f661fc9f275edf2b848fc17beb3799b50fd8ca5a5a76bb4d52360b9c1a2ad38b76d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/as/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/as/firefox-57.0.4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d5885e26ca8e6caddcfa33800785e18f1b86ed96310709fba96bb977fdba81216d843cef4f30e0072e011801836ad5d64aec9280006d07088e0dda577f9c508c"; + sha512 = "8094dff31f7ac1de02f5e8af06bf64d8fda669c68556faba2f30de63f3954b3aa18ee130c76c6acea8e59fcd532cffac0ed822d3bbdce737ea4e01e9f2abc7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ast/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ast/firefox-57.0.4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5f05e368129f721783d40f84d096e3dccac2180ddfeba3b5757f5997c1c8b9bb275edc1073394d7bd9cba09df38092239bc88869ce9cb850edd2ec776382f43d"; + sha512 = "0a5953952051dbf0aeb872593eb6efedc557d8e518393a4672d2fed5a327f2c56720c2c50f31ea64b0799722b30202c3df4c46bf4c8dd227333c42a9fcd2fbaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/az/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/az/firefox-57.0.4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2c14741b737007757268ab9adf5fe4f2e11640f48aff4c7cd09d8b0880c4e16d2ab67bc19003e36ef91df0fb89e5cedff34223e176cd1068821d43d647817264"; + sha512 = "0eaa6a6d139868933b345b8ca62df9cd378c68053cca98d40f2cd83daf46bd9ac0dce4e91900eb447d1ab0ec8f76de293a65bd99913b560bd2f5b6794c565018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/be/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/be/firefox-57.0.4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a4658676505846fa1efb67c2f92d1e2642d0af2508dc85b91c023ed58aeeab4c816967aa6289caf1cd69c05f94a3d21510cee57b818fe48b14a222f34d4abc2c"; + sha512 = "b76736401d8f20d9638e9808b7acb41f46a51f29eeac9eb7d7850a8b3c32974982e946f679c98f8e71b548e87589edf5c7127a20f7108e4e42deb0e0ed71fc1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bg/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bg/firefox-57.0.4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0c47c4a2d6037f21e062451f35d265016ddc0f39d128c662ab265c19d4d310f8788b71b8fffc28797ab61f57bd4db2691454aba90ee726ff15dab5fa2d967719"; + sha512 = "7a47b07dd0791f1cbab7f02645e1b97173630ebc44fb81b2308ceb539d92f0197e8a9aa24f640ddba6fa888fb71a979837d6bd19d0315cc8c8eb2a8cbf99af15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bn-BD/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-BD/firefox-57.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "cc971011f4b7264bad96514eae76bc12bb5be038b69689bb7426f42888f8d3b23ff8307eeaf765a7f31b57ab7edb0a8df21da8dbbeaf90d30677bc7d413f1ac9"; + sha512 = "15ece8585166d99b9d52b1de03a909d1c38cceccae5547dc13267da223026f4be4fcbc2cb42a7c225a4a74147b014ad19173635fe4c3249f4180169b4a503bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bn-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-IN/firefox-57.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "f8d7ff7faa81392d6b62c1fcd38ccee6221aa953a7aa2f382e6cef5da9e4fc0e5ca71eaac4468ad07211acbeb2a64b174b1a950daa4a266538007d159dea00ec"; + sha512 = "72df101c9d0c602542e65da9235dc63d17c220ff56d2d1008c285fc6c10e090bf343ef968e60a36664d0dec72d7bccfe016af542b014ab116c0f243920aae93d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/br/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/br/firefox-57.0.4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "2febd7b6a803d5471b840e9e9c7c5fc266ba1c34326153d99ed04f461ab403f75165dfb0133af738fb0d3b40b76aad88915711a2c34ba702ad10351450b197c3"; + sha512 = "d0830fa2a0e4159d46c24e048767ac5c032910c6e73858eabff4a1ca0006189b3a4978c3e4822242883e6fb3abe639122ed76afeda5d9d2d5391806ea07f6796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bs/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bs/firefox-57.0.4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2b1875db4da17c2ff8fac8f10fbfa415d1d99e65d9a7082632d385a50185419bdf1e7176e0c97789ae71a3b791a2b8d359a931022f148d8104929fc564335814"; + sha512 = "cf93ea42460de4e9c13392eb1bbe4c6053c049a18cfd7038d99c658cf076d9989648abbcc006e345fdb2fc66f56ff8abd044b527ca0ae29accd2b0f52dfcc2a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ca/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ca/firefox-57.0.4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e18a60d9c53bcf6843a469110694f7dcc1a84cce5b92702266319a21866859c6e518de88eac5f3bbd1df87f386eb9b66e8a377c0e35dc8d88cd796c0acb6f849"; + sha512 = "3fbbfc5973384a0a6d65e02d5b82a6b5591ea8d610fec2ece24aa423550eebac1b25fd7d0080bae4300f64ae1955fc6dc881816f10edf33b07e0cb308260a4cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/cak/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cak/firefox-57.0.4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a87c412478a291383b42e36bd85bb0b9970e6e75648f0a46345b648c30f1177d021b75134ff18aa1a37df7ff2a3fead32e52fb7bab9d6895fed0f66318a8676d"; + sha512 = "0cf301895b2dab45cf487e41ba093e547bb4d42b997a9c7a90da2fbfcdb044e654cfc23e4bfb6de7065ecdb8e4923434f98e8b58313cd9ee7cf64dd5435951a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/cs/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cs/firefox-57.0.4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "71a32e068c0843bb907789e9ee5c77fa0aaf81f21b92fa63eb7882237c22dffbcf2de60eff8e2b84fe5834dc5ae2234f1ec4d7e4cf3347cd04c64637ba49dc97"; + sha512 = "20011fd4567fb3112a75a07ae181ab7d3a85702b9583efeb007dfe7a3009c34f8632db631710105dd68ca579b44a83f53d84bd4768f0030ed106bbe12eda8f16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/cy/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cy/firefox-57.0.4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "10c1da2f33b568b0ad8e28fc38c9b1684d20a7bd006db6eca9baadf2394351c1b467851b46c0cdade0aea0ed6a185903d95e7711f0839323a11fba85df5486c7"; + sha512 = "1f9b31e5e36a581ba51737e5e1f85a2d6ce804de854585ad2919f7070305567883724fad9368529ebd98d3f428eeb36c555d2f7ccefcfedb877227969688f896"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/da/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/da/firefox-57.0.4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "83c329c5b6be5c966beb24f38e99521d0a5be168d027030740778141afcc7850f242645f308dc3cdf1827e7cdf66bc44a7bcb4a0e5feb1eae13e6238875ad75c"; + sha512 = "a919e582953660fff4f438d58c8814cd5437f13fc42af9ddb383db163485754fac667b4e830e68cc827d7646436760bd6760ac4b2d7fca2a951c1d5f7d43be59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/de/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/de/firefox-57.0.4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "4f422bb6f6da9f79e62073ca0fa6a0de79aab7ad9530d9c2aa5c3a2364f8aa62442f10698966c121011dd0c0e67d39d0628969423de3868fa631fb79c9e094a7"; + sha512 = "c5f844f17a3201a7a62e1e9c9dab3ede7042ca33bc8d388d9677858ab289d1f0a823594701e7eedcf1f9ee015c2ff16cdb0d9bc0e6861701f065827c69204f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/dsb/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/dsb/firefox-57.0.4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "54d124b325cd95f6024c2c5c948b37d81a2efbe5aaee68030f0aa116dfcb3d3dae963968c67a33c8a906243ee27d75c9d909cc57e010fb760da1219f04441ae3"; + sha512 = "fda1a2b51a3ae8d0d28629141575fe14263baef7d68f3bafed89a744a493382faba2bc7d263648d8ed809eca274dbaf0e1669b534a23281944135195593f0616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/el/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/el/firefox-57.0.4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e98c7c71a0cf3db4bcbe0c69b3427f0f822dff1cdd3e397b7082af2cdd129349c3b37a4c420b7906470bbd0e921453ae517360d39c827218aba99e2562f6c825"; + sha512 = "0c48e342f0ec141f4a7512c0f1cb4826b9dfe77cf315d22365e4f3eee090f067a35215798ace57eaa38a80a5b62dde257992eed2084737dcd85b1d4d3f46740c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/en-GB/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-GB/firefox-57.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "331643e1566e6878d448972f9485f2e9df898a830c87fd8fd52b7d8024aaa637a611d8c5145ccb6b1406f283e0d3a88c5c12bd418a9916a2d446e7230b0b9272"; + sha512 = "d9d24a97b0257bcd1a1b468e6f986ff4fe8d26ced92e3878123d8667957ab187d87bb01e8d389da6fbffde66e1714fe81a9e926a9f3f5c52ea5d38a8eb961d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/en-US/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-US/firefox-57.0.4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1d0d0c2632338f1a319d86251e54c5e8582082e48429fe5b8e62e663c65cc9439094ce7415f2e4643c0ba3f244b8177685b5f112b244c7232d2585bf7a2b4fd4"; + sha512 = "b641a671d7390c505577fa956bc1452f58f6cc8418b3ccaf25eb8b5bb08799a3a2e1e7113525ad720f710d7022b18901c5234be1a1c372881e4908d2ae419743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/en-ZA/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-ZA/firefox-57.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "63f3ba0bfea21f7630b93174d399894fb3d4e1683fad0d0e5dad5d078d15fdffc06ed292a07c95244ab509b30496a81ee868ecb4917ea8f925fb590a2e6b3e17"; + sha512 = "605b7027a57c75e90d8e7004c50415ebdd2e2e111ac679d6bb87f1c55f0ca022aa4b77394a04ed94aa634d9b05359d9384e428f8f9dd000ddb2da755bb5d797a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/eo/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eo/firefox-57.0.4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b1bf24b6ff3cfa938af300a13641dc76910369aa0628b09dadf84817d9f315a0ff1d68b9fd1cfd7be02eec6c31966ae491b856d6c8a5b8088b6c97cb38d2bf0c"; + sha512 = "d5e81e82ffccb2538d94be4752d8bde9e5e84eaf06c5c29a34e0e16b13cc8df62ae17c88a50cdd846dc2ddf35c76355db39f39d74d1d9aac19c962d823d2a5d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-AR/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-AR/firefox-57.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "678dfe1d784f6caabdc06d1cfe6fd6691335f6f66d30fc3e7320f3f7b3fdcfdd907f2de3963e0b60951fb99983aad135dbdcf70216a093139583ef992499a069"; + sha512 = "27ad3f34bdb4f94a08043c699f2c9ce2a5de2cd297e9dc2edf777b78656902dcde7aeebe17463e3f7125d58a2cb5ac7de671695d46852bf15225cf201541eaf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-CL/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-CL/firefox-57.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "cc507767b5191fba46204e7918318bda7aa6ecd5eab20bc51efdc92910f0b059bc5ddcf7b29aeada82e93188c4ddeeef64ec6d2ec6d8f0e138fb257e10ddfeec"; + sha512 = "e65607bb7e1f08a2f0aea512e384d44b7d219939c82cb98cdd8a3697b5d43e7fba7036d4529c102a2ddbdf660baac45e8f9358692293d0a5d0869f72c8ca677c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-ES/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-ES/firefox-57.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a6404c78d8fcd6a329230e24961feaea347807abeacc5edcb329fe40c99517c355671fb788e121aecfa88cf1796049a4bc843fb35cc4bc12afe30d7c7162d739"; + sha512 = "f486c0f40cd610540743546a188c434bf16c2482d88145841ec90974a819e7f82952cc6f9e8c8787665f28f47f1e8b7def418f0b08f9fbce73f9d1aabe62e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-MX/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-MX/firefox-57.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "7ccbb080ffad4b21987172df3e23e1707a52f9d500ee696a0d0bc2efca0821b9c03f5541dcc2414fe9eb578e82f0af8090d3f8e99ef4f325fccc732fc159ac86"; + sha512 = "c4e45e86b5680cb9580948bf8db29c5f3a13d2b2c6a73753872ab2c77715ecb64f756522d4c1e50009d783cd4f589ae39e3bedf771ebb4b03ea6930506210a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/et/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/et/firefox-57.0.4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "32ade01760afb5b46428fc11f4ac3cf59211fd2fd3ee5627b02254129527b2a89d380ad92e8b56ddb426bc0306f1c3f4b41ad3a849877da9181814d0a16865c1"; + sha512 = "181772128d6eb85141169208c283caa0f4658e3ef627b92f723694fa5f38be7fa8e4c6591901971cfbfb760cffd693a285589089436bb25e72ff95fad36c632d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/eu/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eu/firefox-57.0.4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "6fe9ce65476475b548ad06dc13f6f8e8e845675d4797db0067001498e5bbe167d27538aefcbe740be9587b9d29b7e4cdaef6e0f41856e236b070a5f52d549a30"; + sha512 = "e582332c908c98b6eddefa04b223366442e61e231e9039e237e5d15007113d7986a0759e8b927262370ae61b103e749f96160a2596a7b79d2e7321a5416fa0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fa/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fa/firefox-57.0.4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "462514e0392f8ad90c73c3755033a5035926fa6a151e7a7d31ba6d71ad4e8d050c2ee374ff614ed3d428fcba1074eeaddbfbab98730fc470f0c9653cb4a366a2"; + sha512 = "118684887c685acf3fd2a9f0ab1b63bee19c29e285e1817d013202a9fb722b17a3e774db3afa4056618172d4ce741aa78952bf806752d52fda4b651a633139d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ff/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ff/firefox-57.0.4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a553ae8fbe9c43ff99139bd6720c31e1919861094d8a540696c63804750c8d235caa5cab7cd471f9b80169128e5639ffadaf5e95143c92c3ea9038b317294fc6"; + sha512 = "d4917fd09f789ae2ec456b4cef807ba17fd1e2a80f1cf9dd635c18dcebf87c9c5ccaa5937df7846ec24de943c8c58ba4a0c9282ed586958bb3275234fc9bd27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fi/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fi/firefox-57.0.4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ce6c5261ebff909d5691072012d4544d43652daaaea6ce38b47cb13fa236681da0e0c527f28cc307c6b9de3f3f76c1688c1d35629aef6469fe41c4ce3bcb2b24"; + sha512 = "891c8a01940d9896dba75de258ba7da71b5e1b03697fcc04c5919b6570fa8b7164d9f8fba6f5a52614e637c5fe859f59da7fba34d4387c9763b82e7dd4e4ffd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fr/firefox-57.0.4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8afbc7d3b56184b41877a6f901a6e60d4f8e55f8955fd64bb1f07acaf14f45c0fc0f4c6512c3ae52de37d66b548525bc4be1f2795b9f8e6ada8a267ede0f6bcf"; + sha512 = "cb6bf51bd4362b21416dc82a2c52cbecf0afb2aa88d6ab96affac7668d3ff0d7f81f345ce3440b04e0b4df0740505c204efa0d7eaf43af0b5c99294e0170a357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fy-NL/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fy-NL/firefox-57.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "195c6b307c30ba134b4a86b5f241317c39cc846372a0f53be8214f57b192fc24a507ca44fa7606cafe13343e2782f48c97cf16587be64dd49296524b6800abd6"; + sha512 = "17e3030507c7cd0dccb2b94bb36414ad9e4c8248b671f438dce27ec849c06a2a98343520bd457b9157813e11f9360a1e38cd9dc3dda49ee039ed2757168e5d26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ga-IE/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ga-IE/firefox-57.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "cd9521ffe984186097c77f3330b610bd61622f0447568c23bf06fb64ba616c48708c5dba2f7caf4b1b79d0ef7ab3113356e28e1d56d29688bdd09879b417f956"; + sha512 = "18bf7782acd20cb9972e419ddd62be4c9b0d18d2f545bf728f1729f2a63e9f69353cf47b8e2fdf8525829fafa3c87cecc6bc272e899a2df6dd1ae4cf11b5bed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gd/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gd/firefox-57.0.4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "92e9252c285ab20bd727b9cf8ddf60196997f6b8fb29acc6fb81edaa3ec8d9863f8aef4fcbe7a6b8e7016ef08a0b018b6cb9194c48d487120494bf3192c4599f"; + sha512 = "27d56b6d98b4478821e1697398aa0b39ed51123eb72a18f06f03bcca53c7017b4c55fbd32af626a52a74b5c53c9efbd7a20bb265af1d43140189f6f5d03168d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gl/firefox-57.0.4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "82693a4432cbec96483718c6eb00a45419f223ea9e47432dbf1690249339e2f139cd59a8e77c60acbf2ca45ec77e0218b98195398d3649f46d3087f527ff05fd"; + sha512 = "5a7c2e1faee64d224c8dcd822d0e3f0b064f4aa5617944aa048d32335fb2a45caefe7f6971058368493c483a5ac107808794289c68530d97f85d0e2438285a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gn/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gn/firefox-57.0.4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4676bbd543dbd3898345097657192e0eafe679e21f75d5a51bc6edeffbcfbfa85e8e23016e64beac5803c01cea7be8614904bce81bf34848d8717a7410159330"; + sha512 = "5c05eb1d50d0de7f7e25bc0821767ec916ff17a3499ed4cbbe53cb7d833fd43edaf3ec1c1c2db02b76523bad8a78043d7ac25be4d1a4076da942b09097949dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gu-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gu-IN/firefox-57.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "19814fb917e4d0405ea53555f70bfd50d26673a852ab6b4fbc158b8330274445431cba9e49cde1a0b469a32e3a97a1b64faa125f4ac4e962c8120e76a922a587"; + sha512 = "43eaf8f5ff8f921ead14cc2a2a5d9a98ca674af49087407dff37afe4acd9c22a4d83e96750bb50e8e6fd4219beab08c8bf52831fe15b8320b5858d6c93c611f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/he/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/he/firefox-57.0.4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f8900c98ff45c27f4c66676607ce544b25bc20ed45682e67315a9cbed0260e9e6b8104f8f4d022a5b272ec9c4e6d3fd4775a79e2c264f03bdd1629073c6b7969"; + sha512 = "9573f5d24af9f89abad0d46d99750b9380ce77c4c017143236178f3fbbfb2e43d1c1f1ae2223ae0d4c81b22688fc7da8c1fc2a19cb5619bdd42ca03ea7ef810e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hi-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hi-IN/firefox-57.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "63bf09e0a984d9cde04cf2a7887668b453b8998931ca4c1b0bbd13ad7dc8106756732c37779e0a1d84d1f842871e63226e196d3d738320f520f8b88ce6999a66"; + sha512 = "ac0d13b6d935f8b51379287f5ad5e434bec58eee0e29fdc786e43e7d7e270afea094b8af27c779e0f0c11e3f3582f84e2cac4e01fc69339aa569830d180fca6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hr/firefox-57.0.4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "dce713a45a83b67ba237b04481b66e2a3066b9ae7ab00824df03d2f9769ff14d426c7e3cf723aedb3ac1e1108147707b39680c5328f703e5fc849d8d1e51adcd"; + sha512 = "3f17557b50fff4334a27885358cd1c91fcfbaab4394b5cb9a571c47a24bd45a2b807534c6645b58220b65285aef5014582ec6e1a04e57e54f7cdc5cbc4d0e1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hsb/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hsb/firefox-57.0.4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8f6ab7afd6d10b781e0c9a083c72dee3069dfd9c91a500c24f76fc41e9ced3cfeaa47908efdede2d6adbeeecc4ade89a1644c4f5eda79046f1762c35cd2234e4"; + sha512 = "ea3cc8998fa736c27469efaa6aeef4263c1c23d62804721ef577d020295100bd99e6690336c29a0af7f274f8c0fd554d16ce39638b8c9de2132dc0fabe21b91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hu/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hu/firefox-57.0.4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "41149404d276b28a35ba04f19d96ba0c1112f6615207fa8eb65ebf36f0e87115ec2775f374f785f6ad23470cf8f0fd49f1701975bbec218eef2ba9540dc9cd71"; + sha512 = "988721816865e6db32a4e874d7bcc67c0e7bfcf621bc9e8d6a8aa8732ac448930646891a53a6f66bdf64d625b1607ffcca4141ba8b011ec2b69803fb0eca32c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hy-AM/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hy-AM/firefox-57.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4270951b388b5cc34227391f00d4e756a293e3116a9f43827aaf1d27a0b81d255e1fd2021e6fe8b8ba137779eec679bd19e559d767321d0ac2ac6610d06e80a2"; + sha512 = "214105d839762ba56f8f30f9fd4e2b706ba2ab0ff4f76826661745505d2bf7b85481b17782182ee5250d82f0f233b9f3c7123669c2475d33bec40aa270cb83bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/id/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/id/firefox-57.0.4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "69348643ae4fcd209155a1c308d1a5eb29786c37b5719d694f977c0e47f77a9696e156ed50e26b8436bc56f3d63e78d3c44287a49d7e48d7521df84a15130d8f"; + sha512 = "60af8126c39ee9b7bd9f9c06048677ce5e9ac1b4da28176c965064e6d937df3218d01c923fe6bda822ac9fcfd95904e4f01438b88e0659b7df6c5a4b7b475330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/is/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/is/firefox-57.0.4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "c9a217076b1e52f78846d5898d62c2cb3ba33d4a7d04505b7934a89832cd7ce69fefcbea0f8ee46faa4f1db08c3c3c50a41889f18fedf25cadff76501bdb0ef7"; + sha512 = "07230ab55805e4bc26c6aa427d43daef7d799115780d712db5b358a8d731296abb06baa8e21a200310922ac81e23a1e33584c1a25a76031c03a849e33aaabf0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/it/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/it/firefox-57.0.4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "9cb2e8921cbe99b63bf488490e1e3c2e309ad5b5c499cfc08965b23275582491801534af37cd1ec07a6c58aeb8adf730e942a6e363a12e6064e2e6b6b3cfc551"; + sha512 = "4e80d7f042dec9c9752a81f434520b4ea2605319fdbe26a4ffee8e01ff60163a9df9100f154d45690ea4a492953f09a9b602609b88a350250dd71b2f66029713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ja/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ja/firefox-57.0.4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d2436d7e024b06f4a16e39a89a99797f0eab66f007334574d7d81ba1d3b4937b3bb9be46a4b5cdd929aac6e1a764e8ed531927a471d0890a5f6ca0755735350f"; + sha512 = "a14fdbc6e2fb341d78878bbed3df456d3906a6f9721ed80764f8747faa82407ceb48a4a6e8b6c90c4164fcf231208b3f4f147d6465bc434496e991613c7cf250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ka/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ka/firefox-57.0.4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "69cbf913f02dbf4f2c97ba5fe8ad4eaf744a3b1b3d75d975175b88b9f5cb516af49ffdb54b8102e5f3f1be14980bceb9d15a819ec3544e692b7edb0dfb55669c"; + sha512 = "e411fd39ee928f4e66937f55589f7a7d77eb9ee64abb30d49622e18b20d2ed2eecc34a54bb32a40d28a83b43e822b526494227b7b1a8b3cef831dbe8d5573dcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/kab/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kab/firefox-57.0.4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "1f8da18abbdabadfff995b37aabcc6b5413d891a089e15a0f23e9d04bbee0c749efb592c633aeed749b78e4b16a63dd91b089aa1a72795d0e28cc89fbfceb357"; + sha512 = "b430ee1803556d791fdd19ffa21aa32d8245421c2e8a7dda7cda10d751cf9be125bc089de9149fe8b858db663397827b2e511a54a56053827c405b0fa2e17ad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/kk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kk/firefox-57.0.4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "5316ee63bf10c43ce30e64caf2dab766c63fe6605bb672496689f43c14649638844a9381c632a42af108fac2039c78943cd0cd657d7fb0fdb7b33884a51bc856"; + sha512 = "24f142f4c9b85cefb404905317d1afcfb37868fa4061b5e4c659a3e172d86f2fd9d7c07672fc4a78283da27c534e2f0639d1c567350740d698aae6fa50846772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/km/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/km/firefox-57.0.4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4ed2754dde6d9d6040fc52fe099876f0a26d6ae21aa2ba382187d6d5689bdf5db5217bf40e70d1de566d56ccdf0ea9d1883f44c8c7de497514530bddbcbb12ca"; + sha512 = "226fa56eec9704baacf04e54a5f74ed4a6fb01eab2020badd61542f2059f47ddac605f69117d23635fe0562c02d86a088d695ee1a15071315ebe5e19100b965c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/kn/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kn/firefox-57.0.4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2f4ec84174ace361a2d5efbd7ebaf788479d11364d75fffe46b0a9d10f2189893d5eb828064d338e5fdf6993e1a9938ea96a8828a941493b3eb579e339d55601"; + sha512 = "c0c5eb6887ab1e3fe7f8669ff1c09cb5cea4fdad9c8fa488412bb3aef33b7252526ce5069e1dc8a2186c0ab4aa48a6d223487ef62554f90a022287aaed31d09e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ko/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ko/firefox-57.0.4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "b1e8758428a69ea72edfb7fe52f92e0144c541114ac546f1c5295da280ed2454bf755a276dd3b53bb1f75b37a5a13c49813279a92138412acb1cdb571da7aeec"; + sha512 = "397063d49b248302df350e01bc87fbb691e63681371fd9b2180edd8cffa9d00ddaa68de320165e0414bdf89dba037ebf8decdc6801ae0f5134dfe81cbb3c7052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/lij/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lij/firefox-57.0.4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "3eabdd5de44ae2a3063f76a1175287820c417a01b225c0798b4ca6685e4b0dd2515eff7895d1ab3e0b4a071841419c9bdce6102156faa570c48ffa02e5fd00e5"; + sha512 = "0c47e5568f5776829163ee5823c512d91e795478049ca0aa6239afc66c2ec0af940aaa32fb70473f41ddac3755c0dd32cd5b68207e94f095a033bf5accbe9675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/lt/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lt/firefox-57.0.4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "7e1d702b92b81d2656734bbd2c2e61db7bd02905b9d276627bf32c908ab5bac1da2888453efbd4282e5b26b2fb0f03c682265081f93c538569c8f47325f2bd1e"; + sha512 = "3a18a2209fcc5adcfe4426b8acfafc7e6e781c01b7562d35cd02001f8469d93e1db4db400ba34844ad5296ac40a3540ebad5341457fcf00b7d33b9b672514a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/lv/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lv/firefox-57.0.4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3847065c8573b1f37b584581aef3ba4c6a4666c9d937e36f0f434addfb7a0cbfb36f500afbecbbf061b885d4f5689a647fb0d2e487bd53d4e9bd689bd5cc7aed"; + sha512 = "ec9938c819e98f3d1b7979b6e207cdf798af6e0f937f9ad7f23ceae9968272fb44c6d2d28c066b20d6aafcb7edddedb299fa32d0bba29f17e3c50db7bbbf6cc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/mai/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mai/firefox-57.0.4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "459ed2d8fa1fd6ec45e00af73eb23c53a438f179dda349fc434269d737ec3679812c18804ed306f156b2f8f30ab026a0398817dbf5e8c1339302dac4c9bf0454"; + sha512 = "ea5cce55b13cb8eaa652aef1cdc2883720397f872d63728c781805000835c41bbac1c2bef035700c72d1dff79ccb6a8d4980d6485f0774b3aa8c0424e94a3ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/mk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mk/firefox-57.0.4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b0c9b7a06eea66f603ed79c36784dc641b2d2791368040522ca464942f6b4a6828dac0c6c098b5251b696d14ef5a8a795fb31d1fa5a5bc6660c77cde452af555"; + sha512 = "653d8d32d776fbc08126a25fa8a70b3826302e9cce01b8bb6f8abe958a79456df7cdfb8ae09a74b560594c29c515e50afc77bbc1ee260980028d1b1f10cfc1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ml/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ml/firefox-57.0.4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "8005d32b1c41b7deb18305c381f64ca02395e30e468cbc7b4d014af4868477aa7c5af5a4f36111e89def0a4e46e78d6be137c573b72b2f5eb27c1cfe109a44cb"; + sha512 = "e99a9acba626060fe8eea88a478879f3be751ba224ff1e1cfe28ae6c9eedc2d672329f67773f71edbb58d6c3e71be26f57b53504474c67dd65e7ffac79767fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/mr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mr/firefox-57.0.4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3ccf8f3357ff9f559f237c8901f26f8ea54b437bd2a34015a5738af5c97b0cbd882f069ae5c306de3f46d7ccb951f06ed225869ab5d31c82112fdb7da0c2714d"; + sha512 = "6f64740c424e77ce62270b80594915d3e2eb4cc2d3606791e6c9e3c8d3d8bd362ea4d46ed742b13aa427389150fe1a97af782ddd05190b0a5a84e8dfae04563f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ms/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ms/firefox-57.0.4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "29102828e4fff49774580d4d0214ffe7fa7e38ba7cd90d09423b0d1ebd175a057221b6d2d374d4c7cc9b2d054ef449e5ca49ce12c971c15179f1f06523c517d1"; + sha512 = "f3d2450ef0770ccac86b11e84a27c2e58d8a1c4133e874f9ae1cb7524ddb5f104d4bd42ca1fc37c20a8a3b297b386a1df0d2fb348616cbe9ef5d01c59b43ae3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/my/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/my/firefox-57.0.4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b01f3e667887e268fca6f72bb2046461d45fc5f21eb12a760eb61b5ece393de2b4d824000edfe13eb9c680b8f5fb95bcd39b58ba6f3124ac7e179d47f3c221f3"; + sha512 = "8398627bba83a1d0bb4929d1fd15c135bd35c8e8d0560ca804a49a0e36a083fe377652cdded198eef2b8ec1492cd1d7a33d6c660cf72081d090d40ea8b4cf7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/nb-NO/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nb-NO/firefox-57.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "680273b4636e1bc00ffdefc5c264bb6466cbf6ef577ab382ef5c28cfa731de8b51f7d83ea3695d7e7e01d93041b3b8464ad9442b43aeaa866b29f60761d3e849"; + sha512 = "123552055f7838ea2215a379f97c82b5d2e4085dc8e2a9cfc12f0ef5f3550f7247c4f3e70c806baf7eb12e031ff8b857eee721366d480e959dc1acae1d9453cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/nl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nl/firefox-57.0.4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a2409928f939401e530f0e1124f0573ea0cb24ccca0046b170cff8353bc3f82fc9c172088760b4e74055984780debd3e0915187d79802192b5c9a2405a8ab198"; + sha512 = "179c634792a96d8b3f5537273bff06d962cf5faf2ae7e299fa3e11aa4e5b08aba10759e17eaf656fb373c9a9a807590656f905b477c79a5f7da385b66f17a55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/nn-NO/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nn-NO/firefox-57.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f01a149c8a9623bc03dee85e0890019aae858c828c5b4a2609cbd084bc178c15b0aa6677d9d5b2d51edbb75748447a58598e2cb2d6f6ceeed979995a2c1b108a"; + sha512 = "b71efed9fe95408710ef4a4e8d7040ddd2c3f9979567211c5ccb48dabc2eecc609f29c2bdae59ef96913d54f0c52ae432a2bec265cc5d7a9ed1b683cc83379a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/or/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/or/firefox-57.0.4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "55f30387f08e43dd965778de0b18a3cf1584e2ffd5ee732e56c7a53e8092ab25f01dccfc12982d0c8650e32eebac82c50fb0b1e60848d06fce89ea3eb414813c"; + sha512 = "998b2d7a6c215a4634209d1f2e04f5e80858a4172276afe5f3440416212351093c1083e19c116dcf2480a09287749e55adb3d522f62ea4170bfa2610e3884e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pa-IN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pa-IN/firefox-57.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fc32d024176ecfe7e5802fbeb61d5bae7eeefd985336456949f364d98ce80dc0d02e5c60d1dc98d960c455036e2006f8936571e00852b2714ab6c7064eb15e2a"; + sha512 = "f15b76ba3fed7604b96315343e04b11823bcd9b1407c10678fb5a57193b37ca365bab3a41106f1113f2487ee5b81a14068a083243cb4a298aa53105c814b8b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pl/firefox-57.0.4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "701b4652eb5f98b43b9cb8c07152f61af51e158eda425712e79f38d64f73a9fa0ece935de0ca0bce383591cbd238ed8d372e7cec732d5c0c4bc8009954f37e6b"; + sha512 = "cf10e29d8daee0ccca0a3260b97abc4c61f13716b209babed7dbac72809645a05f12ee0baa5ceb02a2b8cf283f27796697eb72bdaaeab5adb07cd89525da924c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pt-BR/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-BR/firefox-57.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "175264c1ef2bfe0f2a87fa2bfe391cd6140fd9602bcfe7c690ed2690f32d4baff8387aff58784f04acb4b08a8199a845026116782311608a89d61d18fb226150"; + sha512 = "0bcc63288bb18b5dcaf382857a65e408d802da8e703cbc376be828e512fe66ed6f12b5e3a46db8c5f883000dd0ce152ab387d25642878abc2660d4d3782c5a0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pt-PT/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-PT/firefox-57.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6fea73a5d2b095cfeeaf9e86078ca67273506612224a0d800b4866da7ab79a5ea21ff21ee1131627856453a6536e84b627b6c5bec45b13b414046f4f094d88d1"; + sha512 = "79969af79356540c274935741e00a0507ec2d7d7047bd03ab5420246daa0329b51320f0f2e92250e8e1c11491cd500a3112bcc7d4c61acebe079ffac8284e0ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/rm/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/rm/firefox-57.0.4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "bec7875fd7151e9175c6d9e0e354c718e61e83893ba050d2555cdd88dc4c6b782c75a3f6b3f92db8bc15bd3fc2a2dbf9007f5d6d33fa9660acbfbc36dfe8f5bb"; + sha512 = "5ba523ff6ce9cf291b6d16c56eaa9688f8bab2fc43eb00d1c496cac9909187e781e0436a0afe47d8cd3808533a1f762e0e7dd417428ac7e5958487271b3e6d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ro/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ro/firefox-57.0.4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "95ae533eafc0a3d83127bac3abb4f17e14d25dda534a486e85e0d7750b6bcfca120479cbdda5a7a34b6222f7a4e894c614853c96df4ffb52cb86c170d703d0b8"; + sha512 = "9575744e3f62b7803a93524e24baf9838488067df5dcdcbce2031fd735fa25223869f22de807d33217f8b541d2185a4a6dd62ada6bd37bf6386f1d6f6b776ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ru/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ru/firefox-57.0.4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5a8f11444d2a72c36bd51b0d60911636a34312e7a2ed467eaf4d5cf21992f412ea36f0990634ee7330555d6cfa56139b567d465dee7e696d7b4a394971665b7e"; + sha512 = "7529dc04a413c7ad5db86b199318bdf8bba0e8837b3f5e50840326301ebd84562d2a3cae2ae352e2625db85d652675bec20dad2de5db46ec520853789fc930f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/si/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/si/firefox-57.0.4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "0c5dc876dcc8bfa56e9bc7ed5bb629ba7a6d9206fc3586f311b994f2d006ead19bdb0ba015669f547043c9a73202fa9c3c90c9f171f2756f108d45520544b6f1"; + sha512 = "7ec9f3b071ca4b7436b81c81c847acc915d8cc6e4d147587cde63527ba5b3f7d177857af308c0d4dc4566e53b3e4cc2398b3dfd367cc4ceae6eb90582027dda4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sk/firefox-57.0.4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "79003a5848287fc6974df32365bb8379b3ad3329d2a3d1d351cc3a61b28229e931b2d53384b5d46961687a928090a6f304b87d80a72cb322d0f39e0bb357f7a1"; + sha512 = "9fa5dc5cd172388bc61719e03fe7df5a2a6e56cd49ad3c7afd9622aca64ba25fbbe83f834431dc4c2a26b2873d80026769e7712c78dce550077cad4d84559dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sl/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sl/firefox-57.0.4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "989d8be27ea47441bc4b9b42006cb34b99a2b2f4982b4f9758af8725a2955aa472ec19241fdb4adccb2e99f3b0dd245159de2a36286d2b96c44ef60607f51d81"; + sha512 = "3e142ce6878e9b01ee34e9a18152e4c869fdb9902a8f78810293d854e4196c8e0a43a8bfb7f7354dd27f2547792a48ac957bec96751aca050a3d65dc5e227f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/son/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/son/firefox-57.0.4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "d4c840680599cdda340b50e91ec348db31e6b896c1fd92587ac938603edcada7973bec0e049a9a1aca73a527867704f51a482e92e3dc5d0d39b74b150b3d772c"; + sha512 = "b0bda73680d788b55526763306477504430b49b4ce465f091b5d3aa62f5e56618f8d6125cc1a68dc4b5403dbe28ae2c1dfa9e7d85e0bde9f06dc8735083d159d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sq/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sq/firefox-57.0.4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "eff9704444512c3a9e63f40b71a41ab595d71be6f83ebe678de46a301f55f561b24cd28804416c254cd36c38f03b587da3ac4aefe0d5fad2035437d8159a0580"; + sha512 = "285d6f4b2f27c14642bd44c572776c49c80d4360a635da1e92161f665a6714b011bd0be2b37f3ec1b2c1726ea6627eb7a21879e2af72bb4c04560a1f701770a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sr/firefox-57.0.4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "44d9071fc069670459f8cd468474d45d83574ded3a647abea358e65cacebdb89cd26cb903cffe279c6a3d72af9377659433d03c542e13dee3b7e20ecd32b137b"; + sha512 = "14c451f7a3237e43bbd6f5fd9370224452a401f97732901c9796e40d313f4542d635984b5feaaba9d44be77e6e3e65a6c191d4081bc5d2d1b57bae12d432c414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sv-SE/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sv-SE/firefox-57.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b9d1654f6a1f9323d0e27bb743bb8e650aabe9978ed9fc818a425377a41cf17b03e3c054945a9cae8e796ad32197f244a5299812cebc602e9bdb67451c234b65"; + sha512 = "70eb6083426d6e382934e7734718d6eaa4884a9ac24e36b1fd87a9c9405dce16353e8f6058912adc4fac0cb4ddecf7e2fdc8428e088b44d56508bc47f6c55abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ta/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ta/firefox-57.0.4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "22e5a751419d5cd332724f09cdea8ab135117b2d7272570622ac8e9b51dfcf61c1a423e78bf4d211d18ce3e4bd652aa6e0b33a02467f011021d23fb0b14179ac"; + sha512 = "615d3727a9efc2e14fefe093678cb83f83e1efaab9053a98391b7613754e40fa7929e4fa3de34da7aaef8053ea752e6ca00f83d114c90c1769f708742f492db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/te/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/te/firefox-57.0.4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "718ca2e72a8beb1a423bba10919faa1a1949e76c3e6aa0a261d7c5a8d611da7c5b73d2a209078f204b8c2f3c9d09c0949260bebe66d52257ee0eafe9b34105f1"; + sha512 = "246c2699bbd27a318778f5517d62bc7c96dd6fdba0a8291f291b0e803d2a68710d96c4a11118fd105d00e4489924a62195c7752edc403b5b42a8a06a36962571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/th/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/th/firefox-57.0.4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "fbcbeae74fb96b8dc8116db5c16f3f9cbc8d0dd074f179ec50b00dd6b6e68d977d968b5b308d5c6fa8303d247d5c30f49b0db9d4d6e13567e7818234375399b3"; + sha512 = "3b34c97e9e3b0ec436e299c45e4913fcb90c9a565687d587774adef2fb10bacf9fd8c576a15a5c8100e2f82cec2d3c4353e645acc9c20245e6fb6e2b73213011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/tr/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/tr/firefox-57.0.4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "31f12bc63b65b455bd7335482d1b45483e8472874f0ee5c32d686f770d063109adb40d4f0b3e54f7bb45da43828de1844e06818da0b6b5aa514bd304c394df0a"; + sha512 = "184b6e4f5a88fd7606868bba6860718d2dec0a6db123222195ea9bafd5ff3a391ee34a911591eff58c5ae7bc90b171aa1866d3d872349d4057ce72a709eea0b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/uk/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uk/firefox-57.0.4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "1cb4b91e8e693f2306247164ba049003dd4543ec19afdfb39531626d0ef83793bff85c5e26b4016a608b01699d36e5fbe936d6c974db9222e5fe22361fd13f0d"; + sha512 = "bb343353890e94526ae5dab5c2dca510ddda25d0d808decdd5ed628af174e60e584f1a883e19f33be2b316e423ed1be7e8c30916eb10ed11c618a015beaa538c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ur/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ur/firefox-57.0.4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ab777f897db855234c1db88a4d1c3f2a2534b926a0abeb9e55094c99b513ef97f13d36188656ed82015044a4cdd45519e4ad20dc465394108cd2f85ded9c6e19"; + sha512 = "f54e1cb54992436bc78b1491214978aa7986153564bc93f9da2c64e038f4bbb77dbf3f44ab4cece5a02e1ff8e1c0d4bf5ed64815817fc908482f9ef203689cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/uz/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uz/firefox-57.0.4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "eb03e3901f5a98b7198c677227830531cce3ab89e1e5e9cfa8a74f344871ec976b14373c337d3113b2a517eb3e80eb91c6239e7e85a2483e5e35d643007a131c"; + sha512 = "832c7b687c1db9545ac9fd81ecf95d29eb329518dad9386541073f6834ba88e80ad9bc70d6ab7e12d820e8430064f638d1558c0559d6b410a8ebd81a7a82b245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/vi/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/vi/firefox-57.0.4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "cb4a7f6ea792e3504d4c6577ee2f616dde7090a020d6bac38bb13a442297ffa279b795ac3aa6cb06c34e739c346dfb1a22fe4a7eaaed832e8c0d387f900dca26"; + sha512 = "e60023cc021263b402ffe829b24ec00f0c0e2e782fb0acba23b3527f612aed710a1c8c65cc28bcb03bbfa54a4450085adeff36be69bb21bbb175bddf4c5894c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/xh/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xh/firefox-57.0.4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6fb867d59393e57f85b597fefafd73d88410b6b8a338882be43c97a8359a6c6fe6542979f280f0b27c50d3c13302be55e16054339bcbb3e2fe0071830bc5ea21"; + sha512 = "94ba86099376c14900fadef25a77b9b4422d8f50d26bcc3bf024dc5d6a35f4c08f897cb5dc1c94232798d9fff11e7b018c90ff7808bc7ee9c861e57f425e96e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/zh-CN/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-CN/firefox-57.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "2e055fb920fc33e40cdd0976881cf3187694f5967b87d28ddb385df1913db1f66f2f481c2879919a6fa0cebf893d15a88bc077be8f5a21c07cfdc11cd70aa476"; + sha512 = "a6cdd0d0553e84a727da33e8f06afe004f4a95d726982b32dc7f74f36182e8bd2b186dfd7f3a90760ab7b01f932fdfc8de4d1b154c5133151f29b7a4d78a409f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/zh-TW/firefox-57.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-TW/firefox-57.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "78bd8081a84d7088b776f0091154e1a88fd5b39e01d8a3380d375a43e94118460c183fad77e801827144dafecffb74fcb4093320205d0143ddc3835652de66b7"; + sha512 = "a6ecdee1aefeb29b51861b011334346acf9816971c8b40196a06969c3e21e1a8ed96f1393f25e558f6fc6e5cf35b5a497de91df4764ad30c52d7ce06bd7d6732"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ccf762afbec3..aeae471ce5bb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -29,9 +29,11 @@ # Set to `privacySupport` or `false`. , webrtcSupport ? !privacySupport -, googleAPISupport ? !privacySupport +, geolocationSupport ? !privacySupport +, googleAPISupport ? geolocationSupport , crashreporterSupport ? false +, safeBrowsingSupport ? false , drmSupport ? false ## other @@ -133,6 +135,9 @@ stdenv.mkDerivation (rec { "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] + ++ lib.optionals (stdenv.lib.versionAtLeast version "57") [ + "--enable-webrender=build" + ] # TorBrowser patches these ++ lib.optionals (!isTorBrowserLike) [ @@ -141,7 +146,7 @@ stdenv.mkDerivation (rec { ] # and wants these - ++ lib.optionals isTorBrowserLike [ + ++ lib.optionals isTorBrowserLike ([ "--with-tor-browser-version=${version}" "--enable-signmar" "--enable-verify-mar" @@ -151,7 +156,9 @@ stdenv.mkDerivation (rec { # possibilities on other platforms. # Lets save some space instead. "--with-system-nspr" - ] + ] ++ flag geolocationSupport "mozril-geoloc" + ++ flag safeBrowsingSupport "safe-browsing" + ) ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c08e7aca2853..7a01978f7d96 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "57.0.1"; + version = "57.0.4"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "8cbfe0ad2c0f935dbc3a0ac4e855c489c83bf8c4506815dbae6e27f5d6a262ecf19ac82b6e81d52782559834fa14403116ecbf3acc8e3bc56b6c319e68316edd"; + sha512 = "58846037aebbf14b85e6b3a46dbe617c780c6916e437ea4ee32a2502a6b55e3689921a0be28b920dedf2f966195df04ac8e45411caeb2601a168ec08b4827cf0"; }; patches = @@ -32,10 +32,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.5.1esr"; + version = "52.5.3esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "37318a9f82fa36fe390b85f536f26be9a6950a5143e74a218477adaffb89c77c1ffe17add4b79b26e320bb3138d418ccbb1371ca11e086d140143ba075947dc0"; + sha512 = "7b9c87905c53bc681dc6475e05596449fed88850f9dc07c8223d0d3edd2dd9d8a0dd88ebae1cd59eced2165696df9370de5e85cc03cded58ec4d0f622634417f"; }; patches = @@ -109,7 +109,7 @@ in rec { src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-45.8.0esr-6.5-2" + # branch "tor-browser-45.8.0esr-6.5-2-slnos" rev = "e4140ea01b9906934f0347e95f860cec207ea824"; sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60"; }; @@ -128,8 +128,9 @@ in rec { src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - rev = "tor-browser-52.3.0esr-7.0-1-slnos"; - sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv"; + # branch "tor-browser-52.5.0esr-7.0-1-slnos"; + rev = "830ff8d622ef20345d83f386174f790b0fc2440d"; + sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5"; }; patches = diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 4c3647bd4481..dd4cb439c1fa 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 -, supportsJDK, jrePlugin, icedtea_web +, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin @@ -36,6 +36,11 @@ let gssSupport = browser.gssSupport or false; jre = cfg.jre or false; icedtea = cfg.icedtea or false; + supportsJDK = + stdenv.system == "i686-linux" || + stdenv.system == "x86_64-linux" || + stdenv.system == "armv7l-linux" || + stdenv.system == "aarch64-linux"; plugins = assert !(jre && icedtea); diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 9a4d90701b28..b868c434e234 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -57,7 +57,7 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap + bzip2 libcap at_spi2_atk ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -139,6 +139,6 @@ in stdenv.mkDerivation rec { homepage = https://www.google.com/chrome/browser/; license = licenses.unfree; maintainers = [ maintainers.msteen ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 0f6c4ed36d40..9cad2838a39b 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { version = "2.8.9dev.16"; src = fetchurl { - url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"; + urls = [ + "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" + "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" + ]; sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; }; @@ -22,9 +25,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; - nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig - ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc - ++ [ nukeReferences ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ nukeReferences ] + ++ stdenv.lib.optional sslSupport pkgconfig; buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index ce9ac961c92a..cea6d5dbeea4 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_23, wrapGAppsHook +{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite , glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 , libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core @@ -29,11 +29,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook cmake intltool + pkgconfig wrapGAppsHook cmake intltool vala_0_34 ]; buildInputs = [ - vala_0_23 gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core (libsoup.override {gnomeSupport = true; valaSupport = true;}) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index ecd4026821a8..614f55d01d6d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "27.0.0.187"; + version = "28.0.0.137"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "1ii97fa1diyggarh1gkg43ia42ws7x84hpjzvrdhxcf6s47lh2ld" + "1hj3sfrspdkhq967fmnpgamgiq90k263cqfas94gp3dzslmkingw" else - "1gphlgy64ddzn4bbgr2k1kh8xwq9ghf0z0c6zilry0nq33i64xa1" + "1v4k6hzngm23xwxnh6ngplp2m0ga480sbcm668bpcj61krmi6xy4" else if arch == "x86_64" then - "1hfcphcvdam62k983rm6r42mnkih4nfwyrnx0v88z3nw14mjr4c3" + "0ijmrk6262a1xcf98g94vdlqxnik9f7igjy08j3a2i4b5bikq479" else - "06jb4jd5840w125wd4l35f0b1iqjak07ajy02k9j8srglwi0ffmw"; + "10a17dba4zy29padvi3fnv2s8v71q698ffqjp8ggsla42pjyhvkh"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 92e73e475581..d5c4f993d8ba 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,19 +55,19 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "27.0.0.187"; + version = "28.0.0.137"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1857g4yy62pj02pnw7p9bpqazp98jf17yv2xdh1fkqiibzahjc6m" + "0xr3hf828sm0xdnmk2kavxmvzc6m0mw369khrxyfwrbxvdsibwn8" else - "0kywx7c3qb1hfljc14ddzm1cyhvwygbbdfxp1rdhqw8s3b6ns0hw"; + "1wr0avjpshrj51svb1sfnshz39xxla1brqs8pbcgfgyqjh350rgn"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index 008c35964832..fa455eb0b7a4 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = ''A wrapper to run browser plugins out-of-process''; homepage = http://nspluginwrapper.org/; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x64_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.raskin ]; inherit (srcData) version; }; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0852b5c9d434..b98d1d415c66 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -37,7 +37,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "48.0.2685.52"; + version = "50.0.2762.45"; rpath = stdenv.lib.makeLibraryPath [ @@ -89,7 +89,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p"; + sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 736011a13eba..9187e7d002a5 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -59,12 +59,18 @@ stdenv.mkDerivation rec { echo > $MOZ_CONFIG " . $src/build/mozconfig.common ac_add_options --prefix=$out + ac_add_options --with-pthreads ac_add_options --enable-application=browser ac_add_options --enable-official-branding ac_add_options --enable-optimize="-O2" + ac_add_options --enable-release + ac_add_options --enable-devtools ac_add_options --enable-jemalloc ac_add_options --enable-shared-js + ac_add_options --enable-strip ac_add_options --disable-tests + ac_add_options --disable-installer + ac_add_options --disable-updaters " ''; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4f0e891dc496..fb8c16abd532 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,41 +1,40 @@ -{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook -, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt -, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav -, qtwebkit-plugins ? null -, attrs +{ stdenv, lib, fetchurl, fetchzip, python3Packages +, makeWrapper, wrapGAppsHook, qtbase, glib_networking +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 +, libxslt, gst_all_1 ? null +, withPdfReader ? true +, withMediaPlayback ? true , withWebEngineDefault ? true }: -assert (! withWebEngineDefault) -> qtwebkit-plugins != null; +assert withMediaPlayback -> gst_all_1 != null; let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; version = "1.7.225"; - src = fetchurl { + src = fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1n8ylmv60r0qbw2vilp640a87l4lgnrsi15z3iihcs6dj1n1yy67"; + sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8"; + stripRoot = false; }; - nativeBuildInputs = [ unzip ]; - buildCommand = '' mkdir $out - unzip -d $out $src + cp -r $src $out ''; }; -in buildPythonApplication rec { - name = "qutebrowser-${version}${fix_postfix}"; - fix_postfix = "-1"; - version = "1.0.3"; +in python3Packages.buildPythonApplication rec { + name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; + version = "1.0.4"; + versionPostfix = ""; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap"; + sha256 = "0z8zrgr914bfmimqk3l17dxyc7gzh42sw8lfp041zzvj6fxw3lkr"; }; # Needs tox @@ -43,21 +42,25 @@ in buildPythonApplication rec { buildInputs = [ qtbase - gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav glib_networking - ] - ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins; + ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ + gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly gst-libav + ]) ++ lib.optional (!withWebEngineDefault) python3Packages.qtwebkit-plugins; nativeBuildInputs = [ - makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + makeWrapper wrapGAppsHook asciidoc + docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs + propagatedBuildInputs = with python3Packages; [ + pyyaml pyqt5 jinja2 pygments + pypeg2 cssutils pyopengl attrs ]; postPatch = '' sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py + '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 1b6bf2ac3002..8f22045578d7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.10"; + version = "7.0.11"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0d1yvb1gmswlzyivr53xxfbd58bvr7nyangd85j36kar4bzbzvhh"; + sha256 = "0i42jxdka0sq8fp6lj64n0az6m4g72il9qhdn63p0h7y4204i2v4"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0mjw8z76pbm1hshz875shkmjmxqhpan5la52r3y20v6rc0gfd9p5"; + sha256 = "1p9s6wqghpkml662vnp5194i8gb9bkqxdr96fmw0fh305cyk25k0"; }; }; in diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index c654723f4c2c..ce06dea70105 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { editor and also easily configurable during runtime. Vimb is mostly keyboard driven and does not detract you from your daily work. ''; - homepage = http://fanglingsu.github.io/vimb/; + homepage = https://fanglingsu.github.io/vimb/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.rickynils ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 410e88663608..00db16a8cf16 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.12.955.38-1"; + version = "1.13.1008.34-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "1bq1ss6vkpr6rw5n0sw9zipxx19vficvxys1lra9symcxk1b4gqw"; + sha256 = "18p5n87n5rkd6dhdsf2lvcyhg6ipn0k4p6a79dy93vsgjmk4bvw2"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix new file mode 100644 index 000000000000..bc8684da7679 --- /dev/null +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, makeWrapper, jre +, version ? "1.3" }: + +let + versionMap = { + "1.3" = { + flinkVersion = "1.3.2"; + scalaVersion = "2.11"; + sha256 = "0mf4qz0963bflzidgslvwpdlvj9za9sj20dfybplw9lhd4sf52rp"; + }; + }; +in + +with versionMap.${version}; + +stdenv.mkDerivation rec { + name = "flink-${flinkVersion}"; + + src = fetchurl { + url = "mirror://apache/flink/${name}/${name}-bin-hadoop27-scala_${scalaVersion}.tgz"; + inherit sha256; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jre ]; + + installPhase = '' + rm bin/*.bat + + mkdir -p $out/bin $out/opt/flink + mv * $out/opt/flink/ + makeWrapper $out/opt/flink/bin/flink $out/bin/flink \ + --prefix PATH : ${jre}/bin + + cat <> $out/opt/flink/conf/flink-conf.yaml + env.java.home: ${jre}" + env.log.dir: /tmp/flink-logs + EOF + ''; + + meta = with stdenv.lib; { + description = "A distributed stream processing framework"; + homepage = https://flink.apache.org; + downloadPage = https://flink.apache.org/downloads.html; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mbode ]; + repositories.git = git://git.apache.org/flink.git; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 6767a0bd7240..408019eeb4b2 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,10 +4,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "1i22givr52kgr76dd2azcg9avgh70wiw5dcpmmyychms2ynxi42y" - else "0phhy3si86ilc6051zfgn8jnniy5lygf1r2gysjpcyfbrc5pw3hj"; + then "9f04c4824fc751d6c932ae5b93f7336eae06e78315352aa80241066aa1d66c49" + else "5058142bcd6e16b7e01695a8f258d27ae0b6469caf227ddf6aa2181405e6aa8e"; pname = "helm"; - version = "2.6.1"; + version = "2.7.2"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix new file mode 100644 index 000000000000..aa5f86633318 --- /dev/null +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kontemplate-${version}"; + version = "1.3.0"; + + goPackagePath = "github.com/tazjin/kontemplate"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "tazjin"; + repo = "kontemplate"; + sha256 = "0g9hs9gwwkng9vbnv07ibhll0kggdprffpmhlbz9nmv81w2z3myi"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Extremely simple Kubernetes resource templates"; + homepage = http://kontemplate.works; + license = licenses.gpl3; + maintainers = with maintainers; [ mbode ]; + platforms = platforms.unix; + repositories.git = git://github.com/tazjin/kontemplate.git; + }; +} diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix new file mode 100644 index 000000000000..1d6dfb3e64f5 --- /dev/null +++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix @@ -0,0 +1,120 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "15d8430ab86497c5c0da827b748823945e1cf1e1"; + sha256 = "0q5w6mjr1zws04z7x1ax1hp1zxdc4mbm9zsikgd6fv0c9ndnjr3q"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "b217b9c388de2cacde4354c536e520c52c055563"; + sha256 = "1f41v3c8c7zagc4qjhcb6nwkvi8nzvf70f89a7ss2m6krkxz0m2a"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/aokoli/goutils"; + fetch = { + type = "git"; + url = "https://github.com/aokoli/goutils"; + rev = "3391d3790d23d03408670993e957e8f408993c34"; + sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "37469d0c81a7910b49d64a0d308ded4823e90937"; + sha256 = "18c2b4h7phdm71mn66x8bsmghjr1b2lpg07zcbgmab37y36bjl20"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "7fe0c75c13abdee74b09fcacef5ea1c6bba6a874"; + sha256 = "1hclh5kpg25s2llpk7j7sm3vf66xci5jchn8wzdcr5fj372ghsbd"; + }; + } + { + goPackagePath = "github.com/polydawn/meep"; + fetch = { + type = "git"; + url = "https://github.com/polydawn/meep"; + rev = "eaf1db2168fe380b4da17a35f0adddb5ae15a651"; + sha256 = "12n134fb2imnj67xkbznzm0gqkg36hdxwr960y91qb5s2q2krxir"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; + sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; + sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; + sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5"; + sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index ff7cb245ae2a..41099192176c 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.7.1"; + version = "1.8.0"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd"; + sha256 = "0vaa18vhwk132fv7i896513isp66wnz9gn0b5613n3x28q0gvkmg"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index a3b30a5ef405..f69b0e5eca9b 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -23,7 +23,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.23.0"; + version = "0.24.1"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h"; + sha256 = "18b5ic4lcn84hq2ji5alyx58x9vi0b03544i5xzfgn3h2k78kynk"; }; patches = [ @@ -65,6 +65,8 @@ in buildGoPackage rec { postInstall = '' mkdir -p $bin/share/bash-completion/completions/ MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube + mkdir -p $bin/share/zsh/site-functions/ + MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube ''; postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}"; diff --git a/pkgs/applications/networking/cluster/minikube/localkube.patch b/pkgs/applications/networking/cluster/minikube/localkube.patch index 08ec85813a3e..2d69cded555f 100644 --- a/pkgs/applications/networking/cluster/minikube/localkube.patch +++ b/pkgs/applications/networking/cluster/minikube/localkube.patch @@ -14,7 +14,7 @@ index 1c4b5000..c9f120d4 100644 - if err != nil { - return errors.Wrap(err, "Error updating localkube from uri") - } -+ localkubeFile = assets.NewBinDataAsset("out/localkube", "/", "localkube", "0777") ++ localkubeFile = assets.NewBinDataAsset("out/localkube", "/usr/local/bin/", "localkube", "0777") copyableFiles = append(copyableFiles, localkubeFile) // user added files diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1fce0695bfd4..54a54b37cadb 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -72,7 +72,7 @@ let in withPlugins (_: []); plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; -in { +in rec { terraform_0_8_5 = generic { version = "0.8.5"; sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; @@ -97,10 +97,14 @@ in { passthru = { inherit plugins; }; }); + terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; + terraform_0_11 = pluggable (generic { - version = "0.11.0"; - sha256 = "0qsydg6bn7k6d68pd1y4j5iys9i66c690yq21axcpnjfibxgqyff"; + version = "0.11.1"; + sha256 = "04qyhlif3b3kjs3m6c3mx45sgr5r13x55aic638zzlrhbpmqiih1"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); + + terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 675e3f768ebf..fb778b4c221b 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,8 +4,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "0.1.0"; - sha256 = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj"; + version = "1.2.0"; + sha256 = "0v3ji83igjf3b7lp8525j42jxwlvbxws1d7q72v20xlnbyz03h3x"; }; archive = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.3.1"; - sha256 = "0vsvvw1qdjb69jilhjl5g8h7dn82n0n23k2v67dqywhinilafcmv"; + version = "1.5.0"; + sha256 = "1c1mkb3299ahf3w58zkk7ilkasflwj2n1kqgddaylqqfcjykblyj"; }; azure = { @@ -46,15 +46,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "0.3.3"; - sha256 = "0qq10gjwka0268ylzx5r7qhj0xpjh8fxrjr1fwbiq8sp6i1jb7sa"; + version = "1.0.0"; + sha256 = "0grpc7apfn03slkkily8agl8pv6mc0j58ch8fa6jgqcqy6dbd0kh"; }; bitbucket = { owner = "terraform-providers"; repo = "terraform-provider-bitbucket"; - version = "0.1.0"; - sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43"; + version = "1.0.0"; + sha256 = "0gi8p1q0y8x5y8lqihijkpqs3v152h0q7icv7ixk33xsdcvb418y"; }; chef = { @@ -116,15 +116,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.0.0"; - sha256 = "1kabjhq7xl2mhh0gvg87a9zh8y2k0h5ghcmb86xzvx25j3jdqfg6"; + version = "1.0.1"; + sha256 = "1a5acwxqwasckkyj9h33kgn1cmnmn14x4fg19kz742zwfyjmncwj"; }; digitalocean = { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "0.1.2"; - sha256 = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg"; + version = "0.1.3"; + sha256 = "10crxciw7y2gnm8vqp007vw0k7c1a1xk2z2zsjr5rksk6qlnri4k"; }; dme = { @@ -193,8 +193,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.2.0"; - sha256 = "1q3ypacsjc8779v1k81z0vs3kx6i340fa4mz26gscf85rx8bghim"; + version = "1.4.0"; + sha256 = "0nlm02ibp2w4m38pvmw6r29807863h23y8k00ywmkcr7yiy1zilr"; }; grafana = { @@ -298,8 +298,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "1.0.0"; - sha256 = "01fvw7yw8dhjclipnn9h1blagbp2849ahmnqj3ysh13i0x1qbq4r"; + version = "1.1.0"; + sha256 = "0n3bd9fiablhb2zxmlqnidahdqlpj3i7701vi62zds04kcgdkxw8"; }; ns1 = { @@ -333,8 +333,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; + version = "1.1.0"; + sha256 = "1w747qbk24b18v6x7l4n08pxnwak395fq1grajpxf3qw6afchjdj"; + }; + opentelekomcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-opentelekomcloud"; version = "1.0.0"; - sha256 = "0ddy62psapajbgnf7f998cnwiyak3lnk43vj0rl230dhnma9crpm"; + sha256 = "1wra9a6cjgsyvbfldvi2xnjk6y9zqv3y06pbq8c8dyjzssd5j591"; }; opsgenie = { @@ -403,8 +410,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.0.0"; - sha256 = "0im4dsnbpbc9qln92lxcrygm9d705bvlhigpx492172cq1fqnw61"; + version = "1.1.0"; + sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl"; }; rundeck = { @@ -494,7 +501,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "0.4.2"; - sha256 = "0k9mndxfiq5drcz2qhqasc7cqra0mfdwwwblb1m6lyg7flg7dli0"; + version = "1.1.1"; + sha256 = "1y209bwkk79ycxjl3b6c20n0z2g5d6njna85w68a0w6npk88zva9"; }; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index d857e4f18700..16eb6004e3ee 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort) # Get all the providers with index diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index adbe2ab5a54f..576daa88127a 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.13.0"; + version = "0.13.23"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "18jbz3vchdp5f3f4grl968k706fdcvj71syf7qmriwdyw4ns83wv"; + sha256 = "1xx3kw38vr563x3bn0rrg1iq4r51rl0qci2magwwng62cgh3zaiy"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index ac6bae693952..c371c756a152 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b"; - sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792"; + rev = "d0cb8551ac28d362e77ea475e5b7b2ebaec06b6b"; + sha256 = "1546kb49wb1qjx6pz7aj4iygmqsjps70npb5csm5q08wxk63vhls"; }; } { @@ -23,8 +23,17 @@ fetch = { type = "git"; url = "https://github.com/go-errors/errors"; - rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105"; - sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa"; + rev = "3afebba5a48dbc89b574d890b6b34d9ee10b4785"; + sha256 = "1vwgczqzd5i6bx12g9ln5cqfsbc7g0f8cz8yvcrasss2injpndi0"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; + sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; }; } { @@ -32,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0"; - sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68"; + rev = "994f50a6f071b07cfbea9eca9618c9674091ca51"; + sha256 = "1v2whvi9rnrkz4ji3b3sinvv3ahr5s4iyzchz00wjw0q2kdvj1zj"; }; } { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-version"; - rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77"; - sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik"; + rev = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee"; + sha256 = "0gq4207s1yf2nq4c2ir3bsai29svzz4830g1vbvzdrpis58r1x4m"; }; } { @@ -50,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; - sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; }; } { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab"; - sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx"; + rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; + sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "9a441910b16872f7b8283682619b3761a9aa2222"; - sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v"; + rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28"; + sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx"; }; } { @@ -86,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + rev = "06020f85339e21b2478f756a78e295255ffa4d6a"; + sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9"; }; } { @@ -95,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "05e8a0eda380579888eb53c394909df027f06991"; - sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; + rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"; + sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml"; }; } { @@ -113,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2"; - sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr"; + rev = "39908eb08fee7c10d842622a114a5c133fb0a3c6"; + sha256 = "1s0whq54xmcljdg94g6sghpf6mkhf6fdxxb18zg0yzzj6fz9yj8j"; }; } ] diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e9d6c5f306f0..5bafb8e7c4c8 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "38.4.27"; + version = "40.4.46"; arch = { "x86_64-linux" = "x86_64"; @@ -54,7 +54,7 @@ buildFHSUserEnv { do_install=1 else installed_version=$(cat "$HOME/.dropbox-dist/VERSION") - latest_version=$(printf "${version}\n$installed_version\n" | sort -V | head -n 1) + latest_version=$(printf "${version}\n$installed_version\n" | sort -rV | head -n 1) if [ "x$installed_version" != "x$latest_version" ]; then do_install=1 fi diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 7d815c8fad08..611d7904991a 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { buildInputs = [ glibcLocales ]; propagatedBuildInputs = with pythonPackages; [ webtest bottle threadpool rocket-errbot requests jinja2 - pyopenssl colorlog Yapsy markdown ansi pygments dns pep8 + pyopenssl colorlog Yapsy markdown ansi pygments dnspython pep8 daemonize pygments-markdown-lexer telegram irc slackclient sleekxmpp hypchat pytest ]; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index b7bc2c6c67a0..80984208460b 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: +{ stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.33.0"; + name = "esniper-2.33.0.2017-11-06"; - src = fetchurl { - url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz"; - sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69"; + src = fetchFromGitHub { + owner = "yhfudev"; + repo = "esniper"; + rev = "c95140d376db3c991300a7462e6c172b0ccf3eb5"; + sha256 = "1dfb5hmcrvm3yg9ask362c6s5ylxs21szw23dm737a94br37j890"; }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix new file mode 100644 index 000000000000..22f9f7822ddf --- /dev/null +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses +, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, makeWrapper }: + +stdenv.mkDerivation rec { + name = "newsboat-${version}"; + version = "2.10.2"; + + src = fetchurl { + url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; + sha256 = "1x4nxx1kvmrcm8jy73dvg56h4z15y3sach2vr13cw8rsbi7v99px"; + }; + + prePatch = '' + substituteInPlace Makefile --replace "|| true" "" + ''; + + nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] + ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; + + buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; + + installFlags = [ "DESTDIR=$(out)" "prefix=" ]; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; + + meta = with stdenv.lib; { + homepage = https://newsboat.org/; + description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console."; + maintainers = with maintainers; [ dotlambda ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index b25d4e109ebc..0a89ec6023be 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "rssguard-${version}"; - version = "3.4.2"; + name = "${pname}-${version}"; + pname = "rssguard"; + version = "3.5.5"; - src = fetchgit { - url = https://github.com/martinrotter/rssguard; - rev = "refs/tags/${version}"; - sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s"; - # Submodules are required only for Windows (and one of them is a huge binary - # package ~400MB). See project wiki for more details. - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "martinrotter"; + repo = pname; + rev = version; + sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48"; }; buildInputs = [ qtwebengine qttools ]; nativeBuildInputs = [ qmake wrapGAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; + # FIXME: This shouldn't be needed after 3.5.5. + # See: https://github.com/martinrotter/rssguard/issues/175 + preConfigure = '' + lrelease rssguard.pro + ''; + meta = with stdenv.lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index 26a05151d1cf..e56dbe0817e7 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "0vpc8nrh3cx91pcw45jjr2jllkqbx6w2khq7nyqv59gc4q5mz0p2"; + sha256 = "152ky06k1wc3jffb48c6zh7c7pr732m9f4g1i316zaa4nx2ynfsa"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 72ffbb6e6d3a..627b6aac29cb 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,8 +1,8 @@ { callPackage, stdenv }: let - stableVersion = "2.1.0"; - previewVersion = "2.1.0rc4"; # == 2.1.0 + stableVersion = "2.1.2"; + previewVersion = "2.1.2"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -12,19 +12,19 @@ let in { guiStable = mkGui { stable = true; - sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk"; + sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk"; }; guiPreview = mkGui { stable = false; - sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s"; + sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk"; }; serverStable = mkServer { stable = true; - sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39"; + sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8"; }; serverPreview = mkServer { stable = false; - sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd"; + sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8"; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 59380cf6965e..5a201dfc4074 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -24,19 +24,21 @@ let aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs: rec { - pname = "aiohttp"; - version = "2.2.5"; - name = "${pname}-${version}"; - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg"; - }; propagatedBuildInputs = [ yarl multidict_3_1_3 ] ++ (with pythonPackages; [ async-timeout chardet ]); })); aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs: - { propagatedBuildInputs = [ aiohttp ]; })); + rec { + pname = "aiohttp-cors"; + version = "0.5.3"; + name = "${pname}-${version}"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; + }; + propagatedBuildInputs = [ aiohttp ]; + })); in pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "gns3-server"; @@ -48,7 +50,7 @@ in pythonPackages.buildPythonPackage rec { sha256 = sha256Hash; }; - propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ] + propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ] ++ (with pythonPackages; [ jinja2 psutil zipstream raven jsonschema typing prompt_toolkit @@ -62,7 +64,7 @@ in pythonPackages.buildPythonPackage rec { doCheck = false; postInstall = '' - rm $out/bin/gns3loopback # For windows only + rm $out/bin/gns3loopback # For Windows only ''; meta = with stdenv.lib; { description = "Graphical Network Simulator 3 server (${branch} release)"; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix new file mode 100644 index 000000000000..9ec9a3451bef --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, boost }: + +stdenv.mkDerivation rec { + name = "SkypeExport-${version}"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "Temptin"; + repo = "SkypeExport"; + rev = "v${version}"; + sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + preConfigure = "cd src/SkypeExport/_gccbuild/linux"; + installPhase = "install -Dt $out/bin SkypeExport"; + + meta = with stdenv.lib; { + description = "Export Skype history to HTML"; + homepage = https://github.com/Temptin/SkypeExport; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ yegortimoshenko ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index fd05948864c0..1477d0674642 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -2,13 +2,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-steam-2015-09-10"; + version = "1.4.2"; + name = "bitlbee-steam-${version}"; src = fetchFromGitHub { - rev = "011375b2d3c67c15d51ca203de0ecaab3b4b7587"; - owner = "jgeboski"; + rev = "v${version}"; + owner = "bitlbee"; repo = "bitlbee-steam"; - sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7"; + sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 80e6af9c1ef5..bfe4e9708e3d 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, vala, cmake, wrapGAppsHook, pkgconfig, gettext +, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup @@ -13,19 +13,20 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2017-09-26"; + name = "dino-unstable-2017-12-03"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "9d8e1e88ec61403659a8cc410d5c4414e3bd3a96"; - sha256 = "1p8sda99n8zsb49qd6wzwb8hddlgrzr2hp7il5v7yqxjjm2vgqfl"; + rev = "cee39b0117c1620d852d50c14ca6f06db4e2956b"; + sha256 = "15cm6y2rgj6fcw8sciygd1wvcw7k9fgf69ji1abfwybzydflj7ny"; fetchSubmodules = true; }; nativeBuildInputs = [ vala cmake + ninja pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 853a6c96a7a4..5ccdd887c8eb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.2"; + version = "0.0.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "0sb7l0rrpqxzn4fndjr50r5xfiid1f81p22gda4mz943yv37mhfz"; + sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 6545b90980e3..32e7c877614a 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,28 +1,27 @@ -{stdenv, fetchFromGitHub, ocamlPackages, opam}: +{ stdenv, fetchFromGitHub, ocamlPackages }: assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2017-08-17"; + version = "2017-12-24"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5"; - sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf"; + rev = "8678e8a1a06e641218a31ae25150040202f89289"; + sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib_p4 hex uutf opam + ptime notty sexplib hex uutf ]; - buildPhase = with ocamlPackages; - "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true"; + buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; - installPhase = "opam-installer --prefix=$out --script | sh"; + inherit (ocamlPackages.topkg) installPhase; meta = with stdenv.lib; { homepage = https://github.com/hannesm/jackline; diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch deleted file mode 100644 index bb2d2d39d25a..000000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt ---- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200 -+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100 -@@ -26,7 +26,7 @@ - get_filename_component (_basename ${_current_MOC} NAME_WE) - set (_header ${_abs_FILE}) - set (_moc ${_abs_PATH}/${_current_MOC}) -- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "") -+ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "") - MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc}) - endforeach (_current_MOC_INC) - endif (_match) -Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~ diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix deleted file mode 100644 index d5595fc85aff..000000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11, - alsaLib, aspell, libidn, qca2, phonon, pkgconfig }: - -stdenv.mkDerivation { - - name = "kadu-0.12.3"; - - src = fetchurl { - url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2; - sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon - ]; - - configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; - - preConfigure = '' - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig" - ''; - - cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'"; - - prePatch = '' - patchShebangs . - ''; - - # Disable the kadu plugins I wasn't able to get to work - patchPhase = '' - sed -i -e '/mpd_mediaplayer/d' \ - -e '/encryption_ng/d' \ - -e '/encryption_ng_simlite/d' Plugins.cmake - patch -p1 < ${./cmake.patch} - ''; - - NIX_LDFLAGS="-lX11"; - - meta = { - description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)"; - homepage = http://www.kadu.net/w/English:Main_Page; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.piotr ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index cf1893b198e5..bd3fc82f7cba 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -3,6 +3,7 @@ , perl, perlXMLParser, libxml2, nss, nspr, farstream , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib, python, libICE, libXext, libSM +, cyrus_sasl ? null , openssl ? null , gnutls ? null , libgcrypt ? null @@ -33,7 +34,7 @@ let unwrapped = stdenv.mkDerivation rec { libxml2 nss nspr farstream libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn - libICE libXext libSM + libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) @@ -55,6 +56,7 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-nm" "--disable-tcl" ] + ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); enableParallelBuilding = true; @@ -78,4 +80,3 @@ in if plugins == [] then unwrapped inherit stdenv makeWrapper symlinkJoin plugins; pidgin = unwrapped; } - diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 8b2e35c2f0e8..768ab24c2f39 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.4"; + version = "0.0.5"; - # libqmatrixclient doesn't support dynamic linking as of 0.1 so we simply pull in the source + # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "1nbxlflm94pb19gdwb95z92kzg4px97dmp8av3mj4imk1ysnyrvi"; + sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 543bf6425250..594004fd2949 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }: +{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha +, auth0ClientID, auth0Domain, disableTooltips }: stdenv.mkDerivation rec { name = "rambox-bare-${version}"; @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4"; }; - patches = [ ./hide-check-for-updates.patch ./isDev.patch ]; + patches = [ ./hide-check-for-updates.patch ./isDev.patch ] + ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; configurePhase = '' echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index b6e9c9210251..a601db8c8da5 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,13 +1,14 @@ { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" }: +, auth0Domain ? "nixpkgs.auth0.com" +, disableTooltips ? false }: let callPackage = newScope self; self = { fetchNodeModules = callPackage ./fetchNodeModules.nix {}; rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain; + inherit auth0ClientID auth0Domain disableTooltips; }; sencha = callPackage ./sencha {}; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch new file mode 100644 index 000000000000..5ddaa9d51771 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch @@ -0,0 +1,19 @@ +--- index.html.orig 2017-12-16 20:06:03.401298402 +0300 ++++ ./index.html 2017-12-16 20:06:21.474484436 +0300 +@@ -43,14 +43,14 @@ + + + +- --> + + + diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 053e8a9c9739..5d004db60e3a 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, libtoxcore +{ stdenv, fetchgit, libtoxcore , conf ? null }: with stdenv.lib; -stdenv.mkDerivation rec { - name = "ratox-0.2.1"; +let + configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); +in - src = fetchurl { - url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz"; - sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19"; +stdenv.mkDerivation rec { + name = "ratox-0.4"; + + src = fetchgit { + url = "git://git.2f30.org/ratox.git"; + rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; + sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; }; + patches = [ ./ldlibs.patch ]; + buildInputs = [ libtoxcore ]; - configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; - preBuild = "makeFlags=PREFIX=$out"; + makeFlags = [ "PREFIX=$(out)" ]; - meta = - { description = "FIFO based tox client"; - homepage = http://ratox.2f30.org/; - license = licenses.isc; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; - }; + meta = { + description = "FIFO based tox client"; + homepage = http://ratox.2f30.org/; + license = licenses.isc; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch new file mode 100644 index 000000000000..1406e7143107 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch @@ -0,0 +1,5 @@ +--- a/config.mk ++++ b/config.mk +@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib +-LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread ++LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 050eb7765906..c99130f28a39 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation rec { cp icons/ricochet.png $out/share/pixmaps/ricochet.png ''; + # RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm' + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Anonymous peer-to-peer instant messaging"; homepage = https://ricochet.im; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2965ce86cc9f..92960e381233 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "19g0d3wqmz4vj9flf7pfgfvm2qf2w3jhxp9qdyfbiwd670h5wjlv"; + sha256 = "0acim3kad6lv5ni4blg75phb3njyk9s5h6x7fsn151h1pvsc5mmw"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix new file mode 100644 index 000000000000..9876767b57ee --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix @@ -0,0 +1,87 @@ +{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, +fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr, +libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, +nspr, alsaLib, cups, expat, udev +}: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + stdenv.cc.cc + udev + xlibs.libxcb + ]; + +in + stdenv.mkDerivation rec { + name = "signal-desktop-${version}"; + + version = "1.1.0-beta.5"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; + sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx"; + } + else + throw "Signal for Desktop is not currently supported on ${stdenv.system}"; + + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + cp -R usr/share $out/share + + chmod -R g-w $out + + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/opt/Signal Beta" \ + "$out/opt/Signal Beta/signal-desktop-beta" + + # Symlink to bin + mkdir -p $out/bin + ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta + + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop-beta.desktop \ + --replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta + ''; + + meta = { + description = "Signal Private Messenger for the Desktop (Beta version)"; + homepage = https://signal.org/; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ixmatus benley ]; + platforms = [ + "x86_64-linux" + ]; + }; + } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index bd0c03cf29d8..373adc42d229 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.0.35"; + version = "1.1.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860"; + sha256 = "1v0ydfdgcnkh6rk7gmqbjrzpz56mw2gjmakz58gpn167ln7l1vkl"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index b92bf50b315b..11a1efec8abe 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -4,6 +4,8 @@ let + # Please keep the version x.y.0.z and do not update to x.y.76.z because the + # source of the latter disappears much faster. version = "8.11.0.4"; rpath = stdenv.lib.makeLibraryPath [ @@ -55,7 +57,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1dq7k4zlqqsx7786phialia5xbpc3cp1wrjhqrvga09yg4dl505c"; + sha256 = "1chwc4rqcwwim03n6nski5dar33bb1gnadbvcjg6gln3xqr0ipib"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 23a5d91f0d25..a32623c1c848 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.9.0"; + version = "3.0.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -46,7 +46,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1ddfvsy4lr7hcnzxbk4crczylj1qwm9av02xms4w2p0k0c8nhvvc"; + sha256 = "17hq31x9k03rvj2sdsdfj6j75v30yrywlsbca4d56a0qsdzysxkw"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index c14c9ade2dda..b7dfdb3e3413 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "0ncqs5ykk1zsn2lqarf7pr39rbp4h54vaqq1sgqi5irpj6yagzak" - else "222e8abb24de9e3ea00fca10be32340ad88859a4d811afa644c5096aada4996d"; + then "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn" + else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr"; }; # grab the plugin sdk for the desktop icon diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 32266d7b42d5..77645371359b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -2,11 +2,11 @@ , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.18.2"; + name = "telepathy-gabble-0.18.3"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9"; + sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf"; }; nativeBuildInputs = [ pkgconfig libxslt ]; @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://telepathy.freedesktop.org; + homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; description = "Jabber/XMPP connection manager for the Telepathy framework"; + license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 0bd6c2e5f2b5..9206aea5c542 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -3,18 +3,20 @@ stdenv.mkDerivation rec { project = "telepathy-logger"; - name = "${project}-0.8.0"; + name = "${project}-0.8.2"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; }; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - - nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt - gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; + nativeBuildInputs = [ + makeWrapper pkgconfig intltool libxslt gobjectIntrospection + ]; + buildInputs = [ + dbus_glib libxml2 sqlite telepathy_glib + dbus_libs telepathy_glib.python + ]; configureFlags = "--enable-call"; @@ -24,10 +26,11 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = { + meta = with stdenv.lib; { description = "Logger service for Telepathy framework"; - homepage = http://telepathy.freedesktop.org/wiki/Logger ; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # Arbitrary choice + homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; + license = licenses.lgpl21; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.gnu; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 87ae0210bdae..82485de58fc1 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-5.16.3"; + name = "${pname}-5.16.4"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi"; + sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; - buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing - # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it + buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkgconfig libxslt makeWrapper ]; doCheck = true; @@ -24,8 +23,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; - homepage = http://telepathy.freedesktop.org/wiki/; + homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/; license = licenses.lgpl21; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index c6bb2479bfc1..5e65c0dfeaf8 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/ii/; + homepage = https://tools.suckless.org/ii/; license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 75c4f9ac5c93..0e8c4849f3c7 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.0.6"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75"; + sha256 = "0iiz0x698bdlpssbj357ln5f7ccjwc1m1550xzy1g7kwcvdpp4mb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 5b86e79e99a1..96218ef87b5f 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -29,13 +29,13 @@ let pname = "konversation"; - version = "1.7.2"; + version = "1.7.4"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz"; + sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp"; }; buildInputs = [ diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 78646f7a8b2f..7c685b9df6b9 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -74,7 +74,7 @@ in with stdenv; mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://quassel-irc.org/; + homepage = https://quassel-irc.org/; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' Quassel IRC is a cross-platform, distributed IRC client, diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 6f48f44214cc..975715ed7fcd 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IRC client"; - homepage = http://tools.suckless.org/sic/; + homepage = https://tools.suckless.org/sic/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 437cb2369854..cfed44c997ae 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -29,23 +29,14 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "1.9.1"; + version = "2.0"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; + sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn"; }; - patches = [ - # TODO: Remove this patch when weechat is updated to a release that - # incorporates weechat/weechat#971 - (fetchpatch { - url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch; - sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj"; - }) - ]; - outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index db36c8dca617..a89898c37392 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,13 +1,17 @@ -{ fetchurl, stdenv, ant }: +{ fetchurl, stdenv, jre }: stdenv.mkDerivation rec { - name = "jmeter-2.11"; + name = "jmeter-3.3"; src = fetchurl { url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; + sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5"; }; + buildInputs = [ jre ]; + installPhase = '' + substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS" + substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS" mkdir $out cp ./* $out/ -R ''; diff --git a/pkgs/applications/networking/kget/default.nix b/pkgs/applications/networking/kget/default.nix deleted file mode 100644 index 0dc37d10d1ae..000000000000 --- a/pkgs/applications/networking/kget/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, lib, fetchFromGitHub, - extra-cmake-modules, kdoctools, makeWrapper, - kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme, - kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui -}: - -let - pname = "kget"; - version = "20170903"; - -in mkDerivation { - name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "KDE"; - repo = pname; - rev = "739c0b399faf5a393c7436c0771662596b840fdc"; - sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43"; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - - buildInputs = [ - kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme - kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui - ]; - - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix new file mode 100644 index 000000000000..0d73f161249d --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "mblaze-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "mblaze"; + rev = "v${version}"; + sha256 = "0p97zfl35ilrnrx9ynj82igsb698m9klikfaicw5jhjpf6qp2n3y"; + }; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/chneukirchen/mblaze; + description = "Unix utilities to deal with Maildir"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = [ maintainers.ajgrf ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 5d0ab27840bb..d28bfb647e5b 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1c8vv4anl555a03pbnwf8wnf0d8pcnd4p35y3q8f5ikkcflq76vl"; + sha256 = "15kqxpx8bykqbyw4q33hkz0j2f65v6cl21sl5li2vw5vaaim5qd2"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index f72fdba52f8b..8704961270df 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20171027"; + version = "20171208"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n"; + sha256 = "1fn28q4akfz0nq3ysp8n53j8yqp2mx6yhbvb59c4zm6zgd4qzgp1"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 6d268f69a7ce..0c0f55e63370 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.25.2"; + version = "0.26"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0ai6vbs9wzwfz7jcphgqsqpcbq137l34xhmcli4h5c8n82fvmdp4"; + sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k"; }; nativeBuildInputs = [ pkgconfig ]; @@ -40,20 +40,14 @@ stdenv.mkDerivation rec { ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies postPatch = '' - find test -type f -exec \ + find test/ -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ - -e "s|gpg |${gnupg}/bin/gpg |" \ - -e "s| gpg| ${gnupg}/bin/gpg|" \ - -e "s|gpgsm |${gnupg}/bin/gpgsm |" \ - -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \ - -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \ "{}" ";" for src in \ - crypto.c \ - notmuch-config.c \ - emacs/notmuch-crypto.el + util/crypto.c \ + notmuch-config.c do substituteInPlace "$src" \ --replace \"gpg\" \"${gnupg}/bin/gpg\" @@ -102,7 +96,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow garbas ]; + maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 4c768325fee9..76231dc7abf2 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; + url = "https://edgehill.s3.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada"; } else diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1df72dbe5fcf..656c4f03c0e8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.5.0"; + version = "52.5.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ar/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ar/thunderbird-52.5.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e848c7a44222be7bc637dc2d0356028e67c4093f48e4eb9c66e0c02731f41b2e1f2d09cd7765ee984137fcef4d498aac8cfee39b31c0fe5187347107b2cd12a3"; + sha512 = "637ca11b07a86b806ea274cf3cd9a47dc2d23a2700203c1ddfb25bac15bb4ed1eb4749f630021dd0f33f00c43539954d9fecc192d3582e752940ade0930422ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ast/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ast/thunderbird-52.5.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a9f8888ab021e696c8460d75ba1f843f8b31555f3f6f95e9af7f9c6d910ea1c3d68bab3d5adc6c0f70e6d8d9227db4176a7db762d28c1ff19addc95e0a756826"; + sha512 = "78c6da93f60134c9b033f270d04b983713dd84ba6af8cd1c0529471dbd3c860085491bc54f0fd37a8373dd5164b064653d9ae6ab12f7748a9722aa61472ed7cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/be/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/be/thunderbird-52.5.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4d903b23dcaf17d41c6b9f3d7a3ec936ecc01f19b93ecba88a5fe826f715b606064a6e2737611697c072e887f3776cf10ddba7e26a66dc4b91c3658129171580"; + sha512 = "7081fddbc88cdd0280bb35c7f16c33f8935d639d91e2ed4258e344565ea6f27d1ed8f2b5daa5d2e861e92357ba65c4c4b05260fab83f0bfaf6e2fa44ab081fbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bg/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bg/thunderbird-52.5.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6d34b3c3e907a16125f26f5f6365b5c3f2127ccf725753e94495b5dafedf3c506e71017d2b4699b755f8940ad0ea4241d6cfc00e958d4642c928c68a7e278fdb"; + sha512 = "d5d21dfea54ac7c75c515cd95f0140a21451a3b2c533cc95f0a519a13b950e01c6f1d17e2fdae3610b46fef7450e1d816158a71ae37e8813d8b9dbbde2fbb4e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bn-BD/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bn-BD/thunderbird-52.5.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "74106efb92c5ba792a3f10dc0ea19d2fc38012f1f761c0e9b9753f8b067e2771a9c4691df55197a9b5e23024f73688bbc26d24357f0eef95b8b305bccad5d9f1"; + sha512 = "c59b5b7381ce8fc65018bd70dce55488b12915d2c9fab7421433d7836cde95a409c2f5206323581bcf7af08b90e7ce8eb3c55b0a4f660734d3e159077ba60374"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/br/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/br/thunderbird-52.5.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2477afe645f7c0e0005a4817a42d24075dfabfce2724446bcd4fce50b72b7408895261544537be0e3dbdf8323e1af07215ca277c9e69261d575cdf4fc1f242ca"; + sha512 = "f3d5bea008f0849dc8834d51b6ba0529c2f803e5b059582076baf016fd9a02288d57851e1073c1df3f79f4fdb0f72ca8c707d25f75109d6b33ed60353180e80c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ca/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ca/thunderbird-52.5.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "810c5295bcde18217b77e2f147a70a5e94798b92c40d659c47f3f113624f049b788ba9fdcdc22608cc57719e8236372636e6ca46ce7fde309b70fc05e3036f47"; + sha512 = "64d024e4c696cffd4d97566411f7412ae16e98f169101bd36e87efb027555bc163f38ea1898b29a772fe31e1667dd69cc5eb19a96e04982b01b0de3975654292"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cs/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cs/thunderbird-52.5.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f8e033ed566d6b076213e33c489fcfcab520a0e1c3ce5c89c78c7443b360e55136e90b518428527a682854a24cb9b303a6c3475a59950d9546c1becd5db2a46a"; + sha512 = "ecd78ba038a9133d8ecd0184ae44af661efd38d08e53184cb26b221d50101df38bc7833a0cd7c76d55a185288f055f5ac630b1da525a9008d878b4c5a3d9166c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cy/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cy/thunderbird-52.5.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "27ade0c53cee3fe125420eb7fdeb5b013771d34af735bacd59af6681836d81acddda3b3b9cefe3f8a05b70703c040d6692732c427db13e5dd971848c078ae7ab"; + sha512 = "1aaef9550bb3e3e5a49ad220344a9b8e20db885e06eea182f87dc8ddeaac62b0cd2b94f58524b0c6d3afea054cea0d75cc96f80732e390cc47848da16cad3fba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/da/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/da/thunderbird-52.5.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "11de17a749643d35bcee49ebb1aa62caeb6806fd0025125363f228593979e873fbf8a927bc451c2e4a5332f431937c00601ff380d74e48bed60cfea5399b891b"; + sha512 = "fa501b4febbeefc90ff9ecf4c2dc4468c6fd2dd04559ac886d8e58ea3d4eaf003cb4577197b5b5c391f602b83defe158b8e3405b36edf2a6e48e48719849deeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/de/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/de/thunderbird-52.5.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "3d2408f523d55471f0bcdcb3a05e66381d390f56987b448a40118b1f0e3fb66cba8ed64cb3178694873f5ee0c7f5a74303ffa288eddf7192a4f519d537ecb65d"; + sha512 = "e4c87e3736dcfbe4e8fcce8a101030844cacfe2c20209de4a21cce247b8e80de3e4646c9a84c36d6d73199ea5926c2777a678b8f2b83521078c0c3a10a752b32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/dsb/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/dsb/thunderbird-52.5.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d1f560111bd8d8eac360ed39b0ac741ca10c480ec528cad48e9bf6544d17e12fe2f41d4abe4caa3549b448fd1fb55416ed84fa864dd60fe0cabd91766e754992"; + sha512 = "eb169f9d2e9836b83edfd8ef8f7af867ac27831bb5aadf5a75f6e652b507dd7c34ca135c278f95d8f967406732d296af3d42a18fa9e91c8ed18216da77824e11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/el/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/el/thunderbird-52.5.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "22c3270759d095c4672694c0885d3960d87cb9f53eedcf7c030f8a38f204d4809914b3fe1cd144f32555508eded73999907c64df2d9ae9494c69ce879180278f"; + sha512 = "dfd0160965fbebdffc217ed171bbb308902e1b0e89d91abe8167d7d26db991a8ce2b40b3161d623441102b2b6379a774b6af4a19bb39c27c59d76840351900b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-GB/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-GB/thunderbird-52.5.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "3e778e8f60101d2371ce7eb369c3f80c26fdc8164f5fcc78b8f65f2986288388e06d1413387b493ae479bd95b3af7fdd76f88365aa5803c4e9e3bb23e4f3aa59"; + sha512 = "8c8506a8fe62e6ca55b1d99d8db9ec5fd224fa87ff63f9eae49656001f94124312110a414769d5d396574aa0e1f69a8f0a5298d6ad86146ba40912ebe68393a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-US/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-US/thunderbird-52.5.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d4eb0d90d621b28cc706bca0f6884361b7fd53cb02dd9ecccfc3f6027634353cc8f4c911824ebe6bf1d7bbfb06318258daad32fd47687f2f3b930c90da4b8830"; + sha512 = "73e15c04a11190e8968bc64226ae4c677fa00ab460fe3497aab861c92c07ff6a3814673a7773ffc4e735491ac338e9d190e0c7cd626416c2508826000e1df002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-AR/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-AR/thunderbird-52.5.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0088b0380aa533e4c2818e0b384f5edafeaa3c84256e81eefd0dff95f27adc32c8a22b3368576d13aa1276674f519333b5c3f4a825fcc38da1abd0751c48f996"; + sha512 = "6b42efb1bd21fb9c9df67496a09fdba958145d56b185d10187256e45b8891dcf725cecbf1868c7cdba515397085f616328c111301ab1cce584158a17ae47b944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-ES/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-ES/thunderbird-52.5.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "251cf4cba82dbc10bc38039348894843b8f5c76875be72ce5ea1cb26cf26939055350e61a86e8ed9f63964bb95e99aac5442389c87588829e45e9ef41709ac7b"; + sha512 = "c1eaa597f18102f93b7621d50b5ebb54f9007ad01b5ce543e3f53cae88a42ce06c7d2332fb0e6b080ac2209403dfe06ce24a17f09c7ae3d5ace8d5e85e1ce603"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/et/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/et/thunderbird-52.5.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "609bfd8fd7f8dc17b52173de9916133e0cd52e41e66a488ee2bd1aea5078cb9e08084c10d0b20be36204bfc3f785574500e2bbf9a81f307394b169068ef3ff07"; + sha512 = "b0386ef97662e21806c15342b68b2224ed3b41a8f1648f1b9869b527eb8b60951f9453a5abbc74e94905799953af5a7289b25c80fc370772368f39a048ef89bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/eu/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/eu/thunderbird-52.5.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ebbc42c9d491f0f0e9ac5528d58c5d8604a913d77fb3d4548cb0127e356817c729c1ce87fd7874ae6f688268ab64b8b898611780b5c6b11707b455f529ab5f65"; + sha512 = "d7070db2bac9aabbf5b020f60080d3beb9b1ecb4df73fb541f387435eb9ea80e2297c76a79910af0858ea42882298cfdd5c5016bd2049fdbe91dfe1f4bdb8b70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fi/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fi/thunderbird-52.5.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "807b4fe85c2b751e815dd4ac19b0e80199f391f7a8fe7e7f5c1f7f75e896620ddc7b758aae076bd44f9cd7774b2020640f858e139db57b508919d78caa77d913"; + sha512 = "2dc49e7ebb96cafb37b600490bbf49a40393ed00cd4889e1bda6331e9dbf377a4cd53cb6cd98e7fb2e7cdf0da75e69e38e9f3894ab289f3ba0894f499e4f83b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fr/thunderbird-52.5.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "d2d6e92815ed9176a2743578c32ac82150d4097eee6bf31356a9bc1cc1ba649c86008d301654e291bf0bf5ae2d81c13d941c4203aaa9dd3c4110d36a34f28140"; + sha512 = "2ece29dfad71788ee5bf98afa262edc3b9bfaf57a2ea07d669c1003b09c5a5fbefcdb028d4842c53e17c1a63cce16f9296e574b834631cd485d0737cb13b174c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fy-NL/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fy-NL/thunderbird-52.5.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "bb5e34f15d63abecc4b68a74cf818def59caa2de47c9ab71458ca79839fd29f3fc2476b5e38a95d5d5252acb03595f0e065bcba5eaba6ff2eba29be66607f417"; + sha512 = "a84eab825c051666d606fff131542c71bcad7f204db19dc10d54166b499869e43951c9799d05b194f66ff40d5f307957c2d27de17da6ecac48ac24621da7287a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ga-IE/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ga-IE/thunderbird-52.5.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "e6f84323e42ad5a0df546307ba0a87be57d1ead7b7a807ffed4cb977b5b4c19c91ce8058794da07fb1ce678e4f8e59838454deb9a19232a5cd7d60c6cbbce74c"; + sha512 = "181fcdb0bae1a2aed16ba61523ec90f89b884d907796e1d1c37c722f68b89dbbabf977446022af6c7050e3e26d995e33891880e875f28247653225479847acfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gd/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gd/thunderbird-52.5.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1e28be9ff5c3ccefc320e020dbe574f9d5f8319eaa79e441ab7f1283557eca01501a2e0f4aca6af6e58157b4c1686422d70a258010657803ceb272b900ad3e3a"; + sha512 = "cc91084f593788da76815f185e2b9a877409537cdf52566000953a008bcb2783c09cd8893cba9f387b731fd636b1d8e7b7208832623d1222b5fef72db8cb4541"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gl/thunderbird-52.5.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "db2d76733fb97558d05b3ccb963ad82ab6886d1db32923bb73e4a62bbd80353fb7d7cbe4e1a82fc9095d582e467fe9a045d82be0aeb319fddcdc88c530733381"; + sha512 = "6491bf74093139c86a5809d02582b6d055ebdb3cbf29a1a24ff7529a6e8c2bb89e26c27e7f65bb588c379566741510d6f8372f7f2a11004350cc7e907a3a6d8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/he/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/he/thunderbird-52.5.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1b4640496d3a1acc7b8a146c8642f25dbc5dcccb7a164fb49a0ddad41e5a43d571936111154838b149bcee091205f0212926618ba5f233aaee051d5def345889"; + sha512 = "4235dfe0f51f55dcb905453aadc01baec3b8033384e5085072abb600c71f777699df4b556233ffa9b07f5d62442aefbce6f1eef2a9d557b24b48d797cf03b026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hr/thunderbird-52.5.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "5d4e361e7597b4dd0a896e38e31cf737dc1d51e87c09490a298147e4f0f395989567de2edff69f862fccc860dd0c18b24d2f91356736294c71429d22f47eab4d"; + sha512 = "4236d464d704ba9c4c60323dd3518a37f71d24cd441404b6ae7a0e97ff17c839e2eff48d100211cf5ce9d3759336e7a0c29abe5f8390facedd769804adb8b956"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hsb/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hsb/thunderbird-52.5.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "40b51097b472a36078a7de4ed35446baf9a3a5806a92f13d49cb0024ca154e511195e6b470959b6084ba689c4475224acb81010f417618686a4e99efc624754d"; + sha512 = "876a6c45e62c1025bf29ad3c626e3d2cbbc7d9d660e8e862b0fb586b73ed42a0bb58611dc69af727571c93f31dca450dd9156ba78b23b9a4a2116e561a8e3763"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hu/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hu/thunderbird-52.5.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "01a11e4e59c527e43d13c5c12dd95665bea7aad105d9ee9988e94671e394b7a55c2e85154e1bfb200d9290373de32d7c33ad1364e6cf2c189d8c9d8b52fb813a"; + sha512 = "7bf7604f08e452f33154ba91cdef8aeda9905470f526f403dd76e19d1010f822cf2f3fb7c5f0525299bd0401139df1a12631f796d603e0ec3af4aa8df73ed0f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hy-AM/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hy-AM/thunderbird-52.5.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "bc3c78d1d3da660c66b64930d295f3e79467684d178c831ae4f2eceb9d9c7753e5f1b60453fca674346da5e6eaf3c835df7340f0cdeb0e9040be546aa69d0cfc"; + sha512 = "bd62aedb2c800265fc34c884f1605caa0040794cc49479189dfa4a959d49397ef023efaac0937c9573ef7a114cee16504b5a65f8f8f3f3d4d222f4a173707bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/id/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/id/thunderbird-52.5.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "d377473cce2365f60aa5a65680daa2569716f3c331d20427f3d9002a72b42c0356e112f943db228a026f0d8cd5319168a9f718f3144b4c0a93ea3209c9003680"; + sha512 = "1dd761bc1bdd865b5ebb494c00dede5e616a1bf7fbe6d7cf88d4f5362eb75435ae162d2e027fb7928783fe255179de00d28a29ab3d90350f75be7a1e4ad428a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/is/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/is/thunderbird-52.5.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "bf41f55ef16c9ec322d732174a1076e5ab6a5db12f861891bb0ad1becf2b630b7504155505789e9ff7778b6c708642da55630aa20c0c18ccf11734572f62bab4"; + sha512 = "12dbca26babd51739fc6505fdd36ad32b5827e1c3e439f3ae4c2c8e0f165528e693af537bec8630146c6c6bbc55b75d7c5bdd3bd84b5255cbf756d627beac2ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/it/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/it/thunderbird-52.5.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "eef60e791ffabfae57c4e9f4094a39c8cb5c61ad4a8296aa111c6ff4e14f05bd86d4f9e682859ba6ae4e8d0c10001403d21bf8fa54e7c5688ca9e0ff06b4d2fb"; + sha512 = "9c9b77c70429436b1cb0030c92109343eba9357f58873c13399e9e64f44807e06fc0c429e0748ce9a11f68baf643bec7cf313fe79cbfd35e548ad579b0e6e108"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ja/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ja/thunderbird-52.5.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "43dfc61aebfd6b80651900b1bd066e3c731e06854bb375d2eba206733d4bffb42f9b0116fbea0853f2aa440a6873cbe9e188ed528cff25c8634d7afb59e9d3c2"; + sha512 = "2f785ddcb2e16ee1970cb582852ce52e1f3f7cbd58e8f714a18a387019b510cddfa1927f593b61ccc4b662b6e65f3fe20135eed451ba07a1df45b5979743b20d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/kab/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/kab/thunderbird-52.5.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e75c653e6dcaa6a3116aba962afc6196c29e9194235b726e3ba0b4fe050129512f6d67358a2ce9e2b6879f6f52c6ada583af10b70cddde7ee0b8fa72edacc40d"; + sha512 = "1bbd7b2c79cce7b74614e6f09cd7235d58def667f74bf3276ec928df4f0084704654224f100f227cdb350f839a13e474cbc98e4614ae45cf00969b2706291076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ko/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ko/thunderbird-52.5.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "52e29e6b2996a59dc4ffeee6f7a35f7a491e1d44af370ab1537d0a45c8d9ab8b1bf972a24f1f2efbcb6fa1d8e9b7b15c7b0c00d5aaf24546fe7860c7a6f97afb"; + sha512 = "e176558707cda5570b020aa0fc3620deae7edc6e7e363e1ba4b51d6cad9f4a9e74a35be5f419fcc0e18dca31b6c887a62112f99b4a60d9026b8dc5f87de45f74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/lt/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/lt/thunderbird-52.5.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "d935c882dd6a9a3ad5a6c5609047a6e3c2c4146b198e8c28657ad166d7b6ad826e6db0e4c88944214521f0cda0907281b50a6088432b574d1ee13e5c504c939a"; + sha512 = "f431c57a74e0f8498a9a1ad36e6528d09dccf8b03aaf9e7ab66ddd503bbd78ddd15176a5e6c2358eeb616ee023f78414c30b67fd39c4c2f15f4e377df81759cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nb-NO/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nb-NO/thunderbird-52.5.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "bd607e451f2601483aa4d59cf6225318a3bf1b2066d0f6b76c64025de0b20a8c8d8211f95b953440505248905d5b4dac569cdc610fe4d9d658a6ecc124966b82"; + sha512 = "5bfae55863550e32ea6581d0c24ae5374e2365d9e5e8f05f91856d0fd2760b761d183b12c9809668730efbba63e6c23408431f4616f6a7cc52ee465ccb939aba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nl/thunderbird-52.5.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "4767403a33047512f301617dfdc779f92e001114a06f31244e5b9a648ed4a7a96c6fa16194a803682417d151f2f9d61da241065f15cdd2e5953eb5ef41220093"; + sha512 = "fd7d35c0205610d868fb0676f3a8aaf328b1906dd1b174124e254ec8b08e5173741853938707dc99b10b4417df4a7010e20cb8a1038bf8f3258dee593cf788bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nn-NO/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nn-NO/thunderbird-52.5.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "f2fd66bc8a520f90fb65e5f737ea25e44f5e3270429cfcf878e4b128f1facfc3bd29282586aa6ba73478de04cb796322436d14580d86fb5861072b6722e2ef87"; + sha512 = "1070fbd6c51d68e560fa0eeab66f2baa39d11752018d20d23a3577b12b504355f5729d0d961ffd20256521f54eda69d03fb8efef70f8254685e28b0164201354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pa-IN/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pa-IN/thunderbird-52.5.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8e4c38febf02e61b874f931b0cf03221781ed9543f9b7a392ca9122f101622c20135f0fd94e5ee7696d0741a9910e1d1031fad3c825941d54da1f56a2533b61f"; + sha512 = "12293c8258f02403c8db220c73cf76b24315268324f2c6ac41dba7d77d9653cd1a21771a4994f7c6dc0db9948a601008e347d908c05dc59b7cf6ddcf95b2e86b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pl/thunderbird-52.5.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3e6fda867feb132f37913a8b2bda2ff2736f4d804e274f01c306d387b3c48fe30aa04b6f85eb4a7fb444036bdd4b3fcd4f68cbb53244d85b5064aa36c3588cde"; + sha512 = "331b81876aeb162e1f4e838cb00712e971310285febfa669bf7c6d245c1e8353be941b6d1236423e0d835feacaabf859077da1918cf2652f6b79de30c4beaa30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-BR/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-BR/thunderbird-52.5.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "662e0616d12fcb7dcfcb98a4e07228509ae7ad731c93d2c90a7bb7ebc3bd0f9636563a70977db14733c832220258eede361526b01132dd02a4e44b16acc6a5e6"; + sha512 = "d69fdae2048b738133fd07c6aa0ab6c264e555a3bc3a899d09fd7fe49435511fd544f3ef04e079c4efd320bc2abfa813f85a5f2a9e477af56aa47495466103b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-PT/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-PT/thunderbird-52.5.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8037be03b26263f3a1e69c4971cb70db50f95356c97e3252f76f080f5a7961c1b2ac5aea09d2e142994c5fc91c91ab8db738e5a104795e8506a06c997977930a"; + sha512 = "fa3286336d47b2216b0ec0c5fb6cba2421cb0cc81d1f815515c637a063b8de167cccfc3dd30b02636ae88e74efb34f8fde1b198924fe864b1fdc08d95b7f0f3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/rm/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/rm/thunderbird-52.5.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "93a76b870c15b61a1135e405f76897a86674e1fad2dfa9b3a71cab83f99c9369b7363a395e813536492a25133548f227f5254795cd20de78f127c969fa3ff5aa"; + sha512 = "b4affea897ac5af177c1fb6e4919f94f5f20860c3f492584c79664d803b7c2d092a96f1a3afe6b3212f689901a52d0ca74abab4910ba291280d52ecef2cf9a33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ro/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ro/thunderbird-52.5.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4a535aac1f6666d20c7aee65ee974bd545cd4aba56fd0ea2655d89a532b60bcbb174b8046792365041b431d3d3099e0c273c5ce83f1e1f3599a476028b482f37"; + sha512 = "3cdcf374f33961484962a6294ad8fd654b006f3472ce6550936a8c00a28943088c9c61049fba278cd304381003b46903a5514ac340b5a85a959edfe17242eb4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ru/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ru/thunderbird-52.5.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ec56cb45428ce24497ad398716f99f49d6a5787a042855dd5839e5185d43763ea87b89090bf15c571841aa0526f5b4b0fec8958bd673a39ccf33ad5f2937b33a"; + sha512 = "aa1d54fe356ef15d852a9ce3f269deee411d4815f4108c93c832def784c1afa104193e62fd9b47977d20ecfcf3057c05d76f39cc3abeb0341102b7e6e6639763"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/si/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/si/thunderbird-52.5.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e1b19b27571cc833de579d1460d27629042529480546cf3de11a39608b8d599ffd19451ae3df96390009e95b87521f17e5843bc77251c923823d3b0529167f17"; + sha512 = "543710116d67afb86e316dd17bf9a74a07ee5e3772381d9f0495af4d42075e96b6ff888ce0c3ce68ec779dc051f3ecb6105d51a6e4459cb4907a604662c933b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sk/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sk/thunderbird-52.5.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d20d0649426fbcc812b536d368ec5785b32def01b91d67776d5776a7fb45d9c723e1c455d20eedc7825370b03e484634ea42fb55dab5b3c860167cbeb8596c7b"; + sha512 = "3ae5ab97172ff0f4d3eaea7a69fa54d9bcf639a8032ee2c5a3fcda2d8b30072d3386c54ef7e8c9bf5417a6030966c1097d69d41dd8c5355e82d048b783aef461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sl/thunderbird-52.5.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c37ecb24cc9bfe2d31459590d0882fd9cf196e822a18105b61150db4049bd52c31bad2a05ebfb710bf1d1d879a22b3e6fdca08ec81663e1c1735a4a2d157b4b2"; + sha512 = "9f3e0724e837608cf4a64a2505af732e4cdf61928bd5dd1237e27d5222147a8ec52870e88c73653de8518e9ab81af4fb8916b067c780b1af25b8f6c208a10684"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sq/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sq/thunderbird-52.5.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0ed120ba3b39f884784269a6098242b8e1298bb4287749b901c2702d06c6824f762942bfe05a0dc1966c19e883239b09312139ee7eeb2cb22995d47aa2d124cc"; + sha512 = "0f2e10a8b9cae1185079af8e37ca9622d9ed29b6bb38377cc2db7523dded8da4969798941ab1e99cc70b36bf2fa59549567cf5c1e1cc40ee0131350d60f8239f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sr/thunderbird-52.5.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5e83710d06507a40705ae5177e4749c31aed4e932efc0c51f8da6a4b30d598328601f8a53b9fc0dc35cadcc130bb637771454d9cf55e8dec2b934287213e17f8"; + sha512 = "1f32b2705e4939c5e57f7a6a3eac29ccacbd90bb93361007b208a0eb1aea4f279b50fa17ffb86571cc2aa793742d3ff62caf28047b69c95ce358b6ec2cd24268"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sv-SE/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sv-SE/thunderbird-52.5.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4cbb20b1d818f0238cb0d5235ea82a1984b8dd632467ca91e3f3f4e8ba58de904603d1135c8a7ea359188f1b01a6ffe8d654a2d0a73b4af1f3862011d697f755"; + sha512 = "887176e1d4d9cb385ce0261a45f22bb67a87a125da737403c6965a6dd57ec7f0763b1245ea0d04b79aff5f41cd1ded3a06dc4ee301a17c01a9417ea2d515dcb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ta-LK/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ta-LK/thunderbird-52.5.2.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "3c2397e9b9e8abbbef10af15cd35ba086336daa5c317ba60d4489786b3ae4fee89457f2b34c0b42ea550000e8536ca3fee94032848b11dbb2c4cb6fe489efe6c"; + sha512 = "fb981e6175b1f8fe79b65f2c324e376a89c7378074a6ead4cf3444516fd8d566591f942133642830caeef1f342ceb169d2e558171a5675ffc96a82deeca585a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/tr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/tr/thunderbird-52.5.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9360797bca24f5477120d93665f9b4aa1614463558b6646e2813b31fac5b5bf84d5e88a752696c28fb51613c288482e3d88197ded2310b66515582b11f81aeb0"; + sha512 = "2ce313b74b8512eea958c2c3e303829a3d7452a48efc07afbfbe9ea783c6099e75693b679cddb65802fef5a47f98526b7ceaf4c1e7fdebf9357c91d5a306bd70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/uk/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/uk/thunderbird-52.5.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ee521d20fd5e7cc3f803f74ef5a9ecc4c1df8b149668489b28cc212ad2d5c765bda838904ad726b92b5e0e2eb35c2ba6fd4f48ac7c700e41e896e0e976fe2028"; + sha512 = "dcf852d0c584c3959fe0f7ff72cdd45fa8497aa1ca44ca036e849c3395da470a52376343f4b6e37a343e2f2919245a52e63bb5dfb5651bbf749c72c35a8918b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/vi/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/vi/thunderbird-52.5.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3d7b7cd1f83e80290f460829b49b6893a73871456cd10ab22da482381ece0ac14fac3e5c0e2fdf1e61d463b7c211c33ec8d98120fc0bc17d2052bbbcd4e16af8"; + sha512 = "2b3c262c1955045bbda194715f4e9fce97872054ca8cc6f7bca3c1c6da303ccda4715336c846d47bc204fadca003ba9f4efdb6798e55c9e928ca822544bfe152"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-CN/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-CN/thunderbird-52.5.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c0f9902bacbb659f5f012f30b6190d4e3e53baa7e4473cf231da0b7c509beb98e49f0e4fd1ca3ed9917c54279609ce5fba1c51b80b12aeafedb82a83218856d2"; + sha512 = "74e7d7f4039d38f6af9590303d173d7293046f897e5b23acf8ff16c7b1ecfc50d0e8896550ee371f19e73518432d137779cba26bad913e8deb9e4af1b0637edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-TW/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-TW/thunderbird-52.5.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "64dbbbe05b3ade46901686fa4733cc7c25570d1f02b378a2b2855b75905e687db9f97db852bb53e2baaa1010a0ff365bbd90060eb7cec7db745faf014c5e5564"; + sha512 = "914af708ab185b76a67e8a2a4c85c14f41bdc05bfbef66c56a8b28820e4eeb866dcb6d60b1b4b61d924af9a6ccfa9ec6a10afd6ffb74794487472d508807b417"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ar/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ar/thunderbird-52.5.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1e6449d23bb937d07fd28049ef4e36b64c1f36edf3f4def640dfa6412d354ec6acd5b1642e0b266f18334f3ab7806a9cbb016946c0a36ec4222cfcae39339bcf"; + sha512 = "b749fdc34c15b48bcc0b99af41ac0357fff3a9c4bf774de536caf1fa65b33dfc69a4a14a4cb0c06a82d41e222362cccafb9ff8f4ca64c128cf0a031c1161d74f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ast/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ast/thunderbird-52.5.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "38f0fddb28d8a894798e9811599e706e60ff80131b22568e3dc70ff7f43388acd6de5ee4485587c59fdba8f790b393f4f16cef6bcdd86b928f3fa1bfff7297e8"; + sha512 = "f3ddb2b95237e8c505286328369c9f7613e5cb22ede50f8842e936c158aa6cbdb053de6c0f4ef0a9256b394b5510c1733ce0f8cc8423370581ec54b871f59b56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/be/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/be/thunderbird-52.5.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "0966c3fdbf73a51d2c7776918abba4b77392dfe2308aee36970cffcbbc3e1de537625c0b5881a85eea74817b33055278d976af719773579885b3294746a3ae50"; + sha512 = "d41e1bcb8460015876d784eccb37aabfeaa8a283f408e6606d84175f3e6b1e7428b8d277d30b250192cede4cb6bf2746945cf6fd4afa698fcb1b4230ee0f6d5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bg/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bg/thunderbird-52.5.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a0a792063a3eaad2d15f4b726c9ed170f59f99b1ba9c966fdcd6471865dcf2f25284ab5e4e28641a66fa8ddcb019f8b8f521d69f5ed5e8d1ebc2729abd9be8b0"; + sha512 = "e07885f88953dab1a940d21142fc04c7b8b2f807fc424f69b99f90d4a8f5ed034fc00de92d76dd4fb858c669cf6c3e9cb82f93ac3a264ba71f7b644e99849fef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bn-BD/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bn-BD/thunderbird-52.5.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ea583cbba8a0080a5529fb91988a0ee1c7aada1447b616e1ae43b6eff86dde87768cb4fe90fdede8454ad5240d266bc5e6ba9f1e5e05f2ad82cd3ef68ba374d3"; + sha512 = "2cdab1cc1066ab51d8fd0787115568cf70f3d584d2fd5e3908eee0f64037ce61a80a3f19ae31dc8cabca8f05cee51221917c717ea535a5a8085dd3410fa56422"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/br/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/br/thunderbird-52.5.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "18060c8473e82554ff793ba495ba6760c7d7d8c2ccf8fdafbb41589c57474baa0a88808d154a29f6359c657bec40d9d164e53066d44bead78d4661b229522783"; + sha512 = "0db76f3544b14360bdee64186b9f828dce717d72d23ab59d4568cf079dd1db138e5b79eb500bae6d0043550bb906a0558f07e3b5ac98d0ff67705578d04ebefb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ca/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ca/thunderbird-52.5.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "f63dc5e923d8e60470fa4e4bc5adb8ef629a82dcca84a87a6e742e9d34a8709cd0946a85bf5822b19b5ff5c1c34b6e290439f3e3418e4ab86844a0ff54c2632a"; + sha512 = "6229309d3e81f374f4f04071843e3a1e7e18ad8316359ba6badd0509284ef59c16085af9a52956a5a2f438bd9cf8c88400e15fb99bcb75001f08fb72c285b3ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cs/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cs/thunderbird-52.5.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "72e1a77e10105a757c51542bb236d10c417f96f58c3875b63112c71848ce023c8754971bcd34dc5d2a48719070939d3733df9dbe4d2218e7bae7e89049d067cd"; + sha512 = "12a2df8d37d02076acf6cd2bc86bbc71e38e157e121b1729096c880481a82d23a0c1c8f1c8b1ff53193aefa1eebc64ffa49bebf38dcdee5fdbdf429bff5d9993"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cy/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cy/thunderbird-52.5.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4901eb53235ac29cdf685dbee78db301abc1f088ea9df585e388814c8f48d81aa0daf816f927b0c7d6df7985d8dd1e64c0c1cc26026f3ad9625251a72b666692"; + sha512 = "7c71ae8ce62dd271e0202b4e25b52ab9291ff83b920465b9a96c36d55c520ee87a5a348ab9d0ffd495744b787d424741ecf9e89ae4879281d0a6f2cb3742ae2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/da/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/da/thunderbird-52.5.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0f061a7ad1e3b113d7b954487d661b4ca57a0ae861770c44081257a069e324388ba506b27ef0123a240cd949edb4ae60f500712c0addeed146cb922c76bbdc32"; + sha512 = "36861c719370036033286139f5e93d750eb8712afea42df7cc7f8bbfb9a00dde999e3ac4e38bc48b64a343a8091483163914cd362e9e30e0f9a98c6cf6a1783a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/de/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/de/thunderbird-52.5.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "12ecdd09f77035ece4161c97cf4ae8bffab6a7eb46c7b9a2f7323dbcbdcf4f3d1bfcf5fab4d40b2887fbf64b541c0d5bac54f1b8f73ce7e31bfa201e955077c0"; + sha512 = "8571075c5435ab4763ac1c0f3904ca39b5ad1363390fd78eec9b73115caccb3eb3cc9f2e1a8c4119469ed5cc99d648fc905a8fb4d51c0bd10dc9ecb0338ad59b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/dsb/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/dsb/thunderbird-52.5.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "54fe7ff647565d5b82843d879ce3f791b2962bb034ec2ec2d5ea85cea3019ddae49f9f45384751d1a2d0f879aff4203a61687a4432ebdb948fd30569b6ddd7be"; + sha512 = "1b873aa804d253786b37a8bd1e85884f12c48292c3703d9c04a9d370e8fff73b0d865495a65de7fe690e34f835220ea88810194385ef50f3b285e8237f3761bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/el/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/el/thunderbird-52.5.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d667a2d4f3782c30b308cfa6dd13ad321f6b7108d95f05c68dabe085228de28439f8e851920205404e48849829e65a07601ddcc553f3c73b08e233175805f046"; + sha512 = "8f6327796a1e937e0d43f2af23f25292ee3a56b9d173bcbad1bf1d7cd60ca464570ef4a9d8255d2f3897dc862680073146a6509944014d0abeb21395da8c0201"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-GB/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-GB/thunderbird-52.5.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ed7d40db832e9abf89d0d1e497f1b276dec7836e494b616eee8db1557cddd33f6f700bc9f17db0324f7a3b191ea425a7701b7e2b10630c21ab07f3c709039312"; + sha512 = "e27a9c743a1d439e3cda7f2924c01044c797f88bd4b90723face80a472c8e0854c747472e5cb72dfe10ab1018188044681e1ae633ea55f4a11aae6f62a3a891b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-US/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-US/thunderbird-52.5.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9ffe74492c2fe29523a34b02ab869f9660aa1c33b16e45a026c4404e714b9cb6a5d2b24e73c7ac2f52e22f21e6e88e9a7686edbeb2c0876594054b17222d9ad5"; + sha512 = "b20aeac366bbfe257e709133fafa59bc8fd784d33926a167adf24d2c90d2cf5adfb68815e2000de4837be7cf73258d890cef555be82112aaeaef2bcc244f634f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-AR/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-AR/thunderbird-52.5.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "9f154f4fcb465925d445cbaecad4495d12d6381f0afd502973c4869890dfcd77366fa90bba835016729343947e064772163529528bfa76d52fc87bba5e9af1d0"; + sha512 = "a3547d8ea9675970dfe9dc40e1b763558fbb204b8d0940156b97212f2a5af00ca82ea2493f77fe896e257d7e0cb1ce7a1fe05a4c23aaa09222da43cc9b823e88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-ES/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-ES/thunderbird-52.5.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4dc72ba78d8de913ab2b3a76920e0f4e3bb75cd880c3a8a55af72cc38334906e5786b24feb0db7d1e12db845f995c28e3342b5bb1bd4600c70de6b9fba012194"; + sha512 = "2ad8177608038799c2ea653ea056c599949972a51493a27a34d4aa0769814106cebc8eac3521c7d6186432fadbf8e17e7b9e5221bdd1bf70de4fa80de163e964"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/et/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/et/thunderbird-52.5.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "64279f558880cd6f6653e9387b479f08dcff440a23dc9a7bda664f09ca641cea05a268bea7cb7ee6495910fc67f1294f78bb163d09d70df06f335486d46d7ee9"; + sha512 = "a68d4606e943a4b5841853b1c2d5165f5c97405690d467c0548ef0169fe472e76088c0387f9adabcd5837a3fba72287398453c4e149343bc9130348b5d62c682"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/eu/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/eu/thunderbird-52.5.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "90185fb2a72b648af46b83470b2c57ab8784baad2c75c32920a5e6e1d5e03b5fd3a5ffad04cd52ea73a942c4ccc9b02d71ef7ca4887d3d089ba8f13745087b79"; + sha512 = "dfc826d722b7ff331df35b6fc9b82eae9714f8f8e75c1fe3119a3b449a5b2817a8641e939ddf32b4b6605406a7cfeb57de24493b5a4d0cf9992a3dc30f2558cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fi/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fi/thunderbird-52.5.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3d8fbda9afd0bb82db6baba04d06682c5083a8a05cb941552c5ae2abfa0fd7e9ea9e020423877f3141922485a69c1af5d48235dda29fb4b583c1f4435a747f59"; + sha512 = "2676d22c662a5d7b4b3eb32a71b032e76bb609b39a89381054b254ad7a966625af2166b2a5edd9c09ad8d9728933203c99a3c60e03c2fb031b748e94c16eba77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fr/thunderbird-52.5.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "669723deede608bb8239ee5a04dcccfccf3680e32da494d28fe5380714b012a322caca38eb3b6ccb3c136a3a9742f917a5614f1183ee08b80d760fa5cb19493a"; + sha512 = "b6ec3f6f2abb0f1ae8de3167e03d9d254959a93881b4cb8202db5880bade5569a53f1b5aaeaec10fb6fcfe453fcbe7cf0c090947c546ec62ae0f858dc0b251d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fy-NL/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fy-NL/thunderbird-52.5.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c35371dc26545e5f1b30a1c866538380e8d6cd21456e1415260cfdcde3c37f6f301f1a5ebfcba4d6a5612ed3809f7a27e5a5470fd5f5b7146b923ab15a5046a7"; + sha512 = "c0e2618f223f5b58d80283b23c38ce703d5fa019444dc2168d1ca88149780e458ed9c5414931457a0a3e7733407eb07b1fd38f3b40c381db2f012c5a1eec7eaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ga-IE/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ga-IE/thunderbird-52.5.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1f5eaa4928e7b56ad27937b6a49f90fc5739149dfa8119563eb6153cd1d850243ce3a15e42d6e5a7a7c306401c97424b5ebbb6bbc7d20102aab09723c91925a5"; + sha512 = "fb6e815a5690382f1608d20cecb596012677616cfe3de11ba8aacdf32c59314a5e61ade11151965fa4c5f310445700f9fe89e14734f8876ebad4dcde9f46535a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gd/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gd/thunderbird-52.5.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "61c1f4d9769981149a5961c096d9826e737ed356582b90d09efc437c38f93d9897ee84489f33e3fdc20787dd9d437ed58a5592bc5f586748d3e5897ddda38b20"; + sha512 = "3edf7e424f7a21540225d6e30543bb39f395564a3effd5064f3471f7922c19e275fc7b20e1df929a93eb375e0b37937f5beb239003300bff0af8af0d2f7b203d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gl/thunderbird-52.5.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "cd23d74ddd303be4d86e4c63d5d2186ce3d0237caa62b0a48987b63c63322898f591e4b2c7a5fa5d219c49cb28070fde5cd933050dc0c0e6b9aefdd5f03e5b1d"; + sha512 = "7afea0817603271e8ddfa01374102f8856fa1d090fb3a98ff9e3ef477aeb019f3860e68c6ea72659ea0b65c54967c68bfa0d84a040d7677469ece8460fbf93c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/he/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/he/thunderbird-52.5.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "58d98ff08576c3cd3d5a8637b8ba8dbab1b7e61942f4dd772ca48e3fb447a2dbcefe2cb9ed8cd3e86ffd0d9f8ba33366dbe01d744a825bf513861ea870d69ecc"; + sha512 = "546484c47f925bfb92bab962735cef6a74336d6b282881afce1054caaee559360e2df1d497d857a12ae76b99ce765ac985adf48d17f9a759b262f8b134e9adf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hr/thunderbird-52.5.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "770a4a095993a9a84266b15e461645c4446ba6370092f1d0984d2ebcf836d24538276f63f9513dcaa537a4f016bb699169dafb14a68450f1e13050679800c5b3"; + sha512 = "552ebbc20522633fdd27117a941a0541bc3195b4a650612e6bf9f5e341f09c39efe1a58dcb9b0bf3ebb4797c7cf49e7d8a8d7922d2f3cb83284f9a3dca7e6b68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hsb/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hsb/thunderbird-52.5.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "35f0a061f152d871636723b4690d3a3ff7172abb5adf0644b02e44fd23583e9a9d8ea68890a5313d74d190a6d293798b5ae8969a38b1166cd942a3d17b0246f6"; + sha512 = "f92450010bfb1d1620bd4819103d89f0d58af567231219ff106dbd48550e04af2900b362b93bd199482aaeb72a0ac88344e3767d754d6934d401cca13af4b718"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hu/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hu/thunderbird-52.5.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "a4e9dd6ad2295cde7d7e5bfa8efee3c68123ae11d7535f0c076e29b18b952320ef39e4c92e8ad4aa66f63d8490b5737ee849e425378db04df8c794bb64f5393e"; + sha512 = "6a4d10925475f3fc499f49894f6c79de88bd394c9b3359efb326e55aa3e1af9b7d6ee2c853908bedd95e113d697ae3b25e612dff72d81d01addb1fbc39c6ea36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hy-AM/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hy-AM/thunderbird-52.5.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "8006eedb925424458cc9e084b367d4b8f16f78a6245159c61f13b75455404adf13eba353b4141cc555d82d4d6060deae9f97633884ba6d3b18d88af8bf93c4c7"; + sha512 = "ecf982393bfc9c826dd74ea6c0452788c34958f031636c4f70bf12388e966a3630cde159f3751540b3b917e52f0b64a2cd572d211ef3b61d97725a80f51b4f5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/id/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/id/thunderbird-52.5.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "df166f9e33adadd2e38290d1ea92a035c9cd0d910c1b246906ed38181c8db12bba29e69b4a909594a79b8b3eccc23131f34236afb40d6746793cdbda3a195bcd"; + sha512 = "a4d735acd212827ceea6205125e8d38f292b0994a5375738857b12531aaa947539033fe3be3e198eae82b77647d243227200a9fafb4ff2729bf4b0028868295f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/is/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/is/thunderbird-52.5.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1a05df69389d95d9920e133e085a0d3a05eb917b1b28c24fe9d8cdce316e19319fe08aa7a3fec304153fa0f59a0b8a630f9c44fa1d9c0310de03fc102172dbc4"; + sha512 = "8d4b0a3eef192d42ecc9c65eb692b5c35ead5c1a7ef17f575e96e06f8990a76607b31abafbb03cabbdd4385eefcb09bb0477c7a6cff1b5fc3a60bc9fb1d0518e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/it/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/it/thunderbird-52.5.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c446fa3e15e9eb72aff880f928f5c8a0b2b0c96632c243db4f5c377bd2dab56ccfb569a8500e9778ac5a4459ca634dc6d2ec1ec0f05aaa2980d3f45109fa2ffa"; + sha512 = "4f2d5c1bd7cc404bb8ab6097bc3dd40424a745f8a6cbc0e73722a28d68a582150acbdab83e02b89811c6617e63a2d56f5f02f6fc463092e8e959a91552a6f3d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ja/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ja/thunderbird-52.5.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c7699f90c49fc4bca1580c749ccc446a95cb9f1a5a48cfee3b2a566ba13e073a4e405ba7b17ebff704f719639e323332f533db19f7c82007300322330f2b3983"; + sha512 = "78445e5bb7211d7319609edb30e063c3584ed8c92eb4fb2953520720125306c28905e2248eb5825d6bc09399d38e35f37be57707e64edd3aae555b4ea748205f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/kab/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/kab/thunderbird-52.5.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "5c098954ce0e642c76c3597d419bcd5f286d62af96ccf2726bd00cefe12036708217cc6829c39cd669a21ed0cdfd8a6d511b8a55e8dafefa8c3940040e99d9a6"; + sha512 = "7ad9d0213a2cd6297cf899f311ea3b8a7493f8596c352c351aa5aae3c7b0639c787dfda9d63adde7b2d920277c09d987b690506c762e24da16d86f985cb8f846"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ko/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ko/thunderbird-52.5.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0a435742a13454634ef563b704d1618ce492a997814466ece1066e244160494e2092588b5cbbe5d1a7076b89c895b5f1a3288a377b547d454eb411960e3faeb4"; + sha512 = "a76a8acadbf082a7fbaecae8798fbb3fec4d03515db2f0a7d2d10d15ef468c128329e79f68e9b0075c4a7767bf56de5d3f1f5521cfa7beaad2fa2026fecb43f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/lt/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/lt/thunderbird-52.5.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0ffbe8a40179cdce48423c70ce871ebbce066932cf9ab21560ba3107d2794198a7c8f5d5d3fefa58627beac4faa2ed398a09c429a47b261153f3045fe5779883"; + sha512 = "cd8911a16d2662f5b80b76b04013113a8e9a231d25404afebe29852b5335d587a1dd22aaa74727c1b74ae5b26ffbd0f4723fc86ecef5c43397485a5199d65b71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nb-NO/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nb-NO/thunderbird-52.5.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d44ece21a5ce26df33d7ea04f56cf2a21dc67bb053212a71a2a30dbabb7894bc9cd5b8a07f86906c882fda29603d2c8ff16d675c8e8bef8ec362be8c824624a9"; + sha512 = "3a82189796c1bbbe4633ef7beb054cd5f324504173678aae2763714b4ca25b04bce479eb63d89abe920c89ce7a4159eefa5e27b6e5959d2bea01a4cd53e13e58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nl/thunderbird-52.5.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8c2489dd4d860fc657893986f268746512cef54943b19f7c129013e5a6a8db8f4a8fb0ef22b1cfdc41306bbd63d1c81131989af7161d310cabe2427e21ab4702"; + sha512 = "63e40217f5abea50375c0fc0060cab6c6291acb25d468edde8a14751c0693f0e9d751cbdee339a2c141269edad6c4ac87ec37f440257b5a78492bc43e66a9cd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nn-NO/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nn-NO/thunderbird-52.5.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "57270f4645bc1d82f3602a49aad11bb6261a2be39200b3284ee65082df363b5870b1cacbaeb3802a83f6ef1554a4d6a2c6e6b2720aa2b9d29b7a86208d676f6a"; + sha512 = "bfa15dfb0606ca225ec370426b983a17c614dc850b665e40ba648504f5d9bf556a2f31ec20533fe739ff94f57f3eb5486f422972c7ed8c08d8cd7c8a023f9937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pa-IN/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pa-IN/thunderbird-52.5.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "7a7464cbf08e418c56c979abba5ef7120f1202073ab630ef4ce070aa1b55520597dda0b0f31e7afc50e14c8c4fe0f33759a2278035d5db5f21edacb6d521672c"; + sha512 = "6989775d3e36ec43aeccf3db32627d3f1be13021943a088385313fc7111d4288b8daa32ec37a9679353d68a9f15761fac2f7a4eb7dc1a60e3d15598296b11f82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pl/thunderbird-52.5.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ae0b8da805a3b055bbb64a3c0f1d3562f44fae08751026b8300c130f4a2629a1a17857d2be2468c9e2ddb2a082155d35a26b7b1f0c99369b2031a90b34aa2443"; + sha512 = "05d252299552f987641be34e5f3462d56b08b01a66637b2d039d1a39f2fdb1b9b986ecd353bc69290bd64b5858b2e7fb7c928209cdbb98b27fca479ec8f959b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-BR/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-BR/thunderbird-52.5.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "f61d66c71c2144aba0781f82370318fcff0637d4bb28cda3703f099718691f13bbbc51eaa4252ef1fbd1dbe821032597e41adb80b1abec89a2bc50df043f5099"; + sha512 = "b40deb4d5239e335f2c2e65d676cb6528c3320ee28bc9d83dd53bae2a486bcce2921726309754cc0bc155d3f8a0f56d69aa98e782bb4b8375cfcebfee5f58320"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-PT/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-PT/thunderbird-52.5.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ad0d63ab9389e3c4cf6985835dc4277d3ac5cf79e09457331f87629c8f9a58e95ce7b68c2eec8973ab445cc8f8c50c0b01b78ebd0ada042f4fa6a2d2bc838241"; + sha512 = "0afa965096f5a79b79b3e49af1758dc200ceb8161192a97d260313f9582f1c8b7a1d4e54e093cca6b9c92a9458dd38ba0493fdd1d6567f0505a90fc9bd97f09a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/rm/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/rm/thunderbird-52.5.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5e5f96598101695ad0d16a7f3aea38c42d875b3d7b7e2eb529786f16cc008ca8b20bfcb24d2b975cdd2e114d00c1d17f8901f19fa84263f64506d9d75568e6be"; + sha512 = "c9babc6d6e85936a251d4f7214991a06a3b92c6ae207a8012fe14cffb277a6b2468213a4ba94672a360bfdf9f4b817b8663cc15ceeafb79a63cbac13310e1aca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ro/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ro/thunderbird-52.5.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "82a0324bc4724460d5aafa194a78d611c1d11cc347446d5c2203e9fb40a45f6c7ffb0e17aa87b603af8b3ae5847fa91cac529ae878a6981c9c754ea91b8b6b52"; + sha512 = "86f303e7878cb988ee1773e6de2ea6b433028d4bfd40d9388384b14b5343b1de9b6b5084f92f1c95b4110ecc7fda669ed98d50dbb6266a775f4e058d5083e24a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ru/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ru/thunderbird-52.5.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "508d949263abd425ff805f417cfa60736d391e1dc99b53dca2243c4c93487ad2889ac6a9bd8beed59b4e09bc82ba31b9c5cbc9fe084ee3b5fde74baaa2720a7e"; + sha512 = "d262ad2a73ab34bdecf6d180840922bfe16fdd4dc7097ccd900712d99ca915da648f2a196accbf6ff9946d9fc48c674e9eb0f0bafdfc94cd6f9069139cf0f036"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/si/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/si/thunderbird-52.5.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e9869c86acbba32bab6b536f2542b498e9de0a306558b3115ffaf143f83c5a5010ead37573ed7ce9565c42b6306d98b4f92da866ba62f5c4042dd537f66e377e"; + sha512 = "6b39cd9501b2dc44d033efe9524c5865cad8fdfd8224a51fb04679227e5306d67d05a9acaf4f5810cd67e6d10b1afc69ff80e63a7926616c35c79ecc3f02d93b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sk/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sk/thunderbird-52.5.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1297d9a8ed5d062790766ee5cb66a1c3b67526326440b5d3f27b712440c0e3525ab2231774e02436bfad4b8ccf1006e5a16d2fce4be26bf2c757427228f7fed7"; + sha512 = "356c86279387b023540fba86f73376b1be12413887f8ea2c3b706ccc268aad282d77b7eb863e58d6f15f66516dd4bd8f56a8f413815753dfd6496f81ee842aea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sl/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sl/thunderbird-52.5.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "734d57ba493e160547953debc20b1d5565c31b0e6e5b486344f5da65aa4cbc77fa7790f49f4ad6322a633232fbcca2f21bdeae7f4abb2aa8cf13e5741519d706"; + sha512 = "86d035a6b7108fab33582eb665afce9063e3d55b0c468b81569503cdde7ffe169de227024e94a60dd45e39073eaa3c3f313bf061c0ba492b66f75f79941c6100"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sq/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sq/thunderbird-52.5.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e7a21ce516318f46d467f987dd244174ed2533bdeeeba41c2fff3a838ebb78047febabe6f3e86ab57bcc12f0b1418fb7ac195ca044a7c84eda404e152690b554"; + sha512 = "f2dd5958774c81710aa59d7c9cf8543c86d82cd21da16b13ad1580cb2680df5caf973cf28a505fb994ad809264deeceea8806641fa27b9df5a7f26c725030515"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sr/thunderbird-52.5.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "132fbcd2a7890ac413dbc3b1651a02227b741a8a31e2406780f36415fd47ed75503968a93414ec31384f28ecf1e14753f0e1bb2988468d973dfac9ab45787519"; + sha512 = "47a96a821fb825b6624262bbc0138027b842a9a69985af8903a7bfd435f6cbd3211e382899f3cc989cf716759aad927a8be22b2500f42f75362cfad09dbe67fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sv-SE/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sv-SE/thunderbird-52.5.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6e07841987bba5fcd69f790fc8a292ad7a3d71bcd802d16081145f243a71d49c8c57c5b6ad60ebfe1a550d62b1c9713843a83066893a397889f925e8b88904ef"; + sha512 = "978c8c41034137361663f2b12818477baac0e795e4c1ca7f7a013a8e1bb68534ef2a8a9d73e31c1ded7461bc5dc6298fc628dc6190b3657ce415f9687a3ed85e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ta-LK/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ta-LK/thunderbird-52.5.2.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "978b1ba5f77271906ea67b37637b31a9c1da0f97453ea4e140adff8558ee2b01fe32f3018a48b141198cd0ad9f9d927ce213100be3f3310b020bfb3ff8b1d69c"; + sha512 = "970405c59d2589e49c53f0ab37e959c6f3b94bac41929ac6d5776c7b78b91bc0f8a6c1acee1557338b76bb8fc2a9f62f179a0ad10a0a8c984254d39577402556"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/tr/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/tr/thunderbird-52.5.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2531185c167e66b77c6b7f968927a64a9e8de56580fd82c7b2408bfac71523738610b740650644eeee4c485dbf532a8da92367bdc574733d0df0d749613bd6b4"; + sha512 = "cec76a997708b5339d5e49baea40125226f4bd708fa57f43f7812e2c7be686515986b90ab6ee525dadcaccbd9b9ea2c961e1a645b2c9634062e3e0c9c00ce2dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/uk/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/uk/thunderbird-52.5.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3f9eed73e2e85528deef2f2ffcbc166d2a836d363693f6ece98adeabe872a6aaa77facd16efd918fac9eefebed68ff35c59750d7116545a6540c9e1aede45c51"; + sha512 = "be710c5a5d28b34136ad72456ab9893d7c31dc0f3eea8cfc38d70169c37df5c96fb3aa18b72555e081115d0791f3a634325da191ac004ffc6a38d1412e140e95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/vi/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/vi/thunderbird-52.5.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "fa776aca6c434491925e6fcd1802f047fcdcc2ae817805ffae0c873e17f1ad233836954544d85ac378ab28fb607c9cbc5b1808a12bbfa1d9337c8e47de4eddd7"; + sha512 = "7d1f59f1fd78609700b6d6246087b88c5190139c79e7e60f2eaba91908ff0afbac0bce0e2a60594cda0800cf68ab0b5568702e0cfcfd1718e4cf46a88f20bc01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-CN/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-CN/thunderbird-52.5.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ddc20a6b05b48d6bcbc59c585b4a2365cee6d526ddef29e3dd04d38c8632c5c7ddda9eab24f2850dd2614bb7acc6e982ae4673c2b51c679eb5afd48047bf6fca"; + sha512 = "5763d93646a83b8a88e8c4b1c1c72101831f72323b600d576619330e2cf77ac7a9dc668aef5ef59188e0f467db900d1d8f3c2ef299f422f83de51f53519c70be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-TW/thunderbird-52.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-TW/thunderbird-52.5.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "aa527aeaa6b10d785e3fa3a8052c5dfa70f9aae2601119aed7dfd60e8af30f03cc1b4d93f749c36be4e54bbce6071fe66fb1937fa392b8391ca695e55ffe68ab"; + sha512 = "cd593b08ed5f31dd89b44e9b79b1db324c51facf63e9d9c0c2ad847b9cc13a0548e831a87078c9c0ae910512c4855e6f3ae22d1c40189e082ff6ff26224c35b4"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 966e1886f34b..720b20e71290 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.5.0"; + version = "52.5.2"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319"; + sha512 = "d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 93e10fbe5664..743da7958067 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12-rc3"; + version = "1.12.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr"; + sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 5ebd01f38c41..d527279ab775 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.8"; + version = "0.18.9"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff"; + sha256 = "0n2rgzyxw6m29i8m8agri3cp5dbpjblhhyklvxsyzmkksnsxpw58"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 41e64d7b721f..f2b7a4a4e999 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { EOF ''; + # `cd common; qmake ostproto.pro; make pdmlreader.o`: + # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; homepage = http://ostinato.org; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 7f8594b8bbb1..c6e5d0f3cb31 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }: +{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { name = "deluge-${version}"; version = "1.3.15"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity + pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 6d204de9ac43..400600751a2e 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; - homepage = http://dev.yorhel.nl/ncdc; + homepage = https://dev.yorhel.nl/ncdc; license = licenses.mit; platforms = platforms.linux; # arbitrary maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1cf6db21bedb..59c48c0a3d3a 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0khy875ahh9rlk8lyfpwsbxjsbp7i1cwqvd1j1s4cqc812szh3z3"; + sha256 = "1lkbrvpzdfbqwilj09a9vraai7pz6dh999w4vl51mj1adm7bh0ws"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software alternative to µtorrent"; - homepage = http://www.qbittorrent.org/; + homepage = https://www.qbittorrent.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index a33f85551f3d..f047b630ec40 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -3,12 +3,12 @@ libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { name = "transgui-5.0.1-svn-r${revision}"; - revision = "986"; + revision = "988"; src = fetchsvn { url = "https://svn.code.sf.net/p/transgui/code/trunk/"; rev = revision; - sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi"; + sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { substituteInPlace restranslator.pas --replace /usr/ $out/ ''; + patches = [ + ./r988-compile-fix.patch + ]; + makeFlags = [ "FPC=fpc" "PP=fpc" diff --git a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch new file mode 100644 index 000000000000..4b070d0cbe8a --- /dev/null +++ b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch @@ -0,0 +1,22 @@ +diff --git a/utils.pas b/utils.pas +index eb8b828..1ff2440 100644 +--- a/utils.pas ++++ b/utils.pas +@@ -100,7 +100,7 @@ uses + {$ifdef CALLSTACK} + lineinfo2, + {$endif CALLSTACK} +- LazFileUtils, LazUtf8, StdCtrls, Graphics; ++ LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil; + + {$ifdef windows} + function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle; +@@ -235,7 +235,7 @@ end; + + function ParamStrUTF8(Param: Integer): utf8string; + begin +- Result:=FileUtil.ParamStrUTF8(Param); ++ Result:=LazUtf8.ParamStrUTF8(Param); + end; + + function ParamCount: integer; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 9b448f86736d..d2bbef7f581f 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper +{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optionals enableGTK3 [ wrapGAppsHook ]; buildInputs = [ intltool file openssl curl libevent zlib ] - ++ optionals enableGTK3 [ gtk3 makeWrapper ] + ++ optionals enableGTK3 [ gtk3 ] ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; @@ -41,10 +42,8 @@ stdenv.mkDerivation rec { ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; - preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ '' + preFixup = optionalString enableGTK3 '' rm "$out/share/icons/hicolor/icon-theme.cache" - wrapProgram "$out/bin/transmission-gtk" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 9d26a74f8bb1..d8e0c76dc490 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = with maintainers; [ xvapx ]; - homepage = http://www.tribler.org/; + homepage = https://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index bceabc2a64a9..b43287230278 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,15 +2,19 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.6"; + version = "2.7.1"; src = fetchurl { url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; + sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; }; buildInputs = [ openssl libsamplerate alsaLib ]; + preConfigure = '' + export LD=$CC + ''; + postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua @@ -25,7 +29,7 @@ stdenv.mkDerivation rec { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = http://pjsip.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric olynch]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index f6be80e4a1d4..6f87e55e8ea3 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -67,9 +67,20 @@ let patch = "0"; x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91"; x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # Fix when updating version x64suffix = "10276927"; x86suffix = "10276925"; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html; + }; + + "13.8.0" = { + major = "13"; + minor = "8"; + patch = "0"; + x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931"; + x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7"; + x64suffix = "10299729"; + x86suffix = "10299729"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; }; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 31e1a860ac98..59ae225210ca 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -13,14 +13,14 @@ }: stdenv.mkDerivation rec { - name = "freerdp-git-${version}"; - version = "20170724"; + name = "freerdp-${version}"; + version = "2.0.0-rc1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; - rev = "2.0.0-rc0"; - sha256 = "0ngwdy0lfv2k59z1z8yq1wj5zbhqigpyfqbgh38m9p35yzh33lv1"; + rev = version; + sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn"; }; # outputs = [ "bin" "out" "dev" ]; @@ -46,17 +46,19 @@ stdenv.mkDerivation rec { cmake pkgconfig ]; + enableParallelBuilding = true; + doCheck = false; cmakeFlags = with lib; [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DWITH_CUNIT=OFF" "-DWITH_OSS=OFF" - ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON" - ++ optional (cups != null) "-DWITH_CUPS=ON" - ++ optional (pcsclite != null) "-DWITH_PCSC=ON" - ++ optional buildServer "-DWITH_SERVER=ON" - ++ optional optimize "-DWITH_SSE2=ON"; + ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON" + ++ optional (cups != null) "-DWITH_CUPS=ON" + ++ optional (pcsclite != null) "-DWITH_PCSC=ON" + ++ optional buildServer "-DWITH_SERVER=ON" + ++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON"; meta = with lib; { description = "A Remote Desktop Protocol Client"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5cbee68551e5..959608b04f5c 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.0-rcgit.17"; + version = "1.2.0-rcgit.24"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "FreeRDP"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1"; + sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index d002b51625c6..4ff649dbf2a0 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -4,7 +4,7 @@ let ld32 = if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else abort "Unsupported architecture"; + else throw "Unsupported system ${stdenv.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 7622cb76ad2a..5e94106a48f1 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -4,7 +4,7 @@ let arch = { "x86_64-linux" = "x64"; "i686-linux" = "i386"; - }.${stdenv.system}; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 2ed87c71a906..f91c0de9c8d7 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.2"; + version = "2.4.3"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,10 +20,13 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i"; + sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"; }; - cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; + cmakeFlags = [ + "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}" + "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" + ]; nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index ad51703bd6fe..71df7a0fb1e7 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.38"; + version = "1.39"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "0f56qm4lz55anzqf6dmjfywmvqy10zi5cl69zz8lda8lmvrpjm1d"; + sha256 = "1x9qxhqkbyd7kd52ai9p996ppslh73xarn5w4ljaa97wwm5vwwsg"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index a95835610d52..69613c489e1e 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: rec { version = "3.1.2"; @@ -7,11 +7,33 @@ rec { url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc"; }; - patches = fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd"; - }; + patches = [ + (fetchurl { + # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 + url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; + sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd"; + }) + (fetchpatch { + name = "CVE-2017-16548.patch"; + url = "https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce"; + sha256 = "1dcdnfhbc5gd0ph7pds0xr2v8rpb2a4p7l9c1wml96nhnyww1pg1"; + }) + (fetchpatch { + name = "CVE-2017-17433.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=3e06d40029cfdce9d0f73d87cfd4edaf54be9c51"; + sha256 = "1kvnh6znp37a447h9fm2pk7v4phx20bk60j4wbsd92xlpp7vck52"; + }) + (fetchpatch { + name = "CVE-2017-17434-patch1.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=5509597decdbd7b91994210f700329d8a35e70a1"; + sha256 = "16gg670s6b4gn3fywkkagixkpkpf31a3fiqx2a544640pblbgvyx"; + }) + (fetchpatch { + name = "CVE-2017-17434-patch2.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9"; + sha256 = "182pc5bk1i57ganyn51bcs6vi2fib7zcw4kz3iyqkzihnjds10a6"; + }) + ]; meta = with stdenv.lib; { homepage = http://rsync.samba.org/; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 1f5e9601ff22..8c66e41f4cd2 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libiconv, zlib, popt +{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt , enableACLs ? true, acl ? null , enableCopyDevicesPatch ? false }: @@ -6,7 +6,7 @@ assert enableACLs -> acl != null; let - base = import ./base.nix { inherit stdenv fetchurl; }; + base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 7563b0ea1950..bc2a6eb9c3cb 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, perl, rsync }: +{ stdenv, fetchurl, fetchpatch, perl, rsync }: let - base = import ./base.nix { inherit stdenv fetchurl; }; + base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; in stdenv.mkDerivation rec { name = "rrsync-${base.version}"; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix new file mode 100644 index 000000000000..80ad1a43332a --- /dev/null +++ b/pkgs/applications/networking/syncplay/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, python2Packages }: + +python2Packages.buildPythonApplication rec { + name = "syncplay-${version}"; + version = "1.5.0"; + + format = "other"; + + src = fetchurl { + url = https://github.com/Syncplay/syncplay/archive/v1.5.0.tar.gz; + sha256 = "762e6318588e14aa02b1340baa18510e7de87771c62ca5b44d985b6d1289964d"; + }; + + propagatedBuildInputs = with python2Packages; [ pyside twisted ]; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + postInstall = '' + mkdir -p $out/lib/python2.7/site-packages + mv $out/lib/syncplay/syncplay $out/lib/python2.7/site-packages/ + ''; + + meta = with stdenv.lib; { + homepage = http://syncplay.pl/; + description = "Free software that synchronises media players"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ enzime ]; + }; +} diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index ecdecd07eeb9..953febf67a86 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.40"; + version = "0.14.42"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5"; + sha256 = "1n3favv94wj1fr7x9av523fgm12b0kjlrmifa25wg2p6z10vwbqf"; }; buildInputs = [ go removeReferencesTo ]; diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 4b5359555f4a..cd6fcc28a50a 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -24,4 +24,12 @@ buildGoPackage rec { preBuild = '' export buildFlagsArray+=("-tags" "noupgrade release") ''; + + meta = { + knownVulnerabilities = [ "CVE-2017-1000420" ]; + homepage = https://www.syncthing.net/; + description = "Open Source Continuous File Synchronization"; + license = stdenv.lib.licenses.mpl20; + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + }; } diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix index b6d318011aa1..e1a0dc38c11f 100644 --- a/pkgs/applications/networking/syncthing013/default.nix +++ b/pkgs/applications/networking/syncthing013/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { + knownVulnerabilities = [ "CVE-2017-1000420" ]; homepage = https://www.syncthing.net/; description = "Open Source Continuous File Synchronization"; license = stdenv.lib.licenses.mpl20; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index dc7c961856d6..50ebee4a0ce5 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,7 +1,11 @@ { stdenv, fetchFromGitHub, pkgs }: -stdenv.mkDerivation rec { +let version = "2.9.5-1"; + pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; + opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; + +in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; src = fetchFromGitHub { @@ -17,8 +21,6 @@ stdenv.mkDerivation rec { patches = [ ./testssl.patch ]; - pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; - opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; postPatch = '' sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix deleted file mode 100644 index 959a44a35c10..000000000000 --- a/pkgs/applications/office/calligra/2.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen -, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg -, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql -, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs -, kactivities, okular, git, oxygen-icons5, makeWrapper -# TODO: not found -#, xbase, openjpeg -# TODO: package libWPS, Spnav, m2mml, LibEtonyek -}: - -stdenv.mkDerivation rec { - name = "calligra-2.9.11"; - - src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; - }; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; - - buildInputs = [ - kdelibs4 lcms2 libpng eigen - exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg - libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql - freetds fftw glew libkdcraw opencolorio kdepimlibs - kactivities okular git - ]; - - enableParallelBuilding = true; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i \ - --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" - done - ''; - - meta = with stdenv.lib; { - description = "A suite of productivity applications"; - longDescription = '' - Calligra Suite is a set of applications written to help - you to accomplish your work. Calligra includes efficient - and capable office components: Words for text processing, - Sheets for computations, Stage for presentations, Plan for - planning, Flow for flowcharts, Kexi for database creation, - Krita for painting and raster drawing, and Karbon for - vector graphics. - ''; - homepage = http://calligra.org; - maintainers = with maintainers; [ phreedom ebzzry ]; - inherit (kdelibs4.meta) platforms; - license = licenses.gpl2; - broken = true; - }; -} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index bec19d675cb0..1537dd9b03ff 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, boost, qtwebkit, qtx11extras, shared_mime_info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, @@ -23,6 +23,16 @@ mkDerivation rec { sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; }; + enableParallelBuilding = true; + + patches = [ + (fetchpatch { + name = "calligra-build-with-newer-kcalcore.patch"; + url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff"; + sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 3632138a0221..60c8b0280a14 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -9,11 +9,11 @@ let isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; }; isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; }; in stdenv.mkDerivation rec { - name = "gnumeric-1.12.36"; + name = "gnumeric-1.12.38"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "3cbfe25f26bd31b832efed2827ac35c3c1600bed9ccd233a4037a9f4d7c54848"; + sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65"; }; configureFlags = "--disable-component"; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 66aee6bd9628..8463703c0179 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -4,7 +4,7 @@ breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, kwidgetsaddons, kxmlgui, - kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql + kdb, kproperty, kreport, lcms2, mysql, marble, postgresql }: mkDerivation rec { @@ -24,7 +24,7 @@ mkDerivation rec { breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets kwidgetsaddons kxmlgui - kdb kproperty kreport lcms2 libmysql marble postgresql + kdb kproperty kreport lcms2 mysql.connector-c marble postgresql ]; propagatedUserEnvPkgs = [ kproperty ]; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 2d66fe4b309e..bb6e529f5d29 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ledger-cli.org/; + homepage = https://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 830ae68fd1b9..cd59f78b6c67 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -11,7 +11,7 @@ , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas +, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , withHelp ? true @@ -166,10 +166,6 @@ in stdenv.mkDerivation rec { for a in sbase scalc sdraw smath swriter simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a - wrapProgram "$out/bin/$a" \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - ; done ln -s $out/bin/soffice $out/bin/libreoffice @@ -252,16 +248,17 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper + libodfgen CoinMP librdf_rasqal defaultIconTheme gdb ] ++ lib.optional kdeIntegration kdelibs4; + nativeBuildInputs = [ wrapGAppsHook ]; passthru = { inherit srcs; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index a3991b8b35c1..679afaa2dce5 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -6,16 +6,15 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas +, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , defaultIconTheme, glib, ncurses , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , withHelp ? true -, kdeIntegration ? false }: let @@ -162,10 +161,6 @@ in stdenv.mkDerivation rec { for a in sbase scalc sdraw smath swriter simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a - wrapProgram "$out/bin/$a" \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - ; done ln -s $out/bin/soffice $out/bin/libreoffice @@ -191,7 +186,6 @@ in stdenv.mkDerivation rec { "--disable-report-builder" "--enable-python=system" "--enable-dbus" - (lib.enableFeature kdeIntegration "kde4") "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" @@ -247,15 +241,15 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew ncurses - libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper - ] - ++ lib.optional kdeIntegration kdelibs4; + libodfgen CoinMP librdf_rasqal defaultIconTheme + ]; + nativeBuildInputs = [ wrapGAppsHook ]; passthru = { inherit srcs; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b78eaa9fd3f3..c2b6dc710ba2 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -15,7 +15,13 @@ , orc , nss , nspr -, qt5 +, qtbase +, qtsvg +, qtdeclarative +, qtwebchannel +, qtquickcontrols +, qtwebkit +, qtwebengine , sqlite , xorg , xlibs @@ -47,13 +53,13 @@ let else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; deps = [ - qt5.qtbase - qt5.qtsvg - qt5.qtdeclarative - qt5.qtwebchannel - qt5.qtquickcontrols - qt5.qtwebkit - qt5.qtwebengine + qtbase + qtsvg + qtdeclarative + qtwebchannel + qtquickcontrols + qtwebkit + qtwebengine alsaLib dbus freetype @@ -96,6 +102,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg which ] ++ deps; + propagatedUserEnvPkgs = [ gconf ]; + unpackPhase = "true"; installPhase = '' diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 30b8809f2247..3ddca8fe7620 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -17,7 +17,7 @@ in meta = { description = "Easy-to-use personal finance software"; - homepage = http://www.moneymanagerex.org/; + homepage = https://www.moneymanagerex.org/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 9f54f2df6bf2..b752f552ba97 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Smart manager for information collecting"; - homepage = http://webhamster.ru/site/page/index/articles/projectcode/138; + homepage = https://webhamster.ru/site/page/index/articles/projectcode/138; license = licenses.gpl3; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 23ee4da8e015..b5475ae337a3 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "osmo-${version}"; - version = "0.4.0-1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/osmo-pim/${name}.tar.gz"; - sha256 = "fb454718e071c44bd360ce3e56cb29926cbf44a0d06ec738fa9b40fe3cbf8a33"; + sha256 = "1gjd4w9jckfpqr9n0bw0w25h3qhfyzw1xvilh3hqdadfinwyal2v"; }; nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index 2e052243a052..9e17d807fb14 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "paperwork-backend"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "openpaperwork"; repo = "paperwork-backend"; rev = version; - sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x"; + sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf"; }; # Python 2.x is not supported. diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index f0592aa0e687..953499c21b91 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { name = "paperwork-${version}"; # Don't forget to also update paperwork-backend when updating this! - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { repo = "paperwork"; owner = "openpaperwork"; rev = version; - sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz"; + sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk"; }; # Patch out a few paths that assume that we're using the FHS: diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index f88cc1470981..1aaf05a123e1 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -14,9 +14,12 @@ mkDerivation rec { sha256 = "1dbvdrkdpgv39v8h7k3mri0nzlslfyd5kk410czj0jdn4qq400md"; }; - nativeBuildInputs = [ cmake extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools shared_mime_info + ]; - buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools + buildInputs = [ + qtwebkit qtscript grantlee kxmlgui kwallet kparts kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx ]; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index bd7d537a2c6e..24542041cc87 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; - homepage = http://www.tagaini.net/; + homepage = https://www.tagaini.net/; license = with licenses; [ /* program */ gpl3Plus /* data */ cc-by-sa-30 diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index 76ad47950c49..a957cd6eee68 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.10"; src = fetchurl { - url = "http://code.meskio.net/tudu/${name}.tar.gz"; + url = "https://code.meskio.net/tudu/${name}.tar.gz"; sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; - homepage = http://code.meskio.net/tudu/; + homepage = https://code.meskio.net/tudu/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index a1fcfd5de700..e0f0c58b4506 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,13 +1,14 @@ -{ stdenv, pythonPackages }: +{ stdenv, pythonPackages, fetchpatch }: -pythonPackages.buildPythonApplication rec { +with pythonPackages; + +buildPythonApplication rec { pname = "td-watson"; - name = "${pname}-${version}"; - version = "1.4.0"; + version = "1.5.2"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit version pname; - sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq"; + sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8"; }; # uses tox, test invocation fails @@ -15,8 +16,16 @@ pythonPackages.buildPythonApplication rec { checkPhase = '' py.test -vs tests ''; - checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; - propagatedBuildInputs = with pythonPackages; [ requests click arrow ]; + + patches = [ + (fetchpatch { + url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch; + sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g"; + }) + ]; + + checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; + propagatedBuildInputs = [ requests click arrow ]; meta = with stdenv.lib; { homepage = https://tailordev.github.io/Watson/; @@ -24,4 +33,4 @@ pythonPackages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ mguentner ] ; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 67f7e2816a48..da096acc27fc 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,24 +1,32 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper -, lua52Packages, libXft, ncurses, readline, zlib }: +, lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { name = "wordgrinder-${version}"; - version = "0.6-db14181"; + version = "0.7.1"; src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; - rev = "db141815e8bd1da6e684a1142a59492e516f3041"; - sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2"; + rev = "${version}"; + sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k"; }; makeFlags = [ "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + "XFT_PACKAGE=--libs=\{-lX11 -lXft\}" ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + + nativeBuildInputs = [ + pkgconfig + makeWrapper + ninja + ]; buildInputs = [ libXft diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 2130e64a2a3a..f8785616c5e6 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - fetchurl, fetchpatch, + fetchFromGitHub, extra-cmake-modules, qtbase, boost, akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap, @@ -9,22 +9,16 @@ mkDerivation rec { pname = "zanshin"; - version = "0.4.1"; + version = "2017-11-25"; name = "${pname}-${version}"; - src = fetchurl { - url = "https://files.kde.org/${pname}/${name}.tar.bz2"; - sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as"; + src = fetchFromGitHub { + owner = "KDE"; + repo = "zanshin"; + rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89"; + sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m"; }; - patches = [ - (fetchpatch { - name = "zanshin-fix-qt59-build.patch"; - url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1"; - sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix new file mode 100644 index 000000000000..148963d64c08 --- /dev/null +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig +, gtk2-x11, glib, curl, goocanvas, intltool +}: + +let + version = "1.3"; +in +stdenv.mkDerivation { + name = "gpredict-${version}"; + + src = fetchurl { + url = "https://sourceforge.net/projects/gpredict/files/Gpredict/${version}/gpredict-${version}.tar.gz"; + sha256 = "18ym71r2f5mwpnjcnrpwrk3py2f6jlqmj8hzp89wbcm1ipnvxxmh"; + }; + + buildInputs = [ curl glib gtk2-x11 goocanvas ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + description = "Real time satellite tracking and orbit prediction"; + longDescription = '' + Gpredict is a real time satellite tracking and orbit prediction program + written using the Gtk+ widgets. Gpredict is targetted mainly towards ham radio + operators but others interested in satellite tracking may find it useful as + well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the + NORAD Keplerian elements. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + homepage = "https://sourceforge.net/projects/gpredict/"; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 844374fceb95..e1add2e14837 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "snpeff-${version}"; - version = "4.3p"; + version = "4.3t"; src = fetchurl { - url = "mirror://sourceforge/project/snpeff/snpEff_v4_3p_core.zip"; - sha256 = "1xb3k0yxd634znw2q083ligm2ww4p6v64041r9sdy3930lhjvxb1"; + url = "mirror://sourceforge/project/snpeff/snpEff_v4_3t_core.zip"; + sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm"; }; buildInputs = [ unzip jre makeWrapper ]; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix new file mode 100644 index 000000000000..b93b68458f9a --- /dev/null +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -0,0 +1,67 @@ +{ atk +, buildFHSUserEnv +, cairo +, dpkg +, fetchurl +, gdk_pixbuf +, glib +, gtk2-x11 +, makeWrapper +, pango +, stdenv +, writeScriptBin +, xorg +}: + +{ src, toolName, version, ... } @ attrs: +let + wrapBinary = libPaths: binaryName: '' + wrapProgram "$out/bin/${binaryName}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" + ''; + pkg = stdenv.mkDerivation (rec { + inherit (attrs) version src; + + name = "${toolName}-${version}"; + + meta = with stdenv.lib; { + homepage = http://bitscope.com/software/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ + vidbina + ]; + } // (attrs.meta or {}); + + buildInputs = [ + dpkg + makeWrapper + ]; + + libs = attrs.libs or [ + atk + cairo + gdk_pixbuf + glib + gtk2-x11 + pango + xorg.libX11 + ]; + + dontBuild = true; + + unpackPhase = attrs.unpackPhase or '' + dpkg-deb -x ${attrs.src} ./ + ''; + + installPhase = attrs.installPhase or '' + mkdir -p "$out/bin" + cp -a usr/* "$out/" + ${(wrapBinary libs) attrs.toolName} + ''; + }); +in buildFHSUserEnv { + name = attrs.toolName; + meta = pkg.meta; + runScript = "${pkg.outPath}/bin/${attrs.toolName}"; +} diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix new file mode 100644 index 000000000000..bb7710bf82eb --- /dev/null +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -0,0 +1,153 @@ +{ buildFHSUserEnv +, callPackage +, fetchurl +, makeWrapper +, stdenv +}: + +let + wrapBinary = libPaths: binaryName: '' + wrapProgram "$out/bin/${binaryName}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" + ''; + mkBitscope = callPackage (import ./common.nix) { }; +in { + chart = let + toolName = "bitscope-chart"; + version = "2.0.FK22M"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Multi-channel waveform data acquisition and chart recording application"; + homepage = "http://bitscope.com/software/chart/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "08mc82pjamyyyhh15sagsv0sc7yx5v5n54bg60fpj7v41wdwrzxw"; + }; + }; + + console = let + toolName = "bitscope-console"; + version = "1.0.FK29A"; + in mkBitscope { + # NOTE: this is meant as a demo by BitScope + inherit toolName version; + + meta = { + description = "Demonstrative communications program designed to make it easy to talk to any model BitScope"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "00b4gxwz7w6pmfrcz14326b24kl44hp0gzzqcqxwi5vws3f0y49d"; + }; + }; + + display = let + toolName = "bitscope-display"; + version = "1.0.EC17A"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Display diagnostic application for BitScope"; + homepage = "http://bitscope.com/software/display/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "05xr5mnka1v3ibcasg74kmj6nlv1nmn3lca1wv77whkq85cmz0s1"; + }; + }; + + dso = let + toolName = "bitscope-dso"; + version = "2.8.FE22H"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Test and measurement software for BitScope"; + homepage = "http://bitscope.com/software/dso/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "0fc6crfkprj78dxxhvhbn1dx1db5chm0cpwlqpqv8sz6whp12mcj"; + }; + }; + + logic = let + toolName = "bitscope-logic"; + version = "1.2.FC20C"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Mixed signal logic timing and serial protocol analysis software for BitScope"; + home = "http://bitscope.com/software/logic/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "0lkb7z9gfkiyxdwh4dq1zxfls8gzdw0na1vrrbgnxfg3klv4xns3"; + }; + }; + + meter = let + toolName = "bitscope-meter"; + version = "2.0.FK22G"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Automated oscilloscope, voltmeter and frequency meter for BitScope"; + homepage = "http://bitscope.com/software/logic/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "0nirbci6ymhk4h4bck2s4wbsl5r9yndk2jvvv72zwkg21248mnbp"; + }; + }; + + proto = let + toolName = "bitscope-proto"; + version = "0.9.FG13B"; + in mkBitscope rec { + inherit toolName version; + # NOTE: this is meant as a demo by BitScope + # NOTE: clicking on logo produces error + # TApplication.HandleException Executable not found: "http://bitscope.com/blog/DK/?p=DK15A" + + meta = { + description = "Demonstrative prototype oscilloscope built using the BitScope Library"; + homepage = "http://bitscope.com/blog/DK/?p=DK15A"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "1ybjfbh3narn29ll4nci4b7rnxy0hj3wdfm4v8c6pjr8pfvv9spy"; + }; + }; + + server = let + toolName = "bitscope-server"; + version = "1.0.FK26A"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Remote access server solution for any BitScope"; + homepage = "http://bitscope.com/software/server/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "1079n7msq6ks0n4aasx40rd4q99w8j9hcsaci71nd2im2jvjpw9a"; + }; + }; +} diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix new file mode 100644 index 000000000000..f954bf5b70ca --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -0,0 +1,54 @@ +{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, mesa, zlib +, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig +, doxygen, pcre, libpthreadstubs, libXdmcp + +, oceSupport ? true, opencascade_oce +, ngspiceSupport ? true, ngspice +, scriptingSupport ? true, swig, python, wxPython +}: + +with lib; +stdenv.mkDerivation rec { + name = "kicad-unstable-${version}"; + version = "2017-12-11"; + + src = fetchFromGitHub { + owner = "KICad"; + repo = "kicad-source-mirror"; + rev = "1955f252265c38a313f6c595d6c4c637f38fd316"; + sha256 = "15cc81h7nh5dk6gj6mc4ylcgdznfriilhb43n1g3xwyq3s8iaibz"; + }; + + postPatch = '' + substituteInPlace CMakeModules/KiCadVersion.cmake \ + --replace no-vcs-found ${version} + ''; + + cmakeFlags = + optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ] + ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" + ++ optionals (scriptingSupport) [ + "-DKICAD_SCRIPTING=ON" + "-DKICAD_SCRIPTING_MODULES=ON" + "-DKICAD_SCRIPTING_WXPYTHON=ON" + # nix installs wxPython headers in wxPython package, not in wxwidget + # as assumed. We explicitely set the header location. + "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" + ]; + + nativeBuildInputs = [ cmake doxygen pkgconfig ]; + buildInputs = [ + mesa zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs + cairo curl openssl boost + ] ++ optional (oceSupport) opencascade_oce + ++ optional (ngspiceSupport) ngspice + ++ optionals (scriptingSupport) [ swig python wxPython ]; + + meta = { + description = "Free Software EDA Suite, Nightly Development Build"; + homepage = http://www.kicad-pcb.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ berce ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 31c2d4f6475e..e34383865576 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and robust (System)Verilog simulator/compiler"; - homepage = "http://www.veripool.org/wiki/verilator"; + homepage = "https://www.veripool.org/wiki/verilator"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index e76689992296..9e6243c54980 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { }; buildInputs = with ocamlPackages; [ - ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson + ocaml findlib camlp4 ansiterminal biniou bolt cairo2 dypgen easy-format ocf yojson ]; patches = [ ./install-emacs-to-site-lisp.patch diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 1f7ef571eaf9..64b0f85aed2a 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; passthru = { diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix deleted file mode 100644 index 968ea74e2960..000000000000 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ /dev/null @@ -1,81 +0,0 @@ -# - coqide compilation can be disabled by setting buildIde to false; -# - The csdp program used for the Micromega tactic is statically referenced. -# However, coq can build without csdp by setting it to null. -# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. - -{stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}: - -let - version = "2017-02-03"; - coq-version = "8.6"; - ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - csdpPatch = if csdp != null then '' - substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" - substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" - '' else ""; - ocaml = ocamlPackages_4_02.ocaml; - findlib = ocamlPackages_4_02.findlib; - lablgtk = ocamlPackages_4_02.lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; -in - -stdenv.mkDerivation { - name = "coq-unstable-${version}"; - - inherit coq-version; - inherit ocaml camlp5 findlib; - - src = fetchgit { - url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06"; - sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; - - postPatch = '' - UNAME=$(type -tp uname) - RM=$(type -tp rm) - substituteInPlace configure --replace "/bin/uname" "$UNAME" - substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\"" - ${csdpPatch} - ''; - - setupHook = writeText "setupHook.sh" '' - addCoqPath () { - if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then - export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" - fi - } - - envHooks=(''${envHooks[@]} addCoqPath) - ''; - - preConfigure = '' - configureFlagsArray=( - -opt - ${ideFlags} - ) - ''; - - prefixKey = "-prefix "; - - buildFlags = "revision coq coqide"; - - meta = with stdenv.lib; { - description = "Coq proof assistant"; - longDescription = '' - Coq is a formal proof management system. It provides a formal language - to write mathematical definitions, executable algorithms and theorems - together with an environment for semi-interactive development of - machine-checked proofs. - ''; - homepage = http://coq.inria.fr; - license = licenses.lgpl21; - branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index cdfd035c7139..9ed535cfe639 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , ocamlPackages, ncurses , buildIde ? true , csdp ? null -, version ? "8.6.1" +, version }: let @@ -19,8 +19,8 @@ let "8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; - "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b"; "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; + "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; @@ -91,7 +91,8 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ]; + buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ] + ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' UNAME=$(type -tp uname) @@ -109,7 +110,7 @@ self = stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; preConfigure = '' diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix new file mode 100644 index 000000000000..50454847baf1 --- /dev/null +++ b/pkgs/applications/science/logic/drat-trim/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "drat-trim-2017-08-31"; + + src = fetchFromGitHub { + owner = "marijnheule"; + repo = "drat-trim"; + rev = "37ac8f874826ffa3500a00698910e137498defac"; + sha256 = "1m9q47dfnvdli1z3kb1jvvbm0dgaw725k1aw6h9w00bggqb91bqh"; + }; + + postPatch = '' + substituteInPlace Makefile --replace gcc cc + ''; + + installPhase = '' + install -Dt $out/bin drat-trim + ''; + + meta = with stdenv.lib; { + description = "A proof checker for unSAT proofs"; + longDescription = '' + DRAT-trim is a satisfiability proof checking and trimming + utility designed to validate proofs for all known satisfiability + solving and preprocessing techniques. DRAT-trim can also emit + trimmed formulas, optimized proofs, and TraceCheck+ dependency + graphs. + + DRAT-trim has been used as part of the judging process in the + annual SAT Competition in recent years, in order to check + competing SAT solvers' work when they claim that a SAT instance + is unsatisfiable. + ''; + homepage = https://www.cs.utexas.edu/~marijn/drat-trim/; + license = licenses.mit; + maintainers = with maintainers; [ kini ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index b10ec814ff55..6fcc8f9c111f 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,18 +1,18 @@ -# - coqide compilation can be disabled by setting lablgtk to null; - -{stdenv, fetchurl, pkgconfig, ocaml, camlp5}: +{ stdenv, fetchFromGitHub, pkgconfig, ocaml }: stdenv.mkDerivation rec { name = "ott-${version}"; - version = "0.25"; + version = "0.27"; - src = fetchurl { - url = "http://www.cl.cam.ac.uk/~pes20/ott/ott_distro_${version}.tar.gz"; - sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd"; + src = fetchFromGitHub { + owner = "ott-lang"; + repo = "ott"; + rev = version; + sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml camlp5 ]; + buildInputs = [ ocaml ]; installPhase = '' mkdir -p $out/bin @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/ott.opt $out/bin/ott mkdir -p $out/share/emacs/site-lisp - cp emacs/ottmode.el $out/share/emacs/site-lisp + cp emacs/ott-mode.el $out/share/emacs/site-lisp ''; meta = { diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix new file mode 100644 index 000000000000..27efe865a9d9 --- /dev/null +++ b/pkgs/applications/science/logic/sapic/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip, ocaml }: + +stdenv.mkDerivation rec { + name = "sapic-${version}"; + version = "0.9"; + + src = fetchurl { + url = "http://sapic.gforge.inria.fr/${name}.zip"; + sha256 = "1ckl090lpyfh90mkjhnpcys5grs3nrl9wlbn9nfkxxnaivn2yx9y"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ ocaml ]; + patches = [ ./native.patch ]; # create a native binary, not a bytecode one + + buildPhase = "make depend && make"; + installPhase = '' + mkdir -p $out/bin + cp ./sapic $out/bin + ''; + + meta = { + description = "Stateful applied Pi Calculus for protocol verification"; + homepage = http://sapic.gforge.inria.fr/; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/sapic/native.patch b/pkgs/applications/science/logic/sapic/native.patch new file mode 100644 index 000000000000..6e0b98113df2 --- /dev/null +++ b/pkgs/applications/science/logic/sapic/native.patch @@ -0,0 +1,38 @@ +diff --git a/Makefile b/Makefile +index a1de94d..f9e2eb8 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ + TARGET = sapic +-OBJS=lexer.cmo apip.cmo firsttranslation.cmo main.cmo #secondtranslation.cmo thirdtranslation.cmo main.cmo ++OBJS=lexer.cmx apip.cmx firsttranslation.cmx main.cmx + + sapic: $(OBJS) +- ocamlc -o $@ $(OBJS) ++ ocamlopt.opt -o $@ $(OBJS) + + depend: + ocamldep *.ml *.mli > .depend +@@ -13,17 +13,17 @@ clean: + rm -rf *.cmi *.cmo $(TARGET) + rm -rf apip.ml apip.mli lexer.ml lexer.mli + +-.SUFFIXES: .ml .mli .mll .mly .cmo .cmi ++.SUFFIXES: .ml .mli .mll .mly .cmo .cmi .cmx + +-.ml.cmo: +- ocamlc -c $< ++.ml.cmx: ++ ocamlopt.opt -c $< + .mli.cmi: +- ocamlc -c $< ++ ocamlopt.opt -c $< + .mll.ml: + ocamllex $< + .mly.ml: + ocamlyacc $< + .ml.mli: +- ocamlc -i $< > $@ ++ ocamlopt.opt -i $< > $@ + + -include .depend diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 8c0b82cc549c..367449f44f38 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { ) ''; + # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`: + # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Simple Theorem Prover"; maintainers = with maintainers; [ mornfall ]; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 53e1a90f5b6a..3769b15f32a7 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2017.11.05"; + version = "2017.12.06"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "symbiyosys"; - rev = "db9c7e97b8f84ef7e9b18ae630009897c7982a08"; - sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0"; + rev = "82f394260a74b07892d7f5bdec10ae0a8cad6caa"; + sha256 = "0cniqxaf2m5xh7hqwcpdvwcxg7vqargzahbkzdfwafkdsqpb0ly3"; }; buildInputs = [ python3 yosys ]; diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix new file mode 100644 index 000000000000..bed7eb65e328 --- /dev/null +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -0,0 +1,87 @@ +{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib +# the following are non-haskell dependencies +, makeWrapper, which, maude, graphviz, sapic +}: + +let + version = "1.3.0"; + src = fetchFromGitHub { + owner = "tamarin-prover"; + repo = "tamarin-prover"; + rev = "8e823691ad3325bce8921617b013735523d74557"; + sha256 = "0rr2syl9xhv17bwky5p39mhn0bypr24h8pld1xidxv87vy7vk7nr"; + }; + + # tamarin has its own dependencies, but they're kept inside the repo, + # no submodules. this factors out the common metadata among all derivations + common = pname: src: { + inherit pname version src; + + license = lib.licenses.gpl3; + homepage = https://tamarin-prover.github.io; + description = "Security protocol verification in the symbolic model"; + maintainers = [ lib.maintainers.thoughtpolice ]; + }; + + # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries + # we set the patchPhase to fix that. otherwise, cabal cries a lot. + replaceSymlinks = '' + cp --remove-destination ${src}/LICENSE .; + cp --remove-destination ${src}/Setup.hs .; + ''; + + tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // { + patchPhase = replaceSymlinks; + libraryHaskellDepends = with haskellPackages; [ + base base64-bytestring binary blaze-builder bytestring containers + deepseq dlist fclabels mtl pretty safe SHA syb time transformers + ]; + }); + + tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // { + patchPhase = replaceSymlinks; + libraryHaskellDepends = (with haskellPackages; [ + attoparsec base binary bytestring containers deepseq dlist HUnit + mtl process safe + ]) ++ [ tamarin-prover-utils ]; + }); + + tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // { + patchPhase = replaceSymlinks; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + aeson aeson-pretty base binary bytestring containers deepseq dlist + fclabels mtl parallel parsec process safe text transformers uniplate + ]) ++ [ tamarin-prover-utils tamarin-prover-term ]; + }); + +in +mkDerivation (common "tamarin-prover" src // { + isLibrary = false; + isExecutable = true; + + # strip out unneeded deps manually + doHaddock = false; + enableSharedExecutables = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + + # wrap the prover to be sure it can find maude, sapic, etc + executableToolDepends = [ makeWrapper which maude graphviz sapic ]; + postInstall = '' + wrapProgram $out/bin/tamarin-prover \ + --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} + ''; + + checkPhase = "./dist/build/tamarin-prover/tamarin-prover test"; + + executableHaskellDepends = (with haskellPackages; [ + base binary binary-orphans blaze-builder blaze-html bytestring + cmdargs conduit containers deepseq directory fclabels file-embed + filepath gitrev http-types HUnit lifted-base mtl parsec process + resourcet safe shakespeare tamarin-prover-term + template-haskell text threads time wai warp yesod-core yesod-static + ]) ++ [ tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + ]; +}) diff --git a/pkgs/applications/science/logic/z3/4.5.0.nix b/pkgs/applications/science/logic/z3/4.5.0.nix new file mode 100644 index 000000000000..827cb2cbe3de --- /dev/null +++ b/pkgs/applications/science/logic/z3/4.5.0.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }: + +let + python = python2; +in stdenv.mkDerivation rec { + name = "z3-${version}"; + version = "4.5.0"; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "z3-4.5.0"; + sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp"; + }; + + buildInputs = [ python fixDarwinDylibNames ]; + enableParallelBuilding = true; + + configurePhase = '' + ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages} + cd build + ''; + + meta = { + description = "A high-performance theorem prover and SMT solver"; + homepage = "https://github.com/Z3Prover/z3"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index be25738a6076..532df11209b8 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -4,13 +4,13 @@ let python = python2; in stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.5.0-2017-11-06"; + version = "4.6.0"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "3350f32e1f2c01c9df63b7d71899796a18ce2272"; - sha256 = "00jn0njn5h9v49pl67yxj6225m6334ndrx6mp37vcqac05pdbpw7"; + rev = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222"; + sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l"; }; buildInputs = [ python fixDarwinDylibNames ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 9d736694cbdc..ae272284bcdc 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig +{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = fetchpatch { + name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; + url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; + sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; + }; + CCACHE_DIR=".ccache"; buildInputs = with lib; [ diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh index 09a775db9bf5..6951e2a4b61b 100644 --- a/pkgs/applications/science/math/R/setup-hook.sh +++ b/pkgs/applications/science/math/R/setup-hook.sh @@ -1,5 +1,7 @@ addRLibPath () { - addToSearchPath R_LIBS_SITE $1/library + if [[ -d "$1/library" ]]; then + addToSearchPath R_LIBS_SITE "$1/library" + fi } -envHooks+=(addRLibPath) +addEnvHooks "$targetOffset" addRLibPath diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 89ed0582b37e..bef695fc650a 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -95,5 +95,6 @@ in stdenv.mkDerivation rec { description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; maintainers = with maintainers; [ abbradar ]; + broken = true; # Never succeeded to build. }; } diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 3e4c8c702869..67dcfd8dc1de 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.lib mpfr gmp + buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 18cb26890634..7af0df5360d5 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://www.cs.waikato.ac.nz/ml/weka/; description = "Collection of machine learning algorithms for data mining tasks"; license = stdenv.lib.licenses.gpl2Plus; - maintainer = [stdenv.lib.maintainers.mimadrid]; + maintainers = [ stdenv.lib.maintainers.mimadrid ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 6c866a8d2164..c7f74071c24f 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, wrapGAppsHook, autoreconfHook, gettext +, wrapGAppsHook, cmake, gettext , maxima, wxGTK, gnome3 }: stdenv.mkDerivation rec { @@ -15,14 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; - nativeBuildInputs = [ wrapGAppsHook autoreconfHook gettext ]; + nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; - doCheck = true; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 8ed8e0e73b00..3bfb70f5ce8e 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}: stdenv.mkDerivation { - name = "fdr-4.2.0"; + name = "fdr-4.2.3"; src = fetchurl { - url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3754-linux-x86_64.tar.gz; - sha256 = "d24492485db9b8b95c62c53a6396094f836ee079cfc743688a397503c3ec9bf8"; + url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz; + sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; }; libPath = stdenv.lib.makeLibraryPath [ @@ -28,7 +28,7 @@ stdenv.mkDerivation { cp -r * "$out" # Hack around lack of libtinfo in NixOS ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5 - ln -s ${qtbase.out}/$qtPluginPrefix $out/lib/qt_plugins + ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1 for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index eb157e8b99f5..f46f7afb659c 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free cross-platform programming exerciser"; - Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/; + homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/; license = licenses.gpl3; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 3a9df1505742..ba9fbee5d969 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { buildInputs = [ libextractor gettext ]; src = fetchurl { - url = "http://grothoff.org/christian/doodle/download/${name}.tar.gz"; + url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz"; sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j"; }; meta = { - homepage = http://grothoff.org/christian/doodle/; + homepage = https://grothoff.org/christian/doodle/; description = "Tool to quickly index and search documents on a computer"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 649b34e75692..01669f3fd409 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -7,12 +7,12 @@ assert stdenv.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.23.1"; + ver = "1.23.5"; name = "recoll-${ver}"; src = fetchurl { url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8"; + sha256 = "0ps7ckrv63ydviqkqxs57hn04z53s2jnjnp94n1prs63xx0njswv"; }; configureFlags = [ "--with-inotify" ]; diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix index 72d6999fa1d7..5883e51f712e 100644 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ b/pkgs/applications/taxes/aangifte-2006/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2006"; - url = "http://www.belastingdienst.nl/download/1341.html"; + homepage = "http://www.belastingdienst.nl/download/1341.html"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix index 15c826feb6e7..43fb26d811a3 100644 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ b/pkgs/applications/taxes/aangifte-2007/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2007"; - url = "http://www.belastingdienst.nl/download/1341.html"; + homepage = "http://www.belastingdienst.nl/download/1341.html"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix index 905471cb76b8..b9fad2fa10bd 100644 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ b/pkgs/applications/taxes/aangifte-2008/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; + homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index c944fc3d68b3..d4230d426ece 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index b5a85415c376..602368d2017b 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index a38bc4254bbe..80c772705142 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/pkgs/applications/taxes/aangifte-2011/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 2e51ef9ed4cf..8066c86742c1 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2012/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix index 5ee0edb4b5e5..6f8e6d6429d3 100644 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix index 3cf85961a9bb..d75b60c83673 100644 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ b/pkgs/applications/taxes/aangifte-2013/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix index 78bb8214257f..38124677f9a5 100644 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix index 0151cca52b2c..33b6f8853aa2 100644 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ b/pkgs/applications/taxes/aangifte-2014/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 54693f3c5f01..0475a8ae76ca 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "gerrit-${version}"; - version = "2.14.3"; + version = "2.14.6"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "1hxrlhp5l5q4lp5b5bq8va7856cnm4blfv01rgqq3yhvn432sq6v"; + sha256 = "0fsqwfsnyb4nbxgb1i1mp0vshl0mk8bwqlddzqr9x2v99mbca28q"; }; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1j1afxv7yj2fxaw0wy8kmxi6sl9fwj8xsxs5kzg9qz5gzayb26kp"; + outputHash = "1qrmvqqnlbabqz4yx06vi030ci12v0063iq2palxmbj3whrzv9la"; buildCommand = '' mkdir -p "$out"/webapps/ diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 75b53d2cfe09..7056249de3fc 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -51,6 +51,10 @@ rec { git-annex = pkgs.haskellPackages.git-annex; gitAnnex = git-annex; + git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui { + inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; + }; + git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix new file mode 100644 index 000000000000..ba64a065d281 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }: + +buildPythonApplication rec { + name = "git-annex-metadata-gui-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "alpernebbi"; + repo = "git-annex-metadata-gui"; + rev = "v${version}"; + sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam"; + }; + + prePatch = '' + substituteInPlace setup.py --replace "'PyQt5', " "" + ''; + + propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; + + meta = with stdenv.lib; { + homepage = https://github.com/alpernebbi/git-annex-metadata-gui; + description = "Graphical interface for git-annex metadata commands"; + maintainers = with maintainers; [ dotlambda ]; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index d38529e92e60..c368dcd487e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-annex-remote-rclone-${version}"; - version = "0.5"; + version = "0.6"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i"; + sha256 = "0j0hlxji8d974fq7zd4xc02n0jpi31ylhxc7z4zp8iiwad5mkpxp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 8e3c6b8d9d02..31504d542d26 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -4,13 +4,13 @@ let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.11"; + version = "3.0"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g"; + sha256 = "0jc360agrlhp1w9i725ffksvc6v95jnzzppjvza7ssip65gplrkx"; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 4ec83af91607..f308073f1f1e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace Makefile --replace rst2man rst2man.py patchShebangs . ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index ba2b71138067..1208afa19630 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -14,12 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - buildInputs = [ docutils makeWrapper ]; - - # The install.sh script expects rst2man, but here it's named rst2man.py - patchPhase = '' - sed -i 's/rst2man/rst2man.py/g' install.sh - ''; + nativeBuildInputs = [ docutils makeWrapper ]; installPhase = '' prefix="$out" ./install.sh diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index c0b672069005..3a2585433307 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.15.0"; + version = "2.15.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h"; + sha256 = "0p04linqdywdf7m1hqa904fzqvgzplsxlzdqrn96j1j5gpyr174r"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index bed0ef358271..07ea2be7ad34 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.3.0"; + version = "2.3.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5"; + sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 7e8f9f2b2557..2aaf872d109b 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,8 +1,10 @@ source 'https://rubygems.org' gem 'github-linguist', '~> 4.7.0', require: 'linguist' -gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly' gem 'activesupport' +gem 'gollum-lib', '~> 4.2', require: false +gem 'gollum-rugged_adapter', '~> 0.4.4', require: false group :development, :test do gem 'gitlab-styles', '~> 2.0.0', require: false diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index 5ea14855b97f..f4e4ab10883e 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -11,10 +11,13 @@ GEM ast (2.3.0) charlock_holmes (0.7.5) concurrent-ruby (1.0.5) + diff-lcs (1.3) escape_utils (1.1.1) faraday (0.12.2) multipart-post (>= 1.2, < 3) - gitaly-proto (0.37.0) + gemojione (3.3.0) + json + gitaly-proto (0.59.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -22,10 +25,29 @@ GEM escape_utils (~> 1.1.0) mime-types (>= 1.19) rugged (>= 0.23.0b) + github-markup (1.6.1) + gitlab-grit (2.8.2) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16) + posix-spawn (~> 0.3) gitlab-styles (2.0.0) rubocop (~> 0.49) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.15) + gollum-grit_adapter (1.0.1) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.2.7) + gemojione (~> 3.2) + github-markup (~> 1.6) + gollum-grit_adapter (~> 1.0) + nokogiri (>= 1.6.1, < 2.0) + rouge (~> 2.1) + sanitize (~> 2.1) + stringex (~> 2.6) + gollum-rugged_adapter (0.4.4) + mime-types (>= 1.15) + rugged (~> 0.25) google-protobuf (3.4.0.2) googleauth (0.5.3) faraday (~> 0.12) @@ -39,6 +61,7 @@ GEM google-protobuf (~> 3.1) googleauth (~> 0.5.1) i18n (0.8.1) + json (2.1.0) jwt (1.5.6) little-plugger (1.1.4) logging (2.2.2) @@ -48,18 +71,23 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) + mini_portile2 (2.3.0) minitest (5.9.1) multi_json (1.12.1) multipart-post (2.0.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) os (0.9.6) parallel (1.12.0) parser (2.4.0.0) ast (~> 2.2) + posix-spawn (0.3.13) powerpack (0.1.1) public_suffix (2.0.5) rainbow (2.2.2) rake rake (12.1.0) + rouge (2.2.1) rubocop (0.50.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -73,11 +101,14 @@ GEM rubocop (>= 0.50.0) ruby-progressbar (1.8.3) rugged (0.26.0) + sanitize (2.1.0) + nokogiri (>= 1.4.4) signet (0.7.3) addressable (~> 2.3) faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) + stringex (2.7.1) thread_safe (0.3.6) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -88,9 +119,11 @@ PLATFORMS DEPENDENCIES activesupport - gitaly-proto (~> 0.37.0) + gitaly-proto (~> 0.59.0) github-linguist (~> 4.7.0) gitlab-styles (~> 2.0.0) + gollum-lib (~> 4.2) + gollum-rugged_adapter (~> 0.4.4) BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 63e5758107f7..43ac470dcd46 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.43.1"; + version = "0.59.2"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq"; + sha256 = "08f109rw3qxdr93l0kl8wxmrvn846a6vdkssvrp2zr40yn9wif7m"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index 57480f3f337e..81bb334085ac 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -41,6 +41,14 @@ }; version = "1.0.5"; }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; escape_utils = { source = { remotes = ["https://rubygems.org"]; @@ -58,14 +66,23 @@ }; version = "0.12.2"; }; + gemojione = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; + type = "gem"; + }; + version = "3.3.0"; + }; gitaly-proto = { dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11"; + sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82"; type = "gem"; }; - version = "0.37.0"; + version = "0.59.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -76,6 +93,23 @@ }; version = "4.7.6"; }; + github-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq"; + type = "gem"; + }; + version = "1.6.1"; + }; + gitlab-grit = { + dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; + type = "gem"; + }; + version = "2.8.2"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -85,6 +119,33 @@ }; version = "2.0.0"; }; + gollum-grit_adapter = { + dependencies = ["gitlab-grit"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; + type = "gem"; + }; + version = "1.0.1"; + }; + gollum-lib = { + dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq"; + type = "gem"; + }; + version = "4.2.7"; + }; + gollum-rugged_adapter = { + dependencies = ["mime-types" "rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0khfmakp65frlaj7ajs6ihqg4xi7yc9z96kpsf1b7giqi3fqhhv4"; + type = "gem"; + }; + version = "0.4.4"; + }; google-protobuf = { source = { remotes = ["https://rubygems.org"]; @@ -119,6 +180,14 @@ }; version = "0.8.1"; }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; jwt = { source = { remotes = ["https://rubygems.org"]; @@ -169,6 +238,14 @@ }; version = "3.2016.0521"; }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + type = "gem"; + }; + version = "2.3.0"; + }; minitest = { source = { remotes = ["https://rubygems.org"]; @@ -193,6 +270,15 @@ }; version = "2.0.0"; }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; + type = "gem"; + }; + version = "1.8.1"; + }; os = { source = { remotes = ["https://rubygems.org"]; @@ -218,6 +304,14 @@ }; version = "2.4.0.0"; }; + posix-spawn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; + type = "gem"; + }; + version = "0.3.13"; + }; powerpack = { source = { remotes = ["https://rubygems.org"]; @@ -251,6 +345,14 @@ }; version = "12.1.0"; }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; + type = "gem"; + }; + version = "2.2.1"; + }; rubocop = { dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { @@ -294,6 +396,15 @@ }; version = "0.26.0"; }; + sanitize = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + type = "gem"; + }; + version = "2.1.0"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -303,6 +414,14 @@ }; version = "0.7.3"; }; + stringex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv"; + type = "gem"; + }; + version = "2.7.1"; + }; thread_safe = { source = { remotes = ["https://rubygems.org"]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index d4afdd7b3cd4..f09d02ab022e 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.2.3"; + version = "1.3.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja"; + sha256 = "11gzb6x8zixmkm57x8hdncmdbbvppzld3yf7p7m0abigg8zyybsj"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch index 06ce521e9e8d..7c36afdff84c 100644 --- a/pkgs/applications/version-management/gitea/static-root-path.patch +++ b/pkgs/applications/version-management/gitea/static-root-path.patch @@ -2,12 +2,12 @@ diff --git i/modules/setting/setting.go w/modules/setting/setting.go index aafe2d1b..1e4a8064 100644 --- i/modules/setting/setting.go +++ w/modules/setting/setting.go -@@ -683,7 +683,7 @@ func NewContext() { +@@ -730,7 +730,7 @@ func NewContext() { LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL) OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() -- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) +- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath) + StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") - AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data")) EnableGzip = sec.Key("ENABLE_GZIP").MustBool() EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false) diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index eea5242e6bcc..2428c6cebddd 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -11,6 +11,10 @@ python2Packages.buildPythonApplication rec { name = name + "-src"; }; + checkInputs = with python2Packages; [ + unittest2 + ]; + meta = with stdenv.lib; { homepage = https://github.com/ejwa/gitinspector; description = "Statistical analysis tool for git repositories"; diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ac05ca4c4847..ab0ff74f03f5 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,19 +1,17 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "5.9.3"; + version = "5.10.2"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p"; + sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf"; }; - buildInputs = [ - ruby bundler go - ]; + buildInputs = [ ruby bundler go ]; patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ]; diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index dd1ecafb8bf8..f28e74b88c50 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -25,3 +25,16 @@ index e7d0254..181ec8a 100644 end def api +diff --git a/go/internal/config/config.go b/go/internal/config/config.go +index c57b4de..88cfc95 100644 +--- a/go/internal/config/config.go ++++ b/go/internal/config/config.go +@@ -27,7 +27,7 @@ func New() (*Config, error) { + } + cfg.RootDir = dir + +- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile)) ++ configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH")) + if err != nil { + return nil, err + } diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 1f3407eddcf5..c43b5ab2a1b6 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.3.1"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r"; + sha256 = "19x9ryp99xygj39kq2r756rahh9mxp6j83hxvv09y33vgz64y8xh"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index b4a457bff6e5..916314f42f93 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.8' +gem 'rails', '4.2.10' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with @@ -90,7 +90,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.6.1' # Files attachments -gem 'carrierwave', '~> 1.1' +gem 'carrierwave', '~> 1.2' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' @@ -102,7 +102,7 @@ gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.1.0' +gem 'fog-aliyun', '~> 0.2.0' # for Google storage gem 'google-api-client', '~> 0.13.6' @@ -111,7 +111,7 @@ gem 'google-api-client', '~> 0.13.6' gem 'unf', '~> 0.1.4' # Seed data -gem 'seed-fu', '~> 2.3.5' +gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' @@ -171,7 +171,7 @@ gem 're2', '~> 1.1.1' gem 'version_sorter', '~> 2.1.0' # Cache -gem 'redis-rails', '~> 5.0.1' +gem 'redis-rails', '~> 5.0.2' # Redis gem 'redis', '~> 3.2' @@ -245,7 +245,7 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.1.0' +gem 'jquery-rails', '~> 4.3.1' gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' @@ -263,6 +263,8 @@ gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.2.0' gem 'gettext', '~> 3.2.2', require: false, group: :development +gem 'batch-loader' + # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' @@ -281,7 +283,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta18' + gem 'prometheus-client-mmap', '~> 0.7.0.beta43' gem 'raindrops', '~> 0.18' end @@ -324,9 +326,9 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.4' - gem 'capybara', '~> 2.15.0' + gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.9.0' + gem 'selenium-webdriver', '~> 3.5' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' @@ -343,7 +345,7 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'license_finder', '~> 2.1.0', require: false + gem 'license_finder', '~> 3.1', require: false gem 'knapsack', '~> 1.11.0' gem 'activerecord_sane_schema_dumper', '0.2' @@ -398,7 +400,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index fd3aab2d54ad..c8915e9172c5 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -4,40 +4,40 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.8) - activesupport (= 4.2.8) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.8) - activesupport (= 4.2.8) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) activerecord-nulldb-adapter (0.3.7) activerecord (>= 2.0.0) activerecord_sane_schema_dumper (0.2) rails (>= 4, < 5) - activesupport (4.2.8) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -75,6 +75,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) + batch-loader (1.1.1) bcrypt (3.1.11) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -85,6 +86,7 @@ GEM bindata (2.4.1) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) + blankslate (2.1.2.4) bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) @@ -109,18 +111,19 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - carrierwave (1.1.0) + carrierwave (1.2.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) charlock_holmes (0.7.5) + childprocess (0.7.0) + ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) chunky_png (1.3.5) citrus (3.0.2) - cliver (0.3.2) coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) @@ -216,7 +219,7 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.1.0) + fog-aliyun (0.2.0) fog-core (~> 1.27) fog-json (~> 1.0) ipaddress (~> 0.8) @@ -275,7 +278,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.39.0) + gitaly-proto (0.59.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -293,14 +296,14 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.2) + gitlab-markup (1.6.3) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.2.7) @@ -326,7 +329,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.4.0.2) + google-protobuf (3.4.1.1) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -353,7 +356,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.6.0) + grpc (1.4.5) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) @@ -396,7 +399,8 @@ GEM json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.2) - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) ice_nine (0.11.2) influxdb (0.2.3) cause @@ -407,7 +411,7 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -449,11 +453,13 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (3.1.1) bundler httparty rubyzip thor + toml (= 0.1.2) + with_env (> 1.0) xml-simple licensee (8.7.0) rugged (~> 0.24) @@ -468,8 +474,8 @@ GEM railties (>= 4, < 5.2) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) mail_room (0.9.1) memoist (0.16.0) memoizable (0.4.2) @@ -482,7 +488,6 @@ GEM mini_mime (0.1.4) mini_portile2 (2.3.0) minitest (5.7.0) - mmap2 (2.2.7) mousetrap-rails (1.4.6) multi_json (1.12.2) multi_xml (0.6.0) @@ -567,8 +572,10 @@ GEM parallel (1.12.0) paranoia (2.3.1) activerecord (>= 4.0, < 5.2) - parser (2.4.0.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) + parslet (1.5.0) + blankslate (~> 2.0) path_expander (1.0.1) peek (1.0.1) concurrent-ruby (>= 0.9.0) @@ -603,11 +610,6 @@ GEM pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) posix-spawn (0.3.13) powerpack (0.1.1) premailer (1.10.4) @@ -622,8 +624,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta18) - mmap2 (~> 2.2, >= 2.2.7) + prometheus-client-mmap (0.7.0.beta43) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -653,16 +654,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -675,15 +676,15 @@ GEM rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.1.0) + rake (12.3.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) @@ -698,24 +699,24 @@ GEM recursive-open-struct (1.0.0) redcarpet (3.4.0) redis (3.3.3) - redis-actionpack (5.0.1) + redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) - redis-store (>= 1.1.0, < 1.4.0) - redis-activesupport (5.0.1) + redis-store (>= 1.1.0, < 2) + redis-activesupport (5.0.4) activesupport (>= 3, < 6) - redis-store (~> 1.2.0) + redis-store (>= 1.3, < 2) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - redis-rack (1.6.0) - rack (~> 1.5) - redis-store (~> 1.2.0) - redis-rails (5.0.1) - redis-actionpack (~> 5.0.0) - redis-activesupport (~> 5.0.0) - redis-store (~> 1.2.0) - redis-store (1.2.0) - redis (>= 2.2) + redis-rack (2.0.4) + rack (>= 1.5, < 3) + redis-store (>= 1.2, < 2) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.4.1) + redis (>= 2.2, < 5) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -817,6 +818,9 @@ GEM activesupport (>= 3.1) select2-rails (3.5.9.3) thor (~> 0.14) + selenium-webdriver (3.5.0) + childprocess (~> 0.5) + rubyzip (~> 1.0) sentry-raven (2.5.3) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) @@ -867,7 +871,7 @@ GEM sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -898,12 +902,14 @@ GEM tilt (2.0.6) timecop (0.8.1) timfel-krb5-auth (0.8.3) + toml (0.1.2) + parslet (~> 1.5.0) toml-rb (0.3.15) citrus (~> 3.0, > 3.0) truncato (0.7.10) htmlentities (~> 4.3.1) nokogiri (~> 1.8.0, >= 1.7.0) - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -948,13 +954,11 @@ GEM hashdiff webpack-rails (0.9.10) railties (>= 3.2.0) - websocket-driver (0.6.3) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) wikicloth (0.8.1) builder expression_parser rinku + with_env (1.1.0) xml-simple (1.1.5) xpath (2.1.0) nokogiri (~> 1.3) @@ -978,6 +982,7 @@ DEPENDENCIES awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) + batch-loader bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) better_errors (~> 2.1.0) @@ -988,9 +993,9 @@ DEPENDENCIES browser (~> 2.2) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.15.0) + capybara (~> 2.15) capybara-screenshot (~> 1.0.0) - carrierwave (~> 1.1) + carrierwave (~> 1.2) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) @@ -1015,7 +1020,7 @@ DEPENDENCIES flay (~> 2.8.0) flipper (~> 0.10.2) flipper-active_record (~> 0.10.2) - fog-aliyun (~> 0.1.0) + fog-aliyun (~> 0.2.0) fog-aws (~> 1.4) fog-core (~> 1.44) fog-google (~> 0.5) @@ -1030,7 +1035,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.39.0) + gitaly-proto (~> 0.59.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) @@ -1055,14 +1060,14 @@ DEPENDENCIES influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) + jquery-rails (~> 4.3.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) knapsack (~> 1.11.0) kubeclient (~> 2.2.0) letter_opener_web (~> 1.3.0) - license_finder (~> 2.1.0) + license_finder (~> 3.1) licensee (~> 8.7.0) lograge (~> 0.5) loofah (~> 2.0.3) @@ -1104,16 +1109,15 @@ DEPENDENCIES peek-redis (~> 1.2.0) peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) - poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta18) + prometheus-client-mmap (~> 0.7.0.beta43) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) - rails (= 4.2.8) + rails (= 4.2.10) rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 4.0.9) rainbow (~> 2.2) @@ -1127,7 +1131,7 @@ DEPENDENCIES redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.5.2) - redis-rails (~> 5.0.1) + redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) rouge (~> 2.0) @@ -1148,8 +1152,9 @@ DEPENDENCIES sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.54.0) - seed-fu (~> 2.3.5) + seed-fu (= 2.3.6) select2-rails (~> 3.5.9) + selenium-webdriver (~> 3.5) sentry-raven (~> 2.5.3) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) @@ -1189,4 +1194,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index bc3ca9192bcb..ea4c9c8731d2 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "10.1.1"; + version = "10.3.3"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2"; + sha256 = "0bnafl7mpm3vjhfkqwgf5ff1y1iixfdfvv25zmpl0yjd70fwx2aq"; }; in @@ -30,17 +30,17 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - buildInputs = [ - rubyEnv ruby bundler tzdata git procps dpkg nettools - ]; - src = fetchFromGitHub { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a"; + sha256 = "1fhjijs8rvxrgx43fc7vp6f3vwshwq74gjwk41fi2yam8bri8p6k"; }; + buildInputs = [ + rubyEnv ruby bundler tzdata git procps dpkg nettools + ]; + patches = [ ./remove-hardcoded-locations.patch ./nulladapter.patch @@ -74,7 +74,11 @@ stdenv.mkDerivation rec { buildPhase = '' mv config/gitlab.yml.example config/gitlab.yml - dpkg -x ${gitlabDeb} . + # work around unpacking deb containing binary with suid bit + ar p ${gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar + tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu + tar -xf gitlab-deb-data.tar + mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public rm -rf opt diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 4fb4c48b0dee..fe861e143046 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -19,55 +19,55 @@ dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pr3cmr0bpgg5d0f6wy1z6r45n14r9yin8jnr4hi3ssf402xpc0q"; + sha256 = "1ivyjsapqgn1xfb2p8yqjrg2jldqm5r7hxrjxq6kdr05gk4fsg59"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9"; + sha256 = "0l6agrxdaishxjx2zc2x8md95plfp39bfskzgs6v9gsdp2y2arpx"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp"; + sha256 = "1jrx2pmkywk70z7n17gw3jrcdw3n03wdzvg45bnq8wxshl1lmbhv"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kazbpfgzz6cdmwjnlb9m671ps4qgggwv2hy8y9xi4h96djyyfqz"; + sha256 = "10jsa5pqklcsd2npicqxr5abjlwi53di2brpzgz35k557fkpc1z8"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; activemodel = { dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld"; + sha256 = "0c4vj9xajxa906bqbcjpni74nya6rh2nbb15gl8xm0vl9zf3ll9v"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0"; + sha256 = "1lws9y4p9c2vnmv3ddfpv8jh6azlddppl3fi31vahaz14ifxjk5s"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; activerecord-nulldb-adapter = { dependencies = ["activerecord"]; @@ -91,10 +91,10 @@ dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi"; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -248,6 +248,14 @@ }; version = "0.3.2"; }; + batch-loader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w4ysjfh74612wsgdnnaq3xqw25hzsr6ajb5syiv1ix7fi15y8bv"; + type = "gem"; + }; + version = "1.1.1"; + }; bcrypt = { source = { remotes = ["https://rubygems.org"]; @@ -298,6 +306,14 @@ }; version = "0.7.2"; }; + blankslate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + type = "gem"; + }; + version = "2.1.2.4"; + }; bootstrap-sass = { dependencies = ["autoprefixer-rails" "sass"]; source = { @@ -387,10 +403,10 @@ dependencies = ["activemodel" "activesupport" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nms4w6vkm7djghdxwi9qzykhc2ynjwblgqwk87w61fhispqlq2c"; + sha256 = "012b5jks7hxis1agiy7rbra5h4zhmwhy95gck3kr22nwdxfk71ii"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; cause = { source = { @@ -408,6 +424,15 @@ }; version = "0.7.5"; }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rqf595gv0bb48awck2cvipk78jy5pj08p1r4xbrfpd0i60jb9hd"; + type = "gem"; + }; + version = "0.7.0"; + }; chronic = { source = { remotes = ["https://rubygems.org"]; @@ -441,14 +466,6 @@ }; version = "3.0.2"; }; - cliver = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7"; - type = "gem"; - }; - version = "0.3.2"; - }; coderay = { source = { remotes = ["https://rubygems.org"]; @@ -894,10 +911,10 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj"; + sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; type = "gem"; }; - version = "0.1.0"; + version = "0.2.0"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1071,10 +1088,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k"; + sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82"; type = "gem"; }; - version = "0.39.0"; + version = "0.59.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1114,10 +1131,10 @@ gitlab-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz"; + sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -1132,10 +1149,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak"; + sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38"; type = "gem"; }; - version = "0.3.7"; + version = "0.4.1"; }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; @@ -1185,10 +1202,10 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl"; + sha256 = "1l9b2f4msp1gkay2mqjbjs7kfhchf916zh1y365singiysrwn2i6"; type = "gem"; }; - version = "3.4.0.2"; + version = "3.4.1.1"; }; googleauth = { dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; @@ -1248,10 +1265,10 @@ dependencies = ["google-protobuf" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52"; + sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38"; type = "gem"; }; - version = "1.6.0"; + version = "1.4.5"; }; haml = { dependencies = ["tilt"]; @@ -1401,12 +1418,13 @@ version = "2.8.2"; }; i18n = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw"; + sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s"; type = "gem"; }; - version = "0.8.6"; + version = "0.9.1"; }; ice_nine = { source = { @@ -1454,10 +1472,10 @@ dependencies = ["rails-dom-testing" "railties" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1asbrr9hqf43q9qbjf87f5lm7fp12pndh76z89ks6jwxf1350fj1"; + sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki"; type = "gem"; }; - version = "4.1.1"; + version = "4.3.1"; }; json = { source = { @@ -1582,13 +1600,13 @@ version = "1.3.0"; }; license_finder = { - dependencies = ["httparty" "rubyzip" "thor" "xml-simple"]; + dependencies = ["httparty" "rubyzip" "thor" "toml" "with_env" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "092rwf1yjq1l63zbqanmbnbky8g5pj7c3g30mcqbyppbqrsflx80"; + sha256 = "12p18a34q8dgzjwi2plgv889kxnxqnnmrqhvjs3ng2z26hv2zfag"; type = "gem"; }; - version = "2.1.0"; + version = "3.1.1"; }; licensee = { dependencies = ["rugged"]; @@ -1643,13 +1661,13 @@ version = "2.0.3"; }; mail = { - dependencies = ["mime-types"]; + dependencies = ["mini_mime"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9"; + sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; type = "gem"; }; - version = "2.6.6"; + version = "2.7.0"; }; mail_room = { source = { @@ -1733,14 +1751,6 @@ }; version = "5.7.0"; }; - mmap2 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rgf4zhqa6632nbqj585hc0x69iz21s5c91mpijcr9i5wpj9p1s6"; - type = "gem"; - }; - version = "2.2.7"; - }; mousetrap-rails = { source = { remotes = ["https://rubygems.org"]; @@ -2081,10 +2091,19 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq"; + sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3"; type = "gem"; }; - version = "2.4.0.0"; + version = "2.4.0.2"; + }; + parslet = { + dependencies = ["blankslate"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + type = "gem"; + }; + version = "1.5.0"; }; path_expander = { source = { @@ -2192,15 +2211,6 @@ }; version = "1.0.1"; }; - poltergeist = { - dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fnkly1ks31nf5cdks9jd5c5vynbanrr8pwp801qq2i8bg78rwc0"; - type = "gem"; - }; - version = "1.9.0"; - }; posix-spawn = { source = { remotes = ["https://rubygems.org"]; @@ -2253,13 +2263,12 @@ version = "0.0.3"; }; prometheus-client-mmap = { - dependencies = ["mmap2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh"; + sha256 = "1wpk9zfbr7c1asvnq1v6jmc3ydbl8y17v24cj4vyhy3nkpds0cij"; type = "gem"; }; - version = "0.7.0.beta18"; + version = "0.7.0.beta43"; }; pry = { dependencies = ["coderay" "method_source" "slop"]; @@ -2378,10 +2387,10 @@ dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpbf3ybzbhqqkwg5vi60121860cr8fybvchrxk5wy3f2jcj0mch"; + sha256 = "15vbdlkmlh470g7msqhmcmhxhi4finv3cjg595x9viafvphnf40l"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; rails-deprecated_sanitizer = { dependencies = ["activesupport"]; @@ -2423,10 +2432,10 @@ dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g"; + sha256 = "0snymfqj2cql0gp51i6a44avcirdridc15yggnxjj9raa9f3229p"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; rainbow = { dependencies = ["rake"]; @@ -2448,10 +2457,10 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw"; + sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf"; type = "gem"; }; - version = "12.1.0"; + version = "12.3.0"; }; rblineprof = { dependencies = ["debugger-ruby_core_source"]; @@ -2542,19 +2551,19 @@ dependencies = ["actionpack" "redis-rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr"; + sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd"; + sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.4"; }; redis-namespace = { dependencies = ["redis"]; @@ -2569,28 +2578,28 @@ dependencies = ["rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3"; + sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb"; type = "gem"; }; - version = "1.6.0"; + version = "2.0.4"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm"; + sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; redis-store = { dependencies = ["redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq"; + sha256 = "00yh8rhv91vxjlqs4ylic99m9npjxmgib2vjj8hgzk1174y6vcmq"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.1"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -2954,6 +2963,15 @@ }; version = "3.5.9.3"; }; + selenium-webdriver = { + dependencies = ["childprocess" "rubyzip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6r0k1w7hpk853qfw18lipyzxs0r0d6xr70zqsjfdn2dwr0rb30"; + type = "gem"; + }; + version = "3.5.0"; + }; sentry-raven = { dependencies = ["faraday"]; source = { @@ -3141,10 +3159,10 @@ dependencies = ["actionpack" "activesupport" "sprockets"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44"; + sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.1"; }; sqlite3 = { source = { @@ -3295,6 +3313,15 @@ }; version = "0.8.3"; }; + toml = { + dependencies = ["parslet"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + type = "gem"; + }; + version = "0.1.2"; + }; toml-rb = { dependencies = ["citrus"]; source = { @@ -3317,10 +3344,10 @@ dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl"; + sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.4"; }; u2f = { source = { @@ -3476,23 +3503,6 @@ }; version = "0.9.10"; }; - websocket-driver = { - dependencies = ["websocket-extensions"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9"; - type = "gem"; - }; - version = "0.6.3"; - }; - websocket-extensions = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br"; - type = "gem"; - }; - version = "0.1.2"; - }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; source = { @@ -3502,6 +3512,14 @@ }; version = "0.8.1"; }; + with_env = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; + type = "gem"; + }; + version = "1.1.0"; + }; xml-simple = { source = { remotes = ["https://rubygems.org"]; @@ -3519,4 +3537,4 @@ }; version = "2.1.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch index 3b30ff03346b..a495ce63cc59 100644 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ b/pkgs/applications/version-management/gitlab/nulladapter.patch @@ -7,7 +7,7 @@ index 4861171ef5..f6e701c548 100644 +gem 'activerecord-nulldb-adapter' + - gem 'rails', '4.2.8' + gem 'rails', '4.2.10' gem 'rails-deprecated_sanitizer', '~> 1.0.3' diff --git a/Gemfile.lock b/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 39c7c28847c4..acc615c63ca5 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -62,24 +62,15 @@ diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 59b21149a9..4f4a39a06c 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb -@@ -13,7 +13,7 @@ +@@ -26,7 +26,7 @@ end - def self.read_latest -- path = Rails.root.join("log", file_name) -+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name) - - return [] unless File.readable?(path) - -@@ -22,7 +22,7 @@ + def self.full_log_path +- Rails.root.join("log", file_name) ++ File.join(ENV["GITLAB_LOG_PATH"], file_name) end - def self.build -- new(Rails.root.join("log", file_name)) -+ new(File.join(ENV["GITLAB_LOG_PATH"], file_name)) - end - end - end + def self.cache_key diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb index b5f4124052..f72c556983 100644 --- a/lib/gitlab/uploads_transfer.rb diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix new file mode 100644 index 000000000000..2b93a95e45ae --- /dev/null +++ b/pkgs/applications/version-management/gitless/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub, pythonPackages, stdenv }: + +pythonPackages.buildPythonApplication rec { + ver = "0.8.5"; + name = "gitless-${ver}"; + + src = fetchFromGitHub { + owner = "sdg-mit"; + repo = "gitless"; + rev = "v${ver}"; + sha256 = "1v22i5lardswpqb6vxjgwra3ac8652qyajbijfj18vlkhajz78hq"; + }; + + propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://gitless.com/; + description = "A version control system built on top of Git"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.cransom ]; + }; +} + diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index bfaa62ebb66d..ded0d5e39863 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { branch = "net.venge.monotone.guitone"; }; + patches = [ ./parallel-building.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ qt4 qmake4Hook graphviz ]; @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 based GUI for monotone"; homepage = http://guitone.thomaskeller.biz; + downloadPage = https://code.monotone.ca/p/guitone/; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/version-management/guitone/parallel-building.patch b/pkgs/applications/version-management/guitone/parallel-building.patch new file mode 100644 index 000000000000..f0e924cbfb81 --- /dev/null +++ b/pkgs/applications/version-management/guitone/parallel-building.patch @@ -0,0 +1,7 @@ +Without this `make tmp/AttributesView.o` fails with +src/view/dialogs/AddEditAttribute.h:22:35: fatal error: ui_add_edit_attribute.h: No such file or directory +--- a/guitone.pro ++++ b/guitone.pro +@@ -215 +215,2 @@ help.commands = @echo Available targets: $${QMAKE_EXTRA_TARGETS} + QMAKE_EXTRA_TARGETS += help ++CONFIG += depend_includepath diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 774aa1082bc8..541bc8799a83 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -18,12 +18,12 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ]; + buildInputs = [ makeWrapper docutils unzip ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ hg-git dulwich ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ]; + propagatedBuildInputs = [ hg-git dulwich ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = (stdenv.lib.optionalString guiSupport '' @@ -34,9 +34,9 @@ in python2Packages.buildPythonApplication { hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py EOF # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\" - --set HG \"$out/bin/hg\" - --prefix PATH : \"${tk}/bin\" " + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " '') + '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f0185e187bbe..8b2d6fcc8c38 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub }: -let version = "1.07"; in +let version = "1.12.0"; in stdenv.mkDerivation { name = "yadm-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = "${version}"; - sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw"; + sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; }; buildCommand = '' diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 21b3f5577765..4adbdbdadb2a 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -50,11 +50,9 @@ stdenv.mkDerivation { fontconfig intltool ]; - # Note: the build may fail with e.g.: - # CXX edl.o + # $ make -C cinelerra edl.o # edl.C:50:25: fatal error: versioninfo.h: No such file or directory - # #include "versioninfo.h" - enableParallelBuilding = true; + enableParallelBuilding = false; meta = { description = "Video Editor"; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index ba72e085bf7c..9f98d46d53bd 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,20 +1,33 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}: +{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib +, libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-mplayer-1.0.4"; + name = "gnome-mplayer-${version}"; + version = "1.0.9"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz"; - sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; + src = fetchFromGitHub { + owner = "kdekorte"; + repo = "gnome-mplayer"; + rev = "v${version}"; + sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 dbus dbus_glib GConf]; + nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ]; - hardeningDisable = [ "format" ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + mencoder = "${mplayer}/bin/mencoder"; + mplayer = "${mplayer}/bin/mplayer"; + }) + ]; - meta = { - homepage = http://kdekorte.googlepages.com/gnomemplayer; + meta = with stdenv.lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; + homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + license = licenses.gpl2; + maintainers = with maintainers; []; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch new file mode 100644 index 000000000000..ede4991c4662 --- /dev/null +++ b/pkgs/applications/video/gnome-mplayer/fix-paths.patch @@ -0,0 +1,87 @@ +--- a/src/gui.c ++++ b/src/gui.c +@@ -7470,7 +7470,7 @@ + filename = g_strdup_printf("%s/00000001.jpg", dirname); + g_free(basepath); + // run mplayer and try to get the first frame and convert it to a jpeg +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + av[ac++] = g_strdup_printf("-vo"); + av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); + av[ac++] = g_strdup_printf("-ao"); +--- a/src/property_page_common.c ++++ b/src/property_page_common.c +@@ -80,7 +80,7 @@ + MetaData *ret; + ret = g_new0(MetaData, 1); + +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + av[ac++] = g_strdup_printf("-vo"); + av[ac++] = g_strdup_printf("null"); + av[ac++] = g_strdup_printf("-ao"); +--- a/src/support.c ++++ b/src/support.c +@@ -566,7 +566,7 @@ + } else { + playlist = FALSE; + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -728,7 +728,7 @@ + playlist = FALSE; + // run mplayer and try to get the first frame and convert it to a jpeg + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -825,7 +825,7 @@ + playlist = FALSE; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1251,7 +1251,7 @@ + gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1532,7 +1532,7 @@ + return 0; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1597,7 +1597,7 @@ + + if (control_id == 0) { + ac = 0; +- av[ac++] = g_strdup_printf("mencoder"); ++ av[ac++] = g_strdup_printf("@mencoder@"); + av[ac++] = g_strdup_printf("-ovc"); + av[ac++] = g_strdup_printf("copy"); + av[ac++] = g_strdup_printf("-oac"); +@@ -2830,7 +2830,7 @@ + gboolean ret = TRUE; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index da90f681f7a8..28577a429bd2 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -8,8 +8,7 @@ , libXt, libXmu, libXext, xextproto , libXinerama, libXrandr, randrproto , libXtst, libXfixes, fixesproto, systemd -, SDL, SDL2, SDL_image, SDL_mixer, alsaLib -, mesa, glew, fontconfig, freetype, ftgl +, alsaLib, mesa, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -44,6 +43,7 @@ assert vdpauSupport -> libvdpau != null; # - cmake is no longer in project/cmake # - maybe we can remove auto{conf,make} and libtool from inputs # - check if dbus support PR has been merged and add dbus as a buildInput +# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches) let kodiReleaseDate = "20171115"; @@ -78,7 +78,8 @@ let preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; - buildInputs = [ gnutls libidn libtasn1 p11_kit zlib ]; + buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ] + ++ lib.optional vdpauSupport libvdpau; nativeBuildInputs = [ cmake nasm pkgconfig ]; }; @@ -124,13 +125,12 @@ in stdenv.mkDerivation rec { openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto libXt libXmu libXext xextproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto - SDL SDL_image SDL_mixer alsaLib - mesa glew fontconfig freetype ftgl - libjpeg jasper libpng libtiff libva wayland + alsaLib mesa glew fontconfig freetype ftgl + libjpeg jasper libpng libtiff wayland libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray - sqlite mysql.lib avahi lame + sqlite mysql.connector-c avahi lame curl bzip2 zip unzip glxinfo xdpyinfo libcec libcec_platform dcadec libuuid libgcrypt libgpgerror libunistring @@ -140,7 +140,7 @@ in stdenv.mkDerivation rec { # libdvdcss libdvdnav libdvdread ] ++ lib.optional dbusSupport dbus_libs - ++ lib.optionals joystickSupport [ cwiid SDL2 ] + ++ lib.optionals joystickSupport [ cwiid ] ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio ++ lib.optional rtmpSupport rtmpdump @@ -189,7 +189,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/$p \ --prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}" + [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}" done substituteInPlace $out/share/xsessions/kodi.desktop \ diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 52c39e837a12..6bcba1e927f9 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -264,7 +264,7 @@ rec { meta = with stdenv.lib; { homepage = https://forum.kodi.tv/showthread.php?tid=187421; - descritpion = "A comic book reader"; + description = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; }; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index ae7625d1972a..1e890c24db1a 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.7"; + ver = "1.10.8"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac"; + sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654"; + sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index f70c142ab41d..bef3a78d782e 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { you an endless video stream. Minitube is not about cloning the YouTube website, it aims to create a new TV-like experience. ''; - homepage = http://flavio.tordini.org/minitube; + homepage = https://flavio.tordini.org/minitube; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 183722beed81..867dacc213e2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv +{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt , withGUI ? true @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "17.0.0"; + version = "19.0.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88"; + sha256 = "068g0mmi284zl9d9p9zhp55h6rj58j5c27czd3mg42kq74cwcsx9"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index d52154887071..67c91168fa2d 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "motion-${version}"; - version = "4.0.1"; + version = "4.1.1"; + src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb"; + sha256 = "1prbgl9wb9q7igsb6n11c25m0p0z246fxr1q8n1vcjr4rcb65y38"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libjpeg ffmpeg ]; + meta = with stdenv.lib; { homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome; description = "Monitors the video signal from cameras"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 24c5b4335c46..fe6090c3230e 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -102,7 +102,8 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; - nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkgconfig yasm ]; buildInputs = with stdenv.lib; [ freetype ffmpeg ] ++ optional aalibSupport aalib diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 680cad1ec252..7aaa1b65fc45 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs , lua, lua5_sockets, libuchardet, libiconv ? null, darwin @@ -90,7 +90,14 @@ in stdenv.mkDerivation rec { sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v"; }; - patchPhase = '' + patches = [ + (fetchpatch { + url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch"; + sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb"; + }) + ]; + + postPatch = '' patchShebangs ./TOOLS/ ''; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 71bb0405111c..167c5bdba40a 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://www.mythtv.org/; description = "Open Source DVR"; license = licenses.gpl2; - meta.platforms = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 057e4327ebe1..64bdbd21686f 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/obs \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib" + --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 83e69495b03a..221f4fc0e5c3 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ogmtools-1.5"; src = fetchurl { - url = "http://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; + url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { (ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap tool for extracting chapter information from DVD. ''; - homepage = http://www.bunkus.org/videotools/ogmtools/; + homepage = https://www.bunkus.org/videotools/ogmtools/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 447518d008b4..75bd398b2080 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext -, libXfixes, mesa, pkgconfig, libpulseaudio, qt4 +, libXfixes, mesa, pkgconfig, libpulseaudio, qt4, cmake, ninja }: stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg"; + sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk"; }; patches = [ ./fix-paths.patch ]; postPatch = '' - # #455 - sed '1i#include ' -i src/Benchmark.cpp - for i in scripts/ssr-glinject src/AV/Input/GLInjectInput.cpp; do substituteInPlace $i \ --subst-var out \ @@ -24,14 +21,12 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig cmake ninja ]; + buildInputs = [ alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa libpulseaudio qt4 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A screen recorder for Linux"; homepage = http://www.maartenbaert.be/simplescreenrecorder; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b465379c50ed..fffbd5c0ffb4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -21,21 +21,13 @@ assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.2.6"; + version = "2.2.8"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"; + sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-9300.patch"; - url = "https://git.videolan.org/?p=vlc/vlc-2.2.git;a=patch;h=55a82442cfea9dab8b853f3a4610f2880c5fadf3;hp=dbe888f9ca9c3b102478b4a16a3d1d985c267899"; - sha256 = "0l0fwqkn31lggwc5dkhb58gkv8pc6ng51y0izjigqvfqvhwdnzxn"; - }) - ]; - # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. # https://trac.videolan.org/vlc/ticket/16497 postPatch = if (!withQt5) then null else diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ba74bc38a357..c4c0adbb9bf9 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -105,6 +105,7 @@ rec { cd ./components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" + export VERSION="${version}" ./hack/make.sh dynbinary cd - '') + '' @@ -136,11 +137,7 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); installPhase = optionalString (stdenv.isLinux) '' - if [ -d "./components/engine/bundles/${version}" ]; then - install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - else - install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - fi + install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ --prefix PATH : "$out/libexec/docker:$extraPath" @@ -207,26 +204,14 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits - docker_17_09 = dockerGen rec { - version = "17.09.0-ce"; - rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit - sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p"; - runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; - runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; - containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; - containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; - }; - - docker_17_11 = dockerGen rec { - version = "17.11.0-ce"; - rev = "1caf76ce6baa889133ece59fab3c36aaf143d4ef"; # git commit - sha256 = "09s7lxcs4wdjj69l7z3nybbms7iqspk1wy7qnr4r52s8vr3fd5s4"; - runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; - runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; - containerdRev = "992280e8e265f491f7a624ab82f3e238be086e49"; - containerdSha256 = "1ci6jlgrrgz4ph451035sl98lj2jd467pd4qnv85ma9gzblrxs7n"; + docker_17_12 = dockerGen rec { + version = "17.12.0-ce"; + rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit + sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps"; + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index c7f8ea696b57..e42c1d5dd1e4 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { better management of, and seamless user interactions with, guests. ''; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ joamaki ]; }; } diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix deleted file mode 100644 index 21cb4906d034..000000000000 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, python2Packages, sqlite, which, strace }: - -python2Packages.buildPythonApplication rec { - name = "glance-${version}"; - version = "11.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/glance/archive/${version}.tar.gz"; - sha256 = "05rz1lmzdmpnw8sf87vvi0l6q9g6s840z934zyinw17yfcvmqrdg"; - }; - - # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt - propagatedBuildInputs = with python2Packages; [ - pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate - httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste - jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python - WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile - - # oslo componenets - oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db - oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization - MySQL_python - ]; - - buildInputs = with python2Packages; [ - Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8 - testresources testscenarios testtools psutil_1 oslotest psycopg2 - sqlite which strace - ]; - - patchPhase = '' - # it's not a test, but a class mixin - sed -i 's/ImageCacheTestCase/ImageCacheMixin/' glance/tests/unit/test_image_cache.py - - # these require network access, see https://bugs.launchpad.net/glance/+bug/1508868 - sed -i 's/test_get_image_data_http/noop/' glance/tests/unit/common/scripts/test_scripts_utils.py - sed -i 's/test_set_image_data_http/noop/' glance/tests/unit/common/scripts/image_import/test_main.py - sed -i 's/test_create_image_with_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py - sed -i 's/test_upload_image_http_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py - - # TODO: couldn't figure out why this test is failing - sed -i 's/test_all_task_api/noop/' glance/tests/integration/v2/test_tasks_api.py - ''; - - postInstall = '' - # check all binaries don't crash - for i in $out/bin/*; do - case "$i" in - *glance-artifacts) # https://bugs.launchpad.net/glance/+bug/1508879 - : - ;; - *) - $i --help - esac - done - - cp etc/*-paste.ini $out/etc/ - ''; - - meta = with stdenv.lib; { - homepage = http://glance.openstack.org/; - description = "Services for discovering, registering, and retrieving virtual machine images"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix deleted file mode 100644 index 39c54f0d204b..000000000000 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, python2Packages, xmlsec, which, openssl }: - -python2Packages.buildPythonApplication rec { - name = "keystone-${version}"; - version = "8.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/keystone/archive/${version}.tar.gz"; - sha256 = "1xbrs7xgwjzrs07zyxxcl2lq18dh582gd6lx1zzzji8c0qmffy0z"; - }; - - # remove on next version bump - patches = [ ./remove-oslo-policy-tests.patch ]; - - # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt - propagatedBuildInputs = with python2Packages; [ - pbr webob eventlet greenlet PasteDeploy paste routes cryptography six - sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached - keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack - xmlsec MySQL_python - - # oslo - oslo-cache oslo-concurrency oslo-config oslo-context oslo-messaging oslo-db - oslo-i18n oslo-log oslo-middleware oslo-policy oslo-serialization oslo-service - oslo-utils - ]; - - buildInputs = with python2Packages; [ - coverage fixtures mock subunit tempest-lib testtools testrepository - ldap ldappool webtest requests oslotest pep8 pymongo which - ]; - - makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"]; - - postInstall = '' - # install .ini files - mkdir -p $out/etc - cp etc/* $out/etc - - # check all binaries don't crash - for i in $out/bin/*; do - $i --help - done - ''; - - meta = with stdenv.lib; { - homepage = http://keystone.openstack.org/; - description = "Authentication, authorization and service discovery mechanisms via HTTP"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch deleted file mode 100644 index d7a2caa2bdea..000000000000 --- a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 3aefdf4de76fdcdc02093bc631e339f9ecd4c707 Mon Sep 17 00:00:00 2001 -From: James Page -Date: Fri, 18 Sep 2015 16:38:47 +0100 -Subject: Add compatibility with iproute2 >= 4.0 - -The ip netns list command adds additional id data in more recent -versions of iproute2 of the format: - - qdhcp-35fc068a-750d-4add-b1d2-af392dbd8790 (id: 1) - -Update parsing to deal with old and new formats. - -Change-Id: I0d3fc4262284172f5ad31e4f2f78ae1fb33b4228 -Closes-Bug: 1497309 ---- - neutron/agent/linux/ip_lib.py | 6 +++--- - neutron/tests/functional/agent/test_l3_agent.py | 2 +- - neutron/tests/unit/agent/linux/test_ip_lib.py | 15 +++++++++++++++ - 3 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py -index 551341a..a717bf6 100644 ---- a/neutron/agent/linux/ip_lib.py -+++ b/neutron/agent/linux/ip_lib.py -@@ -208,7 +208,7 @@ class IPWrapper(SubProcessBase): - @classmethod - def get_namespaces(cls): - output = cls._execute([], 'netns', ('list',)) -- return [l.strip() for l in output.split('\n')] -+ return [l.split()[0] for l in output.splitlines()] - - - class IPDevice(SubProcessBase): -@@ -819,8 +819,8 @@ class IpNetnsCommand(IpCommandBase): - output = self._parent._execute( - ['o'], 'netns', ['list'], - run_as_root=cfg.CONF.AGENT.use_helper_for_ns_read) -- for line in output.split('\n'): -- if name == line.strip(): -+ for line in [l.split()[0] for l in output.splitlines()]: -+ if name == line: - return True - return False - -diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py -index ffa20e6..84b16df 100644 ---- a/neutron/tests/functional/agent/test_l3_agent.py -+++ b/neutron/tests/functional/agent/test_l3_agent.py -@@ -790,7 +790,7 @@ class L3HATestFramework(L3AgentTestFramework): - get_ns_name = mock.patch.object( - namespaces.RouterNamespace, '_get_ns_name').start() - get_ns_name.return_value = "%s%s%s" % ( -- namespaces.RouterNamespace._get_ns_name(router_info['id']), -+ 'qrouter-' + router_info['id'], - self.NESTED_NAMESPACE_SEPARATOR, self.agent.host) - router1 = self.manage_router(self.agent, router_info) - -diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py -index 2de408d..bdfc9d7 100644 ---- a/neutron/tests/unit/agent/linux/test_ip_lib.py -+++ b/neutron/tests/unit/agent/linux/test_ip_lib.py -@@ -27,6 +27,11 @@ NETNS_SAMPLE = [ - 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', - 'cccccccc-cccc-cccc-cccc-cccccccccccc'] - -+NETNS_SAMPLE_IPROUTE2_4 = [ -+ '12345678-1234-5678-abcd-1234567890ab (id: 1)', -+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb (id: 0)', -+ 'cccccccc-cccc-cccc-cccc-cccccccccccc (id: 2)'] -+ - LINK_SAMPLE = [ - '1: lo: mtu 16436 qdisc noqueue state UNKNOWN \\' - 'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0', -@@ -279,6 +284,16 @@ class TestIpWrapper(base.BaseTestCase): - - self.execute.assert_called_once_with([], 'netns', ('list',)) - -+ def test_get_namespaces_iproute2_4(self): -+ self.execute.return_value = '\n'.join(NETNS_SAMPLE_IPROUTE2_4) -+ retval = ip_lib.IPWrapper.get_namespaces() -+ self.assertEqual(retval, -+ ['12345678-1234-5678-abcd-1234567890ab', -+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', -+ 'cccccccc-cccc-cccc-cccc-cccccccccccc']) -+ -+ self.execute.assert_called_once_with([], 'netns', ('list',)) -+ - def test_add_tuntap(self): - ip_lib.IPWrapper().add_tuntap('tap0') - self.execute.assert_called_once_with([], 'tuntap', --- -cgit v0.11.2 - diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix deleted file mode 100644 index 9ee586cf0409..000000000000 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, python2Packages, xmlsec, which, dnsmasq }: - -python2Packages.buildPythonApplication rec { - name = "neutron-${version}"; - version = "7.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/neutron/archive/${version}.tar.gz"; - sha256 = "02ll081xly7zfjmgkal81fy3aplbnn5zgx8xfy3yy1nv3kfnyi40"; - }; - - # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt - propagatedBuildInputs = with python2Packages; [ - pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests - jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six - stevedore pecan ryu networking-hyperv MySQL_python - - # clients - keystoneclient neutronclient novaclient - - # oslo components - oslo-concurrency oslo-config oslo-context oslo-db oslo-i18n oslo-log oslo-messaging - oslo-middleware oslo-policy oslo-rootwrap oslo-serialization oslo-service oslo-utils - oslo-versionedobjects - ]; - - # make sure we include migrations - prePatch = '' - echo "graft neutron" >> MANIFEST.in - substituteInPlace etc/neutron/rootwrap.d/dhcp.filters --replace "/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" - ''; - patches = [ ./neutron-iproute-4.patch ]; - - buildInputs = with python2Packages; [ - cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository - testtools testresources testscenarios webtest oslotest os-testr tempest-lib - ddt pep8 - ]; - - postInstall = '' - # requires extra optional dependencies - # TODO: package networking_mlnx, networking_vsphere, bsnstacklib, XenAPI - rm $out/bin/{neutron-mlnx-agent,neutron-ovsvapp-agent,neutron-restproxy-agent,neutron-rootwrap-xen-dom0} - - # check all binaries don't crash - for i in $out/bin/*; do - case "$i" in - *neutron-pd-notify|*neutron-rootwrap-daemon|*neutron-rootwrap) - : - ;; - *) - $i --help - esac - done - ''; - - meta = with stdenv.lib; { - homepage = http://neutron.openstack.org/; - description = "Virtual network service for Openstack"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - broken = true; - }; -} diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix deleted file mode 100644 index ef3eb2fb0842..000000000000 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, python2Packages, openssl, openssh }: - -python2Packages.buildPythonApplication rec { - name = "nova-${version}"; - version = "12.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/nova/archive/${version}.tar.gz"; - sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w"; - }; - - # otherwise migrate.cfg is not installed - patchPhase = '' - echo "graft nova" >> MANIFEST.in - - # remove transient error test, see http://hydra.nixos.org/build/40203534 - rm nova/tests/unit/compute/test_{shelve,compute_utils}.py - ''; - - # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt - propagatedBuildInputs = with python2Packages; [ - pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography - webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr - netifaces paramiko Babel iso8601 jsonschema keystoneclient requests six - stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql - keystonemiddleware MySQL_python - - # oslo components - oslo-rootwrap oslo-reports oslo-utils oslo-i18n oslo-config oslo-context - oslo-log oslo-serialization oslo-middleware oslo-db oslo-service oslo-messaging - oslo-concurrency oslo-versionedobjects - - # clients - cinderclient neutronclient glanceclient - ]; - - buildInputs = with python2Packages; [ - coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx - oslotest testrepository testresources testtools tempest-lib bandit - oslo-vmware pep8 barbicanclient ironicclient openssl openssh - ]; - - postInstall = '' - cp -prvd etc $out/etc - - # check all binaries don't crash - for i in $out/bin/*; do - case "$i" in - *nova-dhcpbridge*) - : - ;; - *nova-rootwrap*) - : - ;; - *) - $i --help - ;; - esac - done - ''; - - meta = with stdenv.lib; { - homepage = http://nova.openstack.org/; - description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch deleted file mode 100644 index 3cdc27a2d2af..000000000000 --- a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6016d017004acaae288312b196ef07ea98e9962d Mon Sep 17 00:00:00 2001 -From: Brant Knudson -Date: Mon, 12 Oct 2015 15:12:45 -0500 -Subject: [PATCH] Remove oslo.policy implementation tests from keystone - -oslo.policy 0.12.0 contains a change to use requests to do the http -check rather than urllib. This change caused keystone tests to fail -because the keystone tests were mocking urllib, making assumptions -about how oslo.policy is implemented. Keystone doesn't need to test -internal features of oslo.policy, so these tests are removed. - -Change-Id: I9d6e4950b9fe75cbb94100c8effdcec002642027 -Closes-Bug: 1505374 ---- - keystone/tests/unit/test_policy.py | 24 ------------------------ - 1 file changed, 24 deletions(-) - -diff --git a/keystone/tests/unit/test_policy.py b/keystone/tests/unit/test_policy.py -index b2f0e52..686e2b7 100644 ---- a/keystone/tests/unit/test_policy.py -+++ b/keystone/tests/unit/test_policy.py -@@ -16,10 +16,8 @@ - import json - import os - --import mock - from oslo_policy import policy as common_policy - import six --from six.moves.urllib import request as urlrequest - from testtools import matchers - - from keystone import exception -@@ -118,28 +116,6 @@ def test_enforce_good_action(self): - action = "example:allowed" - rules.enforce(self.credentials, action, self.target) - -- def test_enforce_http_true(self): -- -- def fakeurlopen(url, post_data): -- return six.StringIO("True") -- -- action = "example:get_http" -- target = {} -- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen): -- result = rules.enforce(self.credentials, action, target) -- self.assertTrue(result) -- -- def test_enforce_http_false(self): -- -- def fakeurlopen(url, post_data): -- return six.StringIO("False") -- -- action = "example:get_http" -- target = {} -- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen): -- self.assertRaises(exception.ForbiddenAction, rules.enforce, -- self.credentials, action, target) -- - def test_templatized_enforcement(self): - target_mine = {'project_id': 'fake'} - target_not_mine = {'project_id': 'another'} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 2488bb1ae10e..91b02f7ad1f0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,16 +18,17 @@ with stdenv.lib; let - version = "2.10.1"; - sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f"; + version = "2.11.0"; + sha256 = "1jvzw6rdhimn583dz6an8xiw07n3ycvxmj3jpv1s312scv3k9w64"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; - hostCpuTargets = if stdenv.isi686 || stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" - else if stdenv.isArm then "arm-softmmu" - else if stdenv.isAarch64 then "aarch64-softmmu" - else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; + hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" + else if stdenv.isi686 then "i386-softmmu" + else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch64 then "aarch64-softmmu" + else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in stdenv.mkDerivation rec { @@ -62,12 +63,7 @@ stdenv.mkDerivation rec { patches = [ ./no-etc-install.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optional pulseSupport ./fix-hda-recording.patch - ++ [ (fetchpatch { - name = "qemu-CVE-2017-15118.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=51ae4f8455c9e32c54770c4ebc25bf86a8128183"; - sha256 = "0f9i096dz3h1i8g92y99vak23rjs1shf7prlcxqizsz0fah7wx7h"; }) - ]; + ++ optional pulseSupport ./fix-hda-recording.patch; hardeningDisable = [ "stackprotector" ]; @@ -97,14 +93,13 @@ stdenv.mkDerivation rec { done ''; + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = - '' - # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" - if [ -e "$p" ]; then - makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" - fi - ''; + if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else ""; meta = with stdenv.lib; { homepage = http://www.qemu.org/; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index ddd8cf72b93d..236cb8f31e66 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -1,20 +1,52 @@ { stdenv , fetchFromGitHub -, autoreconfHook }: +, autoreconfHook +, gnutar +, which +, gnugrep +, coreutils +, python +, e2fsprogs +, makeWrapper +, squashfsTools +, gzip +, gnused +, curl +, utillinux + }: stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.2"; + version = "2.4"; + + enableParallelBuilding = true; + + patches = [ ./env.patch ]; + + preConfigure = '' + sed -i 's/-static//g' src/Makefile.am + patchShebangs . + ''; + + fixupPhase = '' + patchShebangs $out + for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do + chmod a+x $f + sed -i 's| /sbin/| |g' $f + sed -i 's| /bin/bash| ${stdenv.shell}|g' $f + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath buildInputs} + done + ''; src = fetchFromGitHub { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; + sha256 = "1hi1ag1lb2x4djbz4x34wix83ymx0g9mzn2md6yrpiflc1d85rjz"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ]; meta = with stdenv.lib; { homepage = http://singularity.lbl.gov/; diff --git a/pkgs/applications/virtualization/singularity/env.patch b/pkgs/applications/virtualization/singularity/env.patch new file mode 100644 index 000000000000..bc3be363bb81 --- /dev/null +++ b/pkgs/applications/virtualization/singularity/env.patch @@ -0,0 +1,21 @@ +diff --git a/libexec/functions b/libexec/functions +index bc68107..6c2211c 100644 +--- a/libexec/functions ++++ b/libexec/functions +@@ -29,16 +29,6 @@ if [ -z "${SINGULARITY_MESSAGELEVEL:-}" ]; then + SINGULARITY_MESSAGELEVEL=5 + fi + +-if [ -z "${USER:-}" ]; then +- USER=`id -un` +- export USER +-fi +-if [ -z "${HOME:-}" ]; then +- HOME=`getent passwd "$USER" | cut -d : -f 6` +- export HOME +-fi +- +- + message() { + LEVEL="${1:-}" + MESSAGE="${2:-}" diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 13dbf544c927..b99475bcda84 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,12 +9,12 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.2"; + version = "1.4.3"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23"; + sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj"; }; nativeBuildInputs = [ wrapGAppsHook intltool file ]; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index f386b457fc50..4c5000f0208c 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,27 +1,27 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg -, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.45.75"; + version = "0.48.79"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n"; + sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k"; }; cmakeFlags = [ "-DBUILD_QT_VERSION=5" + "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5" ]; buildInputs = [ - # virt-manager-qt currently does not compile with qtermwidget-0.8.0 - qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1 - libvirt libvncserver pixman spice_gtk spice_protocol + qtbase qtmultimedia qtsvg + libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -38,5 +38,6 @@ mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 3b8d0a7cf63e..68ee06953a38 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -25,8 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib - libcap_ng numactl libapparmor xen - ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; + libcap_ng numactl libapparmor + ] ++ optionals stdenv.isx86_64 [ + xen + ] ++ optionals spiceSupport [ + spice_gtk spice_protocol libcap gdbm + ]; postInstall = '' for f in "$out"/bin/*; do diff --git a/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch b/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch new file mode 100644 index 000000000000..7abe62a59cb8 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch @@ -0,0 +1,153 @@ +From 9ac54c606b581847a170ac2fe525419aff2e5341 Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Wed, 6 Dec 2017 23:58:20 +0100 +Subject: [PATCH] HostServices/SharedClipboard/x11-stub.cpp: use RT_NOREF + rather than NOREF + +Currently, build process fails when configuring with --build-headless like this: + +``` +kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/service.cpp +kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:29: error: macro "NOREF" passed 2 arguments, but takes just 1 + NOREF(pClient, fHeadless); + ^ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:30: error: macro "NOREF" passed 2 arguments, but takes just 1 + NOREF(pClient, u32Formats); + ^ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:37: error: macro "NOREF" passed 4 arguments, but takes just 1 + NOREF(pClient, u32Format, pv, cb); + ^ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:37: error: macro "NOREF" passed 4 arguments, but takes just 1 + NOREF(pClient, pv, cb, u32Format); + ^ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardConnect(VBOXCLIPBOARDCLIENTDATA*, bool)': +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:5: error: 'NOREF' was not declared in this scope + NOREF(pClient, fHeadless); + ^~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:55:52: warning: unused parameter 'pClient' [-Wunused-parameter] + int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, + ^~~~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:56:32: warning: unused parameter 'fHeadless' [-Wunused-parameter] + bool fHeadless) + ^~~~~~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardFormatAnnounce(VBOXCLIPBOARDCLIENTDATA*, uint32_t)': +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:5: error: 'NOREF' was not declared in this scope + NOREF(pClient, u32Formats); + ^~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:91:60: warning: unused parameter 'pClient' [-Wunused-parameter] + void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, + ^~~~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:92:44: warning: unused parameter 'u32Formats' [-Wunused-parameter] + uint32_t u32Formats) + ^~~~~~~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardReadData(VBOXCLIPBOARDCLIENTDATA*, uint32_t, void*, uint32_t, uint32_t*)': +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:5: error: 'NOREF' was not declared in this scope + NOREF(pClient, u32Format, pv, cb); + ^~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:53: warning: unused parameter 'pClient' [-Wunused-parameter] + int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, + ^~~~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:71: warning: unused parameter 'u32Format' [-Wunused-parameter] + int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, + ^~~~~~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:34: warning: unused parameter 'pv' [-Wunused-parameter] + void *pv, uint32_t cb, uint32_t *pcbActual) + ^~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:47: warning: unused parameter 'cb' [-Wunused-parameter] + void *pv, uint32_t cb, uint32_t *pcbActual) + ^~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardWriteData(VBOXCLIPBOARDCLIENTDATA*, void*, uint32_t, uint32_t)': +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:5: error: 'NOREF' was not declared in this scope + NOREF(pClient, pv, cb, u32Format); + ^~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:55: warning: unused parameter 'pClient' [-Wunused-parameter] + void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, + ^~~~~~~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:70: warning: unused parameter 'pv' [-Wunused-parameter] + void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, + ^~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:39: warning: unused parameter 'cb' [-Wunused-parameter] + uint32_t cb, uint32_t u32Format) + ^~ +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:52: warning: unused parameter 'u32Format' [-Wunused-parameter] + uint32_t cb, uint32_t u32Format) + ^~~~~~~~~ +kmk: *** [/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o] Error 1 +The failing command: +@g++ -c -O2 -g -pipe -pedantic -Wshadow -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wno-trigraphs -fdiagnostics-show-option -Wno-unused-parameter -Wlogical-op -Wno-variadic-macros +-Wno-long-long -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter -Wno-overloaded-virtual -Wno-variadic-macros -O2 -mtune=generic -fno-omit-frame-pointer -fno-strict-aliasing +-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden -fPIC -m64 +-I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/dtrace -I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/include +-I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release -DVBOX -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS -DVBOX_WITH_REM -DVBOX_WITH_RAW_MODE -DRT_OS_LINUX -D_FILE_OFFSET_BITS=64 +-DRT_ARCH_AMD64 -D__AMD64__ -DVBOX_WITH_DEBUGGER -DVBOX_WITH_HARDENING -DRTPATH_APP_PRIVATE=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\" +-DRTPATH_APP_PRIVATE_ARCH=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\" +-DRTPATH_APP_PRIVATE_ARCH_TOP=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\" +-DRTPATH_SHARED_LIBS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\" -DRTPATH_APP_DOCS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/doc\" +-DIN_RING3 -DHC_ARCH_BITS=64 -DGC_ARCH_BITS=64 -DVBOX_WITH_DTRACE -DVBOX_WITH_DTRACE_R3 -DPIC -DVBOX_WITH_HGCM +-Wp,-MD,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o.dep +-Wp,-MT,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o -Wp,-MP -o +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o +/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp +``` + +This seems to be caused by the usage of NOREF in +src/VBox/HostServices/SharedClipboard/x11-stub.cpp, so use RT_NOREFN +instead. + +Signed-off-by: Florian Klink +--- + src/VBox/HostServices/SharedClipboard/x11-stub.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp +index d890215..57ba883 100644 +--- a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp ++++ b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp +@@ -55,7 +55,7 @@ void vboxClipboardDestroy (void) + int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, + bool fHeadless) + { +- NOREF(pClient, fHeadless); ++ RT_NOREF2(pClient, fHeadless); + LogFlowFunc(("called, returning VINF_SUCCESS.\n")); + return VINF_SUCCESS; + } +@@ -77,7 +77,7 @@ int vboxClipboardSync (VBOXCLIPBOARDCLIENTDATA * /* pClient */) + */ + void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient) + { +- NOREF(pClient); ++ RT_NOREF1(pClient); + LogFlowFunc(("called, returning.\n")); + } + +@@ -91,7 +91,7 @@ void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient) + void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, + uint32_t u32Formats) + { +- NOREF(pClient, u32Formats); ++ RT_NOREF2(pClient, u32Formats); + LogFlowFunc(("called, returning.\n")); + } + +@@ -107,7 +107,7 @@ void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, + int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, + void *pv, uint32_t cb, uint32_t *pcbActual) + { +- NOREF(pClient, u32Format, pv, cb); ++ RT_NOREF4(pClient, u32Format, pv, cb); + LogFlowFunc(("called, returning VINF_SUCCESS.\n")); + /* No data available. */ + *pcbActual = 0; +@@ -125,6 +125,6 @@ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, + void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, + uint32_t cb, uint32_t u32Format) + { +- NOREF(pClient, pv, cb, u32Format); ++ RT_NOREF4(pClient, pv, cb, u32Format); + LogFlowFunc(("called, returning.\n")); + } +-- +2.15.0 + diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3e502cde08b2..3e9322ddeafb 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2 , libXrandr, libXinerama -, which, alsaLib, curl, libvpx, gawk, nettools, dbus -, xorriso, makeself, perl, pkgconfig +, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +, alsaLib, curl, libvpx, gawk, nettools, dbus +, xorriso, makeself, perl , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null @@ -19,10 +20,11 @@ let python = python2; buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! - extpack = "9328548ca8cbc526232c0631cb5a17618c771b07665b362c1e3d89a2425bf799"; - extpackRev = "119230"; - main = "05y03fcp013gc500q34bj6hvx1banib41v8l3hcxknzfgwq0rarm"; - version = "5.2.2"; + # Do not forget to update the hash in ./guest-additions/default.nix! + extpack = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd"; + extpackRev = "119785"; + main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869"; + version = "5.2.4"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -51,10 +53,12 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu libpng patchelfUnstable python ] + libXmu libpng patchelfUnstable python ] ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio @@ -88,8 +92,13 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ]; + patches = + optional enableHardening ./hardened.patch + # https://www.virtualbox.org/pipermail/vbox-dev/2017-December/014888.html + ++ optional headless [ ./HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch ] + ++ [ ./qtx11extras.patch ]; + + postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ @@ -197,8 +206,9 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; - homepage = http://www.virtualbox.org/; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.linux; + license = licenses.gpl2; + homepage = https://www.virtualbox.org/; + maintainers = with maintainers; [ flokli sander ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 0aa0423fc13a..8f789cdf1707 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1f0vm20qdjxqsbciwgybxqqpn609gj5dy68an8lpi1wlk93s05w3"; + sha256 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - buildInputs = [ patchelf cdrkit makeWrapper dbus ]; + buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 308913adf89c..ec3fe9ccf221 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -230,6 +230,12 @@ callPackage (import ./generic.nix (rec { XSA_243_45 XSA_244_45 XSA_245 + XSA_246_45 + XSA_247_45 + XSA_248_45 + XSA_249 + XSA_250_45 + XSA_251_45 ]; # Fix build on Glibc 2.24. diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 259dd72a960c..6eedca18960b 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -158,6 +158,12 @@ callPackage (import ./generic.nix (rec { XSA_243_48 XSA_244 XSA_245 + XSA_246 + XSA_247_48 + XSA_248_48 + XSA_249 + XSA_250 + XSA_251_48 ]; # Fix build on Glibc 2.24. diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index fd85c85f22bb..8f8cc459a243 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -771,4 +771,97 @@ in rec { sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8"; }) ]; + + # 4.5 - 4.7 + XSA_246_45 = [ + (xsaPatch { + name = "246-4.7"; + sha256 = "13rad4k8z3bq15d67dhgy96kdbrjiq9sy8px0jskbpx9ygjdahkn"; + }) + ]; + + # 4.8 - 4.9 + XSA_246 = [ + (xsaPatch { + name = "246-4.9"; + sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz"; + }) + ]; + + # 4.8 + XSA_247_48 = [ + (xsaPatch { + name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; + sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh"; + }) + (xsaPatch { + name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; + sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr"; + }) + ]; + + # 4.5 + XSA_247_45 = [ + (xsaPatch { + name = "247-4.5/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; + sha256 = "0h1mp5s9si8aw2gipds317f27h9pi7bgnhj0bcmw11p0ch98sg1m"; + }) + (xsaPatch { + name = "247-4.5/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; + sha256 = "0vjjybxbcm4xl26wbqvcqfiyvvlayswm4f98i1fr5a9abmljn5sb"; + }) + ]; + + # 4.5 + XSA_248_45 = [ + (xsaPatch { + name = "248-4.5"; + sha256 = "0csxg6h492ddsa210b45av28iqf7cn2dfdqk4zx10zwf1pv2shyn"; + }) + ]; + + # 4.8 + XSA_248_48 = [ + (xsaPatch { + name = "248-4.8"; + sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1"; + }) + ]; + + # 4.5 .. 4.9 + XSA_249 = [ + (xsaPatch { + name = "249"; + sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl"; + }) + ]; + # 4.5 + XSA_250_45 = [ + (xsaPatch { + name = "250-4.5"; + sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d"; + }) + ]; + # 4.8 ... + XSA_250 = [ + (xsaPatch { + name = "250"; + sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8"; + }) + ]; + # 4.5 + XSA_251_45 = [ + (xsaPatch { + name = "251-4.5"; + sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm"; + }) + ]; + # 4.8 + XSA_251_48 = [ + (xsaPatch { + name = "251-4.8"; + sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq"; + }) + ]; + } diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix index 3a2a030b8a4d..f3d43d15efba 100644 --- a/pkgs/applications/window-managers/awesome/3.5.nix +++ b/pkgs/applications/window-managers/awesome/3.5.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/awesome \ - --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ - --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ + --prefix LUA_CPATH ";" "${lgi}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH ";" "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 4043c05e3d6d..ca596cdfddc1 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -49,8 +49,8 @@ with luaPackages; stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/awesome \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix LUA_CPATH ";" '${lgi}/lib/lua/${lua.luaversion}/?.so' \ - --prefix LUA_PATH ";" '${lgi}/share/lua/${lua.luaversion}/?.lua' \ + --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ + --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 9f6c89375182..76352753db1d 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildPhase = " make "; meta = { - homepage = http://suckless.org/; + homepage = https://suckless.org/; description = "Dynamic window manager for X"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index fbea1d4e9a41..05f89728f6a7 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1651"; + version = "1653"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q"; + sha256 = "09ci3g97xmif66pp9n4sdvdmlxpw67pwp8lbjynxhdvha5pwwpv5"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/orbment/bemenu.nix b/pkgs/applications/window-managers/orbment/bemenu.nix new file mode 100644 index 000000000000..065b81948c2d --- /dev/null +++ b/pkgs/applications/window-managers/orbment/bemenu.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, pango, wayland, libxkbcommon }: + +stdenv.mkDerivation rec { + name = "bemenu-2017-02-14"; + + src = fetchFromGitHub { + owner = "Cloudef"; + repo = "bemenu"; + rev = "d6261274cf0b3aa51ce8ea7418a79495b20ad558"; + sha256 = "08bc623y5yjbz7q83lhl6rb0xs6ji17z79c260bx0fgin8sfj5x8"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ pango wayland libxkbcommon ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A dynamic menu library and client program inspired by dmenu"; + homepage = src.meta.homepage; + license = with licenses; [ gpl3 lgpl3 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix index 8071bc4bb426..46130680af42 100644 --- a/pkgs/applications/window-managers/orbment/default.nix +++ b/pkgs/applications/window-managers/orbment/default.nix @@ -1,9 +1,12 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig +{ lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage , wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng , libdrm, libX11 +, westonLite }: -stdenv.mkDerivation rec { +let + bemenu = callPackage ./bemenu.nix {}; +in stdenv.mkDerivation rec { name = "orbment-${version}"; version = "git-2016-08-13"; @@ -14,13 +17,20 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ]; + postFixup = '' + wrapProgram $out/bin/orbment \ + --prefix PATH : "${stdenv.lib.makeBinPath [ bemenu westonLite ]}" + ''; + + enableParallelBuilding = true; + meta = { description = "Modular Wayland compositor"; homepage = src.url; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d2bf1e5a96de..13eef1c045a4 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A really minimalistic X window manager"; - homepage = http://www.oroborus.org/; + homepage = https://www.oroborus.org/; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 22521cc6da8d..a7b9a77b3dbf 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -41,6 +41,8 @@ python27Packages.buildPythonApplication rec { --run 'export QTILE_SAVED_PATH=$PATH' ''; + doCheck = false; # Requires X server. + meta = with stdenv.lib; { homepage = http://www.qtile.org/; license = licenses.mit; @@ -49,4 +51,3 @@ python27Packages.buildPythonApplication rec { maintainers = with maintainers; [ kamilchm ]; }; } - diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 1e1072e49604..d643e2dd2186 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "sway-${version}"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh"; + sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi"; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = "-DVERSION=${version}"; + cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib"; meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix index 789f074aecdf..0b430693eeed 100644 --- a/pkgs/applications/window-managers/velox/default.nix +++ b/pkgs/applications/window-managers/velox/default.nix @@ -1,25 +1,53 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig -, swc, libxkbcommon -, wld, wayland, pixman, fontconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, newScope +, libxkbcommon +, wayland, pixman, fontconfig +, stConf ? null, stPatches ? [] }: -stdenv.mkDerivation rec { +let + callPackage = newScope self; + self = { + swc = callPackage ./swc.nix {}; + wld = callPackage ./wld.nix {}; + dmenu-velox = callPackage ./dmenu.nix {}; + st-velox = callPackage ./st.nix { + conf = stConf; + patches = stPatches; + }; + }; +in with self; stdenv.mkDerivation rec { name = "velox-${version}"; - version = "git-2015-11-03"; - repo = "https://github.com/michaelforney/velox"; - rev = "53b41348df7e37886cab012609923255e4397419"; + version = "git-2017-07-04"; - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20"; + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "velox"; + rev = "0b1d3d62861653d92d0a1056855a84fcef661bc0"; + sha256 = "0p5ra5p5w21wl696rmv0vdnl7jnri5iwnxfs6nl6miwydhq2dmci"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ]; + propagatedUserEnvPkgs = [ swc ]; + makeFlags = "PREFIX=$(out)"; - installPhase = "PREFIX=$out make install"; + preBuild = '' + substituteInPlace config.c \ + --replace /etc/velox.conf $out/etc/velox.conf + ''; + installPhase = '' + PREFIX=$out make install + mkdir -p $out/etc + cp velox.conf.sample $out/etc/velox.conf + ''; + postFixup = '' + wrapProgram $out/bin/velox \ + --prefix PATH : "${stdenv.lib.makeBinPath [ dmenu-velox st-velox ]}" + ''; + + enableParallelBuilding = true; meta = { description = "velox window manager"; diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix new file mode 100644 index 000000000000..182a290e0eee --- /dev/null +++ b/pkgs/applications/window-managers/velox/dmenu.nix @@ -0,0 +1,37 @@ +{stdenv, fetchFromGitHub #, libX11, libXinerama, enableXft, libXft, zlib +, swc, wld, wayland, libxkbcommon, pixman, fontconfig +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "dmenu-velox-${version}"; + version = "git-2017-04-07"; + + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "dmenu"; + rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70"; + sha256 = "14j8jv0nlybinhzkgd6dplvng9zy8p292prlx39w0k4fm6x5nv6y"; + }; + + buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ]; + + postPatch = '' + sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run + ''; + + preConfigure = [ + ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk'' + ]; + + enableParallelBuilding = true; + + meta = { + description = "A generic, highly customizable, and efficient menu for the X Window System"; + homepage = http://tools.suckless.org/dmenu; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ ]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/window-managers/velox/st.nix similarity index 50% rename from pkgs/applications/misc/st/wayland.nix rename to pkgs/applications/window-managers/velox/st.nix index 69794b1cffbd..49ce57469bd6 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/window-managers/velox/st.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, writeText -, ncurses, wayland, wld, libxkbcommon, fontconfig, pixman -, conf ? null, patches ? [] }: +{ stdenv, fetchFromGitHub, pkgconfig, writeText +, ncurses, wayland, wayland-protocols, wld, libxkbcommon, fontconfig, pixman +, conf, patches }: with stdenv.lib; stdenv.mkDerivation rec { - name = "st-wayland-${version}"; - version = "git-2015-08-29"; - rev = "61b47b76a09599c8093214e28c48938f5b424daa"; + name = "st-velox-${version}"; + version = "git-2016-12-22"; - src = fetchurl { - url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz"; - sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97"; + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "st"; + rev = "b27f17da65f74b0a923952601873524e03b4d047"; + sha256 = "17aa4bz5g14jvqghk2c8mw77hb8786s07pv814rmlk7nnsavmp3i"; }; inherit patches; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ]; + buildInputs = [ ncurses wayland wayland-protocols wld libxkbcommon fontconfig pixman ]; NIX_LDFLAGS = "-lfontconfig"; @@ -28,6 +29,8 @@ stdenv.mkDerivation rec { TERMINFO=$out/share/terminfo make install PREFIX=$out ''; + enableParallelBuilding = true; + meta = { homepage = http://st.suckless.org/; license = licenses.mit; diff --git a/pkgs/applications/window-managers/velox/swc.nix b/pkgs/applications/window-managers/velox/swc.nix new file mode 100644 index 000000000000..a2f98b8b65e7 --- /dev/null +++ b/pkgs/applications/window-managers/velox/swc.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig +, wld, wayland, wayland-protocols, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm +}: + +stdenv.mkDerivation rec { + name = "swc-${version}"; + version = "git-2017-06-28"; + + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "swc"; + rev = "5b20050872f8ad29cfc97729f8af47b6b3df5393"; + sha256 = "1lxpm17v5d8png6ixc0zn0w00xgrhz2n5b8by9vx6800b18246z8"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ wld wayland wayland-protocols fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ]; + + prePatch = '' + substituteInPlace launch/local.mk --replace 4755 755 + ''; + + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + enableParallelBuilding = true; + + meta = { + description = "A library for making a simple Wayland compositor"; + homepage = src.meta.homepage; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/wld/default.nix b/pkgs/applications/window-managers/velox/wld.nix similarity index 59% rename from pkgs/development/libraries/wld/default.nix rename to pkgs/applications/window-managers/velox/wld.nix index 1dd5858ec720..d85f8212ec47 100644 --- a/pkgs/development/libraries/wld/default.nix +++ b/pkgs/applications/window-managers/velox/wld.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , wayland, fontconfig, pixman, freetype, libdrm }: stdenv.mkDerivation rec { name = "wld-${version}"; - version = "git-2015-09-01"; - repo = "https://github.com/michaelforney/wld"; - rev = "efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f0"; + version = "git-2017-10-31"; - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "09388f7828e18c75e7b8d41454903886a725d7a868f60e66c128bd7d2e953ee1"; + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "wld"; + rev = "b4e902bbecb678c45485b52c3aa183cbc932c595"; + sha256 = "0j2n776flnzyw3vhxl0r8h1c48wrihi4g6bs2z8j4hbw5pnwq1k6"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,9 +20,11 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; installPhase = "PREFIX=$out make install"; + enableParallelBuilding = true; + meta = { description = "A primitive drawing library targeted at Wayland"; - homepage = repo; + homepage = src.meta.homepage; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/window-managers/way-cooler/bar.diff b/pkgs/applications/window-managers/way-cooler/bar.diff new file mode 100644 index 000000000000..e60ebabe9833 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/bar.diff @@ -0,0 +1,37 @@ +--- bar.py.txt.orig 2017-12-05 18:10:20.108569182 +0300 ++++ ./bar.py.txt 2017-12-10 21:42:10.622781945 +0300 +@@ -5,6 +5,7 @@ import datetime + import json + from time import sleep + from pydbus import SessionBus ++from glob import glob + + BUS = SessionBus() + LAYOUT = BUS.get(bus_name='org.way-cooler', object_path='/org/way_cooler/Layout') +@@ -32,7 +33,7 @@ def main(): + output += func() + print(output) + sys.stdout.flush() +- sleep(.1) ++ sleep(1) + + def get_workspaces(layout_json): + """Gets the workspace names from the layout json""" +@@ -49,9 +50,14 @@ def get_time(): + return datetime.datetime.now().strftime(' %a %b %d %H:%M ') + + def get_battery(): +- with open("/sys/class/power_supply/BAT0/capacity", "r") as f: +- bat = f.readlines() +- return bat[0].strip() + "% Battery" ++ try: ++ [path] = glob("/sys/class/power_supply/BAT?/capacity") ++ with open(path, "r") as f: ++ bat = f.readlines() ++ result = bat[0].strip() + "% Battery" ++ except Exception: ++ result = "" ++ return result + + def format_workspaces(layout, workspaces, active_workspace): + workspaces = " " + workspaces.replace(" ", " ") + " " diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix old mode 100755 new mode 100644 index 75c9e6ecf8c8..1830ee2c42a5 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -1,27 +1,112 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig -, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }: +{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides +, wayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon, pam, python3Packages, lemonbar +}: -with rustPlatform; +let + # refer to + # https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh + # for version numbers + fakegit = writeShellScriptBin "git" '' + echo "" + ''; + way-cooler = ((callPackage ./way-cooler.nix {}).way_cooler_0_6_2.override { + crateOverrides = defaultCrateOverrides // { -buildRustPackage rec { - name = "way-cooler-${version}"; - version = "0.5.2"; + way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit ]; }; + dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; + gobject-sys = attrs: { buildInputs = [ dbus_glib ]; }; + cairo-rs = attrs: { buildInputs = [ cairo ]; }; + };}).overrideAttrs (oldAttrs: rec { + nativeBuildInputs = [ makeWrapper ]; - src = fetchFromGitHub { - owner = "way-cooler"; - repo = "way-cooler"; - rev = "v${version}"; - sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb"; + postBuild = '' + mkdir -p $out/etc + cp -r config $out/etc/way-cooler + ''; + # prior v0.7 https://github.com/way-cooler/way-cooler/issues/395 + postFixup = '' + makeWrapper $out/bin/way_cooler $out/bin/way-cooler \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}" + ''; + }); + wc-bg = ((callPackage ./wc-bg.nix {}).way_cooler_bg_0_2_1.override { + crateOverrides = defaultCrateOverrides // { + + dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; + };}).overrideAttrs (oldAttrs: rec { + postFixup = '' + cd $out/bin + mv way_cooler_bg way-cooler-bg + ''; + }); + wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab_0_2_0.override { + crateOverrides = defaultCrateOverrides // { + + wc-grab = attrs: { + src = fetchFromGitHub { + owner = "way-cooler"; + repo = "way-cooler-grab"; + rev = "v0.2.0"; + sha256 = "1pc8rhvzdi6bi8g5w03i0ygbcpks9051c3d3yc290rgmmmmkmnwq"; + }; + }; + + dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; + };}).overrideAttrs (oldAttrs: rec { + postFixup = '' + cd $out/bin + mv wc_grab wc-grab + ''; + }); + wc-lock = ((callPackage ./wc-lock.nix {}).wc_lock_0_1_0.override { + crateOverrides = defaultCrateOverrides // { wc-lock = attrs: { + + buildInputs = [ pam ]; + };};}).overrideAttrs (oldAttrs: rec { + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + makeWrapper $out/bin/wc_lock $out/bin/wc-lock \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon ]}" + ''; + }); + # https://github.com/way-cooler/way-cooler/issues/446 + wc-bar-bare = stdenv.mkDerivation { + name = "wc-bar-bare-2017-12-05"; + + src = fetchurl { + url = "https://github.com/way-cooler/way-cooler/files/1529701/bar.py.txt"; + sha256 = "1n1rf1k02i6vimr9n0iksf65phhyy96i5wh5d0rrx7yqki3dh6ka"; + }; + + unpackPhase = "cat $src > bar.py.txt"; + + # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-350567833 + patches = [ ./bar.diff ]; + + pythonPath = with python3Packages; [ pydbus ]; + nativeBuildInputs = with python3Packages; [ python wrapPython ]; + + installPhase = '' + install -Dm755 bar.py.txt $out/bin/bar.py + patchShebangs $out/bin/bar.py + wrapPythonPrograms + ''; }; - - cargoSha256 = "06qivlybmmc49ksv4232sm1r4hp923xsq4c2ksa4i2azdzc1csdc"; - - buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ]; - - nativeBuildInputs = [ pkgconfig ]; + wc-bar = writeShellScriptBin "lemonbar" '' + SELECTED="#000000" + SELECTED_OTHER_WORKSPACE="#555555" + BACKGROUND="#4E2878" + # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-349471439 + sleep 5 + ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d + ''; +in symlinkJoin rec { + version = "0.6.2"; + name = "way-cooler-with-extensions-${version}"; + paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ]; meta = with stdenv.lib; { - broken = true; description = "Customizable Wayland compositor (window manager)"; longDescription = '' Way Cooler is a customizable tiling window manager written in Rust diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix new file mode 100644 index 000000000000..816a1c887089 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix @@ -0,0 +1,938 @@ +# Generated by carnix 0.5.0: carnix -o way-cooler.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + bitflags_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.4.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c"; + inherit dependencies buildDependencies features; + }; + bitflags_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.5.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0bgw1kiy121kikjrwj6zsd7l8n1gg1jirivzkc7zpjsvqa3p0hla"; + inherit dependencies buildDependencies features; + }; + bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.6.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; + inherit dependencies buildDependencies features; + }; + c_vec_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "c_vec"; + version = "1.2.1"; + authors = [ "Guillaume Gomez " ]; + sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd"; + inherit dependencies buildDependencies features; + }; + cairo_rs_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cairo-rs"; + version = "0.1.3"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "17wp5wh1jvn2ny8s6fckvbwn0x8ixha6xrqas1bqxd9ygm5g58w1"; + libName = "cairo"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + cairo_sys_rs_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cairo-sys-rs"; + version = "0.3.4"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "1fzxshv7vysnnc2nywla6gj3hh00nr6cz1ak0mrxkg65rzrgxkww"; + libName = "cairo_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1grr9v6ijms84cvl1jqv5hp9clw9gn3l3g6kj9a31sdzvidd6v29"; + inherit dependencies buildDependencies features; + }; + dbus_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.4.1"; + authors = [ "David Henningsson " ]; + sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + dbus_macros_0_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus-macros"; + version = "0.0.6"; + authors = [ "Antoni Boucher " ]; + sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd"; + inherit dependencies buildDependencies features; + }; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.1"; + authors = [ "David Tolnay " ]; + sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; + inherit dependencies buildDependencies features; + }; + dummy_rustwlc_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dummy-rustwlc"; + version = "0.6.3"; + authors = [ "Snirk Immington " "Preston Carpenter " ]; + sha256 = "09pcl2r3ifajgq794j4jqaq0n4kyb2z4aaavs1fr78w4fhrzqqmj"; + inherit dependencies buildDependencies features; + }; + env_logger_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw"; + inherit dependencies buildDependencies features; + }; + fixedbitset_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fixedbitset"; + version = "0.1.6"; + authors = [ "bluss" ]; + sha256 = "1jcq0i41l888153v4jyb6q2kc9sjs004md5byfz5mprlmhdawha3"; + inherit dependencies buildDependencies features; + }; + gcc_0_3_46_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.46"; + authors = [ "Alex Crichton " ]; + sha256 = "17rbdxa2yapjymbdq7b930sc1ipiwhx4xz7hh48q4bz3d28zg6qb"; + inherit dependencies buildDependencies features; + }; + getopts_0_2_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "getopts"; + version = "0.2.14"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1wdz34vls97g9868h8kiw4wmwkbyxg4xm3xzvr1542hc3w4c7z0a"; + inherit dependencies buildDependencies features; + }; + glib_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glib"; + version = "0.1.3"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "1j2zwsnxlfdrj8wdi8yp3zl5l9nydsifgxspnwl6ijq3ywnjhcpa"; + inherit dependencies buildDependencies features; + }; + glib_sys_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glib-sys"; + version = "0.3.4"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "06ymp4ljrjnb7cly0bixy3svxgnwpbx79499889dqakpfs7566rc"; + libName = "glib_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + gobject_sys_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gobject-sys"; + version = "0.3.4"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "0rrk3c94myhspyl3iq7k4kcm72zxl8bk3r7kvqv2f9lf6y820giw"; + libName = "gobject_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + hlua_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hlua"; + version = "0.1.9"; + authors = [ "pierre.krieger1708@gmail.com" ]; + sha256 = "1vn7w1rcaj9g04yx5jak09a3wpw7g3yx2fgn8ibx36z07vpf57fs"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.1"; + authors = [ "David Tolnay " ]; + sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; + inherit dependencies buildDependencies features; + }; + json_macro_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "json_macro"; + version = "0.1.1"; + authors = [ "Denis Kolodin " ]; + sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; + inherit dependencies buildDependencies features; + }; + libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.23"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm"; + inherit dependencies buildDependencies features; + }; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + log_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1qxrwkhpfzhgcmfnw4bl9yy7wwr92wwbin3dp6izcfy58lr369v4"; + inherit dependencies buildDependencies features; + }; + lua52_sys_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lua52-sys"; + version = "0.0.4"; + authors = [ "Pierre Krieger " ]; + sha256 = "115i7k2dnnf4c1b2mxwf5mvqv2wsqmmxm3krphf5wjky20gi2ciz"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "0.1.11"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; + inherit dependencies buildDependencies features; + }; + nix_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nix"; + version = "0.6.0"; + authors = [ "Carl Lerche " ]; + sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + nix_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nix"; + version = "0.8.1"; + authors = [ "The nix-rust Project Developers" ]; + sha256 = "0iqmn55ajwcq91pl8xviwdvc2zrkaccajsp0nc9lbq9ydli0vhf9"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; + }; + ordermap_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ordermap"; + version = "0.2.10"; + authors = [ "bluss" ]; + sha256 = "1pj6d56nwi0wa7cnwl80dwz13vws9nf5s1b7k7i2dav35gkpwy1z"; + inherit dependencies buildDependencies features; + }; + petgraph_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "petgraph"; + version = "0.4.5"; + authors = [ "bluss" "mitchmindtree" ]; + sha256 = "0482id2flwnxkhj1443g384cvk7f9lva9n6wj2wsag9145zhpjzg"; + inherit dependencies buildDependencies features; + }; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.1.80"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; + inherit dependencies buildDependencies features; + }; + rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.24"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + rustwlc_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustwlc"; + version = "0.6.2"; + authors = [ "Snirk Immington " "Timidger " ]; + sha256 = "16k8wzyvn1syxcjimy2vh7hc6jlbw31v03ysrzrqgfwncmwx5b2d"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread-id"; + version = "2.0.0"; + authors = [ "Ruud van Asseldonk " ]; + sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; + inherit dependencies buildDependencies features; + }; + thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.2.7"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "0.1.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; + inherit dependencies buildDependencies features; + }; + uuid_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "uuid"; + version = "0.3.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + way_cooler_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler"; + version = "0.6.2"; + authors = [ "Snirk Immington " "Timidger " ]; + sha256 = "0ygzgjjhf54fcpk6sbi0acbyki4ff1v7wyckfk4lhv4ycpg9v3cj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.9.4"; + authors = [ "Victor Berger " ]; + sha256 = "1kdhpm1gkn99sj8vxhyr1x6nxnhm0cjvypajycvn2fa9sdpgw8yc"; + inherit dependencies buildDependencies features; + }; + wayland_server_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-server"; + version = "0.9.4"; + authors = [ "Victor Berger " ]; + sha256 = "1aqidrac0z7ny65yhfv9inl3xmdmph21yhmyd3k0nafyghgg9pxw"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.6.0"; + authors = [ "Victor Berger " ]; + sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.4"; + authors = [ "Victor Berger " ]; + sha256 = "0vqrc46ib5hgbq6djghapairbjskdncas09k680f7pwylbi7yzcj"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.3.6"; + authors = [ "Vladimir Matveev " ]; + sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + +in +rec { + aho_corasick_0_5_3 = aho_corasick_0_5_3_ rec { + dependencies = [ memchr_0_1_11 ]; + }; + memchr_0_1_11_features."default".from_aho_corasick_0_5_3__default = true; + bitflags_0_4_0 = bitflags_0_4_0_ rec { + features = mkFeatures bitflags_0_4_0_features; + }; + bitflags_0_4_0_features."".self = true; + bitflags_0_5_0 = bitflags_0_5_0_ rec { + features = mkFeatures bitflags_0_5_0_features; + }; + bitflags_0_5_0_features."".self = true; + bitflags_0_6_0 = bitflags_0_6_0_ rec {}; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_0_8_2 = bitflags_0_8_2_ rec { + features = mkFeatures bitflags_0_8_2_features; + }; + bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {}); + c_vec_1_2_1 = c_vec_1_2_1_ rec {}; + cairo_rs_0_1_3 = cairo_rs_0_1_3_ rec { + dependencies = [ c_vec_1_2_1 cairo_sys_rs_0_3_4 glib_0_1_3 libc_0_2_23 ] + ++ (if lib.lists.any (x: x == "glib") features then [glib_0_1_3] else []) + ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); + buildDependencies = []; + features = mkFeatures cairo_rs_0_1_3_features; + }; + cairo_rs_0_1_3_features."".self = true; + cairo_rs_0_1_3_features."glib".self_default = hasDefault cairo_rs_0_1_3_features; + cairo_rs_0_1_3_features."gtk-rs-lgpl-docs".self_embed-lgpl-docs = hasFeature (cairo_rs_0_1_3_features."embed-lgpl-docs" or {}); + cairo_rs_0_1_3_features."gtk-rs-lgpl-docs".self_purge-lgpl-docs = hasFeature (cairo_rs_0_1_3_features."purge-lgpl-docs" or {}); + c_vec_1_2_1_features."default".from_cairo_rs_0_1_3__default = true; + cairo_sys_rs_0_3_4_features."png".from_cairo_rs_0_1_3__png = hasFeature (cairo_rs_0_1_3_features."png" or {}); + cairo_sys_rs_0_3_4_features."v1_12".from_cairo_rs_0_1_3__v1_12 = hasFeature (cairo_rs_0_1_3_features."v1_12" or {}); + cairo_sys_rs_0_3_4_features."xcb".from_cairo_rs_0_1_3__xcb = hasFeature (cairo_rs_0_1_3_features."xcb" or {}); + cairo_sys_rs_0_3_4_features."default".from_cairo_rs_0_1_3__default = true; + glib_0_1_3_features."default".from_cairo_rs_0_1_3__default = true; + libc_0_2_23_features."default".from_cairo_rs_0_1_3__default = true; + winapi_0_2_8_features."default".from_cairo_rs_0_1_3__default = true; + cairo_sys_rs_0_3_4 = cairo_sys_rs_0_3_4_ rec { + dependencies = [ libc_0_2_23 ] + ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); + buildDependencies = [ pkg_config_0_3_9 ]; + features = mkFeatures cairo_sys_rs_0_3_4_features; + }; + cairo_sys_rs_0_3_4_features."v1_12".self_v1_14 = hasFeature (cairo_sys_rs_0_3_4_features."v1_14" or {}); + cairo_sys_rs_0_3_4_features."x11".self_xlib = hasFeature (cairo_sys_rs_0_3_4_features."xlib" or {}); + libc_0_2_23_features."default".from_cairo_sys_rs_0_3_4__default = true; + x11_0_0_0_features."xlib".from_cairo_sys_rs_0_3_4 = true; + x11_0_0_0_features."default".from_cairo_sys_rs_0_3_4__default = true; + winapi_0_2_8_features."default".from_cairo_sys_rs_0_3_4__default = true; + cfg_if_0_1_0 = cfg_if_0_1_0_ rec {}; + dbus_0_4_1 = dbus_0_4_1_ rec { + dependencies = [ libc_0_2_23 ]; + buildDependencies = [ pkg_config_0_3_9 ]; + }; + libc_0_2_23_features."default".from_dbus_0_4_1__default = true; + dbus_macros_0_0_6 = dbus_macros_0_0_6_ rec { + dependencies = [ dbus_0_4_1 ]; + }; + dbus_0_4_1_features."default".from_dbus_macros_0_0_6__default = true; + dlib_0_3_1 = dlib_0_3_1_ rec { + dependencies = [ libloading_0_3_4 ]; + features = mkFeatures dlib_0_3_1_features; + }; + dlib_0_3_1_features."".self = true; + libloading_0_3_4_features."default".from_dlib_0_3_1__default = true; + dtoa_0_4_1 = dtoa_0_4_1_ rec {}; + dummy_rustwlc_0_6_3 = dummy_rustwlc_0_6_3_ rec { + dependencies = [ bitflags_0_6_0 libc_0_2_23 wayland_sys_0_9_4 ]; + }; + bitflags_0_6_0_features."default".from_dummy_rustwlc_0_6_3__default = true; + libc_0_2_23_features."default".from_dummy_rustwlc_0_6_3__default = true; + wayland_sys_0_9_4_features."server".from_dummy_rustwlc_0_6_3 = true; + wayland_sys_0_9_4_features."dlopen".from_dummy_rustwlc_0_6_3 = true; + wayland_sys_0_9_4_features."default".from_dummy_rustwlc_0_6_3__default = true; + env_logger_0_3_5 = env_logger_0_3_5_ rec { + dependencies = [ log_0_3_7 regex_0_1_80 ] + ++ (if lib.lists.any (x: x == "regex") features then [regex_0_1_80] else []); + features = mkFeatures env_logger_0_3_5_features; + }; + env_logger_0_3_5_features."".self = true; + env_logger_0_3_5_features."regex".self_default = hasDefault env_logger_0_3_5_features; + log_0_3_7_features."default".from_env_logger_0_3_5__default = true; + regex_0_1_80_features."default".from_env_logger_0_3_5__default = true; + fixedbitset_0_1_6 = fixedbitset_0_1_6_ rec {}; + gcc_0_3_46 = gcc_0_3_46_ rec { + dependencies = []; + features = mkFeatures gcc_0_3_46_features; + }; + gcc_0_3_46_features."rayon".self_parallel = hasFeature (gcc_0_3_46_features."parallel" or {}); + rayon_0_0_0_features."default".from_gcc_0_3_46__default = true; + getopts_0_2_14 = getopts_0_2_14_ rec {}; + glib_0_1_3 = glib_0_1_3_ rec { + dependencies = [ bitflags_0_5_0 glib_sys_0_3_4 gobject_sys_0_3_4 lazy_static_0_2_8 libc_0_2_23 ]; + features = mkFeatures glib_0_1_3_features; + }; + glib_0_1_3_features."v2_38".self_v2_40 = hasFeature (glib_0_1_3_features."v2_40" or {}); + glib_0_1_3_features."v2_40".self_v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {}); + glib_0_1_3_features."v2_44".self_v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {}); + glib_0_1_3_features."v2_46".self_v2_48 = hasFeature (glib_0_1_3_features."v2_48" or {}); + glib_0_1_3_features."v2_48".self_v2_50 = hasFeature (glib_0_1_3_features."v2_50" or {}); + bitflags_0_5_0_features."default".from_glib_0_1_3__default = true; + glib_sys_0_3_4_features."v2_38".from_glib_0_1_3__v2_38 = hasFeature (glib_0_1_3_features."v2_38" or {}); + glib_sys_0_3_4_features."v2_40".from_glib_0_1_3__v2_40 = hasFeature (glib_0_1_3_features."v2_40" or {}); + glib_sys_0_3_4_features."v2_44".from_glib_0_1_3__v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {}); + glib_sys_0_3_4_features."v2_46".from_glib_0_1_3__v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {}); + glib_sys_0_3_4_features."v2_48".from_glib_0_1_3__v2_48 = hasFeature (glib_0_1_3_features."v2_48" or {}); + glib_sys_0_3_4_features."v2_50".from_glib_0_1_3__v2_50 = hasFeature (glib_0_1_3_features."v2_50" or {}); + glib_sys_0_3_4_features."default".from_glib_0_1_3__default = true; + gobject_sys_0_3_4_features."v2_38".from_glib_0_1_3__v2_38 = hasFeature (glib_0_1_3_features."v2_38" or {}); + gobject_sys_0_3_4_features."v2_44".from_glib_0_1_3__v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {}); + gobject_sys_0_3_4_features."v2_46".from_glib_0_1_3__v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {}); + gobject_sys_0_3_4_features."default".from_glib_0_1_3__default = true; + lazy_static_0_2_8_features."default".from_glib_0_1_3__default = true; + libc_0_2_23_features."default".from_glib_0_1_3__default = true; + glib_sys_0_3_4 = glib_sys_0_3_4_ rec { + dependencies = [ bitflags_0_8_2 libc_0_2_23 ]; + buildDependencies = [ pkg_config_0_3_9 ]; + features = mkFeatures glib_sys_0_3_4_features; + }; + glib_sys_0_3_4_features."v2_34".self_v2_36 = hasFeature (glib_sys_0_3_4_features."v2_36" or {}); + glib_sys_0_3_4_features."v2_36".self_v2_38 = hasFeature (glib_sys_0_3_4_features."v2_38" or {}); + glib_sys_0_3_4_features."v2_38".self_v2_40 = hasFeature (glib_sys_0_3_4_features."v2_40" or {}); + glib_sys_0_3_4_features."v2_40".self_v2_44 = hasFeature (glib_sys_0_3_4_features."v2_44" or {}); + glib_sys_0_3_4_features."v2_44".self_v2_46 = hasFeature (glib_sys_0_3_4_features."v2_46" or {}); + glib_sys_0_3_4_features."v2_46".self_v2_48 = hasFeature (glib_sys_0_3_4_features."v2_48" or {}); + glib_sys_0_3_4_features."v2_48".self_v2_50 = hasFeature (glib_sys_0_3_4_features."v2_50" or {}); + bitflags_0_8_2_features."default".from_glib_sys_0_3_4__default = true; + libc_0_2_23_features."default".from_glib_sys_0_3_4__default = true; + gobject_sys_0_3_4 = gobject_sys_0_3_4_ rec { + dependencies = [ bitflags_0_8_2 glib_sys_0_3_4 libc_0_2_23 ]; + buildDependencies = [ pkg_config_0_3_9 ]; + features = mkFeatures gobject_sys_0_3_4_features; + }; + gobject_sys_0_3_4_features."v2_34".self_v2_36 = hasFeature (gobject_sys_0_3_4_features."v2_36" or {}); + gobject_sys_0_3_4_features."v2_36".self_v2_38 = hasFeature (gobject_sys_0_3_4_features."v2_38" or {}); + gobject_sys_0_3_4_features."v2_38".self_v2_42 = hasFeature (gobject_sys_0_3_4_features."v2_42" or {}); + gobject_sys_0_3_4_features."v2_42".self_v2_44 = hasFeature (gobject_sys_0_3_4_features."v2_44" or {}); + gobject_sys_0_3_4_features."v2_44".self_v2_46 = hasFeature (gobject_sys_0_3_4_features."v2_46" or {}); + bitflags_0_8_2_features."default".from_gobject_sys_0_3_4__default = true; + glib_sys_0_3_4_features."default".from_gobject_sys_0_3_4__default = true; + libc_0_2_23_features."default".from_gobject_sys_0_3_4__default = true; + hlua_0_1_9 = hlua_0_1_9_ rec { + dependencies = [ libc_0_2_23 lua52_sys_0_0_4 ]; + }; + libc_0_2_23_features."default".from_hlua_0_1_9__default = true; + lua52_sys_0_0_4_features."default".from_hlua_0_1_9__default = true; + itoa_0_3_1 = itoa_0_3_1_ rec {}; + json_macro_0_1_1 = json_macro_0_1_1_ rec { + dependencies = [ rustc_serialize_0_3_24 ]; + }; + rustc_serialize_0_3_24_features."default".from_json_macro_0_1_1__default = true; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; + lazy_static_0_2_8 = lazy_static_0_2_8_ rec { + dependencies = []; + features = mkFeatures lazy_static_0_2_8_features; + }; + lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); + lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); + spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true; + libc_0_2_23 = libc_0_2_23_ rec { + features = mkFeatures libc_0_2_23_features; + }; + libc_0_2_23_features."use_std".self_default = hasDefault libc_0_2_23_features; + libloading_0_3_4 = libloading_0_3_4_ rec { + dependencies = [ lazy_static_0_2_8 ] + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + buildDependencies = [ target_build_utils_0_3_1 ]; + }; + lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true; + kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true; + winapi_0_2_8_features."default".from_libloading_0_3_4__default = true; + log_0_3_7 = log_0_3_7_ rec { + features = mkFeatures log_0_3_7_features; + }; + log_0_3_7_features."use_std".self_default = hasDefault log_0_3_7_features; + lua52_sys_0_0_4 = lua52_sys_0_0_4_ rec { + dependencies = [ libc_0_2_23 ]; + buildDependencies = [ gcc_0_3_46 pkg_config_0_3_9 ]; + }; + libc_0_2_23_features."default".from_lua52_sys_0_0_4__default = true; + memchr_0_1_11 = memchr_0_1_11_ rec { + dependencies = [ libc_0_2_23 ]; + }; + libc_0_2_23_features."default".from_memchr_0_1_11__default = true; + nix_0_6_0 = nix_0_6_0_ rec { + dependencies = [ bitflags_0_4_0 cfg_if_0_1_0 libc_0_2_23 void_1_0_2 ]; + buildDependencies = [ rustc_version_0_1_7 semver_0_1_20 ]; + features = mkFeatures nix_0_6_0_features; + }; + nix_0_6_0_features."".self = true; + bitflags_0_4_0_features."default".from_nix_0_6_0__default = true; + cfg_if_0_1_0_features."default".from_nix_0_6_0__default = true; + libc_0_2_23_features."default".from_nix_0_6_0__default = true; + void_1_0_2_features."default".from_nix_0_6_0__default = true; + nix_0_8_1 = nix_0_8_1_ rec { + dependencies = [ bitflags_0_7_0 cfg_if_0_1_0 libc_0_2_23 void_1_0_2 ]; + features = mkFeatures nix_0_8_1_features; + }; + nix_0_8_1_features."".self = true; + bitflags_0_7_0_features."default".from_nix_0_8_1__default = true; + cfg_if_0_1_0_features."default".from_nix_0_8_1__default = true; + libc_0_2_23_features."default".from_nix_0_8_1__default = true; + void_1_0_2_features."default".from_nix_0_8_1__default = true; + num_traits_0_1_37 = num_traits_0_1_37_ rec {}; + ordermap_0_2_10 = ordermap_0_2_10_ rec { + features = mkFeatures ordermap_0_2_10_features; + }; + ordermap_0_2_10_features."".self = true; + petgraph_0_4_5 = petgraph_0_4_5_ rec { + dependencies = [ fixedbitset_0_1_6 ordermap_0_2_10 ] + ++ (if lib.lists.any (x: x == "ordermap") features then [ordermap_0_2_10] else []); + features = mkFeatures petgraph_0_4_5_features; + }; + petgraph_0_4_5_features."".self = true; + petgraph_0_4_5_features."unstable".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); + petgraph_0_4_5_features."quickcheck".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); + petgraph_0_4_5_features."stable_graph".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); + petgraph_0_4_5_features."graphmap".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); + petgraph_0_4_5_features."graphmap".self_default = hasDefault petgraph_0_4_5_features; + petgraph_0_4_5_features."stable_graph".self_default = hasDefault petgraph_0_4_5_features; + petgraph_0_4_5_features."ordermap".self_graphmap = hasFeature (petgraph_0_4_5_features."graphmap" or {}); + petgraph_0_4_5_features."generate".self_unstable = hasFeature (petgraph_0_4_5_features."unstable" or {}); + fixedbitset_0_1_6_features."default".from_petgraph_0_4_5__default = true; + ordermap_0_2_10_features."default".from_petgraph_0_4_5__default = true; + quickcheck_0_0_0_features."default".from_petgraph_0_4_5__default = false; + phf_0_7_21 = phf_0_7_21_ rec { + dependencies = [ phf_shared_0_7_21 ]; + features = mkFeatures phf_0_7_21_features; + }; + phf_0_7_21_features."".self = true; + phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {}); + phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {}); + phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true; + phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec { + dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ]; + }; + phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; + phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; + phf_generator_0_7_21 = phf_generator_0_7_21_ rec { + dependencies = [ phf_shared_0_7_21 rand_0_3_15 ]; + }; + phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true; + rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true; + phf_shared_0_7_21 = phf_shared_0_7_21_ rec { + dependencies = [ siphasher_0_2_2 ]; + features = mkFeatures phf_shared_0_7_21_features; + }; + phf_shared_0_7_21_features."".self = true; + siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true; + unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true; + pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; + rand_0_3_15 = rand_0_3_15_ rec { + dependencies = [ libc_0_2_23 ]; + }; + libc_0_2_23_features."default".from_rand_0_3_15__default = true; + regex_0_1_80 = regex_0_1_80_ rec { + dependencies = [ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ]; + features = mkFeatures regex_0_1_80_features; + }; + regex_0_1_80_features."simd".self_simd-accel = hasFeature (regex_0_1_80_features."simd-accel" or {}); + aho_corasick_0_5_3_features."default".from_regex_0_1_80__default = true; + memchr_0_1_11_features."default".from_regex_0_1_80__default = true; + regex_syntax_0_3_9_features."default".from_regex_0_1_80__default = true; + simd_0_0_0_features."default".from_regex_0_1_80__default = true; + thread_local_0_2_7_features."default".from_regex_0_1_80__default = true; + utf8_ranges_0_1_3_features."default".from_regex_0_1_80__default = true; + regex_syntax_0_3_9 = regex_syntax_0_3_9_ rec {}; + rustc_serialize_0_3_24 = rustc_serialize_0_3_24_ rec {}; + rustc_version_0_1_7 = rustc_version_0_1_7_ rec { + dependencies = [ semver_0_1_20 ]; + }; + semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true; + rustwlc_0_6_2 = rustwlc_0_6_2_ rec { + dependencies = [ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_6_0 ] + ++ (if lib.lists.any (x: x == "wayland-sys") features then [wayland_sys_0_6_0] else []); + features = mkFeatures rustwlc_0_6_2_features; + }; + rustwlc_0_6_2_features."".self = true; + rustwlc_0_6_2_features."wayland-sys".self_wlc-wayland = hasFeature (rustwlc_0_6_2_features."wlc-wayland" or {}); + bitflags_0_7_0_features."default".from_rustwlc_0_6_2__default = true; + libc_0_2_23_features."default".from_rustwlc_0_6_2__default = true; + wayland_sys_0_6_0_features."server".from_rustwlc_0_6_2 = true; + wayland_sys_0_6_0_features."default".from_rustwlc_0_6_2__default = true; + semver_0_1_20 = semver_0_1_20_ rec {}; + serde_0_9_15 = serde_0_9_15_ rec { + dependencies = []; + features = mkFeatures serde_0_9_15_features; + }; + serde_0_9_15_features."unstable".self_alloc = hasFeature (serde_0_9_15_features."alloc" or {}); + serde_0_9_15_features."alloc".self_collections = hasFeature (serde_0_9_15_features."collections" or {}); + serde_0_9_15_features."std".self_default = hasDefault serde_0_9_15_features; + serde_0_9_15_features."serde_derive".self_derive = hasFeature (serde_0_9_15_features."derive" or {}); + serde_0_9_15_features."serde_derive".self_playground = hasFeature (serde_0_9_15_features."playground" or {}); + serde_0_9_15_features."unstable".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); + serde_0_9_15_features."std".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); + serde_derive_0_0_0_features."default".from_serde_0_9_15__default = true; + serde_json_0_9_10 = serde_json_0_9_10_ rec { + dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ]; + features = mkFeatures serde_json_0_9_10_features; + }; + serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {}); + dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true; + itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true; + linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true; + num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true; + serde_0_9_15_features."default".from_serde_json_0_9_10__default = true; + siphasher_0_2_2 = siphasher_0_2_2_ rec { + dependencies = []; + }; + clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true; + target_build_utils_0_3_1 = target_build_utils_0_3_1_ rec { + dependencies = [ phf_0_7_21 serde_json_0_9_10 ] + ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []); + buildDependencies = [ phf_codegen_0_7_21 ]; + features = mkFeatures target_build_utils_0_3_1_features; + }; + target_build_utils_0_3_1_features."".self = true; + target_build_utils_0_3_1_features."serde_json".self_default = hasDefault target_build_utils_0_3_1_features; + phf_0_7_21_features."default".from_target_build_utils_0_3_1__default = true; + serde_json_0_9_10_features."default".from_target_build_utils_0_3_1__default = true; + thread_id_2_0_0 = thread_id_2_0_0_ rec { + dependencies = [ kernel32_sys_0_2_2 libc_0_2_23 ]; + }; + kernel32_sys_0_2_2_features."default".from_thread_id_2_0_0__default = true; + libc_0_2_23_features."default".from_thread_id_2_0_0__default = true; + thread_local_0_2_7 = thread_local_0_2_7_ rec { + dependencies = [ thread_id_2_0_0 ]; + }; + thread_id_2_0_0_features."default".from_thread_local_0_2_7__default = true; + utf8_ranges_0_1_3 = utf8_ranges_0_1_3_ rec {}; + uuid_0_3_1 = uuid_0_3_1_ rec { + dependencies = [ rand_0_3_15 rustc_serialize_0_3_24 ] + ++ (if lib.lists.any (x: x == "rand") features then [rand_0_3_15] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_24] else []); + features = mkFeatures uuid_0_3_1_features; + }; + uuid_0_3_1_features."".self = true; + uuid_0_3_1_features."rand".self_v4 = hasFeature (uuid_0_3_1_features."v4" or {}); + uuid_0_3_1_features."sha1".self_v5 = hasFeature (uuid_0_3_1_features."v5" or {}); + rand_0_3_15_features."default".from_uuid_0_3_1__default = true; + rustc_serialize_0_3_24_features."default".from_uuid_0_3_1__default = true; + serde_0_0_0_features."default".from_uuid_0_3_1__default = true; + sha1_0_0_0_features."default".from_uuid_0_3_1__default = true; + void_1_0_2 = void_1_0_2_ rec { + features = mkFeatures void_1_0_2_features; + }; + void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features; + way_cooler_0_6_2 = way_cooler_0_6_2_ rec { + dependencies = [ bitflags_0_7_0 cairo_rs_0_1_3 dbus_0_4_1 dbus_macros_0_0_6 env_logger_0_3_5 getopts_0_2_14 hlua_0_1_9 json_macro_0_1_1 lazy_static_0_2_8 log_0_3_7 nix_0_6_0 petgraph_0_4_5 rustc_serialize_0_3_24 rustwlc_0_6_2 uuid_0_3_1 wayland_server_0_9_4 wayland_sys_0_9_4 ]; + buildDependencies = [ wayland_scanner_0_9_4 ]; + features = mkFeatures way_cooler_0_6_2_features; + }; + way_cooler_0_6_2_features."".self = true; + bitflags_0_7_0_features."default".from_way_cooler_0_6_2__default = true; + cairo_rs_0_1_3_features."default".from_way_cooler_0_6_2__default = true; + dbus_0_4_1_features."default".from_way_cooler_0_6_2__default = true; + dbus_macros_0_0_6_features."default".from_way_cooler_0_6_2__default = true; + env_logger_0_3_5_features."default".from_way_cooler_0_6_2__default = true; + getopts_0_2_14_features."default".from_way_cooler_0_6_2__default = true; + hlua_0_1_9_features."default".from_way_cooler_0_6_2__default = true; + json_macro_0_1_1_features."default".from_way_cooler_0_6_2__default = true; + lazy_static_0_2_8_features."default".from_way_cooler_0_6_2__default = true; + log_0_3_7_features."default".from_way_cooler_0_6_2__default = true; + nix_0_6_0_features."default".from_way_cooler_0_6_2__default = true; + petgraph_0_4_5_features."default".from_way_cooler_0_6_2__default = true; + rustc_serialize_0_3_24_features."default".from_way_cooler_0_6_2__default = true; + rustwlc_0_6_2_features."wlc-wayland".from_way_cooler_0_6_2 = true; + rustwlc_0_6_2_features."static-wlc".from_way_cooler_0_6_2__static-wlc = hasFeature (way_cooler_0_6_2_features."static-wlc" or {}); + rustwlc_0_6_2_features."default".from_way_cooler_0_6_2__default = true; + uuid_0_3_1_features."v4".from_way_cooler_0_6_2 = true; + uuid_0_3_1_features."rustc-serialize".from_way_cooler_0_6_2 = true; + uuid_0_3_1_features."default".from_way_cooler_0_6_2__default = true; + wayland_server_0_9_4_features."default".from_way_cooler_0_6_2__default = true; + wayland_sys_0_9_4_features."client".from_way_cooler_0_6_2 = true; + wayland_sys_0_9_4_features."dlopen".from_way_cooler_0_6_2 = true; + wayland_sys_0_9_4_features."default".from_way_cooler_0_6_2__default = true; + wayland_scanner_0_9_4 = wayland_scanner_0_9_4_ rec { + dependencies = [ xml_rs_0_3_6 ]; + }; + xml_rs_0_3_6_features."default".from_wayland_scanner_0_9_4__default = true; + wayland_server_0_9_4 = wayland_server_0_9_4_ rec { + dependencies = [ bitflags_0_7_0 libc_0_2_23 nix_0_8_1 wayland_sys_0_9_4 ]; + buildDependencies = [ wayland_scanner_0_9_4 ]; + features = mkFeatures wayland_server_0_9_4_features; + }; + wayland_server_0_9_4_features."".self = true; + bitflags_0_7_0_features."default".from_wayland_server_0_9_4__default = true; + libc_0_2_23_features."default".from_wayland_server_0_9_4__default = true; + nix_0_8_1_features."default".from_wayland_server_0_9_4__default = true; + wayland_sys_0_9_4_features."server".from_wayland_server_0_9_4 = true; + wayland_sys_0_9_4_features."dlopen".from_wayland_server_0_9_4__dlopen = hasFeature (wayland_server_0_9_4_features."dlopen" or {}); + wayland_sys_0_9_4_features."default".from_wayland_server_0_9_4__default = true; + wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec { + dependencies = [ dlib_0_3_1 libc_0_2_23 ] + ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_23] else []); + features = mkFeatures wayland_sys_0_6_0_features; + }; + wayland_sys_0_6_0_features."".self = true; + wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); + wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {}); + dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); + dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true; + lazy_static_0_0_0_features."default".from_wayland_sys_0_6_0__default = true; + libc_0_2_23_features."default".from_wayland_sys_0_6_0__default = true; + wayland_sys_0_9_4 = wayland_sys_0_9_4_ rec { + dependencies = [ dlib_0_3_1 lazy_static_0_2_8 libc_0_2_23 ] + ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_2_8] else []) ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_23] else []); + features = mkFeatures wayland_sys_0_9_4_features; + }; + wayland_sys_0_9_4_features."".self = true; + wayland_sys_0_9_4_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_9_4_features."dlopen" or {}); + wayland_sys_0_9_4_features."libc".self_server = hasFeature (wayland_sys_0_9_4_features."server" or {}); + dlib_0_3_1_features."dlopen".from_wayland_sys_0_9_4__dlopen = hasFeature (wayland_sys_0_9_4_features."dlopen" or {}); + dlib_0_3_1_features."default".from_wayland_sys_0_9_4__default = true; + lazy_static_0_2_8_features."default".from_wayland_sys_0_9_4__default = true; + libc_0_2_23_features."default".from_wayland_sys_0_9_4__default = true; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; + xml_rs_0_3_6 = xml_rs_0_3_6_ rec { + dependencies = [ bitflags_0_7_0 ]; + }; + bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true; +} diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix new file mode 100644 index 000000000000..50e2bf837348 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -0,0 +1,962 @@ +# Generated by carnix 0.5.0: carnix -o wc-bg.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; + }; + atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.2"; + authors = [ "softprops " ]; + sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; + inherit dependencies buildDependencies features; + }; + bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.6.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; + inherit dependencies buildDependencies features; + }; + byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; + inherit dependencies buildDependencies features; + }; + byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1"; + inherit dependencies buildDependencies features; + }; + clap_2_23_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.23.2"; + authors = [ "Kevin K. " ]; + sha256 = "1sfc2h9sn4k3vkgqxwk2mhl75f0i9gl3ncl7d2y7plhp18k5nlrs"; + inherit dependencies buildDependencies features; + }; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; + }; + dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.5.2"; + authors = [ "David Henningsson " ]; + sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "deque"; + version = "0.3.1"; + authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ]; + sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68"; + inherit dependencies buildDependencies features; + }; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.1"; + authors = [ "David Tolnay " ]; + sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; + inherit dependencies buildDependencies features; + }; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; + }; + error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.7.2"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi"; + inherit dependencies buildDependencies features; + }; + flate2_0_2_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.19"; + authors = [ "Alex Crichton " ]; + sha256 = "1dpnvw4hcxplalr3bk527d9rfiy7c08580hji9dnfcv5fmdg1znq"; + inherit dependencies buildDependencies features; + }; + gcc_0_3_45_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.45"; + authors = [ "Alex Crichton " ]; + sha256 = "0d3pzpbh7wr7645i2rkg5f7c4bhp01a9syrw600fjcvqhkiykp5n"; + inherit dependencies buildDependencies features; + }; + gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.1"; + authors = [ "nwin " ]; + sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r"; + inherit dependencies buildDependencies features; + }; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; + }; + image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.10.4"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; + }; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.1"; + authors = [ "David Tolnay " ]; + sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; + inherit dependencies buildDependencies features; + }; + jpeg_decoder_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.12"; + authors = [ "Ulf Nilsson " ]; + sha256 = "1f8y6v3alf93gwfmcd53izh77w2a1gv85zlhdbnyla2kna7r9pwz"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.1.16"; + authors = [ "Marvin Löbel " ]; + sha256 = "0lc5ixs5bmnc43lfri2ynh9393l7vs0z3sw2v5rkaady2ivnznpc"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; + inherit dependencies buildDependencies features; + }; + libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.21"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75"; + inherit dependencies buildDependencies features; + }; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; + }; + metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "metadeps"; + version = "1.1.1"; + authors = [ "Josh Triplett " ]; + sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar"; + inherit dependencies buildDependencies features; + }; + miniz_sys_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.9"; + authors = [ "Alex Crichton " ]; + sha256 = "09m2953zr0msq8cgk86991y4aqfvw3cxf52fx0d49jqy92nqmfmv"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_bigint_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-bigint"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0scyqfi5azf48yyc8fhns8i1g8zq1rax155hhj9mhr0c1j6w99gs"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1i160ddy78sgih3xq9r6raqmg4s83abwbphv4cvyb1lnwsh0b318"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3"; + inherit dependencies buildDependencies features; + }; + num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.36"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.3.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb"; + inherit dependencies buildDependencies features; + }; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.5.2"; + authors = [ "nwin " ]; + sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + rayon_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.7.0"; + authors = [ "Niko Matsakis " ]; + sha256 = "102qkpni68wc9fz1hmba1z8d6pgnl86g5gdl9i3h3ilc6zjymxx7"; + inherit dependencies buildDependencies features; + }; + rayon_core_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon-core"; + version = "1.0.0"; + authors = [ "Niko Matsakis " ]; + sha256 = "0gv3ysmx69r20n0ywjnqbgm802jjzgg0rly1iv1ssphgn5gg4hsh"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + rustc_serialize_0_3_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.23"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0s8i928syzkj1xrsfqf04xlyi4zl37bfpzilf160gi2vhcikj0lw"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + serde_0_9_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.13"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "1lgh3mhmdagzb6wrm6nd4f9mfqwmw464hc8q99ia2qv4xwkx72xp"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.0"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "03vxpzmcsvzi1zzjj1h9c956m9s815v3ikrxa1mz1h5hzs3q7bkg"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempfile"; + version = "2.1.5"; + authors = [ "Steven Allen " ]; + sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.3.0"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; + inherit dependencies buildDependencies features; + }; + toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; + inherit dependencies buildDependencies features; + }; + unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-segmentation"; + version = "1.1.0"; + authors = [ "kwantam " ]; + sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.7.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1"; + inherit dependencies buildDependencies features; + }; + way_cooler_bg_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler-bg"; + version = "0.2.1"; + authors = [ "Timidger " ]; + sha256 = "04sa2g4kisc6g15fam7ciqya96l5ajfd8x2fq5i46m22qrvagvq2"; + inherit dependencies buildDependencies features; + }; + wayland_client_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-client"; + version = "0.6.2"; + authors = [ "Victor Berger " ]; + sha256 = "04p9wjjvd4ahylhb27i7aggcrchcqk9ykpny6hjsc1lqfbqbhj3d"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.6.0"; + authors = [ "Victor Berger " ]; + sha256 = "01x9i8ngl9m3hngv7p0xb2qfwfxpcljhbrils506cf1l1q8838kb"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.6.0"; + authors = [ "Victor Berger " ]; + sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.3.6"; + authors = [ "Vladimir Matveev " ]; + sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + +in +rec { + ansi_term_0_9_0 = ansi_term_0_9_0_ rec {}; + atty_0_2_2 = atty_0_2_2_ rec { + dependencies = (if !(kernel == "windows") then [ libc_0_2_21 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + libc_0_2_21_features."default".from_atty_0_2_2__default = true; + kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true; + winapi_0_2_8_features."default".from_atty_0_2_2__default = true; + bitflags_0_6_0 = bitflags_0_6_0_ rec {}; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_0_8_2 = bitflags_0_8_2_ rec { + features = mkFeatures bitflags_0_8_2_features; + }; + bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {}); + byteorder_0_5_3 = byteorder_0_5_3_ rec { + features = mkFeatures byteorder_0_5_3_features; + }; + byteorder_0_5_3_features."std".self_default = hasDefault byteorder_0_5_3_features; + byteorder_1_0_0 = byteorder_1_0_0_ rec { + features = mkFeatures byteorder_1_0_0_features; + }; + byteorder_1_0_0_features."std".self_default = hasDefault byteorder_1_0_0_features; + clap_2_23_2 = clap_2_23_2_ rec { + dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_2 strsim_0_6_0 term_size_0_3_0 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ] + ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_3_0] else []); + features = mkFeatures clap_2_23_2_features; + }; + clap_2_23_2_features."".self = true; + clap_2_23_2_features."ansi_term".self_color = hasFeature (clap_2_23_2_features."color" or {}); + clap_2_23_2_features."atty".self_color = hasFeature (clap_2_23_2_features."color" or {}); + clap_2_23_2_features."suggestions".self_default = hasDefault clap_2_23_2_features; + clap_2_23_2_features."color".self_default = hasDefault clap_2_23_2_features; + clap_2_23_2_features."wrap_help".self_default = hasDefault clap_2_23_2_features; + clap_2_23_2_features."clippy".self_lints = hasFeature (clap_2_23_2_features."lints" or {}); + clap_2_23_2_features."strsim".self_suggestions = hasFeature (clap_2_23_2_features."suggestions" or {}); + clap_2_23_2_features."term_size".self_wrap_help = hasFeature (clap_2_23_2_features."wrap_help" or {}); + clap_2_23_2_features."yaml-rust".self_yaml = hasFeature (clap_2_23_2_features."yaml" or {}); + ansi_term_0_9_0_features."default".from_clap_2_23_2__default = true; + atty_0_2_2_features."default".from_clap_2_23_2__default = true; + bitflags_0_8_2_features."default".from_clap_2_23_2__default = true; + clippy_0_0_0_features."default".from_clap_2_23_2__default = true; + strsim_0_6_0_features."default".from_clap_2_23_2__default = true; + term_size_0_3_0_features."default".from_clap_2_23_2__default = true; + unicode_segmentation_1_1_0_features."default".from_clap_2_23_2__default = true; + unicode_width_0_1_4_features."default".from_clap_2_23_2__default = true; + vec_map_0_7_0_features."default".from_clap_2_23_2__default = true; + yaml_rust_0_0_0_features."default".from_clap_2_23_2__default = true; + color_quant_1_0_0 = color_quant_1_0_0_ rec {}; + dbus_0_5_2 = dbus_0_5_2_ rec { + dependencies = [ libc_0_2_21 ]; + buildDependencies = [ metadeps_1_1_1 ]; + features = mkFeatures dbus_0_5_2_features; + }; + dbus_0_5_2_features."".self = true; + libc_0_2_21_features."default".from_dbus_0_5_2__default = true; + deque_0_3_1 = deque_0_3_1_ rec { + dependencies = [ rand_0_3_15 ]; + }; + rand_0_3_15_features."default".from_deque_0_3_1__default = true; + dlib_0_3_1 = dlib_0_3_1_ rec { + dependencies = [ libloading_0_3_4 ]; + features = mkFeatures dlib_0_3_1_features; + }; + dlib_0_3_1_features."".self = true; + libloading_0_3_4_features."default".from_dlib_0_3_1__default = true; + dtoa_0_4_1 = dtoa_0_4_1_ rec {}; + enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec { + dependencies = [ num_traits_0_1_37 ]; + }; + num_traits_0_1_37_features."default".from_enum_primitive_0_1_1__default = false; + error_chain_0_7_2 = error_chain_0_7_2_ rec { + dependencies = []; + features = mkFeatures error_chain_0_7_2_features; + }; + error_chain_0_7_2_features."backtrace".self_default = hasDefault error_chain_0_7_2_features; + error_chain_0_7_2_features."example_generated".self_default = hasDefault error_chain_0_7_2_features; + backtrace_0_0_0_features."default".from_error_chain_0_7_2__default = true; + flate2_0_2_19 = flate2_0_2_19_ rec { + dependencies = [ libc_0_2_21 miniz_sys_0_1_9 ] + ++ (if lib.lists.any (x: x == "miniz-sys") features then [miniz_sys_0_1_9] else []); + features = mkFeatures flate2_0_2_19_features; + }; + flate2_0_2_19_features."".self = true; + flate2_0_2_19_features."miniz-sys".self_default = hasDefault flate2_0_2_19_features; + flate2_0_2_19_features."tokio-io".self_tokio = hasFeature (flate2_0_2_19_features."tokio" or {}); + flate2_0_2_19_features."futures".self_tokio = hasFeature (flate2_0_2_19_features."tokio" or {}); + flate2_0_2_19_features."libz-sys".self_zlib = hasFeature (flate2_0_2_19_features."zlib" or {}); + futures_0_0_0_features."default".from_flate2_0_2_19__default = true; + libc_0_2_21_features."default".from_flate2_0_2_19__default = true; + libz_sys_0_0_0_features."default".from_flate2_0_2_19__default = true; + miniz_sys_0_1_9_features."default".from_flate2_0_2_19__default = true; + tokio_io_0_0_0_features."default".from_flate2_0_2_19__default = true; + gcc_0_3_45 = gcc_0_3_45_ rec { + dependencies = []; + features = mkFeatures gcc_0_3_45_features; + }; + gcc_0_3_45_features."rayon".self_parallel = hasFeature (gcc_0_3_45_features."parallel" or {}); + rayon_0_0_0_features."default".from_gcc_0_3_45__default = true; + gif_0_9_1 = gif_0_9_1_ rec { + dependencies = [ color_quant_1_0_0 lzw_0_10_0 ]; + features = mkFeatures gif_0_9_1_features; + }; + gif_0_9_1_features."libc".self_c_api = hasFeature (gif_0_9_1_features."c_api" or {}); + gif_0_9_1_features."raii_no_panic".self_default = hasDefault gif_0_9_1_features; + color_quant_1_0_0_features."default".from_gif_0_9_1__default = true; + libc_0_0_0_features."default".from_gif_0_9_1__default = true; + lzw_0_10_0_features."default".from_gif_0_9_1__default = true; + glob_0_2_11 = glob_0_2_11_ rec {}; + image_0_10_4 = image_0_10_4_ rec { + dependencies = [ byteorder_0_5_3 enum_primitive_0_1_1 gif_0_9_1 glob_0_2_11 jpeg_decoder_0_1_12 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 png_0_5_2 scoped_threadpool_0_1_7 ] + ++ (if lib.lists.any (x: x == "gif") features then [gif_0_9_1] else []) ++ (if lib.lists.any (x: x == "jpeg-decoder") features then [jpeg_decoder_0_1_12] else []) ++ (if lib.lists.any (x: x == "png") features then [png_0_5_2] else []) ++ (if lib.lists.any (x: x == "scoped_threadpool") features then [scoped_threadpool_0_1_7] else []); + features = mkFeatures image_0_10_4_features; + }; + image_0_10_4_features."".self = true; + image_0_10_4_features."gif_codec".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."jpeg".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."ico".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."png_codec".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."ppm".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."tga".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."tiff".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."webp".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."bmp".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."hdr".self_default = hasDefault image_0_10_4_features; + image_0_10_4_features."gif".self_gif_codec = hasFeature (image_0_10_4_features."gif_codec" or {}); + image_0_10_4_features."scoped_threadpool".self_hdr = hasFeature (image_0_10_4_features."hdr" or {}); + image_0_10_4_features."bmp".self_ico = hasFeature (image_0_10_4_features."ico" or {}); + image_0_10_4_features."png_codec".self_ico = hasFeature (image_0_10_4_features."ico" or {}); + image_0_10_4_features."jpeg-decoder".self_jpeg = hasFeature (image_0_10_4_features."jpeg" or {}); + image_0_10_4_features."png".self_png_codec = hasFeature (image_0_10_4_features."png_codec" or {}); + byteorder_0_5_3_features."default".from_image_0_10_4__default = true; + enum_primitive_0_1_1_features."default".from_image_0_10_4__default = true; + gif_0_9_1_features."default".from_image_0_10_4__default = true; + glob_0_2_11_features."default".from_image_0_10_4__default = true; + jpeg_decoder_0_1_12_features."default".from_image_0_10_4__default = true; + num_iter_0_1_33_features."default".from_image_0_10_4__default = true; + num_rational_0_1_36_features."default".from_image_0_10_4__default = true; + num_traits_0_1_37_features."default".from_image_0_10_4__default = true; + png_0_5_2_features."default".from_image_0_10_4__default = true; + scoped_threadpool_0_1_7_features."default".from_image_0_10_4__default = true; + inflate_0_1_1 = inflate_0_1_1_ rec { + features = mkFeatures inflate_0_1_1_features; + }; + inflate_0_1_1_features."".self = true; + itoa_0_3_1 = itoa_0_3_1_ rec {}; + jpeg_decoder_0_1_12 = jpeg_decoder_0_1_12_ rec { + dependencies = [ byteorder_1_0_0 rayon_0_7_0 ] + ++ (if lib.lists.any (x: x == "rayon") features then [rayon_0_7_0] else []); + features = mkFeatures jpeg_decoder_0_1_12_features; + }; + jpeg_decoder_0_1_12_features."".self = true; + jpeg_decoder_0_1_12_features."rayon".self_default = hasDefault jpeg_decoder_0_1_12_features; + byteorder_1_0_0_features."default".from_jpeg_decoder_0_1_12__default = true; + rayon_0_7_0_features."default".from_jpeg_decoder_0_1_12__default = true; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; + lazy_static_0_1_16 = lazy_static_0_1_16_ rec { + features = mkFeatures lazy_static_0_1_16_features; + }; + lazy_static_0_1_16_features."".self = true; + lazy_static_0_2_8 = lazy_static_0_2_8_ rec { + dependencies = []; + features = mkFeatures lazy_static_0_2_8_features; + }; + lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); + lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); + spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true; + libc_0_2_21 = libc_0_2_21_ rec { + features = mkFeatures libc_0_2_21_features; + }; + libc_0_2_21_features."use_std".self_default = hasDefault libc_0_2_21_features; + libloading_0_3_4 = libloading_0_3_4_ rec { + dependencies = [ lazy_static_0_2_8 ] + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + buildDependencies = [ target_build_utils_0_3_0 ]; + }; + lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true; + kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true; + winapi_0_2_8_features."default".from_libloading_0_3_4__default = true; + lzw_0_10_0 = lzw_0_10_0_ rec { + features = mkFeatures lzw_0_10_0_features; + }; + lzw_0_10_0_features."raii_no_panic".self_default = hasDefault lzw_0_10_0_features; + metadeps_1_1_1 = metadeps_1_1_1_ rec { + dependencies = [ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]; + }; + error_chain_0_7_2_features."default".from_metadeps_1_1_1__default = false; + pkg_config_0_3_9_features."default".from_metadeps_1_1_1__default = true; + toml_0_2_1_features."default".from_metadeps_1_1_1__default = false; + miniz_sys_0_1_9 = miniz_sys_0_1_9_ rec { + dependencies = [ libc_0_2_21 ]; + buildDependencies = [ gcc_0_3_45 ]; + }; + libc_0_2_21_features."default".from_miniz_sys_0_1_9__default = true; + num_bigint_0_1_37 = num_bigint_0_1_37_ rec { + dependencies = [ num_integer_0_1_34 num_traits_0_1_37 rand_0_3_15 rustc_serialize_0_3_23 ] + ++ (if lib.lists.any (x: x == "rand") features then [rand_0_3_15] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_23] else []); + features = mkFeatures num_bigint_0_1_37_features; + }; + num_bigint_0_1_37_features."".self = true; + num_bigint_0_1_37_features."rand".self_default = hasDefault num_bigint_0_1_37_features; + num_bigint_0_1_37_features."rustc-serialize".self_default = hasDefault num_bigint_0_1_37_features; + num_integer_0_1_34_features."default".from_num_bigint_0_1_37__default = true; + num_traits_0_1_37_features."default".from_num_bigint_0_1_37__default = true; + rand_0_3_15_features."default".from_num_bigint_0_1_37__default = true; + rustc_serialize_0_3_23_features."default".from_num_bigint_0_1_37__default = true; + serde_0_0_0_features."default".from_num_bigint_0_1_37__default = true; + num_integer_0_1_34 = num_integer_0_1_34_ rec { + dependencies = [ num_traits_0_1_37 ]; + }; + num_traits_0_1_37_features."default".from_num_integer_0_1_34__default = true; + num_iter_0_1_33 = num_iter_0_1_33_ rec { + dependencies = [ num_integer_0_1_34 num_traits_0_1_37 ]; + }; + num_integer_0_1_34_features."default".from_num_iter_0_1_33__default = true; + num_traits_0_1_37_features."default".from_num_iter_0_1_33__default = true; + num_rational_0_1_36 = num_rational_0_1_36_ rec { + dependencies = [ num_bigint_0_1_37 num_integer_0_1_34 num_traits_0_1_37 rustc_serialize_0_3_23 ] + ++ (if lib.lists.any (x: x == "num-bigint") features then [num_bigint_0_1_37] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_23] else []); + features = mkFeatures num_rational_0_1_36_features; + }; + num_rational_0_1_36_features."".self = true; + num_rational_0_1_36_features."num-bigint".self_bigint = hasFeature (num_rational_0_1_36_features."bigint" or {}); + num_rational_0_1_36_features."bigint".self_default = hasDefault num_rational_0_1_36_features; + num_rational_0_1_36_features."rustc-serialize".self_default = hasDefault num_rational_0_1_36_features; + num_bigint_0_1_37_features."default".from_num_rational_0_1_36__default = true; + num_integer_0_1_34_features."default".from_num_rational_0_1_36__default = true; + num_traits_0_1_37_features."default".from_num_rational_0_1_36__default = true; + rustc_serialize_0_3_23_features."default".from_num_rational_0_1_36__default = true; + serde_0_0_0_features."default".from_num_rational_0_1_36__default = true; + num_traits_0_1_37 = num_traits_0_1_37_ rec {}; + num_cpus_1_3_0 = num_cpus_1_3_0_ rec { + dependencies = [ libc_0_2_21 ]; + }; + libc_0_2_21_features."default".from_num_cpus_1_3_0__default = true; + phf_0_7_21 = phf_0_7_21_ rec { + dependencies = [ phf_shared_0_7_21 ]; + features = mkFeatures phf_0_7_21_features; + }; + phf_0_7_21_features."".self = true; + phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {}); + phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {}); + phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true; + phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec { + dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ]; + }; + phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; + phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; + phf_generator_0_7_21 = phf_generator_0_7_21_ rec { + dependencies = [ phf_shared_0_7_21 rand_0_3_15 ]; + }; + phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true; + rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true; + phf_shared_0_7_21 = phf_shared_0_7_21_ rec { + dependencies = [ siphasher_0_2_2 ]; + features = mkFeatures phf_shared_0_7_21_features; + }; + phf_shared_0_7_21_features."".self = true; + siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true; + unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true; + pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; + png_0_5_2 = png_0_5_2_ rec { + dependencies = [ bitflags_0_7_0 flate2_0_2_19 inflate_0_1_1 num_iter_0_1_33 ] + ++ (if lib.lists.any (x: x == "flate2") features then [flate2_0_2_19] else []); + features = mkFeatures png_0_5_2_features; + }; + png_0_5_2_features."".self = true; + png_0_5_2_features."png-encoding".self_default = hasDefault png_0_5_2_features; + png_0_5_2_features."flate2".self_png-encoding = hasFeature (png_0_5_2_features."png-encoding" or {}); + bitflags_0_7_0_features."default".from_png_0_5_2__default = true; + flate2_0_2_19_features."default".from_png_0_5_2__default = true; + inflate_0_1_1_features."default".from_png_0_5_2__default = true; + num_iter_0_1_33_features."default".from_png_0_5_2__default = true; + rand_0_3_15 = rand_0_3_15_ rec { + dependencies = [ libc_0_2_21 ]; + }; + libc_0_2_21_features."default".from_rand_0_3_15__default = true; + rayon_0_7_0 = rayon_0_7_0_ rec { + dependencies = [ rayon_core_1_0_0 ]; + features = mkFeatures rayon_0_7_0_features; + }; + rayon_0_7_0_features."".self = true; + rayon_core_1_0_0_features."unstable".from_rayon_0_7_0__unstable = hasFeature (rayon_0_7_0_features."unstable" or {}); + rayon_core_1_0_0_features."default".from_rayon_0_7_0__default = true; + rayon_core_1_0_0 = rayon_core_1_0_0_ rec { + dependencies = [ deque_0_3_1 lazy_static_0_2_8 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]; + features = mkFeatures rayon_core_1_0_0_features; + }; + rayon_core_1_0_0_features."futures".self_unstable = hasFeature (rayon_core_1_0_0_features."unstable" or {}); + deque_0_3_1_features."default".from_rayon_core_1_0_0__default = true; + futures_0_0_0_features."default".from_rayon_core_1_0_0__default = true; + lazy_static_0_2_8_features."default".from_rayon_core_1_0_0__default = true; + libc_0_2_21_features."default".from_rayon_core_1_0_0__default = true; + num_cpus_1_3_0_features."default".from_rayon_core_1_0_0__default = true; + rand_0_3_15_features."default".from_rayon_core_1_0_0__default = true; + rustc_serialize_0_3_23 = rustc_serialize_0_3_23_ rec {}; + rustc_version_0_1_7 = rustc_version_0_1_7_ rec { + dependencies = [ semver_0_1_20 ]; + }; + semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true; + scoped_threadpool_0_1_7 = scoped_threadpool_0_1_7_ rec { + features = mkFeatures scoped_threadpool_0_1_7_features; + }; + scoped_threadpool_0_1_7_features."".self = true; + semver_0_1_20 = semver_0_1_20_ rec {}; + serde_0_9_13 = serde_0_9_13_ rec { + dependencies = []; + features = mkFeatures serde_0_9_13_features; + }; + serde_0_9_13_features."unstable".self_alloc = hasFeature (serde_0_9_13_features."alloc" or {}); + serde_0_9_13_features."alloc".self_collections = hasFeature (serde_0_9_13_features."collections" or {}); + serde_0_9_13_features."std".self_default = hasDefault serde_0_9_13_features; + serde_0_9_13_features."serde_derive".self_derive = hasFeature (serde_0_9_13_features."derive" or {}); + serde_0_9_13_features."serde_derive".self_playground = hasFeature (serde_0_9_13_features."playground" or {}); + serde_0_9_13_features."unstable".self_unstable-testing = hasFeature (serde_0_9_13_features."unstable-testing" or {}); + serde_0_9_13_features."std".self_unstable-testing = hasFeature (serde_0_9_13_features."unstable-testing" or {}); + serde_derive_0_0_0_features."default".from_serde_0_9_13__default = true; + serde_json_0_9_10 = serde_json_0_9_10_ rec { + dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_13 ]; + features = mkFeatures serde_json_0_9_10_features; + }; + serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {}); + dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true; + itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true; + linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true; + num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true; + serde_0_9_13_features."default".from_serde_json_0_9_10__default = true; + siphasher_0_2_2 = siphasher_0_2_2_ rec { + dependencies = []; + }; + clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true; + strsim_0_6_0 = strsim_0_6_0_ rec {}; + target_build_utils_0_3_0 = target_build_utils_0_3_0_ rec { + dependencies = [ phf_0_7_21 serde_json_0_9_10 ] + ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []); + buildDependencies = [ phf_codegen_0_7_21 ]; + features = mkFeatures target_build_utils_0_3_0_features; + }; + target_build_utils_0_3_0_features."".self = true; + target_build_utils_0_3_0_features."serde_json".self_default = hasDefault target_build_utils_0_3_0_features; + phf_0_7_21_features."default".from_target_build_utils_0_3_0__default = true; + serde_json_0_9_10_features."default".from_target_build_utils_0_3_0__default = true; + tempfile_2_1_5 = tempfile_2_1_5_ rec { + dependencies = [ rand_0_3_15 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_21 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + buildDependencies = [ rustc_version_0_1_7 ]; + }; + rand_0_3_15_features."default".from_tempfile_2_1_5__default = true; + libc_0_2_21_features."default".from_tempfile_2_1_5__default = true; + kernel32_sys_0_2_2_features."default".from_tempfile_2_1_5__default = true; + winapi_0_2_8_features."default".from_tempfile_2_1_5__default = true; + term_size_0_3_0 = term_size_0_3_0_ rec { + dependencies = [] + ++ (if !(kernel == "windows") then [ libc_0_2_21 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + features = mkFeatures term_size_0_3_0_features; + }; + term_size_0_3_0_features."clippy".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); + term_size_0_3_0_features."nightly".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); + term_size_0_3_0_features."lints".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); + term_size_0_3_0_features."nightly".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); + clippy_0_0_0_features."default".from_term_size_0_3_0__default = true; + libc_0_2_21_features."default".from_term_size_0_3_0__default = true; + kernel32_sys_0_2_2_features."default".from_term_size_0_3_0__default = true; + winapi_0_2_8_features."default".from_term_size_0_3_0__default = true; + toml_0_2_1 = toml_0_2_1_ rec { + dependencies = []; + }; + toml_0_2_1_features."rustc-serialize".self_default = hasDefault toml_0_2_1_features; + rustc_serialize_0_0_0_features."default".from_toml_0_2_1__default = true; + serde_0_0_0_features."default".from_toml_0_2_1__default = true; + unicode_segmentation_1_1_0 = unicode_segmentation_1_1_0_ rec { + features = mkFeatures unicode_segmentation_1_1_0_features; + }; + unicode_segmentation_1_1_0_features."".self = true; + unicode_width_0_1_4 = unicode_width_0_1_4_ rec { + features = mkFeatures unicode_width_0_1_4_features; + }; + unicode_width_0_1_4_features."".self = true; + vec_map_0_7_0 = vec_map_0_7_0_ rec { + dependencies = []; + features = mkFeatures vec_map_0_7_0_features; + }; + vec_map_0_7_0_features."serde".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); + vec_map_0_7_0_features."serde_derive".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); + serde_0_0_0_features."default".from_vec_map_0_7_0__default = true; + serde_derive_0_0_0_features."default".from_vec_map_0_7_0__default = true; + way_cooler_bg_0_2_1 = way_cooler_bg_0_2_1_ rec { + dependencies = [ byteorder_0_5_3 clap_2_23_2 dbus_0_5_2 image_0_10_4 tempfile_2_1_5 wayland_client_0_6_2 wayland_sys_0_6_0 ]; + }; + byteorder_0_5_3_features."default".from_way_cooler_bg_0_2_1__default = true; + clap_2_23_2_features."default".from_way_cooler_bg_0_2_1__default = true; + dbus_0_5_2_features."default".from_way_cooler_bg_0_2_1__default = true; + image_0_10_4_features."default".from_way_cooler_bg_0_2_1__default = true; + tempfile_2_1_5_features."default".from_way_cooler_bg_0_2_1__default = true; + wayland_client_0_6_2_features."cursor".from_way_cooler_bg_0_2_1 = true; + wayland_client_0_6_2_features."dlopen".from_way_cooler_bg_0_2_1 = true; + wayland_client_0_6_2_features."default".from_way_cooler_bg_0_2_1__default = true; + wayland_sys_0_6_0_features."client".from_way_cooler_bg_0_2_1 = true; + wayland_sys_0_6_0_features."dlopen".from_way_cooler_bg_0_2_1 = true; + wayland_sys_0_6_0_features."default".from_way_cooler_bg_0_2_1__default = true; + wayland_client_0_6_2 = wayland_client_0_6_2_ rec { + dependencies = [ bitflags_0_6_0 libc_0_2_21 wayland_sys_0_6_0 ]; + buildDependencies = [ wayland_scanner_0_6_0 ]; + features = mkFeatures wayland_client_0_6_2_features; + }; + wayland_client_0_6_2_features."wp-presentation_time".self_all_stable_protocols = hasFeature (wayland_client_0_6_2_features."all_stable_protocols" or {}); + wayland_client_0_6_2_features."wp-viewporter".self_all_stable_protocols = hasFeature (wayland_client_0_6_2_features."all_stable_protocols" or {}); + wayland_client_0_6_2_features."unstable-protocols".self_all_unstable_protocols = hasFeature (wayland_client_0_6_2_features."all_unstable_protocols" or {}); + wayland_client_0_6_2_features."wpu-xdg_shell".self_all_unstable_protocols = hasFeature (wayland_client_0_6_2_features."all_unstable_protocols" or {}); + bitflags_0_6_0_features."default".from_wayland_client_0_6_2__default = true; + lazy_static_0_0_0_features."default".from_wayland_client_0_6_2__default = true; + libc_0_2_21_features."default".from_wayland_client_0_6_2__default = true; + wayland_sys_0_6_0_features."client".from_wayland_client_0_6_2 = true; + wayland_sys_0_6_0_features."cursor".from_wayland_client_0_6_2__cursor = hasFeature (wayland_client_0_6_2_features."cursor" or {}); + wayland_sys_0_6_0_features."dlopen".from_wayland_client_0_6_2__dlopen = hasFeature (wayland_client_0_6_2_features."dlopen" or {}); + wayland_sys_0_6_0_features."egl".from_wayland_client_0_6_2__egl = hasFeature (wayland_client_0_6_2_features."egl" or {}); + wayland_sys_0_6_0_features."default".from_wayland_client_0_6_2__default = true; + wayland_scanner_0_6_0 = wayland_scanner_0_6_0_ rec { + dependencies = [ xml_rs_0_3_6 ]; + }; + xml_rs_0_3_6_features."default".from_wayland_scanner_0_6_0__default = true; + wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec { + dependencies = [ dlib_0_3_1 lazy_static_0_1_16 ] + ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_1_16] else []); + features = mkFeatures wayland_sys_0_6_0_features; + }; + wayland_sys_0_6_0_features."".self = true; + wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); + wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {}); + dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); + dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true; + lazy_static_0_1_16_features."default".from_wayland_sys_0_6_0__default = true; + libc_0_0_0_features."default".from_wayland_sys_0_6_0__default = true; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; + xml_rs_0_3_6 = xml_rs_0_3_6_ rec { + dependencies = [ bitflags_0_7_0 ]; + }; + bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true; +} diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix new file mode 100644 index 000000000000..bc5d937206de --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -0,0 +1,562 @@ +# Generated by carnix 0.5.0: carnix -o wc-grab.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "adler32"; + version = "1.0.0"; + authors = [ "Remi Rampin " ]; + sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w"; + inherit dependencies buildDependencies features; + }; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; + }; + atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.2"; + authors = [ "softprops " ]; + sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1h489m0wzhng5gvvc40jgdbaf0ac3rgkka31vwinhsjmfvrqcc4v"; + inherit dependencies buildDependencies features; + }; + byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1"; + inherit dependencies buildDependencies features; + }; + clap_2_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.22.0"; + authors = [ "Kevin K. " ]; + sha256 = "0gdgyfh3ydpd2px4xh0i5qd6bhi2c5f43bqv9z4kla9vkmmfiavd"; + inherit dependencies buildDependencies features; + }; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; + }; + dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.5.2"; + authors = [ "David Henningsson " ]; + sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + deflate_0_7_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "deflate"; + version = "0.7.5"; + authors = [ "oyvindln " ]; + sha256 = "18bcmdkyshnzpkxx22b29gn55g6bk5ysy98ghjpjhxy3hky96rvy"; + inherit dependencies buildDependencies features; + }; + deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "deque"; + version = "0.3.1"; + authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ]; + sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68"; + inherit dependencies buildDependencies features; + }; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; + }; + error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.7.2"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi"; + inherit dependencies buildDependencies features; + }; + gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.1"; + authors = [ "nwin " ]; + sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r"; + inherit dependencies buildDependencies features; + }; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; + }; + image_0_12_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.12.3"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "12xdzi29vr19gz3h93c1ihyvyv9xar9sp0inrjwwvlbjvn8nn0p9"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; + }; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; + }; + jpeg_decoder_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.11"; + authors = [ "Ulf Nilsson " ]; + sha256 = "1xm39c1cff5gkczs164371hk2gpkjpkbw63k4f8mjnpwwpn9xk4n"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.21"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75"; + inherit dependencies buildDependencies features; + }; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; + }; + metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "metadeps"; + version = "1.1.1"; + authors = [ "Josh Triplett " ]; + sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1rhy9lf4lhl7r8278n73mi9y55v9a71639as3v92bj2gk1x4k729"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3"; + inherit dependencies buildDependencies features; + }; + num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.36"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.3.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + png_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.6.2"; + authors = [ "nwin " ]; + sha256 = "03i78w5jbvk9y6babfrh7h0akvg81pcyyhniilv24z5v0vh5jvjs"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + rayon_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.6.0"; + authors = [ "Niko Matsakis " ]; + sha256 = "0y2693bari5j4h46mjzkyc9lkfbnq2d1p0ldyn6sb02jn63lpw97"; + inherit dependencies buildDependencies features; + }; + scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + term_size_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.2.3"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "16b7gq2dmz7mws4vgai7whxy4xkg4yvlhm7spz0q6jyipqfq87ci"; + inherit dependencies buildDependencies features; + }; + toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; + inherit dependencies buildDependencies features; + }; + unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-segmentation"; + version = "1.1.0"; + authors = [ "kwantam " ]; + sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.7.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1"; + inherit dependencies buildDependencies features; + }; + wc_grab_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-grab"; + version = "0.2.0"; + authors = [ "Timidger " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + +in +rec { + adler32_1_0_0 = adler32_1_0_0_ rec {}; + ansi_term_0_9_0 = ansi_term_0_9_0_ rec {}; + atty_0_2_2 = atty_0_2_2_ rec { + dependencies = (if !(kernel == "windows") then [ libc_0_2_21 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + libc_0_2_21_features."default".from_atty_0_2_2__default = true; + kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true; + winapi_0_2_8_features."default".from_atty_0_2_2__default = true; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_0_8_0 = bitflags_0_8_0_ rec { + features = mkFeatures bitflags_0_8_0_features; + }; + bitflags_0_8_0_features."i128".self_unstable = hasFeature (bitflags_0_8_0_features."unstable" or {}); + byteorder_1_0_0 = byteorder_1_0_0_ rec { + features = mkFeatures byteorder_1_0_0_features; + }; + byteorder_1_0_0_features."std".self_default = hasDefault byteorder_1_0_0_features; + clap_2_22_0 = clap_2_22_0_ rec { + dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_0 strsim_0_6_0 term_size_0_2_3 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ] + ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_2_3] else []); + features = mkFeatures clap_2_22_0_features; + }; + clap_2_22_0_features."".self = true; + clap_2_22_0_features."ansi_term".self_color = hasFeature (clap_2_22_0_features."color" or {}); + clap_2_22_0_features."atty".self_color = hasFeature (clap_2_22_0_features."color" or {}); + clap_2_22_0_features."suggestions".self_default = hasDefault clap_2_22_0_features; + clap_2_22_0_features."color".self_default = hasDefault clap_2_22_0_features; + clap_2_22_0_features."wrap_help".self_default = hasDefault clap_2_22_0_features; + clap_2_22_0_features."clippy".self_lints = hasFeature (clap_2_22_0_features."lints" or {}); + clap_2_22_0_features."strsim".self_suggestions = hasFeature (clap_2_22_0_features."suggestions" or {}); + clap_2_22_0_features."term_size".self_wrap_help = hasFeature (clap_2_22_0_features."wrap_help" or {}); + clap_2_22_0_features."yaml-rust".self_yaml = hasFeature (clap_2_22_0_features."yaml" or {}); + ansi_term_0_9_0_features."default".from_clap_2_22_0__default = true; + atty_0_2_2_features."default".from_clap_2_22_0__default = true; + bitflags_0_8_0_features."default".from_clap_2_22_0__default = true; + clippy_0_0_0_features."default".from_clap_2_22_0__default = true; + strsim_0_6_0_features."default".from_clap_2_22_0__default = true; + term_size_0_2_3_features."default".from_clap_2_22_0__default = true; + unicode_segmentation_1_1_0_features."default".from_clap_2_22_0__default = true; + unicode_width_0_1_4_features."default".from_clap_2_22_0__default = true; + vec_map_0_7_0_features."default".from_clap_2_22_0__default = true; + yaml_rust_0_0_0_features."default".from_clap_2_22_0__default = true; + color_quant_1_0_0 = color_quant_1_0_0_ rec {}; + dbus_0_5_2 = dbus_0_5_2_ rec { + dependencies = [ libc_0_2_21 ]; + buildDependencies = [ metadeps_1_1_1 ]; + features = mkFeatures dbus_0_5_2_features; + }; + dbus_0_5_2_features."".self = true; + libc_0_2_21_features."default".from_dbus_0_5_2__default = true; + deflate_0_7_5 = deflate_0_7_5_ rec { + dependencies = [ adler32_1_0_0 byteorder_1_0_0 ]; + }; + adler32_1_0_0_features."default".from_deflate_0_7_5__default = true; + byteorder_1_0_0_features."default".from_deflate_0_7_5__default = true; + deque_0_3_1 = deque_0_3_1_ rec { + dependencies = [ rand_0_3_15 ]; + }; + rand_0_3_15_features."default".from_deque_0_3_1__default = true; + enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec { + dependencies = [ num_traits_0_1_37 ]; + }; + num_traits_0_1_37_features."default".from_enum_primitive_0_1_1__default = false; + error_chain_0_7_2 = error_chain_0_7_2_ rec { + dependencies = []; + features = mkFeatures error_chain_0_7_2_features; + }; + error_chain_0_7_2_features."backtrace".self_default = hasDefault error_chain_0_7_2_features; + error_chain_0_7_2_features."example_generated".self_default = hasDefault error_chain_0_7_2_features; + backtrace_0_0_0_features."default".from_error_chain_0_7_2__default = true; + gif_0_9_1 = gif_0_9_1_ rec { + dependencies = [ color_quant_1_0_0 lzw_0_10_0 ]; + features = mkFeatures gif_0_9_1_features; + }; + gif_0_9_1_features."libc".self_c_api = hasFeature (gif_0_9_1_features."c_api" or {}); + gif_0_9_1_features."raii_no_panic".self_default = hasDefault gif_0_9_1_features; + color_quant_1_0_0_features."default".from_gif_0_9_1__default = true; + libc_0_0_0_features."default".from_gif_0_9_1__default = true; + lzw_0_10_0_features."default".from_gif_0_9_1__default = true; + glob_0_2_11 = glob_0_2_11_ rec {}; + image_0_12_3 = image_0_12_3_ rec { + dependencies = [ byteorder_1_0_0 enum_primitive_0_1_1 gif_0_9_1 glob_0_2_11 jpeg_decoder_0_1_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 png_0_6_2 scoped_threadpool_0_1_7 ] + ++ (if lib.lists.any (x: x == "gif") features then [gif_0_9_1] else []) ++ (if lib.lists.any (x: x == "jpeg-decoder") features then [jpeg_decoder_0_1_11] else []) ++ (if lib.lists.any (x: x == "png") features then [png_0_6_2] else []) ++ (if lib.lists.any (x: x == "scoped_threadpool") features then [scoped_threadpool_0_1_7] else []); + features = mkFeatures image_0_12_3_features; + }; + image_0_12_3_features."".self = true; + image_0_12_3_features."gif_codec".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."jpeg".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."ico".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."png_codec".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."ppm".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."tga".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."tiff".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."webp".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."bmp".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."hdr".self_default = hasDefault image_0_12_3_features; + image_0_12_3_features."gif".self_gif_codec = hasFeature (image_0_12_3_features."gif_codec" or {}); + image_0_12_3_features."scoped_threadpool".self_hdr = hasFeature (image_0_12_3_features."hdr" or {}); + image_0_12_3_features."bmp".self_ico = hasFeature (image_0_12_3_features."ico" or {}); + image_0_12_3_features."png_codec".self_ico = hasFeature (image_0_12_3_features."ico" or {}); + image_0_12_3_features."jpeg-decoder".self_jpeg = hasFeature (image_0_12_3_features."jpeg" or {}); + image_0_12_3_features."png".self_png_codec = hasFeature (image_0_12_3_features."png_codec" or {}); + byteorder_1_0_0_features."default".from_image_0_12_3__default = true; + enum_primitive_0_1_1_features."default".from_image_0_12_3__default = true; + gif_0_9_1_features."default".from_image_0_12_3__default = true; + glob_0_2_11_features."default".from_image_0_12_3__default = true; + jpeg_decoder_0_1_11_features."default".from_image_0_12_3__default = true; + num_iter_0_1_33_features."default".from_image_0_12_3__default = true; + num_rational_0_1_36_features."default".from_image_0_12_3__default = false; + num_traits_0_1_37_features."default".from_image_0_12_3__default = true; + png_0_6_2_features."default".from_image_0_12_3__default = true; + scoped_threadpool_0_1_7_features."default".from_image_0_12_3__default = true; + inflate_0_1_1 = inflate_0_1_1_ rec { + features = mkFeatures inflate_0_1_1_features; + }; + inflate_0_1_1_features."".self = true; + jpeg_decoder_0_1_11 = jpeg_decoder_0_1_11_ rec { + dependencies = [ byteorder_1_0_0 rayon_0_6_0 ] + ++ (if lib.lists.any (x: x == "rayon") features then [rayon_0_6_0] else []); + features = mkFeatures jpeg_decoder_0_1_11_features; + }; + jpeg_decoder_0_1_11_features."".self = true; + jpeg_decoder_0_1_11_features."rayon".self_default = hasDefault jpeg_decoder_0_1_11_features; + byteorder_1_0_0_features."default".from_jpeg_decoder_0_1_11__default = true; + rayon_0_6_0_features."default".from_jpeg_decoder_0_1_11__default = true; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; + libc_0_2_21 = libc_0_2_21_ rec { + features = mkFeatures libc_0_2_21_features; + }; + libc_0_2_21_features."use_std".self_default = hasDefault libc_0_2_21_features; + lzw_0_10_0 = lzw_0_10_0_ rec { + features = mkFeatures lzw_0_10_0_features; + }; + lzw_0_10_0_features."raii_no_panic".self_default = hasDefault lzw_0_10_0_features; + metadeps_1_1_1 = metadeps_1_1_1_ rec { + dependencies = [ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]; + }; + error_chain_0_7_2_features."default".from_metadeps_1_1_1__default = false; + pkg_config_0_3_9_features."default".from_metadeps_1_1_1__default = true; + toml_0_2_1_features."default".from_metadeps_1_1_1__default = false; + num_integer_0_1_33 = num_integer_0_1_33_ rec { + dependencies = [ num_traits_0_1_37 ]; + }; + num_traits_0_1_37_features."default".from_num_integer_0_1_33__default = true; + num_iter_0_1_33 = num_iter_0_1_33_ rec { + dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ]; + }; + num_integer_0_1_33_features."default".from_num_iter_0_1_33__default = true; + num_traits_0_1_37_features."default".from_num_iter_0_1_33__default = true; + num_rational_0_1_36 = num_rational_0_1_36_ rec { + dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ]; + features = mkFeatures num_rational_0_1_36_features; + }; + num_rational_0_1_36_features."num-bigint".self_bigint = hasFeature (num_rational_0_1_36_features."bigint" or {}); + num_rational_0_1_36_features."bigint".self_default = hasDefault num_rational_0_1_36_features; + num_rational_0_1_36_features."rustc-serialize".self_default = hasDefault num_rational_0_1_36_features; + num_bigint_0_0_0_features."default".from_num_rational_0_1_36__default = true; + num_integer_0_1_33_features."default".from_num_rational_0_1_36__default = true; + num_traits_0_1_37_features."default".from_num_rational_0_1_36__default = true; + rustc_serialize_0_0_0_features."default".from_num_rational_0_1_36__default = true; + serde_0_0_0_features."default".from_num_rational_0_1_36__default = true; + num_traits_0_1_37 = num_traits_0_1_37_ rec {}; + num_cpus_1_3_0 = num_cpus_1_3_0_ rec { + dependencies = [ libc_0_2_21 ]; + }; + libc_0_2_21_features."default".from_num_cpus_1_3_0__default = true; + pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; + png_0_6_2 = png_0_6_2_ rec { + dependencies = [ bitflags_0_7_0 deflate_0_7_5 inflate_0_1_1 num_iter_0_1_33 ] + ++ (if lib.lists.any (x: x == "deflate") features then [deflate_0_7_5] else []); + features = mkFeatures png_0_6_2_features; + }; + png_0_6_2_features."".self = true; + png_0_6_2_features."png-encoding".self_default = hasDefault png_0_6_2_features; + png_0_6_2_features."deflate".self_png-encoding = hasFeature (png_0_6_2_features."png-encoding" or {}); + bitflags_0_7_0_features."default".from_png_0_6_2__default = true; + deflate_0_7_5_features."default".from_png_0_6_2__default = true; + inflate_0_1_1_features."default".from_png_0_6_2__default = true; + num_iter_0_1_33_features."default".from_png_0_6_2__default = true; + rand_0_3_15 = rand_0_3_15_ rec { + dependencies = [ libc_0_2_21 ]; + }; + libc_0_2_21_features."default".from_rand_0_3_15__default = true; + rayon_0_6_0 = rayon_0_6_0_ rec { + dependencies = [ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]; + features = mkFeatures rayon_0_6_0_features; + }; + rayon_0_6_0_features."".self = true; + deque_0_3_1_features."default".from_rayon_0_6_0__default = true; + libc_0_2_21_features."default".from_rayon_0_6_0__default = true; + num_cpus_1_3_0_features."default".from_rayon_0_6_0__default = true; + rand_0_3_15_features."default".from_rayon_0_6_0__default = true; + scoped_threadpool_0_1_7 = scoped_threadpool_0_1_7_ rec { + features = mkFeatures scoped_threadpool_0_1_7_features; + }; + scoped_threadpool_0_1_7_features."".self = true; + strsim_0_6_0 = strsim_0_6_0_ rec {}; + term_size_0_2_3 = term_size_0_2_3_ rec { + dependencies = [] + ++ (if !(kernel == "windows") then [ libc_0_2_21 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + features = mkFeatures term_size_0_2_3_features; + }; + term_size_0_2_3_features."clippy".self_lints = hasFeature (term_size_0_2_3_features."lints" or {}); + term_size_0_2_3_features."nightly".self_lints = hasFeature (term_size_0_2_3_features."lints" or {}); + term_size_0_2_3_features."lints".self_travis = hasFeature (term_size_0_2_3_features."travis" or {}); + term_size_0_2_3_features."nightly".self_travis = hasFeature (term_size_0_2_3_features."travis" or {}); + clippy_0_0_0_features."default".from_term_size_0_2_3__default = true; + libc_0_2_21_features."default".from_term_size_0_2_3__default = true; + kernel32_sys_0_2_2_features."default".from_term_size_0_2_3__default = true; + winapi_0_2_8_features."default".from_term_size_0_2_3__default = true; + toml_0_2_1 = toml_0_2_1_ rec { + dependencies = []; + }; + toml_0_2_1_features."rustc-serialize".self_default = hasDefault toml_0_2_1_features; + rustc_serialize_0_0_0_features."default".from_toml_0_2_1__default = true; + serde_0_0_0_features."default".from_toml_0_2_1__default = true; + unicode_segmentation_1_1_0 = unicode_segmentation_1_1_0_ rec { + features = mkFeatures unicode_segmentation_1_1_0_features; + }; + unicode_segmentation_1_1_0_features."".self = true; + unicode_width_0_1_4 = unicode_width_0_1_4_ rec { + features = mkFeatures unicode_width_0_1_4_features; + }; + unicode_width_0_1_4_features."".self = true; + vec_map_0_7_0 = vec_map_0_7_0_ rec { + dependencies = []; + features = mkFeatures vec_map_0_7_0_features; + }; + vec_map_0_7_0_features."serde".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); + vec_map_0_7_0_features."serde_derive".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); + serde_0_0_0_features."default".from_vec_map_0_7_0__default = true; + serde_derive_0_0_0_features."default".from_vec_map_0_7_0__default = true; + wc_grab_0_2_0 = wc_grab_0_2_0_ rec { + dependencies = [ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]; + }; + clap_2_22_0_features."default".from_wc_grab_0_2_0__default = true; + dbus_0_5_2_features."default".from_wc_grab_0_2_0__default = true; + image_0_12_3_features."default".from_wc_grab_0_2_0__default = true; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; +} diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix new file mode 100644 index 000000000000..634288cfca80 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -0,0 +1,625 @@ +# Generated by carnix 0.5.0: carnix -o wc-lock.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; + }; + atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.2"; + authors = [ "softprops " ]; + sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; + inherit dependencies buildDependencies features; + }; + byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; + inherit dependencies buildDependencies features; + }; + clap_2_24_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.24.2"; + authors = [ "Kevin K. " ]; + sha256 = "0028bkzafprs6n7ing8lnf7iss2a2zq17qmgadipgdfgvww43rmv"; + inherit dependencies buildDependencies features; + }; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.1"; + authors = [ "David Tolnay " ]; + sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; + inherit dependencies buildDependencies features; + }; + fs2_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fs2"; + version = "0.2.5"; + authors = [ "Dan Burkert " ]; + sha256 = "0j6l5r95jigbl0lgkm69c82dzq10jipjbm9qnni147hb45gyw790"; + inherit dependencies buildDependencies features; + }; + gcc_0_3_50_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.50"; + authors = [ "Alex Crichton " ]; + sha256 = "032izcbbyiakv9ck5j3s27p3ddx4468n7qpaxgwi5iswmimjaaj0"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.1"; + authors = [ "David Tolnay " ]; + sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.1.16"; + authors = [ "Marvin Löbel " ]; + sha256 = "0lc5ixs5bmnc43lfri2ynh9393l7vs0z3sw2v5rkaady2ivnznpc"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; + inherit dependencies buildDependencies features; + }; + libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.23"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm"; + inherit dependencies buildDependencies features; + }; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + memmap_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memmap"; + version = "0.4.0"; + authors = [ "Dan Burkert " ]; + sha256 = "0q2gm5p8n9najc8kccbxxkannmnjh85rin4k8d4y1kg5ymdp6kll"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; + }; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempfile"; + version = "2.1.5"; + authors = [ "Steven Allen " ]; + sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.3.0"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; + inherit dependencies buildDependencies features; + }; + unicode_segmentation_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-segmentation"; + version = "1.2.0"; + authors = [ "kwantam " ]; + sha256 = "0yz43x7wrhr3n7a2zsinx3r60yxsdqicg8a5kycyyhdaq1zmiz1y"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + wayland_client_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-client"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "1908h6ilvq2cxph1lxv1vzrb3dcfx4x6pf6pszxwifsfqva8nm34"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_kbd_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-kbd"; + version = "0.9.0"; + authors = [ "Victor Berger " ]; + sha256 = "1x0f7n79hjwf5fclf62fpzjp05xdzc93xw84zgyrn8f1hill3qhj"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "1w5cyc48g4x5w3rakb4sji5328rl5yph1abmjbh5h4slkm4n76g1"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.6.0"; + authors = [ "Victor Berger " ]; + sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "0izw50pmj1r10hmr29gi8ps01avs6zjwisywijlq7wr268h6yxcg"; + inherit dependencies buildDependencies features; + }; + wc_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-lock"; + version = "0.1.0"; + authors = [ "Timidger " ]; + sha256 = "1fwfqzhqa8zqxx18amc129xfp1lrb7y9qxi92jqr856xiq4r8ypk"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.3.6"; + authors = [ "Vladimir Matveev " ]; + sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + +in +rec { + ansi_term_0_9_0 = ansi_term_0_9_0_ rec {}; + atty_0_2_2 = atty_0_2_2_ rec { + dependencies = (if !(kernel == "windows") then [ libc_0_2_23 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + libc_0_2_23_features."default".from_atty_0_2_2__default = true; + kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true; + winapi_0_2_8_features."default".from_atty_0_2_2__default = true; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_0_8_2 = bitflags_0_8_2_ rec { + features = mkFeatures bitflags_0_8_2_features; + }; + bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {}); + byteorder_0_5_3 = byteorder_0_5_3_ rec { + features = mkFeatures byteorder_0_5_3_features; + }; + byteorder_0_5_3_features."std".self_default = hasDefault byteorder_0_5_3_features; + clap_2_24_2 = clap_2_24_2_ rec { + dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_2 strsim_0_6_0 term_size_0_3_0 unicode_segmentation_1_2_0 unicode_width_0_1_4 vec_map_0_8_0 ] + ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_3_0] else []); + features = mkFeatures clap_2_24_2_features; + }; + clap_2_24_2_features."".self = true; + clap_2_24_2_features."ansi_term".self_color = hasFeature (clap_2_24_2_features."color" or {}); + clap_2_24_2_features."atty".self_color = hasFeature (clap_2_24_2_features."color" or {}); + clap_2_24_2_features."suggestions".self_default = hasDefault clap_2_24_2_features; + clap_2_24_2_features."color".self_default = hasDefault clap_2_24_2_features; + clap_2_24_2_features."wrap_help".self_default = hasDefault clap_2_24_2_features; + clap_2_24_2_features."clippy".self_lints = hasFeature (clap_2_24_2_features."lints" or {}); + clap_2_24_2_features."strsim".self_suggestions = hasFeature (clap_2_24_2_features."suggestions" or {}); + clap_2_24_2_features."term_size".self_wrap_help = hasFeature (clap_2_24_2_features."wrap_help" or {}); + clap_2_24_2_features."yaml-rust".self_yaml = hasFeature (clap_2_24_2_features."yaml" or {}); + ansi_term_0_9_0_features."default".from_clap_2_24_2__default = true; + atty_0_2_2_features."default".from_clap_2_24_2__default = true; + bitflags_0_8_2_features."default".from_clap_2_24_2__default = true; + clippy_0_0_0_features."default".from_clap_2_24_2__default = true; + strsim_0_6_0_features."default".from_clap_2_24_2__default = true; + term_size_0_3_0_features."default".from_clap_2_24_2__default = true; + unicode_segmentation_1_2_0_features."default".from_clap_2_24_2__default = true; + unicode_width_0_1_4_features."default".from_clap_2_24_2__default = true; + vec_map_0_8_0_features."default".from_clap_2_24_2__default = true; + yaml_rust_0_0_0_features."default".from_clap_2_24_2__default = true; + dlib_0_3_1 = dlib_0_3_1_ rec { + dependencies = [ libloading_0_3_4 ]; + features = mkFeatures dlib_0_3_1_features; + }; + dlib_0_3_1_features."".self = true; + libloading_0_3_4_features."default".from_dlib_0_3_1__default = true; + dtoa_0_4_1 = dtoa_0_4_1_ rec {}; + fs2_0_2_5 = fs2_0_2_5_ rec { + dependencies = [ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]; + }; + kernel32_sys_0_2_2_features."default".from_fs2_0_2_5__default = true; + libc_0_2_23_features."default".from_fs2_0_2_5__default = true; + winapi_0_2_8_features."default".from_fs2_0_2_5__default = true; + gcc_0_3_50 = gcc_0_3_50_ rec { + dependencies = []; + features = mkFeatures gcc_0_3_50_features; + }; + gcc_0_3_50_features."rayon".self_parallel = hasFeature (gcc_0_3_50_features."parallel" or {}); + rayon_0_0_0_features."default".from_gcc_0_3_50__default = true; + itoa_0_3_1 = itoa_0_3_1_ rec {}; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; + lazy_static_0_1_16 = lazy_static_0_1_16_ rec { + features = mkFeatures lazy_static_0_1_16_features; + }; + lazy_static_0_1_16_features."".self = true; + lazy_static_0_2_8 = lazy_static_0_2_8_ rec { + dependencies = []; + features = mkFeatures lazy_static_0_2_8_features; + }; + lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); + lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); + spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true; + libc_0_2_23 = libc_0_2_23_ rec { + features = mkFeatures libc_0_2_23_features; + }; + libc_0_2_23_features."use_std".self_default = hasDefault libc_0_2_23_features; + libloading_0_3_4 = libloading_0_3_4_ rec { + dependencies = [ lazy_static_0_2_8 ] + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + buildDependencies = [ target_build_utils_0_3_1 ]; + }; + lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true; + kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true; + winapi_0_2_8_features."default".from_libloading_0_3_4__default = true; + memmap_0_4_0 = memmap_0_4_0_ rec { + dependencies = [ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]; + }; + fs2_0_2_5_features."default".from_memmap_0_4_0__default = true; + kernel32_sys_0_2_2_features."default".from_memmap_0_4_0__default = true; + libc_0_2_23_features."default".from_memmap_0_4_0__default = true; + winapi_0_2_8_features."default".from_memmap_0_4_0__default = true; + num_traits_0_1_37 = num_traits_0_1_37_ rec {}; + phf_0_7_21 = phf_0_7_21_ rec { + dependencies = [ phf_shared_0_7_21 ]; + features = mkFeatures phf_0_7_21_features; + }; + phf_0_7_21_features."".self = true; + phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {}); + phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {}); + phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true; + phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec { + dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ]; + }; + phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; + phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; + phf_generator_0_7_21 = phf_generator_0_7_21_ rec { + dependencies = [ phf_shared_0_7_21 rand_0_3_15 ]; + }; + phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true; + rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true; + phf_shared_0_7_21 = phf_shared_0_7_21_ rec { + dependencies = [ siphasher_0_2_2 ]; + features = mkFeatures phf_shared_0_7_21_features; + }; + phf_shared_0_7_21_features."".self = true; + siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true; + unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true; + rand_0_3_15 = rand_0_3_15_ rec { + dependencies = [ libc_0_2_23 ]; + }; + libc_0_2_23_features."default".from_rand_0_3_15__default = true; + rustc_version_0_1_7 = rustc_version_0_1_7_ rec { + dependencies = [ semver_0_1_20 ]; + }; + semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true; + semver_0_1_20 = semver_0_1_20_ rec {}; + serde_0_9_15 = serde_0_9_15_ rec { + dependencies = []; + features = mkFeatures serde_0_9_15_features; + }; + serde_0_9_15_features."unstable".self_alloc = hasFeature (serde_0_9_15_features."alloc" or {}); + serde_0_9_15_features."alloc".self_collections = hasFeature (serde_0_9_15_features."collections" or {}); + serde_0_9_15_features."std".self_default = hasDefault serde_0_9_15_features; + serde_0_9_15_features."serde_derive".self_derive = hasFeature (serde_0_9_15_features."derive" or {}); + serde_0_9_15_features."serde_derive".self_playground = hasFeature (serde_0_9_15_features."playground" or {}); + serde_0_9_15_features."unstable".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); + serde_0_9_15_features."std".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); + serde_derive_0_0_0_features."default".from_serde_0_9_15__default = true; + serde_json_0_9_10 = serde_json_0_9_10_ rec { + dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ]; + features = mkFeatures serde_json_0_9_10_features; + }; + serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {}); + dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true; + itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true; + linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true; + num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true; + serde_0_9_15_features."default".from_serde_json_0_9_10__default = true; + siphasher_0_2_2 = siphasher_0_2_2_ rec { + dependencies = []; + }; + clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true; + strsim_0_6_0 = strsim_0_6_0_ rec {}; + target_build_utils_0_3_1 = target_build_utils_0_3_1_ rec { + dependencies = [ phf_0_7_21 serde_json_0_9_10 ] + ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []); + buildDependencies = [ phf_codegen_0_7_21 ]; + features = mkFeatures target_build_utils_0_3_1_features; + }; + target_build_utils_0_3_1_features."".self = true; + target_build_utils_0_3_1_features."serde_json".self_default = hasDefault target_build_utils_0_3_1_features; + phf_0_7_21_features."default".from_target_build_utils_0_3_1__default = true; + serde_json_0_9_10_features."default".from_target_build_utils_0_3_1__default = true; + tempfile_2_1_5 = tempfile_2_1_5_ rec { + dependencies = [ rand_0_3_15 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_23 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + buildDependencies = [ rustc_version_0_1_7 ]; + }; + rand_0_3_15_features."default".from_tempfile_2_1_5__default = true; + libc_0_2_23_features."default".from_tempfile_2_1_5__default = true; + kernel32_sys_0_2_2_features."default".from_tempfile_2_1_5__default = true; + winapi_0_2_8_features."default".from_tempfile_2_1_5__default = true; + term_size_0_3_0 = term_size_0_3_0_ rec { + dependencies = [] + ++ (if !(kernel == "windows") then [ libc_0_2_23 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + features = mkFeatures term_size_0_3_0_features; + }; + term_size_0_3_0_features."clippy".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); + term_size_0_3_0_features."nightly".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); + term_size_0_3_0_features."lints".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); + term_size_0_3_0_features."nightly".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); + clippy_0_0_0_features."default".from_term_size_0_3_0__default = true; + libc_0_2_23_features."default".from_term_size_0_3_0__default = true; + kernel32_sys_0_2_2_features."default".from_term_size_0_3_0__default = true; + winapi_0_2_8_features."default".from_term_size_0_3_0__default = true; + unicode_segmentation_1_2_0 = unicode_segmentation_1_2_0_ rec { + features = mkFeatures unicode_segmentation_1_2_0_features; + }; + unicode_segmentation_1_2_0_features."".self = true; + unicode_width_0_1_4 = unicode_width_0_1_4_ rec { + features = mkFeatures unicode_width_0_1_4_features; + }; + unicode_width_0_1_4_features."".self = true; + vec_map_0_8_0 = vec_map_0_8_0_ rec { + dependencies = []; + features = mkFeatures vec_map_0_8_0_features; + }; + vec_map_0_8_0_features."serde".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); + vec_map_0_8_0_features."serde_derive".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); + serde_0_0_0_features."default".from_vec_map_0_8_0__default = true; + serde_derive_0_0_0_features."default".from_vec_map_0_8_0__default = true; + wayland_client_0_9_6 = wayland_client_0_9_6_ rec { + dependencies = [ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_9_6 ]; + buildDependencies = [ wayland_scanner_0_9_6 ]; + features = mkFeatures wayland_client_0_9_6_features; + }; + wayland_client_0_9_6_features."egl".self_default = hasDefault wayland_client_0_9_6_features; + wayland_client_0_9_6_features."cursor".self_default = hasDefault wayland_client_0_9_6_features; + bitflags_0_7_0_features."default".from_wayland_client_0_9_6__default = true; + libc_0_2_23_features."default".from_wayland_client_0_9_6__default = true; + wayland_sys_0_9_6_features."client".from_wayland_client_0_9_6 = true; + wayland_sys_0_9_6_features."cursor".from_wayland_client_0_9_6__cursor = hasFeature (wayland_client_0_9_6_features."cursor" or {}); + wayland_sys_0_9_6_features."dlopen".from_wayland_client_0_9_6__dlopen = hasFeature (wayland_client_0_9_6_features."dlopen" or {}); + wayland_sys_0_9_6_features."egl".from_wayland_client_0_9_6__egl = hasFeature (wayland_client_0_9_6_features."egl" or {}); + wayland_sys_0_9_6_features."default".from_wayland_client_0_9_6__default = true; + wayland_kbd_0_9_0 = wayland_kbd_0_9_0_ rec { + dependencies = [ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]; + }; + bitflags_0_7_0_features."default".from_wayland_kbd_0_9_0__default = true; + dlib_0_3_1_features."default".from_wayland_kbd_0_9_0__default = true; + lazy_static_0_2_8_features."default".from_wayland_kbd_0_9_0__default = true; + memmap_0_4_0_features."default".from_wayland_kbd_0_9_0__default = true; + wayland_client_0_9_6_features."default".from_wayland_kbd_0_9_0__default = true; + wayland_scanner_0_9_6 = wayland_scanner_0_9_6_ rec { + dependencies = [ xml_rs_0_3_6 ]; + }; + xml_rs_0_3_6_features."default".from_wayland_scanner_0_9_6__default = true; + wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec { + dependencies = [ dlib_0_3_1 lazy_static_0_1_16 ] + ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_1_16] else []); + features = mkFeatures wayland_sys_0_6_0_features; + }; + wayland_sys_0_6_0_features."".self = true; + wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); + wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {}); + dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); + dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true; + lazy_static_0_1_16_features."default".from_wayland_sys_0_6_0__default = true; + libc_0_0_0_features."default".from_wayland_sys_0_6_0__default = true; + wayland_sys_0_9_6 = wayland_sys_0_9_6_ rec { + dependencies = [ dlib_0_3_1 lazy_static_0_2_8 ] + ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_2_8] else []); + features = mkFeatures wayland_sys_0_9_6_features; + }; + wayland_sys_0_9_6_features."".self = true; + wayland_sys_0_9_6_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_9_6_features."dlopen" or {}); + wayland_sys_0_9_6_features."libc".self_server = hasFeature (wayland_sys_0_9_6_features."server" or {}); + dlib_0_3_1_features."dlopen".from_wayland_sys_0_9_6__dlopen = hasFeature (wayland_sys_0_9_6_features."dlopen" or {}); + dlib_0_3_1_features."default".from_wayland_sys_0_9_6__default = true; + lazy_static_0_2_8_features."default".from_wayland_sys_0_9_6__default = true; + libc_0_0_0_features."default".from_wayland_sys_0_9_6__default = true; + wc_lock_0_1_0 = wc_lock_0_1_0_ rec { + dependencies = [ byteorder_0_5_3 clap_2_24_2 libc_0_2_23 tempfile_2_1_5 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_6_0 ]; + buildDependencies = [ gcc_0_3_50 ]; + }; + byteorder_0_5_3_features."default".from_wc_lock_0_1_0__default = true; + clap_2_24_2_features."default".from_wc_lock_0_1_0__default = true; + libc_0_2_23_features."default".from_wc_lock_0_1_0__default = true; + tempfile_2_1_5_features."default".from_wc_lock_0_1_0__default = true; + wayland_client_0_9_6_features."cursor".from_wc_lock_0_1_0 = true; + wayland_client_0_9_6_features."dlopen".from_wc_lock_0_1_0 = true; + wayland_client_0_9_6_features."default".from_wc_lock_0_1_0__default = true; + wayland_kbd_0_9_0_features."default".from_wc_lock_0_1_0__default = true; + wayland_sys_0_6_0_features."client".from_wc_lock_0_1_0 = true; + wayland_sys_0_6_0_features."dlopen".from_wc_lock_0_1_0 = true; + wayland_sys_0_6_0_features."default".from_wc_lock_0_1_0__default = true; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; + xml_rs_0_3_6 = xml_rs_0_3_6_ rec { + dependencies = [ bitflags_0_7_0 ]; + }; + bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true; +} diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 5e92c52e521b..a5d02093e3f6 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -2,7 +2,6 @@ , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version -, playerctl }: stdenv.mkDerivation { @@ -21,7 +20,6 @@ stdenv.mkDerivation { buildInputs = [ cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper - playerctl ]; postPatch = '' @@ -30,7 +28,7 @@ stdenv.mkDerivation { --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" ''; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; postInstall = '' mkdir -p $out/share/yabar/examples diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index b704c480d668..842e10ad83b7 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -1,10 +1,18 @@ -{ callPackage, attrs ? {} }: +{ playerctl, libxkbcommon, callPackage, attrs ? {} }: let - overrides = { - version = "unstable-2017-10-12"; + pkg = callPackage ./build.nix ({ + version = "unstable-2018-01-02"; - rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e"; - sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb"; - } // attrs; -in callPackage ./build.nix overrides + rev = "d9f75933f1fdd7bec24bf7db104c7e1df2728b98"; + sha256 = "0ry2pgqsnl6cmvkhakm73cjqdnirkimldnmbngl6hbvggx32z8c9"; + } // attrs); +in pkg.overrideAttrs (o: { + buildInputs = o.buildInputs ++ [ + playerctl libxkbcommon + ]; + + makeFlags = o.makeFlags ++ [ + "PLAYERCTL=1" + ]; +}) diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh new file mode 100644 index 000000000000..7d118d20fc68 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -0,0 +1,40 @@ +# See cc-wrapper for comments. +var_templates_list=( + NIX+IGNORE_LD_THROUGH_GCC + NIX+LDFLAGS + NIX+LDFLAGS_BEFORE + NIX+LDFLAGS_AFTER + NIX+LDFLAGS_HARDEN +) +var_templates_bool=( + NIX+SET_BUILD_ID + NIX+DONT_SET_RPATH +) + +declare -a role_infixes=() +if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then + role_infixes+=(_BUILD_) +fi +if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then + role_infixes+=(_) +fi +if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then + role_infixes+=(_TARGET_) +fi + +for var in "${var_templates_list[@]}"; do + mangleVarList "$var" "${role_infixes[@]}" +done +for var in "${var_templates_bool[@]}"; do + mangleVarBool "$var" "${role_infixes[@]}" +done + +if [ -e @out@/nix-support/libc-ldflags ]; then + NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" +fi + +if [ -e @out@/nix-support/libc-ldflags-before ]; then + NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" +fi + +export NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh new file mode 100644 index 000000000000..5282d17fce27 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -0,0 +1,53 @@ +hardeningFlags=(relro bindnow) +# Intentionally word-split in case 'hardeningEnable' is defined in +# Nix. Also, our bootstrap tools version of bash is old enough that +# undefined arrays trip `set -u`. +if [[ -v hardeningEnable[@] ]]; then + hardeningFlags+=(${hardeningEnable[@]}) +fi +hardeningLDFlags=() + +declare -A hardeningDisableMap + +# Intentionally word-split in case 'hardeningDisable' is defined in Nix. +for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ +do + hardeningDisableMap[$flag]=1 +done + +if (( "${NIX_DEBUG:-0}" >= 1 )); then + printf 'HARDENING: disabled flags:' >&2 + (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 + echo >&2 +fi + +if [[ -z "${hardeningDisableMap[all]:-}" ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then + echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; + fi + for flag in "${hardeningFlags[@]}" + do + if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then + case $flag in + pie) + if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi + hardeningLDFlags+=('-pie') + fi + ;; + relro) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi + hardeningLDFlags+=('-z' 'relro') + ;; + bindnow) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi + hardeningLDFlags+=('-z' 'now') + ;; + *) + # Ignore unsupported. Checked in Nix that at least *some* + # tool supports each flag. + ;; + esac + fi + done +fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix new file mode 100644 index 000000000000..bb0e6b82aa5d --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -0,0 +1,306 @@ +# The Nixpkgs CC is not directly usable, since it doesn't know where +# the C library and standard header files are. Therefore the compiler +# produced by that package cannot be installed directly in a user +# environment and used from the command line. So we use a wrapper +# script that sets up the right environment variables so that the +# compiler and the linker just "work". + +{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, bintools ? null, libc ? null +, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null +, extraPackages ? [], extraBuildCommands ? "" +, buildPackages ? {} +, useMacosReexportHack ? false +}: + +with stdenvNoCC.lib; + +assert nativeTools -> nativePrefix != ""; +assert !nativeTools -> + bintools != null && coreutils != null && gnugrep != null; +assert !(nativeLibc && noLibc); +assert (noLibc || nativeLibc) == (libc == null); + +let + stdenv = stdenvNoCC; + inherit (stdenv) hostPlatform targetPlatform; + + # Prefix for binaries. Customarily ends with a dash separator. + # + # TODO(@Ericson2314) Make unconditional, or optional but always true by + # default. + targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + (targetPlatform.config + "-"); + + bintoolsVersion = (builtins.parseDrvName bintools.name).version; + bintoolsName = (builtins.parseDrvName bintools.name).name; + + libc_bin = if libc == null then null else getBin libc; + libc_dev = if libc == null then null else getDev libc; + libc_lib = if libc == null then null else getLib libc; + bintools_bin = if nativeTools then "" else getBin bintools; + # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. + coreutils_bin = if nativeTools then "" else getBin coreutils; + + dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; + + # See description in cc-wrapper. + infixSalt = dashlessTarget; + + # The dynamic linker has different names on different platforms. This is a + # shell glob that ought to match it. + dynamicLinker = + /**/ if libc == null then null + else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" + else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" + # ARM with a wildcard, which can be "" or "-armhf". + else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" + else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" + else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.isDarwin then "/usr/lib/dyld" + else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" + else null; + + expand-response-params = + if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" + then import ../expand-response-params { inherit (buildPackages) stdenv; } + else ""; + +in + +stdenv.mkDerivation { + name = targetPrefix + + (if name != "" then name else "${bintoolsName}-wrapper") + + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}"); + + preferLocalBuild = true; + + inherit bintools_bin libc_bin libc_dev libc_lib coreutils_bin; + shell = getBin shell + shell.shellPath or ""; + gnugrep_bin = if nativeTools then "" else gnugrep; + + inherit targetPrefix infixSalt; + + outputs = [ "out" "info" "man" ]; + + passthru = { + inherit bintools libc nativeTools nativeLibc nativePrefix; + + emacsBufferSetup = pkgs: '' + ; We should handle propagation here too + (mapc + (lambda (arg) + (when (file-directory-p (concat arg "/lib")) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) + (when (file-directory-p (concat arg "/lib64")) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) + '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + ''; + }; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + src=$PWD + ''; + + installPhase = + '' + set -u + + mkdir -p $out/bin {$out,$info,$man}/nix-support + + wrap() { + local dst="$1" + local wrapper="$2" + export prog="$3" + set +u + substituteAll "$wrapper" "$out/bin/$dst" + set -u + chmod +x "$out/bin/$dst" + } + '' + + + (if nativeTools then '' + echo ${nativePrefix} > $out/nix-support/orig-bintools + + ldPath="${nativePrefix}/bin" + '' else '' + echo $bintools_bin > $out/nix-support/orig-bintools + + ldPath="${bintools_bin}/bin" + '' + + + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' + # Solaris needs an additional ld wrapper. + ldPath="${nativePrefix}/bin" + exec="$ldPath/${targetPrefix}ld" + wrap ld-solaris ${./ld-solaris-wrapper.sh} + '') + + + '' + # Create a symlink to as (the assembler). + if [ -e $ldPath/${targetPrefix}as ]; then + ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as + fi + + '' + (if !useMacosReexportHack then '' + wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} + '' else '' + ldInner="${targetPrefix}ld-reexport-delegate" + wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld} + wrap "${targetPrefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" + unset ldInner + '') + '' + + for variant in ld.gold ld.bfd ld.lld; do + local underlying=$ldPath/${targetPrefix}$variant + [[ -e "$underlying" ]] || continue + wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying + done + + set +u + ''; + + emulation = let + fmt = + /**/ if targetPlatform.isDarwin then "mach-o" + else if targetPlatform.isWindows then "pe" + else "elf" + toString targetPlatform.parsed.cpu.bits; + endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; + arch = + /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" + else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isx86_64 then "x86-64" + else if targetPlatform.isi686 then "i386" + else throw "unknown emulation for platform: " + targetPlatform.config; + in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch); + + depsTargetTargetPropagated = extraPackages; + + setupHook = ./setup-hook.sh; + + postFixup = + '' + set -u + '' + + + optionalString (libc != null) ('' + ## + ## General libc support + ## + + echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags + + echo "${libc_lib}" > $out/nix-support/orig-libc + echo "${libc_dev}" > $out/nix-support/orig-libc-dev + + ## + ## Dynamic linker support + ## + + if [[ -z ''${dynamicLinker+x} ]]; then + echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 + local dynamicLinker="${libc_lib}/lib/ld*.so.?" + fi + + # Expand globs to fill array of options + dynamicLinker=($dynamicLinker) + + case ''${#dynamicLinker[@]} in + 0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;; + 1) echo "Using dynamic linker: '$dynamicLinker'" >&2;; + *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; + esac + + if [ -n "''${dynamicLinker:-}" ]; then + echo $dynamicLinker > $out/nix-support/dynamic-linker + + '' + (if targetPlatform.isDarwin then '' + printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + '' else '' + if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then + echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + local ldflagsBefore=(-dynamic-linker "$dynamicLinker") + '') + '' + fi + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to ld + # (the *last* value counts, so ours should come first). + printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before + '') + + + optionalString (!nativeTools) '' + + ## + ## User env support + ## + + # Propagate the underling unwrapped bintools so that if you + # install the wrapper, you get tools like objdump, the manpages, + # etc. as well (same for any binaries of libc). + printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + + ## + ## Man page and info support + ## + + printWords ${bintools.info or ""} \ + >> $info/nix-support/propagated-build-inputs + printWords ${bintools.man or ""} \ + >> $man/nix-support/propagated-build-inputs + '' + + + '' + + ## + ## Hardening support + ## + + # some linkers on some platforms don't support specific -z flags + export hardening_unsupported_flags="" + if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + hardening_unsupported_flags+=" bindnow" + fi + if [[ "$($ldPath/${targetPrefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + hardening_unsupported_flags+=" relro" + fi + '' + + + optionalString hostPlatform.isCygwin '' + hardening_unsupported_flags+=" pic" + '' + + + '' + set +u + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh + substituteAll ${../cc-wrapper/utils.sh} $out/nix-support/utils.sh + + ## + ## Extra custom steps + ## + + '' + + extraBuildCommands; + + inherit dynamicLinker expand-response-params; + + # for substitution in utils.sh + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + + meta = + let bintools_ = if bintools != null then bintools else {}; in + (if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) // + { description = + stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + + " (wrapper script)"; + } // optionalAttrs useMacosReexportHack { + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh old mode 100755 new mode 100644 similarity index 100% rename from pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh rename to pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh similarity index 96% rename from pkgs/build-support/cc-wrapper/ld-wrapper.sh rename to pkgs/build-support/bintools-wrapper/ld-wrapper.sh index ef618f9a86d4..991ed0fe263c 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -14,12 +14,12 @@ if [ -n "@coreutils_bin@" ]; then PATH="@coreutils_bin@/bin" fi -if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then +source @out@/nix-support/utils.sh + +if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi -source @out@/nix-support/utils.sh - # Optionally filter out paths not refering to the store. expandResponseParams "$@" @@ -67,6 +67,11 @@ fi extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) +# Specify the target emulation if nothing is passed in ("-m" overrides this +# environment variable). Ensures we never blindly fallback on targeting the host +# platform. +: ${LDEMULATION:=@emulation@} + # Three tasks: # # 1. Find all -L... switches for rpath diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash similarity index 95% rename from pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash rename to pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash index 205035453332..a0c4e9edfcdb 100644 --- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash +++ b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash @@ -81,8 +81,10 @@ else symbolBloatObject=$outputNameLibless-symbol-hack.o if [[ ! -e $symbolBloatObject ]]; then + # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward + # dependency cycle. printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @targetPrefix@as -- -o $symbolBloatObject + | @targetPrefix@as -Q -- -o $symbolBloatObject fi # first half of libs diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh new file mode 100644 index 000000000000..48a00b0b9b07 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -0,0 +1,88 @@ +# Binutils Wrapper hygiene +# +# See comments in cc-wrapper's setup hook. This works exactly the same way. + +set -u + +# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a +# native compile. +# +# TODO(@Ericson2314): No native exception +[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 + +bintoolsWrapper_addLDVars () { + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib64" + fi + + if [[ -d "$1/lib" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib" + fi +} + +case $targetOffset in + -1) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1 + role_pre='BUILD_' + role_post='_FOR_BUILD' + ;; + 0) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1 + role_pre='' + role_post='' + ;; + 1) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET=1 + role_pre='TARGET_' + role_post='_FOR_TARGET' + ;; + *) + echo "cc-wrapper: used as improper sort of dependency" >2; + return 1 + ;; +esac + +addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars + +# shellcheck disable=SC2157 +if [ -n "@bintools_bin@" ]; then + addToSearchPath _PATH @bintools_bin@/bin +fi + +# shellcheck disable=SC2157 +if [ -n "@libc_bin@" ]; then + addToSearchPath _PATH @libc_bin@/bin +fi + +# shellcheck disable=SC2157 +if [ -n "@coreutils_bin@" ]; then + addToSearchPath _PATH @coreutils_bin@/bin +fi + +# Export tool environment variables so various build systems use the right ones. + +export NIX_${role_pre}BINTOOLS=@out@ + +for cmd in \ + ar as ld nm objcopy objdump readelf ranlib strip strings size windres +do + if + PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null + then + upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")" + export "${role_pre}${upper_case}=@targetPrefix@${cmd}"; + export "${upper_case}${role_post}=@targetPrefix@${cmd}"; + fi +done + +# No local scope in sourced file +unset -v role_pre role_post cmd upper_case +set +u diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb deleted file mode 100755 index 833aab16ceb1..000000000000 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env ruby - -# Bind mounts hierarchy: from => to (relative) -# If 'to' is nil, path will be the same -mounts = { '/' => 'host', - '/proc' => nil, - '/sys' => nil, - '/nix' => nil, - '/tmp' => nil, - '/var' => nil, - '/run' => nil, - '/dev' => nil, - '/home' => nil, - } - -# Propagate environment variables -envvars = [ 'TERM', - 'DISPLAY', - 'XAUTHORITY', - 'HOME', - 'XDG_RUNTIME_DIR', - 'LANG', - 'SSL_CERT_FILE', - 'DBUS_SESSION_BUS_ADDRESS', - ] - -require 'tmpdir' -require 'fileutils' -require 'pathname' -require 'set' -require 'fiddle' - -def write_file(path, str) - File.open(path, 'w') { |file| file.write str } -end - -# Import C standard library and several needed calls -$libc = Fiddle.dlopen nil - -def make_fcall(name, args, output) - c = Fiddle::Function.new $libc[name], args, output - lambda do |*args| - ret = c.call *args - raise SystemCallError.new Fiddle.last_error if ret < 0 - return ret - end -end - -$fork = make_fcall 'fork', [], Fiddle::TYPE_INT - -CLONE_NEWNS = 0x00020000 -CLONE_NEWUSER = 0x10000000 -$unshare = make_fcall 'unshare', [Fiddle::TYPE_INT], Fiddle::TYPE_INT - -MS_BIND = 0x1000 -MS_REC = 0x4000 -MS_SLAVE = 0x80000 -$mount = make_fcall 'mount', [Fiddle::TYPE_VOIDP, - Fiddle::TYPE_VOIDP, - Fiddle::TYPE_VOIDP, - Fiddle::TYPE_LONG, - Fiddle::TYPE_VOIDP], - Fiddle::TYPE_INT - -# Read command line args -abort "Usage: chrootenv program args..." unless ARGV.length >= 1 -execp = ARGV - -# Populate extra mounts -if not ENV["CHROOTENV_EXTRA_BINDS"].nil? - $stderr.puts "CHROOTENV_EXTRA_BINDS is discussed for deprecation." - $stderr.puts "If you have a usecase, please drop a note in issue #16030." - $stderr.puts "Notice that we now bind-mount host FS to '/host' and symlink all directories from it to '/' by default." - - for extra in ENV["CHROOTENV_EXTRA_BINDS"].split(':') - paths = extra.split('=') - if not paths.empty? - if paths.size <= 2 - mounts[paths[0]] = paths[1] - else - $stderr.puts "Ignoring invalid entry in CHROOTENV_EXTRA_BINDS: #{extra}" - end - end - end -end - -# Set destination paths for mounts -mounts = mounts.map { |k, v| [k, v.nil? ? k.sub(/^\/*/, '') : v] }.to_h - -# Create temporary directory for root and chdir -root = Dir.mktmpdir 'chrootenv' - -# Fork process; we need this to do a proper cleanup because -# child process will chroot into temporary directory. -# We use imported 'fork' instead of native to overcome -# CRuby's meddling with threads; this should be safe because -# we don't use threads at all. -$cpid = $fork.call -if $cpid == 0 - # If we are root, no need to create new user namespace. - if Process.uid == 0 - $unshare.call CLONE_NEWNS - # Mark all mounted filesystems as slave so changes - # don't propagate to the parent mount namespace. - $mount.call nil, '/', nil, MS_REC | MS_SLAVE, nil - else - # Save user UID and GID - uid = Process.uid - gid = Process.gid - - # Create new mount and user namespaces - # CLONE_NEWUSER requires a program to be non-threaded, hence - # native fork above. - $unshare.call CLONE_NEWNS | CLONE_NEWUSER - - # Map users and groups to the parent namespace - begin - # setgroups is only available since Linux 3.19 - write_file '/proc/self/setgroups', 'deny' - rescue - end - write_file '/proc/self/uid_map', "#{uid} #{uid} 1" - write_file '/proc/self/gid_map', "#{gid} #{gid} 1" - end - - # Do rbind mounts. - mounts.each do |from, rto| - to = "#{root}/#{rto}" - FileUtils.mkdir_p to - $mount.call from, to, nil, MS_BIND | MS_REC, nil - end - - # Don't make root private so privilege drops inside chroot are possible - File.chmod(0755, root) - # Chroot! - Dir.chroot root - Dir.chdir '/' - - # New environment - new_env = Hash[ envvars.map { |x| [x, ENV[x]] } ] - - # Finally, exec! - exec(new_env, *execp, close_others: true, unsetenv_others: true) -end - -# Wait for a child. If we catch a signal, resend it to child and continue -# waiting. -def wait_child - begin - Process.wait - - # Return child's exit code - if $?.exited? - exit $?.exitstatus - else - exit 1 - end - rescue SignalException => e - Process.kill e.signo, $cpid - wait_child - end -end - -begin - wait_child -ensure - # Cleanup - FileUtils.rm_rf root, secure: true -end diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c new file mode 100644 index 000000000000..c03a1710f451 --- /dev/null +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -0,0 +1,139 @@ +#define _GNU_SOURCE + +#include +#include + +#include +#include +#include + +#define fail(s, err) g_error("%s: %s: %s", __func__, s, g_strerror(err)) +#define fail_if(expr) \ + if (expr) \ + fail(#expr, errno); + +#include + +#include +#include +#include +#include + +const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", NULL}; + +void bind_mount(const gchar *source, const gchar *target) { + fail_if(g_mkdir(target, 0755)); + fail_if(mount(source, target, "bind", MS_BIND | MS_REC, NULL)); +} + +void bind_mount_host(const gchar *host, const gchar *guest) { + g_autofree gchar *point = g_build_filename(guest, "host", NULL); + bind_mount(host, point); +} + +void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) { + g_autofree gchar *source = g_build_filename(host, name, NULL); + g_autofree gchar *target = g_build_filename(guest, name, NULL); + + if (G_LIKELY(g_file_test(source, G_FILE_TEST_IS_DIR))) + bind_mount(source, target); +} + +void bind(const gchar *host, const gchar *guest) { + g_autoptr(GError) err = NULL; + g_autoptr(GDir) dir = g_dir_open(host, 0, &err); + + if (err != NULL) + fail("g_dir_open", errno); + + const gchar *item; + + while (item = g_dir_read_name(dir)) + if (!g_strv_contains(bind_blacklist, item)) + bind_mount_item(host, guest, item); + + bind_mount_host(host, guest); +} + +void spit(const char *path, char *fmt, ...) { + va_list args; + va_start(args, fmt); + + FILE *f = g_fopen(path, "w"); + + if (f == NULL) + fail("g_fopen", errno); + + g_vfprintf(f, fmt, args); + fclose(f); +} + +int nftw_remove(const char *path, const struct stat *sb, int type, + struct FTW *ftw) { + return remove(path); +} + +int main(gint argc, gchar **argv) { + const gchar *self = *argv++; + + if (argc < 2) { + g_message("%s command [arguments...]", self); + return 1; + } + + if (g_getenv("NIX_CHROOTENV")) + g_warning("chrootenv doesn't stack!"); + else + g_setenv("NIX_CHROOTENV", "", TRUE); + + g_autofree gchar *prefix = + g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL); + + fail_if(!g_mkdtemp_full(prefix, 0755)); + + pid_t cpid = fork(); + + if (cpid < 0) + fail("fork", errno); + + else if (cpid == 0) { + uid_t uid = getuid(); + gid_t gid = getgid(); + + if (unshare(CLONE_NEWNS | CLONE_NEWUSER) < 0) { + int unshare_errno = errno; + + g_message("Requires Linux version >= 3.19 built with CONFIG_USER_NS"); + if (g_file_test("/proc/sys/kernel/unprivileged_userns_clone", + G_FILE_TEST_EXISTS)) + g_message("Run: sudo sysctl -w kernel.unprivileged_userns_clone=1"); + + fail("unshare", unshare_errno); + } + + spit("/proc/self/setgroups", "deny"); + spit("/proc/self/uid_map", "%d %d 1", uid, uid); + spit("/proc/self/gid_map", "%d %d 1", gid, gid); + + bind("/", prefix); + + fail_if(chroot(prefix)); + fail_if(execvp(*argv, argv)); + } + + else { + int status; + + fail_if(waitpid(cpid, &status, 0) != cpid); + fail_if(nftw(prefix, nftw_remove, getdtablesize(), + FTW_DEPTH | FTW_MOUNT | FTW_PHYS)); + + if (WIFEXITED(status)) + return WEXITSTATUS(status); + + else if (WIFSIGNALED(status)) + kill(getpid(), WTERMSIG(status)); + + return 1; + } +} diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix new file mode 100644 index 000000000000..375c30e1e463 --- /dev/null +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -0,0 +1,19 @@ +{ stdenv, pkgconfig, glib }: + +stdenv.mkDerivation { + name = "chrootenv"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; + + buildCommand = '' + cc ${./chrootenv.c} $(pkg-config --cflags --libs glib-2.0) -o $out + ''; + + meta = with stdenv.lib; { + description = "Setup mount/user namespace for FHS emulation"; + license = licenses.free; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index d91cdffcf392..219530a67bd8 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,17 +1,13 @@ -{ callPackage, runCommand, lib, writeScript, stdenv, coreutils, ruby }: +{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in -args@{ name, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: +args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: let - env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" "passthru" ]); + env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); - # Sandboxing script - chroot-user = writeScript "chroot-user" '' - #! ${ruby}/bin/ruby - ${builtins.readFile ./chroot-user.rb} - ''; + chrootenv = callPackage ./chrootenv {}; init = run: writeScript "${name}-init" '' #! ${stdenv.shell} @@ -32,8 +28,7 @@ in runCommand name { passthru = passthru // { env = runCommand "${name}-shell-env" { shellHook = '' - ${lib.optionalString (extraBindMounts != []) ''export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"''} - exec ${chroot-user} ${init "bash"} "$(pwd)" + exec ${chrootenv} ${init "bash"} "$(pwd)" ''; } '' echo >&2 "" @@ -46,8 +41,7 @@ in runCommand name { mkdir -p $out/bin cat <$out/bin/${name} #! ${stdenv.shell} - ${lib.optionalString (extraBindMounts != []) ''export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"''} - exec ${chroot-user} ${init runScript} "\$(pwd)" "\$@" + exec ${chrootenv} ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} ${extraInstallCommands} diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index ce948739c320..738dbb56708d 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -22,6 +22,4 @@ stdenv.mkDerivation (args // { makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; autoreconfPhase = "phpize"; - - preConfigure = "touch unix.h"; }) diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 39633fce69a8..d8b42244607a 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -4,19 +4,14 @@ # that case, it is cheaper/better to not repeat this step and let the forked # wrapped binary just inherit the work of the forker's wrapper script. -var_templates=( +var_templates_list=( NIX+CFLAGS_COMPILE NIX+CFLAGS_LINK NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_LINK NIX+GNATFLAGS_COMPILE - NIX+IGNORE_LD_THROUGH_GCC - NIX+LDFLAGS - NIX+LDFLAGS_BEFORE - NIX+LDFLAGS_AFTER - - NIX+SET_BUILD_ID - NIX+DONT_SET_RPATH +) +var_templates_bool=( NIX+ENFORCE_NO_NATIVE ) @@ -35,17 +30,11 @@ fi # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. -for var in "${var_templates[@]}"; do - outputVar="${var/+/_@infixSalt@_}" - export ${outputVar}+='' - # For each role we serve, we accumulate the input parameters into our own - # cc-wrapper-derivation-specific environment variables. - for infix in "${role_infixes[@]}"; do - inputVar="${var/+/${infix}}" - if [ -v "$inputVar" ]; then - export ${outputVar}+="${!outputVar:+ }${!inputVar}" - fi - done +for var in "${var_templates_list[@]}"; do + mangleVarList "$var" "${role_infixes[@]}" +done +for var in "${var_templates_bool[@]}"; do + mangleVarBool "$var" "${role_infixes[@]}" done # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. @@ -66,17 +55,9 @@ if [ -e @out@/nix-support/gnat-cflags ]; then NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" fi -if [ -e @out@/nix-support/libc-ldflags ]; then - NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" -fi - if [ -e @out@/nix-support/cc-ldflags ]; then NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi -if [ -e @out@/nix-support/libc-ldflags-before ]; then - NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" -fi - # That way forked processes will not extend these environment variables again. export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index b0e39e455ffc..a35ff3cb4260 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -6,7 +6,6 @@ if [[ -v hardeningEnable[@] ]]; then hardeningFlags+=(${hardeningEnable[@]}) fi hardeningCFlags=() -hardeningLDFlags=() declare -A hardeningDisableMap @@ -44,7 +43,6 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningCFlags+=('-pie') - hardeningLDFlags+=('-pie') fi ;; pic) @@ -59,14 +57,6 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; - relro) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi - hardeningLDFlags+=('-z' 'relro') - ;; - bindnow) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi - hardeningLDFlags+=('-z' 'now') - ;; *) # Ignore unsupported. Checked in Nix that at least *some* # tool supports each flag. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index d2cdbf6ce0cc..c2e6c1406358 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -15,12 +15,18 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi +source @out@/nix-support/utils.sh + +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi -source @out@/nix-support/utils.sh - # Parse command line options and set several variables. # For instance, figure out if linker flags should be passed. @@ -59,7 +65,8 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 - elif [ "${p:0:1}" != - ]; then + elif [[ "$p" != -?* ]]; then + # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 fi n+=1 diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b79697b33f0c..8de2366ff5f5 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,18 +6,17 @@ # compiler and the linker just "work". { name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenvNoCC.shell +, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} -, useMacosReexportHack ? false }: with stdenvNoCC.lib; assert nativeTools -> nativePrefix != ""; assert !nativeTools -> - cc != null && binutils != null && coreutils != null && gnugrep != null; + cc != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); @@ -42,11 +41,10 @@ let libc_dev = if libc == null then null else getDev libc; libc_lib = if libc == null then null else getLib libc; cc_solib = getLib cc; - binutils_bin = if nativeTools then "" else getBin binutils; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile=optionalString (targetPlatform.isLinux && !(cc.isGNU or false)) + default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools) "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; @@ -58,21 +56,6 @@ let # unstable implementation detail, however. infixSalt = dashlessTarget; - # The dynamic linker has different names on different platforms. This is a - # shell glob that ought to match it. - dynamicLinker = - /**/ if libc == null then null - else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" - else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" - # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" - else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" - else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.isDarwin then "/usr/lib/dyld" - else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" - else null; - expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } @@ -80,6 +63,14 @@ let in +# Ensure bintools matches +assert libc_bin == bintools.libc_bin; +assert libc_dev == bintools.libc_dev; +assert libc_lib == bintools.libc_lib; +assert nativeTools == bintools.nativeTools; +assert nativeLibc == bintools.nativeLibc; +assert nativePrefix == bintools.nativePrefix; + stdenv.mkDerivation { name = targetPrefix + (if name != "" then name else "${ccName}-wrapper") @@ -87,8 +78,8 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc libc_bin libc_dev libc_lib binutils_bin coreutils_bin; - shell = getBin shell + shell.shellPath or ""; + inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin; + shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath; gnugrep_bin = if nativeTools then "" else gnugrep; inherit targetPrefix infixSalt; @@ -98,20 +89,18 @@ stdenv.mkDerivation { passthru = { # "cc" is the generic name for a C compiler, but there is no one for package # providing the linker and related tools. The two we use now are GNU - # Binutils, and Apple's "cctools"; "binutils" as an attempt to find an + # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. - bintools = binutils_bin; + inherit bintools; inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; emacsBufferSetup = pkgs: '' ; We should handle propagation here too - (mapc (lambda (arg) - (when (file-directory-p (concat arg "/include")) - (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include"))) - (when (file-directory-p (concat arg "/lib")) - (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) - (when (file-directory-p (concat arg "/lib64")) - (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (mapc + (lambda (arg) + (when (file-directory-p (concat arg "/include")) + (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include")))) + '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; @@ -141,45 +130,18 @@ stdenv.mkDerivation { echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin" - ldPath="${nativePrefix}/bin" '' else '' echo $cc > $out/nix-support/orig-cc ccPath="${cc}/bin" - ldPath="${binutils_bin}/bin" - '' - - + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' - # Solaris needs an additional ld wrapper. - ldPath="${nativePrefix}/bin" - exec="$ldPath/${targetPrefix}ld" - wrap ld-solaris ${./ld-solaris-wrapper.sh} '') + '' - # Create a symlink to as (the assembler). This is useful when a - # cc-wrapper is installed in a user environment, as it ensures that - # the right assembler is called. - if [ -e $ldPath/${targetPrefix}as ]; then - ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as - fi - - '' + (if !useMacosReexportHack then '' - wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} - '' else '' - ldInner="${targetPrefix}ld-reexport-delegate" - wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld} - wrap "${targetPrefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" - unset ldInner - '') + '' - - if [ -e ${binutils_bin}/bin/${targetPrefix}ld.gold ]; then - wrap ${targetPrefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${targetPrefix}ld.gold - fi - - if [ -e ${binutils_bin}/bin/ld.bfd ]; then - wrap ${targetPrefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${targetPrefix}ld.bfd - fi + # Create symlinks to everything in the bintools wrapper. + for bbin in $bintools/bin/*; do + mkdir -p "$out/bin" + ln -s "$bbin" "$out/bin/$(basename $bbin)" + done # We export environment variables pointing to the wrapped nonstandard # cmds, lest some lousy configure script use those to guess compiler @@ -239,16 +201,29 @@ stdenv.mkDerivation { ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl ''; - propagatedBuildInputs = extraPackages; + propagatedBuildInputs = [ bintools ]; + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; postFixup = '' set -u + + # Backwards compatability for packages expecting this file, e.g. with + # `$NIX_CC/nix-support/dynamic-linker`. + # + # TODO(@Ericson2314): Remove this after stable release and force + # everyone to refer to bintools-wrapper directly. + if [[ -f "$bintools/nix-support/dynamic-linker" ]]; then + ln -s "$bintools/nix-support/dynamic-linker" "$out/nix-support" + fi + if [[ -f "$bintools/nix-support/dynamic-linker-m32" ]]; then + ln -s "$bintools/nix-support/dynamic-linker-m32" "$out/nix-support" + fi '' - + optionalString (libc != null) ('' + + optionalString (libc != null) '' ## ## General libc support ## @@ -264,50 +239,11 @@ stdenv.mkDerivation { # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. - echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags - - echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags + echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev - - ## - ## Dynamic linker support - ## - - if [[ -z ''${dynamicLinker+x} ]]; then - echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 - local dynamicLinker="${libc_lib}/lib/ld*.so.?" - fi - - # Expand globs to fill array of options - dynamicLinker=($dynamicLinker) - - case ''${#dynamicLinker[@]} in - 0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;; - 1) echo "Using dynamic linker: '$dynamicLinker'" >&2;; - *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; - esac - - if [ -n "''${dynamicLinker:-}" ]; then - echo $dynamicLinker > $out/nix-support/dynamic-linker - - '' + (if targetPlatform.isDarwin then '' - printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' - if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then - echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - - local ldflagsBefore=(-dynamic-linker "$dynamicLinker") - '') + '' - fi - - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to gcc/ld - # (the *last* value counts, so ours should come first). - printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before - '') + '' + optionalString (!nativeTools) '' @@ -348,7 +284,6 @@ stdenv.mkDerivation { # Propagate the wrapped cc so that if you install the wrapper, # you get tools like gcov, the manpages, etc. as well (including # for binutils and Glibc). - printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages '' @@ -358,14 +293,7 @@ stdenv.mkDerivation { ## Hardening support ## - # some linkers on some platforms don't support specific -z flags - export hardening_unsupported_flags="" - if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then - hardening_unsupported_flags+=" bindnow" - fi - if [[ "$($ldPath/${targetPrefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then - hardening_unsupported_flags+=" relro" - fi + export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" '' + optionalString hostPlatform.isCygwin '' @@ -384,7 +312,7 @@ stdenv.mkDerivation { '' + extraBuildCommands; - inherit dynamicLinker expand-response-params; + inherit expand-response-params; # for substitution in utils.sh expandResponseParams = "${expand-response-params}/bin/expand-response-params"; @@ -395,7 +323,5 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; - } // optionalAttrs useMacosReexportHack { - platforms = stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 7a0eb28be636..a86c9fe4ada4 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -17,12 +17,12 @@ if [ -n "@coreutils_bin@" ]; then PATH="@coreutils_bin@/bin" fi +source @out@/nix-support/utils.sh + if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi -source @out@/nix-support/utils.sh - # Figure out if linker flags should be passed. GCC prints annoying # warnings when they are not needed. @@ -36,10 +36,6 @@ for i in "$@"; do dontLink=1 elif [ "${i:0:1}" != - ]; then nonFlagArgs=1 - elif [ "$i" = -m32 ]; then - if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" - fi fi done diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index a8f29bd5877d..29a7306b9b7e 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -54,19 +54,26 @@ # For more details, read the individual files where the mechanisms used to # accomplish this will be individually documented. +set -u + +# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a +# native compile. +# +# TODO(@Ericson2314): No native exception +[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 # It's fine that any other cc-wrapper will redefine this. Bash functions close # over no state, and there's no @-substitutions within, so any redefined # function is guaranteed to be exactly the same. ccWrapper_addCVars () { - # The `depOffset` describes how the platforms of the dependencies are slid - # relative to the depending package. It is brought into scope of the - # environment hook defined as the role of the dependency being applied. - case $depOffset in + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in -1) local role='BUILD_' ;; 0) local role='' ;; 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; return 1 ;; esac @@ -74,14 +81,6 @@ ccWrapper_addCVars () { export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" fi - if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib64" - fi - - if [[ -d "$1/lib" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib" - fi - if [[ -d "$1/Library/Frameworks" ]]; then export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" fi @@ -95,18 +94,31 @@ ccWrapper_addCVars () { # # We also need to worry about what role is being added on *this* invocation of # setup-hook, which `role` tracks. -if [ -n "${crossConfig:-}" ]; then - export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role="BUILD_" -else - export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 - role="" -fi +case $targetOffset in + -1) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 + role_pre='BUILD_' + role_post='_FOR_BUILD' + ;; + 0) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 + role_pre='' + role_post='' + ;; + 1) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET=1 + role_pre='TARGET_' + role_post='_FOR_TARGET' + ;; + *) + echo "cc-wrapper: used as improper sort of dependency" >2; + return 1 + ;; +esac -# Eventually the exact sort of env-hook we create will depend on the role. This -# is because based on what relative platform we are targeting, we use different -# dependencies. -envHooks+=(ccWrapper_addCVars) +# We use the `targetOffset` to choose the right env hook to accumulate the right +# sort of deps (those with that offset). +addEnvHooks "$targetOffset" ccWrapper_addCVars # Note 1: these come *after* $out in the PATH (see setup.sh). # Note 2: phase separation makes this look useless to shellcheck. @@ -116,11 +128,6 @@ if [ -n "@cc@" ]; then addToSearchPath _PATH @cc@/bin fi -# shellcheck disable=SC2157 -if [ -n "@binutils_bin@" ]; then - addToSearchPath _PATH @binutils_bin@/bin -fi - # shellcheck disable=SC2157 if [ -n "@libc_bin@" ]; then addToSearchPath _PATH @libc_bin@/bin @@ -133,20 +140,13 @@ fi # Export tool environment variables so various build systems use the right ones. -export NIX_${role}CC=@out@ +export NIX_${role_pre}CC=@out@ -export ${role}CC=@named_cc@ -export ${role}CXX=@named_cxx@ - -for CMD in \ - ar as nm objcopy ranlib strip strings size ld windres -do - if - PATH=$_PATH type -p "@targetPrefix@$CMD" > /dev/null - then - export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@targetPrefix@${CMD}"; - fi -done +export ${role_pre}CC=@named_cc@ +export ${role_pre}CXX=@named_cxx@ +export CC${role_post}=@named_cc@ +export CXX${role_post}=@named_cxx@ # No local scope in sourced file -unset role +unset -v role_pre role_post +set +u diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index c43c2e12d74a..4b2b13809181 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -1,3 +1,35 @@ +mangleVarList() { + local var="$1" + shift + local -a role_infixes=("$@") + + local outputVar="${var/+/_@infixSalt@_}" + declare -gx ${outputVar}+='' + # For each role we serve, we accumulate the input parameters into our own + # cc-wrapper-derivation-specific environment variables. + for infix in "${role_infixes[@]}"; do + local inputVar="${var/+/${infix}}" + if [ -v "$inputVar" ]; then + export ${outputVar}+="${!outputVar:+ }${!inputVar}" + fi + done +} + +mangleVarBool() { + local var="$1" + shift + local -a role_infixes=("$@") + + local outputVar="${var/+/_@infixSalt@_}" + declare -gxi ${outputVar}+=0 + for infix in "${role_infixes[@]}"; do + local inputVar="${var/+/${infix}}" + if [ -v "$inputVar" ]; then + let "${outputVar} |= ${!inputVar}" + fi + done +} + skip () { if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "skipping impure path $1" >&2 diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index b9a334971744..691d4bb74dbf 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -102,7 +102,7 @@ rec { ]; }; - # 5. nix example to play with the container nix store + # 6. nix example to play with the container nix store # docker run -it --rm nix nix-store -qR $(nix-build '' -A nix) nix = buildImageWithNixDb { name = "nix"; diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index defef45b55f5..e1db3e828fd7 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -4,4 +4,8 @@ addEmacsVars () { fi } -envHooks+=(addEmacsVars) +# If this is for a wrapper derivation, emacs and the dependencies are all +# run-time dependencies. If this is for precompiling packages into bytecode, +# emacs is a compile-time dependency of the package. +addEnvHooks "$targetOffset" addEmacsVars +addEnvHooks "$targetOffset" addEmacsVars diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index bd733f1b9baf..27633c912b23 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -55,12 +55,46 @@ stdenv.mkDerivation { deps = runCommand "emacs-packages-deps" { inherit explicitRequires lndir emacs; } '' + findInputsOld() { + local pkg="$1"; shift + local var="$1"; shift + local propagatedBuildInputsFiles=("$@") + + # TODO(@Ericson2314): Restore using associative array once Darwin + # nix-shell doesn't use impure bash. This should replace the O(n) + # case with an O(1) hash map lookup, assuming bash is implemented + # well :D. + local varSlice="$var[*]" + # ''${..-} to hack around old bash empty array problem + case "''${!varSlice-}" in + *" $pkg "*) return 0 ;; + esac + unset -v varSlice + + eval "$var"'+=("$pkg")' + + if ! [ -e "$pkg" ]; then + echo "build input $pkg does not exist" >&2 + exit 1 + fi + + local file + for file in "''${propagatedBuildInputsFiles[@]}"; do + file="$pkg/nix-support/$file" + [[ -f "$file" ]] || continue + + local pkgNext + for pkgNext in $(< "$file"); do + findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}" + done + done + } mkdir -p $out/bin mkdir -p $out/share/emacs/site-lisp local requires for pkg in $explicitRequires; do - findInputs $pkg requires propagated-user-env-packages + findInputsOld $pkg requires propagated-user-env-packages done # requires now holds all requested packages and their transitive dependencies diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index 8ed30b37fc7f..c386a3f3489f 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -22,11 +22,7 @@ if test -z "$LC_ALL"; then export LC_ALL="en_US.UTF-8" fi; -# Pipe the "p" character into Subversion to force it to accept the -# server's certificate. This is perfectly safe: we don't care -# whether the server is being spoofed --- only the cryptographic -# hash of the output matters. Pass in extra p's to handle redirects. -printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive \ +svn export --trust-server-cert --non-interactive \ ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \ -r "$rev" "$url" "$out" diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index ae17989d932b..2c2b2c0e1d5c 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -8,7 +8,7 @@ { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null -, hostPlatform, targetPlatform +, hostPlatform, targetPlatform, targetPackages }: assert nativeTools -> nativePrefix != ""; @@ -58,18 +58,6 @@ stdenv.mkDerivation { zlib = if gcc != null && gcc ? langVhdl then zlib else null; shell = shell + shell.shellPath or ""; - crossAttrs = { - # - # This is not the best way to do this. I think the reference should be - # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I - # do this sufficient if/else. - dynamicLinker = - (if hostPlatform.arch == "arm" then "ld-linux.so.3" else - if hostPlatform.arch == "mips" then "ld.so.1" else - if stdenv.lib.hasSuffix "pc-gnu" hostPlatform.config then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform"); - }; - preferLocalBuild = true; meta = @@ -83,17 +71,6 @@ stdenv.mkDerivation { # The dynamic linker has different names on different platforms. dynamicLinker = if !nativeLibc then - (if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else - if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else - # ARM with a wildcard, which can be "" or "-armhf". - if targetPlatform.isArm then "ld-linux*.so.3" else - if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else - if targetPlatform.system == "powerpc-linux" then "ld.so.1" else - if targetPlatform.system == "mips64el-linux" then "ld.so.1" else - if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" else - if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else - builtins.trace - "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead." - null) + targetPackages.stdenv.cc.bintools.dynamicLinker else ""; } diff --git a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh index d8bdf858ae58..ad3ffeffbbbc 100644 --- a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh @@ -1,4 +1,4 @@ -addCVars () { +gccWrapperOld_addCVars () { if test -d $1/include; then export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" fi @@ -12,7 +12,7 @@ addCVars () { fi } -envHooks=(${envHooks[@]} addCVars) +envBuildBuildHooks+=(gccWrapperOld_addCVars) # Note: these come *after* $out in the PATH (see setup.sh). diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index bc777c7e6c74..d13cdd681a21 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -14,5 +14,11 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + description = "An LD_PRELOAD library to intercept and rewrite the paths in glibc calls"; + longDescription = '' + libredirect is an LD_PRELOAD library to intercept and rewrite the paths in + glibc calls based on the value of $NIX_REDIRECTS, a colon-separated list + of path prefixes to be rewritten, e.g. "/src=/dst:/usr/=/nix/store/". + ''; }; } diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix new file mode 100644 index 000000000000..a98b4affacba --- /dev/null +++ b/pkgs/build-support/mkshell/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv }: + +# A special kind of derivation that is only meant to be consumed by the +# nix-shell. +{ + inputsFrom ? [], # a list of derivations whose inputs will be made available to the environment + buildInputs ? [], + nativeBuildInputs ? [], + propagatedBuildInputs ? [], + propagatedNativeBuildInputs ? [], + ... +}@attrs: +let + mergeInputs = name: + let + op = item: sum: sum ++ item."${name}" or []; + nul = []; + list = [attrs] ++ inputsFrom; + in + lib.foldr op nul list; + + rest = builtins.removeAttrs attrs [ + "inputsFrom" + "buildInputs" + "nativeBuildInputs" + "propagatedBuildInputs" + "propagatedNativeBuildInputs" + ]; +in + +stdenv.mkDerivation ({ + name = "nix-shell"; + phases = ["nobuildPhase"]; + + buildInputs = mergeInputs "buildInputs"; + nativeBuildInputs = mergeInputs "nativeBuildInputs"; + propagatedBuildInputs = mergeInputs "propagatedBuildInputs"; + propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs"; + + nobuildPhase = '' + echo + echo "This derivation is not meant to be built, aborting"; + echo + exit 1 + ''; +} // rest) diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 5e1785446441..c7129ae83f92 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation ( # Tarball builds are generally important, so give them a high # default priority. - schedulingPriority = "200"; + schedulingPriority = 200; }; } diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix new file mode 100644 index 000000000000..72bb3b80492a --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -0,0 +1,382 @@ +# Code for buildRustCrate, a Nix function that builds Rust code, just +# like Cargo, but using Nix instead. +# +# This can be useful for deploying packages with NixOps, and to share +# binary dependencies between projects. + +{ lib, buildPlatform, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }: + +let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies, + dependencies, completeDeps, completeBuildDeps, + crateFeatures, libName, build, release, libPath, + crateType, metadata, crateBin, finalBins, + verbose, colors }: + + let depsDir = lib.concatStringsSep " " dependencies; + completeDepsDir = lib.concatStringsSep " " completeDeps; + completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; + makeDeps = dependencies: + (lib.concatMapStringsSep " " (dep: + let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in + (if dep.crateType == "lib" then + " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" + else + " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}") + ) dependencies); + deps = makeDeps dependencies; + buildDeps = makeDeps buildDependencies; + optLevel = if release then 3 else 0; + rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2"); + rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + version_ = lib.splitString "-" crateVersion; + versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; + version = lib.splitString "." (lib.head version_); + authors = lib.concatStringsSep ":" crateAuthors; + in '' + norm="" + bold="" + green="" + boldgreen="" + if [[ "${colors}" -eq "always" ]]; then + norm="$(printf '\033[0m')" #returns to "normal" + bold="$(printf '\033[0;1m')" #set bold + green="$(printf '\033[0;32m')" #set green + boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green. + fi + + echo_build_heading() { + start="" + end="" + if [[ x"${colors}" -eq x"always" ]]; then + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + fi + if (( $# == 1 )); then + echo "$start""Building $1""$end" + else + echo "$start""Building $1 ($2)""$end" + fi + } + + noisily() { + start="" + end="" + if [[ x"${colors}" -eq x"always" ]]; then + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + fi + ${lib.optionalString verbose '' + echo -n "$start"Running "$end" + echo $@ + ''} + $@ + } + + symlink_dependency() { + # $1 is the nix-store path of a dependency + i=$1 + dest=target/deps + if [ ! -z $2 ]; then + if [ "$2" = "--buildDep" ]; then + dest=target/buildDeps + fi + fi + ln -s -f $i/lib/*.rlib $dest #*/ + ln -s -f $i/lib/*.so $i/lib/*.dylib $dest #*/ + if [ -e "$i/lib/link" ]; then + cat $i/lib/link >> target/link + cat $i/lib/link >> target/link.final + fi + if [ -e $i/env ]; then + source $i/env + fi + } + + build_lib() { + lib_src=$1 + echo_build_heading $lib_src ${libName} + + noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \ + ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \ + --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \ + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + + EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib" + if [ -e target/deps/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary} ]; then + EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary}" + fi + } + + build_bin() { + crate_name=$1 + crate_name_=$(echo $crate_name | sed -e "s/-/_/g") + main_file="" + if [[ ! -z $2 ]]; then + main_file=$2 + fi + echo_build_heading $@ + noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ + ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ + $LINK ${deps}$EXTRA_LIB --cap-lints allow \ + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + if [ "$crate_name_" -ne "$crate_name" ]; then + mv target/bin/$crate_name_ target/bin/$crate_name + fi + } + + runHook preBuild + mkdir -p target/{deps,lib,build,buildDeps} + chmod uga+w target -R + for i in ${completeDepsDir}; do + symlink_dependency $i + done + for i in ${completeBuildDepsDir}; do + symlink_dependency $i --buildDep + done + if [ -e target/link ]; then + sort -u target/link > target/link.sorted + mv target/link.sorted target/link + sort -u target/link.final > target/link.final.sorted + mv target/link.final.sorted target/link.final + tr '\n' ' ' < target/link > target/link_ + fi + EXTRA_BUILD="" + BUILD_OUT_DIR="" + export CARGO_PKG_NAME=${crateName} + export CARGO_PKG_VERSION=${crateVersion} + export CARGO_PKG_AUTHORS="${authors}" + export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} + export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name} + + export CARGO_CFG_TARGET_ENV="gnu" + export CARGO_MANIFEST_DIR="." + export DEBUG="${toString (!release)}" + export OPT_LEVEL="${toString optLevel}" + export TARGET="${buildPlatform.config}" + export HOST="${buildPlatform.config}" + export PROFILE=${if release then "release" else "debug"} + export OUT_DIR=$(pwd)/target/build/${crateName}.out + export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0} + export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1} + export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2} + if [ -n "${versionPre}" ]; then + export CARGO_PKG_VERSION_PRE="${versionPre}" + fi + + BUILD="" + if [[ ! -z "${build}" ]] ; then + BUILD=${build} + elif [[ -e "build.rs" ]]; then + BUILD="build.rs" + fi + if [[ ! -z "$BUILD" ]] ; then + echo_build_heading "$BUILD" ${libName} + mkdir -p target/build/${crateName} + EXTRA_BUILD_FLAGS="" + if [ -e target/link_ ]; then + EXTRA_BUILD_FLAGS=$(cat target/link_) + fi + if [ -e target/link.build ]; then + EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)" + fi + noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \ + ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \ + -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors} + + mkdir -p target/build/${crateName}.out + export RUST_BACKTRACE=1 + BUILD_OUT_DIR="-L $OUT_DIR" + mkdir -p $OUT_DIR + target/build/${crateName}/build_script_build > target/build/${crateName}.opt + set +e + EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") + grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ + | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env + + set -e + if [ -n "$(ls target/build/${crateName}.out)" ]; then + + if [ -e "${libPath}" ] ; then + cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/ + else + cp -r target/build/${crateName}.out/* src #*/ + fi + fi + fi + + EXTRA_LIB="" + CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g") + + if [ -e target/link_ ]; then + EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD" + fi + + if [ -e "${libPath}" ] ; then + build_lib ${libPath} + elif [ -e src/lib.rs ] ; then + build_lib src/lib.rs + elif [ -e src/${libName}.rs ] ; then + build_lib src/${libName}.rs + fi + + echo "$EXTRA_LINK_SEARCH" | while read i; do + if [ ! -z "$i" ]; then + for lib in $i; do + echo "-L $lib" >> target/link + L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#") + echo "-L $L" >> target/link.final + done + fi + done + echo "$EXTRA_LINK" | while read i; do + if [ ! -z "$i" ]; then + for lib in $i; do + echo "-l $lib" >> target/link + echo "-l $lib" >> target/link.final + done + fi + done + + if [ -e target/link ]; then + sort -u target/link.final > target/link.final.sorted + mv target/link.final.sorted target/link.final + sort -u target/link > target/link.sorted + mv target/link.sorted target/link + + tr '\n' ' ' < target/link > target/link_ + LINK=$(cat target/link_) + fi + + mkdir -p target/bin + echo "${crateBin}" | sed -n 1'p' | tr ',' '\n' | while read BIN; do + if [ ! -z "$BIN" ]; then + build_bin $BIN + fi + done + ${lib.optionalString (crateBin == "") '' + if [[ -e src/main.rs ]]; then + build_bin ${crateName} src/main.rs + fi + for i in src/bin/*.rs; do #*/ + build_bin "$(basename $i .rs)" "$i" + done + ''} + # Remove object files to avoid "wrong ELF type" + find target -type f -name "*.o" -print0 | xargs -0 rm -f + runHook postBuild + '' + finalBins; + + installCrate = crateName: '' + mkdir -p $out + if [ -s target/env ]; then + cp target/env $out/env + fi + if [ -s target/link.final ]; then + mkdir -p $out/lib + cp target/link.final $out/lib/link + fi + if [ "$(ls -A target/lib)" ]; then + mkdir -p $out/lib + cp target/lib/* $out/lib #*/ + fi + if [ "$(ls -A target/build)" ]; then # */ + mkdir -p $out/lib + cp -r target/build/* $out/lib # */ + fi + if [ "$(ls -A target/bin)" ]; then + mkdir -p $out/bin + cp -P target/bin/* $out/bin # */ + fi + ''; +in + +crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides }: + +let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); + buildInputs_ = buildInputs; +in +stdenv.mkDerivation rec { + + inherit (crate) crateName; + + src = if lib.hasAttr "src" crate then + crate.src + else + fetchCrate { inherit (crate) crateName version sha256; }; + name = "rust_${crate.crateName}-${crate.version}"; + buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_; + dependencies = + builtins.map + (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + (crate.dependencies or []); + + buildDependencies = + builtins.map + (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + (crate.buildDependencies or []); + + completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies); + completeBuildDeps = lib.lists.unique ( + buildDependencies + ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies + ); + + crateFeatures = if crate ? features then + lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) + else ""; + + libName = if crate ? libName then crate.libName else crate.crateName; + libPath = if crate ? libPath then crate.libPath else ""; + + metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion)); + + crateBin = if crate ? crateBin then + builtins.foldl' (bins: bin: + let name = + lib.strings.replaceStrings ["-"] ["_"] + (if bin ? name then bin.name else crateName); + path = if bin ? path then bin.path else "src/main.rs"; + in + bins + (if bin == "" then "" else ",") + "${name} ${path}" + + ) "" crate.crateBin + else ""; + + finalBins = if crate ? crateBin then + builtins.foldl' (bins: bin: + let name = lib.strings.replaceStrings ["-"] ["_"] + (if bin ? name then bin.name else crateName); + new_name = if bin ? name then bin.name else crateName; + in + if name == new_name then bins else + (bins + "mv target/bin/${name} target/bin/${new_name};") + + ) "" crate.crateBin + else ""; + + build = if crate ? build then crate.build else ""; + crateVersion = crate.version; + crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; + crateType = + if lib.attrByPath ["procMacro"] false crate then "proc-macro" else + if lib.attrByPath ["plugin"] false crate then "dylib" else "lib"; + colors = lib.attrByPath [ "colors" ] "always" crate; + buildPhase = buildCrate { + inherit crateName dependencies buildDependencies completeDeps completeBuildDeps + crateFeatures libName build release libPath crateType crateVersion + crateAuthors metadata crateBin finalBins verbose colors; + }; + installPhase = installCrate crateName; + +}) { + rust = rustc; + release = true; + verbose = true; + features = []; + buildInputs = []; + crateOverrides = defaultCrateOverrides; +} diff --git a/pkgs/build-support/rust/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor.nix index 6b50f8b83e73..9c379eaa3337 100644 --- a/pkgs/build-support/rust/cargo-vendor.nix +++ b/pkgs/build-support/rust/cargo-vendor.nix @@ -8,13 +8,15 @@ let x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5"; x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm"; }; - hash = hashes. ${system} or (throw "missing bootstrap hash for platform ${system}"); + hash = hashes. ${system} or badSystem; + + badSystem = throw "missing bootstrap hash for platform ${system}"; platforms = { x86_64-linux = "x86_64-unknown-linux-musl"; x86_64-darwin = "x86_64-apple-darwin"; }; - platform = platforms . ${system}; + platform = platforms . ${system} or badSystem; in stdenv.mkDerivation { name = "cargo-vendor-${version}"; diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix new file mode 100644 index 000000000000..adb7139758cd --- /dev/null +++ b/pkgs/build-support/rust/carnix.nix @@ -0,0 +1,875 @@ +# Generated by carnix 0.5.0: carnix -o carnix.nix --src ./. Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_10_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.10.2"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "07k0hfmlhv43lihyxb9d81l5mq5zlpqvv30dkfd3knmv2ginasn9"; + inherit dependencies buildDependencies features; + }; + atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.3"; + authors = [ "softprops " ]; + sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + inherit dependencies buildDependencies features; + }; + backtrace_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.4"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "1caba8w3rqd5ghr88ghyz5wgkf81dgx18bj1llkax6qmianc6gk7"; + inherit dependencies buildDependencies features; + }; + backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; + inherit dependencies buildDependencies features; + }; + carnix_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "carnix"; + version = "0.5.2"; + authors = [ "pe@pijul.org " ]; + sha256 = "1znj345jziksxxkq7ap3i8p3fp3x4794qggac35d0banj7ml3fv8"; + inherit dependencies buildDependencies features; + }; + cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.3"; + authors = [ "Alex Crichton " ]; + sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; + }; + clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.28.0"; + authors = [ "Kevin K. " ]; + sha256 = "0m0rj9xw6mja4gdhqmaldv0q5y5jfsfzbyzfd70mm3857aynq03k"; + inherit dependencies buildDependencies features; + }; + dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbghelp-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; + libName = "dbghelp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; + }; + either_1_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.4.0"; + authors = [ "bluss" ]; + sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; + inherit dependencies buildDependencies features; + }; + env_logger_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0nrx04p4xa86d5kc7aq4fwvipbqji9cmgy449h47nc9f1chafhgg"; + inherit dependencies buildDependencies features; + }; + error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.11.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.2.1"; + authors = [ "Raph Levien " ]; + sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.2.0"; + authors = [ "Raph Levien " ]; + sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + inherit dependencies buildDependencies features; + }; + itertools_0_7_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itertools"; + version = "0.7.3"; + authors = [ "bluss" ]; + sha256 = "128a69cnmgpj38rs6lcwzya773d2vx7f9y7012iycjf9yi2pyckj"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + authors = [ "Marvin Löbel " ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + inherit dependencies buildDependencies features; + }; + libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1"; + inherit dependencies buildDependencies features; + }; + libsqlite3_sys_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libsqlite3-sys"; + version = "0.9.0"; + authors = [ "John Gallagher " ]; + sha256 = "1pnx3i9h85si6cs4nhazfb28hsvk7dn0arnfvpdzpjdnj9z38q57"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "linked-hash-map"; + version = "0.4.2"; + authors = [ "Stepan Koltsov " "Andrew Paseltiner " ]; + sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; + inherit dependencies buildDependencies features; + }; + log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.8"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + inherit dependencies buildDependencies features; + }; + lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lru-cache"; + version = "0.1.1"; + authors = [ "Stepan Koltsov " ]; + sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; + inherit dependencies buildDependencies features; + }; + memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + inherit dependencies buildDependencies features; + }; + nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nom"; + version = "3.2.1"; + authors = [ "contact@geoffroycouprie.com" ]; + sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + inherit dependencies buildDependencies features; + }; + rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.18"; + authors = [ "The Rust Project Developers" ]; + sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.32"; + authors = [ "Jeremy Soller " ]; + sha256 = "1axxj8x6ngh6npkzqc5h216fajkcyrdxdgb7m2f0n5xfclbk47fv"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.2.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.4.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; + inherit dependencies buildDependencies features; + }; + rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rusqlite"; + version = "0.13.0"; + authors = [ "John Gallagher " ]; + sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; + inherit dependencies buildDependencies features; + }; + rustc_demangle_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.5"; + authors = [ "Alex Crichton " ]; + sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; + inherit dependencies buildDependencies features; + }; + serde_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.21"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.21"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0r20qyimm9scfaz7lc0swnhik9d045zklmbidd0zzpd4b2f3jsqm"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_derive_internals_0_17_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive_internals"; + version = "0.17.0"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1g1j3v6pj9wbcz3v3w4smjpwrcdwjicmf6yd5cbai04as9iwhw74"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.6"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + inherit dependencies buildDependencies features; + }; + synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "textwrap"; + version = "0.9.0"; + authors = [ "Martin Geisler " ]; + sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.4"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + inherit dependencies buildDependencies features; + }; + time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "time"; + version = "0.1.38"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; + inherit dependencies buildDependencies features; + }; + toml_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.4.5"; + authors = [ "Alex Crichton " ]; + sha256 = "06zxqhn3y58yzjfaykhcrvlf7p2dnn54kn3g4apmja3cn5b18lkk"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + inherit dependencies buildDependencies features; + }; + vcpkg_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.2"; + authors = [ "Jim McGrath " ]; + sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + +in +rec { + aho_corasick_0_6_3 = aho_corasick_0_6_3_ rec { + dependencies = [ memchr_1_0_2 ]; + }; + memchr_1_0_2_features."default".from_aho_corasick_0_6_3__default = true; + ansi_term_0_10_2 = ansi_term_0_10_2_ rec {}; + atty_0_2_3 = atty_0_2_3_ rec { + dependencies = (if kernel == "redox" then [ termion_1_5_1 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + termion_1_5_1_features."default".from_atty_0_2_3__default = true; + libc_0_2_33_features."default".from_atty_0_2_3__default = false; + kernel32_sys_0_2_2_features."default".from_atty_0_2_3__default = true; + winapi_0_2_8_features."default".from_atty_0_2_3__default = true; + backtrace_0_3_4 = backtrace_0_3_4_ rec { + dependencies = [ cfg_if_0_1_2 rustc_demangle_0_1_5 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then [ backtrace_sys_0_1_16 ] + ++ (if lib.lists.any (x: x == "backtrace-sys") features then [backtrace_sys_0_1_16] else []) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ dbghelp_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ] + ++ (if lib.lists.any (x: x == "dbghelp-sys") features then [dbghelp_sys_0_2_0] else []) ++ (if lib.lists.any (x: x == "kernel32-sys") features then [kernel32_sys_0_2_2] else []) ++ (if lib.lists.any (x: x == "winapi") features then [winapi_0_2_8] else []) else []); + features = mkFeatures backtrace_0_3_4_features; + }; + backtrace_0_3_4_features."".self = true; + backtrace_0_3_4_features."kernel32-sys".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); + backtrace_0_3_4_features."winapi".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); + backtrace_0_3_4_features."dbghelp-sys".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); + backtrace_0_3_4_features."libunwind".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."libbacktrace".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."coresymbolication".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."dladdr".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."dbghelp".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."addr2line".self_gimli-symbolize = hasFeature (backtrace_0_3_4_features."gimli-symbolize" or {}); + backtrace_0_3_4_features."findshlibs".self_gimli-symbolize = hasFeature (backtrace_0_3_4_features."gimli-symbolize" or {}); + backtrace_0_3_4_features."backtrace-sys".self_libbacktrace = hasFeature (backtrace_0_3_4_features."libbacktrace" or {}); + backtrace_0_3_4_features."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_4_features."serialize-rustc" or {}); + backtrace_0_3_4_features."serde".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {}); + backtrace_0_3_4_features."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {}); + addr2line_0_0_0_features."default".from_backtrace_0_3_4__default = true; + cfg_if_0_1_2_features."default".from_backtrace_0_3_4__default = true; + cpp_demangle_0_0_0_features."default".from_backtrace_0_3_4__default = false; + findshlibs_0_0_0_features."default".from_backtrace_0_3_4__default = true; + rustc_demangle_0_1_5_features."default".from_backtrace_0_3_4__default = true; + rustc_serialize_0_0_0_features."default".from_backtrace_0_3_4__default = true; + serde_0_0_0_features."default".from_backtrace_0_3_4__default = true; + serde_derive_0_0_0_features."default".from_backtrace_0_3_4__default = true; + backtrace_sys_0_1_16_features."default".from_backtrace_0_3_4__default = true; + libc_0_2_33_features."default".from_backtrace_0_3_4__default = true; + dbghelp_sys_0_2_0_features."default".from_backtrace_0_3_4__default = true; + kernel32_sys_0_2_2_features."default".from_backtrace_0_3_4__default = true; + winapi_0_2_8_features."default".from_backtrace_0_3_4__default = true; + backtrace_sys_0_1_16 = backtrace_sys_0_1_16_ rec { + dependencies = [ libc_0_2_33 ]; + buildDependencies = [ cc_1_0_3 ]; + }; + libc_0_2_33_features."default".from_backtrace_sys_0_1_16__default = true; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_1_0_1 = bitflags_1_0_1_ rec { + features = mkFeatures bitflags_1_0_1_features; + }; + bitflags_1_0_1_features."example_generated".self_default = hasDefault bitflags_1_0_1_features; + carnix_0_5_2 = carnix_0_5_2_ rec { + dependencies = [ clap_2_28_0 env_logger_0_4_3 error_chain_0_11_0 itertools_0_7_3 log_0_3_8 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]; + }; + clap_2_28_0_features."default".from_carnix_0_5_2__default = true; + env_logger_0_4_3_features."default".from_carnix_0_5_2__default = true; + error_chain_0_11_0_features."default".from_carnix_0_5_2__default = true; + itertools_0_7_3_features."default".from_carnix_0_5_2__default = true; + log_0_3_8_features."default".from_carnix_0_5_2__default = true; + nom_3_2_1_features."default".from_carnix_0_5_2__default = true; + regex_0_2_2_features."default".from_carnix_0_5_2__default = true; + rusqlite_0_13_0_features."default".from_carnix_0_5_2__default = true; + serde_1_0_21_features."default".from_carnix_0_5_2__default = true; + serde_derive_1_0_21_features."default".from_carnix_0_5_2__default = true; + serde_json_1_0_6_features."default".from_carnix_0_5_2__default = true; + tempdir_0_3_5_features."default".from_carnix_0_5_2__default = true; + toml_0_4_5_features."default".from_carnix_0_5_2__default = true; + cc_1_0_3 = cc_1_0_3_ rec { + dependencies = []; + features = mkFeatures cc_1_0_3_features; + }; + cc_1_0_3_features."rayon".self_parallel = hasFeature (cc_1_0_3_features."parallel" or {}); + rayon_0_0_0_features."default".from_cc_1_0_3__default = true; + cfg_if_0_1_2 = cfg_if_0_1_2_ rec {}; + clap_2_28_0 = clap_2_28_0_ rec { + dependencies = [ ansi_term_0_10_2 atty_0_2_3 bitflags_1_0_1 strsim_0_6_0 textwrap_0_9_0 unicode_width_0_1_4 vec_map_0_8_0 ] + ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_10_2] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_3] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "vec_map") features then [vec_map_0_8_0] else []); + features = mkFeatures clap_2_28_0_features; + }; + clap_2_28_0_features."".self = true; + clap_2_28_0_features."ansi_term".self_color = hasFeature (clap_2_28_0_features."color" or {}); + clap_2_28_0_features."atty".self_color = hasFeature (clap_2_28_0_features."color" or {}); + clap_2_28_0_features."suggestions".self_default = hasDefault clap_2_28_0_features; + clap_2_28_0_features."color".self_default = hasDefault clap_2_28_0_features; + clap_2_28_0_features."vec_map".self_default = hasDefault clap_2_28_0_features; + clap_2_28_0_features."yaml".self_doc = hasFeature (clap_2_28_0_features."doc" or {}); + clap_2_28_0_features."clippy".self_lints = hasFeature (clap_2_28_0_features."lints" or {}); + clap_2_28_0_features."strsim".self_suggestions = hasFeature (clap_2_28_0_features."suggestions" or {}); + clap_2_28_0_features."term_size".self_wrap_help = hasFeature (clap_2_28_0_features."wrap_help" or {}); + clap_2_28_0_features."yaml-rust".self_yaml = hasFeature (clap_2_28_0_features."yaml" or {}); + ansi_term_0_10_2_features."default".from_clap_2_28_0__default = true; + atty_0_2_3_features."default".from_clap_2_28_0__default = true; + bitflags_1_0_1_features."default".from_clap_2_28_0__default = true; + clippy_0_0_0_features."default".from_clap_2_28_0__default = true; + strsim_0_6_0_features."default".from_clap_2_28_0__default = true; + term_size_0_0_0_features."default".from_clap_2_28_0__default = true; + textwrap_0_9_0_features."term_size".from_clap_2_28_0__wrap_help = hasFeature (clap_2_28_0_features."wrap_help" or {}); + textwrap_0_9_0_features."default".from_clap_2_28_0__default = true; + unicode_width_0_1_4_features."default".from_clap_2_28_0__default = true; + vec_map_0_8_0_features."default".from_clap_2_28_0__default = true; + yaml_rust_0_0_0_features."default".from_clap_2_28_0__default = true; + dbghelp_sys_0_2_0 = dbghelp_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_dbghelp_sys_0_2_0__default = true; + dtoa_0_4_2 = dtoa_0_4_2_ rec {}; + either_1_4_0 = either_1_4_0_ rec { + dependencies = []; + features = mkFeatures either_1_4_0_features; + }; + either_1_4_0_features."use_std".self_default = hasDefault either_1_4_0_features; + serde_0_0_0_features."derive".from_either_1_4_0 = true; + serde_0_0_0_features."default".from_either_1_4_0__default = true; + env_logger_0_4_3 = env_logger_0_4_3_ rec { + dependencies = [ log_0_3_8 regex_0_2_2 ] + ++ (if lib.lists.any (x: x == "regex") features then [regex_0_2_2] else []); + features = mkFeatures env_logger_0_4_3_features; + }; + env_logger_0_4_3_features."".self = true; + env_logger_0_4_3_features."regex".self_default = hasDefault env_logger_0_4_3_features; + log_0_3_8_features."default".from_env_logger_0_4_3__default = true; + regex_0_2_2_features."default".from_env_logger_0_4_3__default = true; + error_chain_0_11_0 = error_chain_0_11_0_ rec { + dependencies = [ backtrace_0_3_4 ] + ++ (if lib.lists.any (x: x == "backtrace") features then [backtrace_0_3_4] else []); + features = mkFeatures error_chain_0_11_0_features; + }; + error_chain_0_11_0_features."".self = true; + error_chain_0_11_0_features."backtrace".self_default = hasDefault error_chain_0_11_0_features; + error_chain_0_11_0_features."example_generated".self_default = hasDefault error_chain_0_11_0_features; + backtrace_0_3_4_features."default".from_error_chain_0_11_0__default = true; + fuchsia_zircon_0_2_1 = fuchsia_zircon_0_2_1_ rec { + dependencies = [ fuchsia_zircon_sys_0_2_0 ]; + }; + fuchsia_zircon_sys_0_2_0_features."default".from_fuchsia_zircon_0_2_1__default = true; + fuchsia_zircon_sys_0_2_0 = fuchsia_zircon_sys_0_2_0_ rec { + dependencies = [ bitflags_0_7_0 ]; + }; + bitflags_0_7_0_features."default".from_fuchsia_zircon_sys_0_2_0__default = true; + itertools_0_7_3 = itertools_0_7_3_ rec { + dependencies = [ either_1_4_0 ]; + features = mkFeatures itertools_0_7_3_features; + }; + itertools_0_7_3_features."use_std".self_default = hasDefault itertools_0_7_3_features; + either_1_4_0_features."default".from_itertools_0_7_3__default = false; + itoa_0_3_4 = itoa_0_3_4_ rec { + features = mkFeatures itoa_0_3_4_features; + }; + itoa_0_3_4_features."".self = true; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; + lazy_static_0_2_11 = lazy_static_0_2_11_ rec { + dependencies = []; + features = mkFeatures lazy_static_0_2_11_features; + }; + lazy_static_0_2_11_features."compiletest_rs".self_compiletest = hasFeature (lazy_static_0_2_11_features."compiletest" or {}); + lazy_static_0_2_11_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {}); + lazy_static_0_2_11_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {}); + compiletest_rs_0_0_0_features."default".from_lazy_static_0_2_11__default = true; + spin_0_0_0_features."default".from_lazy_static_0_2_11__default = true; + libc_0_2_33 = libc_0_2_33_ rec { + features = mkFeatures libc_0_2_33_features; + }; + libc_0_2_33_features."use_std".self_default = hasDefault libc_0_2_33_features; + libsqlite3_sys_0_9_0 = libsqlite3_sys_0_9_0_ rec { + dependencies = (if abi == "msvc" then [] else []); + buildDependencies = [ pkg_config_0_3_9 ] + ++ (if lib.lists.any (x: x == "pkg-config") features then [pkg_config_0_3_9] else []); + features = mkFeatures libsqlite3_sys_0_9_0_features; + }; + libsqlite3_sys_0_9_0_features."bindgen".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."cc".self_bundled = hasFeature (libsqlite3_sys_0_9_0_features."bundled" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8".self_default = hasDefault libsqlite3_sys_0_9_0_features; + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_16" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_16" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4" or {}); + linked_hash_map_0_4_2 = linked_hash_map_0_4_2_ rec { + dependencies = []; + features = mkFeatures linked_hash_map_0_4_2_features; + }; + linked_hash_map_0_4_2_features."heapsize".self_heapsize_impl = hasFeature (linked_hash_map_0_4_2_features."heapsize_impl" or {}); + linked_hash_map_0_4_2_features."serde".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {}); + linked_hash_map_0_4_2_features."serde_test".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {}); + clippy_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + heapsize_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + serde_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + serde_test_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + log_0_3_8 = log_0_3_8_ rec { + features = mkFeatures log_0_3_8_features; + }; + log_0_3_8_features."use_std".self_default = hasDefault log_0_3_8_features; + lru_cache_0_1_1 = lru_cache_0_1_1_ rec { + dependencies = [ linked_hash_map_0_4_2 ]; + features = mkFeatures lru_cache_0_1_1_features; + }; + lru_cache_0_1_1_features."heapsize".self_heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {}); + heapsize_0_0_0_features."default".from_lru_cache_0_1_1__default = true; + linked_hash_map_0_4_2_features."heapsize_impl".from_lru_cache_0_1_1__heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {}); + linked_hash_map_0_4_2_features."default".from_lru_cache_0_1_1__default = true; + memchr_1_0_2 = memchr_1_0_2_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_33] else []); + features = mkFeatures memchr_1_0_2_features; + }; + memchr_1_0_2_features."".self = true; + memchr_1_0_2_features."use_std".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."use_std".from_memchr_1_0_2__use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."default".from_memchr_1_0_2__default = false; + nom_3_2_1 = nom_3_2_1_ rec { + dependencies = [ memchr_1_0_2 ]; + features = mkFeatures nom_3_2_1_features; + }; + nom_3_2_1_features."std".self_default = hasDefault nom_3_2_1_features; + nom_3_2_1_features."stream".self_default = hasDefault nom_3_2_1_features; + nom_3_2_1_features."compiler_error".self_nightly = hasFeature (nom_3_2_1_features."nightly" or {}); + nom_3_2_1_features."regex".self_regexp = hasFeature (nom_3_2_1_features."regexp" or {}); + nom_3_2_1_features."regexp".self_regexp_macros = hasFeature (nom_3_2_1_features."regexp_macros" or {}); + nom_3_2_1_features."lazy_static".self_regexp_macros = hasFeature (nom_3_2_1_features."regexp_macros" or {}); + compiler_error_0_0_0_features."default".from_nom_3_2_1__default = true; + lazy_static_0_0_0_features."default".from_nom_3_2_1__default = true; + memchr_1_0_2_features."use_std".from_nom_3_2_1__std = hasFeature (nom_3_2_1_features."std" or {}); + memchr_1_0_2_features."default".from_nom_3_2_1__default = false; + regex_0_0_0_features."default".from_nom_3_2_1__default = true; + num_traits_0_1_40 = num_traits_0_1_40_ rec {}; + pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; + quote_0_3_15 = quote_0_3_15_ rec {}; + rand_0_3_18 = rand_0_3_18_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if kernel == "fuchsia" then [ fuchsia_zircon_0_2_1 ] else []); + features = mkFeatures rand_0_3_18_features; + }; + rand_0_3_18_features."i128_support".self_nightly = hasFeature (rand_0_3_18_features."nightly" or {}); + libc_0_2_33_features."default".from_rand_0_3_18__default = true; + fuchsia_zircon_0_2_1_features."default".from_rand_0_3_18__default = true; + redox_syscall_0_1_32 = redox_syscall_0_1_32_ rec {}; + redox_termios_0_1_1 = redox_termios_0_1_1_ rec { + dependencies = [ redox_syscall_0_1_32 ]; + }; + redox_syscall_0_1_32_features."default".from_redox_termios_0_1_1__default = true; + regex_0_2_2 = regex_0_2_2_ rec { + dependencies = [ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]; + features = mkFeatures regex_0_2_2_features; + }; + regex_0_2_2_features."simd".self_simd-accel = hasFeature (regex_0_2_2_features."simd-accel" or {}); + aho_corasick_0_6_3_features."default".from_regex_0_2_2__default = true; + memchr_1_0_2_features."default".from_regex_0_2_2__default = true; + regex_syntax_0_4_1_features."default".from_regex_0_2_2__default = true; + simd_0_0_0_features."default".from_regex_0_2_2__default = true; + thread_local_0_3_4_features."default".from_regex_0_2_2__default = true; + utf8_ranges_1_0_0_features."default".from_regex_0_2_2__default = true; + regex_syntax_0_4_1 = regex_syntax_0_4_1_ rec {}; + rusqlite_0_13_0 = rusqlite_0_13_0_ rec { + dependencies = [ bitflags_1_0_1 libsqlite3_sys_0_9_0 lru_cache_0_1_1 time_0_1_38 ]; + features = mkFeatures rusqlite_0_13_0_features; + }; + rusqlite_0_13_0_features."".self = true; + bitflags_1_0_1_features."default".from_rusqlite_0_13_0__default = true; + chrono_0_0_0_features."default".from_rusqlite_0_13_0__default = true; + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11".from_rusqlite_0_13_0__backup = hasFeature (rusqlite_0_13_0_features."backup" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4".from_rusqlite_0_13_0__blob = hasFeature (rusqlite_0_13_0_features."blob" or {}); + libsqlite3_sys_0_9_0_features."buildtime_bindgen".from_rusqlite_0_13_0__buildtime_bindgen = hasFeature (rusqlite_0_13_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."bundled".from_rusqlite_0_13_0__bundled = hasFeature (rusqlite_0_13_0_features."bundled" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3".from_rusqlite_0_13_0__functions = hasFeature (rusqlite_0_13_0_features."functions" or {}); + libsqlite3_sys_0_9_0_features."sqlcipher".from_rusqlite_0_13_0__sqlcipher = hasFeature (rusqlite_0_13_0_features."sqlcipher" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23".from_rusqlite_0_13_0__trace = hasFeature (rusqlite_0_13_0_features."trace" or {}); + libsqlite3_sys_0_9_0_features."default".from_rusqlite_0_13_0__default = true; + lru_cache_0_1_1_features."default".from_rusqlite_0_13_0__default = true; + serde_json_0_0_0_features."default".from_rusqlite_0_13_0__default = true; + time_0_1_38_features."default".from_rusqlite_0_13_0__default = true; + rustc_demangle_0_1_5 = rustc_demangle_0_1_5_ rec {}; + serde_1_0_21 = serde_1_0_21_ rec { + dependencies = []; + features = mkFeatures serde_1_0_21_features; + }; + serde_1_0_21_features."unstable".self_alloc = hasFeature (serde_1_0_21_features."alloc" or {}); + serde_1_0_21_features."std".self_default = hasDefault serde_1_0_21_features; + serde_1_0_21_features."serde_derive".self_derive = hasFeature (serde_1_0_21_features."derive" or {}); + serde_1_0_21_features."serde_derive".self_playground = hasFeature (serde_1_0_21_features."playground" or {}); + serde_derive_0_0_0_features."default".from_serde_1_0_21__default = true; + serde_derive_1_0_21 = serde_derive_1_0_21_ rec { + dependencies = [ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ]; + }; + quote_0_3_15_features."default".from_serde_derive_1_0_21__default = true; + serde_derive_internals_0_17_0_features."default".from_serde_derive_1_0_21__default = false; + syn_0_11_11_features."visit".from_serde_derive_1_0_21 = true; + syn_0_11_11_features."default".from_serde_derive_1_0_21__default = true; + serde_derive_internals_0_17_0 = serde_derive_internals_0_17_0_ rec { + dependencies = [ syn_0_11_11 synom_0_11_3 ]; + }; + syn_0_11_11_features."parsing".from_serde_derive_internals_0_17_0 = true; + syn_0_11_11_features."default".from_serde_derive_internals_0_17_0__default = false; + synom_0_11_3_features."default".from_serde_derive_internals_0_17_0__default = true; + serde_json_1_0_6 = serde_json_1_0_6_ rec { + dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_21 ]; + features = mkFeatures serde_json_1_0_6_features; + }; + serde_json_1_0_6_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_6_features."preserve_order" or {}); + dtoa_0_4_2_features."default".from_serde_json_1_0_6__default = true; + itoa_0_3_4_features."default".from_serde_json_1_0_6__default = true; + linked_hash_map_0_0_0_features."default".from_serde_json_1_0_6__default = true; + num_traits_0_1_40_features."default".from_serde_json_1_0_6__default = true; + serde_1_0_21_features."default".from_serde_json_1_0_6__default = true; + strsim_0_6_0 = strsim_0_6_0_ rec {}; + syn_0_11_11 = syn_0_11_11_ rec { + dependencies = [ quote_0_3_15 synom_0_11_3 unicode_xid_0_0_4 ] + ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else []) ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else []) ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []); + features = mkFeatures syn_0_11_11_features; + }; + syn_0_11_11_features."".self = true; + syn_0_11_11_features."parsing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."printing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."unicode-xid".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."synom".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."quote".self_printing = hasFeature (syn_0_11_11_features."printing" or {}); + quote_0_3_15_features."default".from_syn_0_11_11__default = true; + synom_0_11_3_features."default".from_syn_0_11_11__default = true; + unicode_xid_0_0_4_features."default".from_syn_0_11_11__default = true; + synom_0_11_3 = synom_0_11_3_ rec { + dependencies = [ unicode_xid_0_0_4 ]; + }; + unicode_xid_0_0_4_features."default".from_synom_0_11_3__default = true; + tempdir_0_3_5 = tempdir_0_3_5_ rec { + dependencies = [ rand_0_3_18 ]; + }; + rand_0_3_18_features."default".from_tempdir_0_3_5__default = true; + termion_1_5_1 = termion_1_5_1_ rec { + dependencies = (if !(kernel == "redox") then [ libc_0_2_33 ] else []) + ++ (if kernel == "redox" then [ redox_syscall_0_1_32 redox_termios_0_1_1 ] else []); + }; + libc_0_2_33_features."default".from_termion_1_5_1__default = true; + redox_syscall_0_1_32_features."default".from_termion_1_5_1__default = true; + redox_termios_0_1_1_features."default".from_termion_1_5_1__default = true; + textwrap_0_9_0 = textwrap_0_9_0_ rec { + dependencies = [ unicode_width_0_1_4 ]; + }; + hyphenation_0_0_0_features."default".from_textwrap_0_9_0__default = true; + term_size_0_0_0_features."default".from_textwrap_0_9_0__default = true; + unicode_width_0_1_4_features."default".from_textwrap_0_9_0__default = true; + thread_local_0_3_4 = thread_local_0_3_4_ rec { + dependencies = [ lazy_static_0_2_11 unreachable_1_0_0 ]; + }; + lazy_static_0_2_11_features."default".from_thread_local_0_3_4__default = true; + unreachable_1_0_0_features."default".from_thread_local_0_3_4__default = true; + time_0_1_38 = time_0_1_38_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if kernel == "redox" then [ redox_syscall_0_1_32 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + libc_0_2_33_features."default".from_time_0_1_38__default = true; + rustc_serialize_0_0_0_features."default".from_time_0_1_38__default = true; + redox_syscall_0_1_32_features."default".from_time_0_1_38__default = true; + kernel32_sys_0_2_2_features."default".from_time_0_1_38__default = true; + winapi_0_2_8_features."default".from_time_0_1_38__default = true; + toml_0_4_5 = toml_0_4_5_ rec { + dependencies = [ serde_1_0_21 ]; + }; + serde_1_0_21_features."default".from_toml_0_4_5__default = true; + unicode_width_0_1_4 = unicode_width_0_1_4_ rec { + features = mkFeatures unicode_width_0_1_4_features; + }; + unicode_width_0_1_4_features."".self = true; + unicode_xid_0_0_4 = unicode_xid_0_0_4_ rec { + features = mkFeatures unicode_xid_0_0_4_features; + }; + unicode_xid_0_0_4_features."".self = true; + unreachable_1_0_0 = unreachable_1_0_0_ rec { + dependencies = [ void_1_0_2 ]; + }; + void_1_0_2_features."default".from_unreachable_1_0_0__default = false; + utf8_ranges_1_0_0 = utf8_ranges_1_0_0_ rec {}; + vcpkg_0_2_2 = vcpkg_0_2_2_ rec {}; + vec_map_0_8_0 = vec_map_0_8_0_ rec { + dependencies = []; + features = mkFeatures vec_map_0_8_0_features; + }; + vec_map_0_8_0_features."serde".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); + vec_map_0_8_0_features."serde_derive".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); + serde_0_0_0_features."default".from_vec_map_0_8_0__default = true; + serde_derive_0_0_0_features."default".from_vec_map_0_8_0__default = true; + void_1_0_2 = void_1_0_2_ rec { + features = mkFeatures void_1_0_2_features; + }; + void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; +} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix new file mode 100644 index 000000000000..c074d46a7f75 --- /dev/null +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -0,0 +1,10 @@ +{ pkgconfig, sqlite, openssl, ... }: + +{ + libsqlite3-sys = attrs: { + buildInputs = [ pkgconfig sqlite ]; + }; + openssl-sys = attrs: { + buildInputs = [ pkgconfig openssl ]; + }; +} diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix new file mode 100644 index 000000000000..95dfd38b12ae --- /dev/null +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, unzip }: + +{ crateName +, version +, sha256 +, ... } @ args: + +lib.overrideDerivation (fetchurl ({ + + name = "${crateName}-${version}.tar.gz"; + url = "https://crates.io/api/v1/crates/${crateName}/${version}/download"; + recursiveHash = true; + + downloadToTemp = true; + + postFetch = + '' + export PATH=${unzip}/bin:$PATH + + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + + renamed="$TMPDIR/${crateName}-${version}.tar.gz" + mv "$downloadedFile" "$renamed" + unpackFile "$renamed" + fn=$(cd "$unpackDir" && echo *) + if [ -f "$unpackDir/$fn" ]; then + mkdir $out + fi + mv "$unpackDir/$fn" "$out" + ''; +} // removeAttrs args [ "crateName" "version" ])) +# Hackety-hack: we actually need unzip hooks, too +(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh index b742d5a8ffd9..85364a61f612 100644 --- a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh +++ b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh @@ -18,5 +18,5 @@ if [ -z "$libxmlHookDone" ]; then # xmllint and xsltproc from looking in /etc/xml/catalog. export XML_CATALOG_FILES if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi - envHooks+=(addXMLCatalogs) + addEnvHooks "$hostOffset" addXMLCatalogs fi diff --git a/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh b/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh new file mode 100644 index 000000000000..b53e184b0956 --- /dev/null +++ b/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh @@ -0,0 +1,5 @@ +ld-is-cc-hook() { + LD=$CC +} + +preConfigureHooks+=(ld-is-cc-hook) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index c90d2cd52013..19dbb10d18e7 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -19,7 +19,7 @@ _separateDebugInfo() { if ! isELF "$i"; then continue; fi # Extract the Build ID. FIXME: there's probably a cleaner way. - local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" + local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" if [ "${#id}" != 40 ]; then echo "could not find build ID of $i, skipping" >&2 continue @@ -28,8 +28,8 @@ _separateDebugInfo() { # Extract the debug info. header "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" - objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" - strip --strip-debug "$i" + $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" + $STRIP --strip-debug "$i" # Also a create a symlink .debug. ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/build-support/setup-hooks/set-java-classpath.sh index 047da91bc97c..5d3548dc2e88 100644 --- a/pkgs/build-support/setup-hooks/set-java-classpath.sh +++ b/pkgs/build-support/setup-hooks/set-java-classpath.sh @@ -10,4 +10,4 @@ addPkgToClassPath () { done } -envHooks+=(addPkgToClassPath) +addEnvHooks "$targetOffset" addPkgToClassPath diff --git a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh index 2fd2a2d6da6f..96bf48cf123a 100644 --- a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh +++ b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh @@ -2,4 +2,4 @@ setupDebugInfoDirs () { addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug } -envHooks+=(setupDebugInfoDirs) +addEnvHooks "$targetOffset" setupDebugInfoDirs diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 0bf37e10d870..fc4c7bfbaf95 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -3,24 +3,45 @@ fixupOutputHooks+=(_doStrip) _doStrip() { - if [ -z "$dontStrip" ]; then + # We don't bother to strip build platform code because it shouldn't make it + # to $out anyways---if it does, that's a bigger problem that a lack of + # stripping will help catch. + local -ra flags=(dontStripHost dontStripTarget) + local -ra stripCmds=(STRIP TARGET_STRIP) + + # Optimization + if [[ "$STRIP" == "$TARGET_STRIP" ]]; then + dontStripTarget+=1 + fi + + local i + for i in ${!stripCmds[@]}; do + local -n flag="${flags[$i]}" + local -n stripCmd="${stripCmds[$i]}" + + # `dontStrip` disables them all + if [[ "$dontStrip" || "$flag" ]] || ! type -f "$stripCmd" 2>/dev/null + then continue; fi + stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} if [ -n "$stripDebugList" ]; then - stripDirs "$stripDebugList" "${stripDebugFlags:--S}" + stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}" fi stripAllList=${stripAllList:-} if [ -n "$stripAllList" ]; then - stripDirs "$stripAllList" "${stripAllFlags:--s}" + stripDirs "$stripCmd" "$stripAllList" "${stripAllFlags:--s}" fi - fi + done } stripDirs() { - local dirs="$1" - local stripFlags="$2" + local cmd="$1" + local dirs="$2" + local stripFlags="$3" local dirsNew= + local d for d in ${dirs}; do if [ -d "$prefix/$d" ]; then dirsNew="${dirsNew} $prefix/$d " @@ -29,8 +50,8 @@ stripDirs() { dirs=${dirsNew} if [ -n "${dirs}" ]; then - header "stripping (with flags $stripFlags) in$dirs" - find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags 2>/dev/null || true + header "stripping (with command $cmd and flags $stripFlags) in$dirs" + find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $cmd $commonStripFlags $stripFlags 2>/dev/null || true stopNest fi } diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index 9658b9f82595..6130f32bef86 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -25,7 +25,7 @@ _linkDLLs() { linkCount=0 # Iterate over any DLL that we depend on. local dll - for dll in $(objdump -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do + for dll in $($OBJDUMP -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do if [ -e "./$dll" ]; then continue; fi # Locate the DLL - it should be an *executable* file on $DLLPATH. local dllPath="$(PATH="$DLLPATH" type -P "$dll")" diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 79b8d5b73fa1..25ac12996cc1 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -6,7 +6,7 @@ find_gio_modules() { fi } -envHooks+=(find_gio_modules) +addEnvHooks "$targetOffset" find_gio_modules # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set. wrapGAppsHook() { diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 3c27b9fc1ad9..62cf13e52021 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -61,6 +61,7 @@ rec { mkfs -t ext3 -b 4096 /dev/${vmTools.hd} mount /dev/${vmTools.hd} disk cd disk + mkdir proc sys dev # Run root script ${stdenv.lib.optionalString (runAsRoot != null) '' @@ -92,8 +93,10 @@ rec { cd disk export PATH=$PATH:${e2fsprogs}/bin/ - singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out - tar -c . | singularity import $out + echo creating + singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out + echo importing + tar -c . | singularity image.import $out ''); in result; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 7d44feb5ca65..9664abeb4651 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -95,8 +95,8 @@ rec { # Make a package that just contains a setup hook with the given contents. - makeSetupHook = { deps ? [], substitutions ? {} }: script: - runCommand "hook" substitutions + makeSetupHook = { name ? "hook", deps ? [], substitutions ? {} }: script: + runCommand name substitutions ('' mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index fdd7c2013b40..64f4a759e1be 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -60,21 +60,6 @@ rec { ''; # */ - createDeviceNodes = dev: - '' - mknod -m 666 ${dev}/null c 1 3 - mknod -m 666 ${dev}/zero c 1 5 - mknod -m 666 ${dev}/full c 1 7 - mknod -m 666 ${dev}/random c 1 8 - mknod -m 666 ${dev}/urandom c 1 9 - mknod -m 666 ${dev}/tty c 5 0 - mknod -m 666 ${dev}/ttyS0 c 4 64 - mknod ${dev}/rtc c 254 0 - . /sys/class/block/${hd}/uevent - mknod ${dev}/${hd} b $MAJOR $MINOR - ''; - - stage1Init = writeScript "vm-run-stage1" '' #! ${initrdUtils}/bin/ash -e @@ -109,8 +94,7 @@ rec { insmod $i done - mount -t tmpfs none /dev - ${createDeviceNodes "/dev"} + mount -t devtmpfs devtmpfs /dev ifconfig lo up @@ -224,7 +208,7 @@ rec { -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ - -drive file=$diskImage,if=virtio,cache=unsafe,werror=report \ + ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ @@ -239,8 +223,6 @@ rec { mkdir xchg mv saved-env xchg/ - diskImage=''${diskImage:-/dev/null} - eval "$preVM" if [ "$enableParallelBuilding" = 1 ]; then @@ -256,7 +238,7 @@ rec { # the -K option to preserve the temporary build directory). cat > ./run-vm <"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed - newHash=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }') + newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | tr -d "'" | awk '{ print $(NF-4) }') fi if [ -z "$newHash" ]; then @@ -82,6 +82,11 @@ if [ -z "$newHash" ]; then die "Couldn't figure out new hash of '$attr.src'!" fi +if [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then + mv "$nixFile.bak" "$nixFile" + die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" +fi + sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace temporary source hash of '$attr' to the final source hash!" diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index a1e90244f808..68a1fb92cc86 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zeal-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; rev = "v${version}"; - sha256 = "1mfcw843g4slr79bvidb5s88m7a3swr9by6srdn233b88j8mqwzl"; + sha256 = "14gm9n2zmqgig4nz5i3089dhn0a7c175g1szr0zg9yzr9j2hk0mr"; }; # while ads can be disabled from the user settings, by default they are not so @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = http://zealdocs.org/; + homepage = https://zealdocs.org/; license = licenses.gpl3; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ skeidel peterhoeg ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch index 7f163376865c..1c0b3c081f16 100644 --- a/pkgs/data/documentation/zeal/remove_ads.patch +++ b/pkgs/data/documentation/zeal/remove_ads.patch @@ -1,13 +1,16 @@ diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index afe9e2a..490a0fb 100644 +index 22e6278..ec09771 100644 --- a/src/app/resources/browser/welcome.html +++ b/src/app/resources/browser/welcome.html -@@ -34,9 +34,6 @@ +@@ -35,12 +35,6 @@
--
-- +-
+-
+- +-
-

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 1e888fe0784b..60e1eff2c9d5 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -64,11 +64,11 @@ in stdenv.mkDerivation { buildCommand = '' mkdir -p $out/share/fonts/truetype cp ${full-ttf}/share/fonts/truetype/*.ttf $out/share/fonts/truetype/ - ln -s --force ${minimal}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf + ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1nf0h15p8yvjx36syq1034i3hix99lm8p54iyjw8dpa19i9jfkmd"; + outputHash = "15l93xm9mg2ziaxv4nqy2a4jaz54d05xf0hfz1h84bclzb882llh"; inherit meta; passthru.minimal = minimal; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 2e2ffdeb5bb4..829eca8c06fc 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; meta = with stdenv.lib; { - homepage = http://software.sil.org/gentium/; + homepage = https://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; longDescription = '' Gentium is a typeface family designed to enable the diverse ethnic groups @@ -35,7 +35,7 @@ in fetchzip rec { This package contains the regular and italic styles for the Gentium Plus font family, along with documentation. ''; - downloadPage = "http://software.sil.org/gentium/download/"; + downloadPage = "https://software.sil.org/gentium/download/"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix new file mode 100644 index 000000000000..573cb432085e --- /dev/null +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub }: + +let version = "0.5.3"; +in fetchFromGitHub rec { + name = "ibm-plex-${version}"; + + owner = "IBM"; + repo = "type"; + rev = "v${version}"; + sha256 = "1im7sid3qsk4wnm0yhq9h7i50bz46jksqxv60svdfnsrwq0krd1h"; + + postFetch = '' + tar --strip-components=1 -xzvf $downloadedFile + mkdir -p $out/share/fonts/opentype + cp fonts/*/desktop/mac/*.otf $out/share/fonts/opentype/ + ''; + + meta = with lib; { + description = "IBM Plex Typeface"; + homepage = https://ibm.github.io/type/; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 5217b175ed20..94c580c30df0 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; - longDescrition = '' + longDescription = '' Input is a font family designed for computer programming, data, and text composition. It was designed by David Jonathan Ross between 2012 and 2014 and published by The Font Bureau. It diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index b70166b7ec17..0fd724149d8f 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "062"; + version = "063"; in fetchzip rec { name = "mplus-${version}"; @@ -13,7 +13,7 @@ in fetchzip rec { cp *.ttf $out/share/fonts/truetype ''; - sha256 = "0zm1snq5r584rz90yv5lndsqgchdaxq2185vrk7849ch4k5vd23z"; + sha256 = "0d485l2ihxfk039rrrnfviamlbj13cwky0c752m4ikwvgiqiq94y"; meta = with stdenv.lib; { description = "M+ Outline Fonts"; diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix new file mode 100644 index 000000000000..f3be8857284c --- /dev/null +++ b/pkgs/data/fonts/myrica/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub }: + +fetchFromGitHub rec { + name = "myrica-2.011.20160403"; + + owner = "tomokuni"; + repo = "Myrica"; + rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; + sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; + + postFetch = '' + tar --strip-components=1 -xzvf $downloadedFile + mkdir -p $out/share/fonts/truetype + cp product/*.TTC $out/share/fonts/truetype + ''; + + meta = with lib; { + homepage = https://myrica.estable.jp/; + license = licenses.ofl; + maintainers = with maintainers; [ mikoim ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index f1546a17f58a..b5fc13daefa0 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -27,6 +27,6 @@ pythonPackages.buildPythonPackage rec { description = "Noto fonts support tools and scripts plus web site generation"; license = lib.licenses.asl20; homepage = https://github.com/googlei18n/nototools; - platform = lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 9b1324639720..40a9be3282e0 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -16,7 +16,7 @@ in fetchzip { sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2"; meta = with stdenv.lib; { - homepage = http://opendyslexic.org/; + homepage = https://opendyslexic.org/; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index b695143fa592..99f0d913b857 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -17,7 +17,7 @@ in fetchzip { meta = { homepage = https://github.com/stark/siji; description = "An iconic bitmap font based on Stlarch with additional glyphs"; - liscense = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.asymmetric ]; }; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index f84d067eed83..65fa3fb81ab5 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -26,7 +26,7 @@ fetchzip { meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx; - binaryDistribution = false; # haven't read the EULA, but we probably can't redistribute these files, so... + license = stdenv.lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix new file mode 100644 index 000000000000..d77d6d8b3011 --- /dev/null +++ b/pkgs/data/fonts/zilla-slab/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip }: + +let + version = "1.002"; + hash = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; +in fetchzip { + name = "zilla-slab-${version}"; + + url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip"; + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/truetype + cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ + ''; + sha256 = hash; + + meta = with stdenv.lib; { + homepage = https://github.com/mozilla/zilla-slab; + description = "Zilla Slab fonts"; + longDescription = '' + Zilla Slab is Mozilla's core typeface, used + for the Mozilla wordmark, headlines and + throughout their designs. A contemporary + slab serif, based on Typotheque's Tesla, it + is constructed with smooth curves and true + italics, which gives text an unexpectedly + sophisticated industrial look and a friendly + approachability in all weights. + ''; + license = licenses.ofl; + maintainers = with maintainers; [ caugner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix new file mode 100644 index 000000000000..9ff54d5d64d5 --- /dev/null +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + name = "elementary-xfce-icon-theme-${version}"; + version = "2017-11-28"; + + src = fetchFromGitHub { + owner = "shimmerproject"; + repo = "elementary-xfce"; + rev = "b5cc6f044ed24e388ed2fffed1d02f43ce76f5e6"; + sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; + }; + + # fallback icon theme + propagatedBuildInputs = [ hicolor_icon_theme ]; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/icons + cp -dr --no-preserve='ownership' elementary-xfce{,-dark,-darker,-darkest} $out/share/icons/ + ''; + + postInstall = '' + for icons in "$out"/share/icons/*; do + "${gtk3.out}/bin/gtk-update-icon-cache" "$icons" + done + ''; + + meta = with stdenv.lib; { + description = "Elementary icons for Xfce and other Gtk+ desktops like Gnome3"; + homepage = https://github.com/shimmerproject/elementary-xfce; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index 05ab9b3d65df..29306cb316af 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -8,7 +8,8 @@ hicolorIconThemeHook() { } -envHooks+=(hicolorIconThemeHook) +# I think this is meant to be a runtime dep +addEnvHooks "$hostOffset" hicolorIconThemeHook # Remove icon cache hicolorPreFixupPhase() { diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 1dd268cf816e..3de3dbe110c4 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, numix-icon-theme }: stdenv.mkDerivation rec { - version = "17-09-13"; + version = "17-12-25"; package-name = "numix-icon-theme-circle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "14ck07j9v0yh8ky191sa3xxi4qh7bbg84i8jijy3kbjcx9s0zl8a"; + sha256 = "10sn2w9xzmh7arbw0vn516p9nfym1bs8bf7i8zzvz7y09s61lkxh"; }; buildInputs = [ numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 90040c8fc286..503a66b736f6 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "17-09-13"; + version = "17-12-25"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1grpm902hiid561fbp9y1rb9z21y8d1krjgxgs7j8qnpx380sd5x"; + sha256 = "07rcfkz3c1z5fwqiib4r1bm964mpwf1f128xm8kz55xp6w1c7zgl"; }; buildInputs = [ numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index a7c6c4908972..08fd012bb41e 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, hicolor_icon_theme }: stdenv.mkDerivation rec { - version = "2017-11-18"; + version = "17-12-25"; package-name = "numix-icon-theme"; @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "ea7f2069ca1f6190494e96aa2febcadf6248c5b4"; - sha256 = "1nk0mc2qycwmjqdlrsfgar5m83pyj3hf6f66pywf9706nn2yz8fv"; + rev = version; + sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; }; + buildInputs = [ hicolor_icon_theme ]; + dontBuild = true; installPhase = '' diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 72ee323030a9..41f704e750c5 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "adapta-backgrounds-${version}"; - version = "0.4.0.6"; + version = "0.5.2.3"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; rev = version; - sha256 = "1yqxrwhjl6g92wm52kalbns41i2l5g45qbd4185b22crhbrn5x79"; + sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007"; }; nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - description = "A wallpaper collection for adapta-project"; + description = "Wallpaper collection for adapta-project"; homepage = https://github.com/adapta-project/adapta-backgrounds; - license = with licenses; [ gpl2 cc-by-sa-30 ]; + license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index eaebc3aff268..5f4497020319 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,26 +8,26 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2017-09-17"; + version = "2017-12-02"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" - "1xqxlnxxk8grqr0nr9vaf5r6z5bcdbadh83qhzr6jvhs20s37lsl"; + "1nggml11wzlanmzk6wbw2kla91fj8ggd9kh9yz42lnyckdlf5ac4"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" - "0g3am25jmhm3r51hvz9lknkrnzj98hxdxav2cvrhz6b7wndgyspk"; + "0w809xgmr5zi4fgm9q3lhrnh1vl62s49n737bhq4jplm5918ki50"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.gz" - "1syw19gx2mpqz9ypkaq2gh712bv60a7rf56afzd3qzkmgf6rw1qr"; + "0cibajsv5xdjpw1qfx22izm5azqcj0d7nvk39irgwflkim9jfjbs"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "0ihbqm1f5b9qb68i73ghmk30b6i2n53fmmhv2wadja5zcdpkhdvk"; + "1ldwbzgs64irfgb3kq3jp8fmhwmwqk713dr4kkdqlglrblr9hfkc"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "0adddsk0g9a3xaa0f8qx12s07n31wvirymjzrhnsg66i2qlm0h34"; + "06qqs8qr8vxqwd80npz7n66k3bpc1vs7w43i2bb4k0di5yxnjwr9"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" - "1qar0vdlpk3razq83l5fzb54zihs2sma8xgngpql8njfgby0w825"; + "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix new file mode 100644 index 000000000000..c38097abde97 --- /dev/null +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: + +stdenv.mkDerivation rec { + name = "osinfo-db-20170813"; + + src = fetchurl { + url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; + sha256 = "0v9i325aaflzj2y5780mj9b0jv5ysb1bn90bm3s4f2ck5n124ffw"; + }; + + nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; + + phases = [ "installPhase" ]; + + installPhase = '' + osinfo-db-import --dir "$out/share/osinfo" "${src}" + ''; + + meta = with stdenv.lib; { + description = "Osinfo database of information about operating systems for virtualization provisioning tools"; + homepage = https://libosinfo.org/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix new file mode 100644 index 000000000000..2769ed1a166a --- /dev/null +++ b/pkgs/data/misc/scowl/default.nix @@ -0,0 +1,101 @@ +{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "scowl"; + version = "2017.08.24"; + + src = fetchFromGitHub { + owner = "en-wl"; + repo = "wordlist"; + rev = "rel-${version}"; + sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz"; + }; + + buildInputs = []; + nativeBuildInputs = [unzip zip perl aspell dos2unix]; + + NIX_CFLAGS_COMPILE = " -Wno-narrowing "; + + preConfigure = '' + patchShebangs . + export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon" + ''; + + postBuild = '' + ( + cd scowl/speller + make aspell + make hunspell + ) + ''; + + enableParallelBuilding = false; + + installPhase = '' + eval "$preInstall" + + mkdir -p "$out/share/scowl" + mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" + mkdir -p "$out/share/dict" + + cp -r scowl/speller/aspell "$out/lib/aspell" + cp scowl/speller/*.{aff,dic} "$out/share/hunspell" + ln -s "$out/share/hunspell" "$out/share/myspell/dicts" + + cp scowl/final/* "$out/share/scowl" + + ( + cd scowl + for region in american british british_s british_z canadian australian; do + case $region in + american) + regcode=en-us; + ;; + british) + regcode=en-gb-ise; + ;; + british_s) + regcode=en-gb-ise; + ;; + british_z) + regcode=en-gb-ize; + ;; + canadian) + regcode=en-ca; + ;; + australian) + regcode=en-au; + ;; + esac + regcode_var="$regcode" + if test "$region" = british; then + regcode_var="en-gb" + fi + + echo $region $regcode $regcode_sz + for s in 10 20 30 35 40 50 55 60 70 80 90; do + ./mk-list $regcode $s > "$out/share/dict/w$region.$s" + ./mk-list --variants=1 $regcode_var $s > "$out/share/dict/w$region.variants.$s" + ./mk-list --variants=2 $regcode_var $s > "$out/share/dict/w$region.acceptable.$s" + done + ./mk-list $regcode 60 > "$out/share/dict/w$region.txt" + ./mk-list --variants=1 $regcode_var 60 > "$out/share/dict/w$region.variants.txt" + ./mk-list --variants=2 $regcode_var 80 > "$out/share/dict/w$region.scrabble.txt" + done + ./mk-list --variants=1 en-gb 60 > "$out/share/dict/words.variants.txt" + ./mk-list --variants=1 en-gb 80 > "$out/share/dict/words.scrabble.txt" + ./mk-list en-gb-ise 60 > "$out/share/dict/words.txt" + ) + + eval "$postInstall" + ''; + + meta = { + inherit version; + description = "Spell checker oriented word lists"; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.unix; + homepage = "http://wordlist.aspell.net/"; + }; +} diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 1b4d967af553..ada2ed997dad 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { cp tzfile.h "$dev/include/tzfile.h" ''; + setupHook = ./tzdata-setup-hook.sh; + meta = { homepage = http://www.iana.org/time-zones; description = "Database of current and historical time zones"; diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh new file mode 100644 index 000000000000..9ae9b46d85c5 --- /dev/null +++ b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh @@ -0,0 +1,6 @@ +tzdataHook() { + export TZDIR=@out@/share/zoneinfo +} + +envHooks+=(tzdataHook) +crossEnvHooks+=(tzdataHook) diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index a9d09945d7ff..640659a61080 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index b7ab83aa5773..cc71e0026324 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let +let src = fetchurl { url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip; @@ -19,7 +19,7 @@ stdenv.mkDerivation { unpackPhase = "true"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 424a44c1bc78..dc7ebf5959da 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let +let src = fetchurl { url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip; @@ -19,7 +19,7 @@ stdenv.mkDerivation { unpackPhase = "true"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh deleted file mode 100644 index 939305d486a7..000000000000 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/xml/dtd/docbook-ebnf -cd $out/xml/dtd/docbook-ebnf -cp -p $dtd dbebnf.dtd -cp -p $catalog $(stripHash $catalog) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index e9ff03f78435..bc51ceeca431 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,16 +1,24 @@ {stdenv, fetchurl, unzip}: -assert unzip != null; - stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; - builder = ./builder.sh; + dtd = fetchurl { url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; + unpackPhase = '' + mkdir -p $out/xml/dtd/docbook-ebnf + cd $out/xml/dtd/docbook-ebnf + ''; + + installPhase = '' + cp -p $dtd dbebnf.dtd + cp -p $catalog $(stripHash $catalog) + ''; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh deleted file mode 100644 index 8b52ebd70b44..000000000000 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/xml/dtd/docbook -cd $out/xml/dtd/docbook -unpackFile $src -find . -type f -exec chmod -x {} \; -eval "$postInstall" diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 373778d43de6..10b76f7b2b55 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,12 +1,21 @@ { stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: -assert unzip != null; - stdenv.mkDerivation { inherit src name postInstall; - builder = ./builder.sh; - buildInputs = [unzip]; - propagatedBuildInputs = [ findXMLCatalogs ]; + + nativeBuildInputs = [unzip]; + propagatedNativeBuildInputs = [ findXMLCatalogs ]; + + unpackPhase = '' + mkdir -p $out/xml/dtd/docbook + cd $out/xml/dtd/docbook + unpackFile $src + ''; + + installPhase = '' + find . -type f -exec chmod -x {} \; + runHook postInstall + ''; meta = meta // { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index f1cad801cdfa..54ef5225d2f1 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl"; }; - buildInputs = [ libxml2 ]; + nativeBuildInputs = [ libxml2 ]; installPhase = '' diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 5f6a451d0655..9b3bdc90eb53 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, pcre, curl, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, curl, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "0xlxb1hmbnqcy088cqpj2i87hsd5h3da7d2f9afiavz0ssw4ll94"; + url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz"; + sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; }; nativeBuildInputs = [ + meson + ninja (pkgconfig.override { vanilla = true; }) wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 1732b81f0704..514389c6faf8 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau, libcanberra +, glib, gtk, pango, atk, libXau, libcanberra_gtk2 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop , libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { [ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils - libtasn1 libtool libcanberra xorg.libICE xorg.libSM + libtasn1 libtool libcanberra_gtk2 xorg.libICE xorg.libSM ]; nativeBuildInputs = [ pkgconfig intltool which ]; diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix index a3584d67beaf..10c790bc09cc 100644 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/metacity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra, intltool, GConf, startup_notification, zenity, gnome_doc_utils +, libcanberra_gtk2, intltool, GConf, startup_notification, zenity, gnome_doc_utils , gsettings_desktop_schemas }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra + [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra_gtk2 intltool GConf startup_notification zenity gnome_doc_utils gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index e5d2489436ee..80c77d9b291c 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses +{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk, ncurses , pythonSupport ? false, python27Packages}: let @@ -15,7 +15,17 @@ in stdenv.mkDerivation rec { ./alt.patch ./change-scroll-region.patch # CVE-2012-2738 - ./vte-0.28.2-limit-arguments.patch + # fixed in upstream version 0.32.2 + (fetchpatch{ + name = "CVE-2012-2738-1.patch"; + url = https://git.gnome.org/browse/vte/patch/?id=feeee4b5832b17641e505b7083e0d299fdae318e; + sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n"; + }) + (fetchpatch{ + name = "CVE-2012-2738-2.patch"; + url = https://git.gnome.org/browse/vte/patch/?id=98ce2f265f986fb88c38d508286bb5e3716b9e74; + sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn"; + }) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch b/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch deleted file mode 100644 index fd454079390f..000000000000 --- a/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Sat, 19 May 2012 17:36:09 +0000 -Subject: emulation: Limit integer arguments to 65535 - -To guard against malicious sequences containing excessively big numbers, -limit all parsed numbers to 16 bit range. Doing this here in the parsing -routine is a catch-all guard; this doesn't preclude enforcing -more stringent limits in the handlers themselves. - -https://bugzilla.gnome.org/show_bug.cgi?id=676090 ---- -diff --git a/src/table.c b/src/table.c -index 140e8c8..85cf631 100644 ---- a/src/table.c -+++ b/src/table.c -@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array, - if (G_UNLIKELY (*array == NULL)) { - *array = g_value_array_new(1); - } -- g_value_set_long(&value, total); -+ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); - g_value_array_append(*array, &value); - } while (i++ < arginfo->length); - g_value_unset(&value); -diff --git a/src/vteseq.c b/src/vteseq.c -index 457c06a..46def5b 100644 ---- a/src/vteseq.c -+++ b/src/vteseq.c -@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal, - GValueArray *params, - VteTerminalSequenceHandler handler) - { -- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); -+ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); - } - - static void --- -cgit v0.9.0.2 diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index a9957c41ff5d..5a488e052c19 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra +{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra_gtk2 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg }: @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra_gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 7a4cd0e94956..e94a89c7f27c 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,18 +1,41 @@ { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev -, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: +, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib +, libxslt, yelp_tools, gnome_common, gtk_doc +, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool - gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 + nativeBuildInputs = [ + pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib + libxslt docbook_xml_dtd_43 docbook_xsl + autoreconfHook gtk_doc yelp_tools gnome_common + ]; + buildInputs = [ gtk3 glib gnome-video-effects + gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop gst_all_1.gst-plugins-bad clutter_gtk clutter-gst libcanberra_gtk3 libgudev ]; + outputs = [ "out" "man" "devdoc" ]; + + patches = [ + gtk_doc.respect_xml_catalog_files_var_patch + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Effects + --prefix XDG_DATA_DIRS : "${gnome-video-effects}/share" + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${totem}/share" + ) + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/evolution/src.nix b/pkgs/desktops/gnome-3/apps/evolution/src.nix index 5e44e384ae75..0c8155efde20 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/src.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-3.26.2"; + name = "evolution-3.26.3"; src = fetchurl { - url = mirror://gnome/sources/evolution/3.26/evolution-3.26.2.tar.xz; - sha256 = "2d9299b8414903021faa03cbb885814de454f5260398eb2c2a03600224479137"; + url = mirror://gnome/sources/evolution/3.26/evolution-3.26.3.tar.xz; + sha256 = "091621f21827e2dfb8057f3b2c3a215c4e97a692c59d0a4ee33108af571de60e"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gedit/src.nix b/pkgs/desktops/gnome-3/apps/gedit/src.nix index 3fdc6cfaa685..7a68b75eb2a7 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/src.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gedit-3.22.0"; + name = "gedit-3.22.1"; src = fetchurl { - url = mirror://gnome/sources/gedit/3.22/gedit-3.22.0.tar.xz; - sha256 = "063b5a0b5dcc8f540f6e8c3ea1c22cf8a3a19edffc25315a1b6bc51d462b3f45"; + url = mirror://gnome/sources/gedit/3.22/gedit-3.22.1.tar.xz; + sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b"; }; } diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index e48d15e6abfe..8b198b9c8797 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, python, autoreconfHook +{ stdenv, intltool, fetchurl, python3 , pkgconfig, gtk3, glib, gobjectIntrospection , wrapGAppsHook, itstool, libxml2, docbook_xsl , gnome3, gdk_pixbuf, libxslt }: @@ -6,33 +6,17 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection - # reconfiguration - autoreconfHook gnome3.gnome_common gnome3.yelp_tools ]; - buildInputs = [ gtk3 glib libxml2 python - gnome3.gsettings_desktop_schemas - gdk_pixbuf gnome3.defaultIconTheme ]; + buildInputs = [ + gtk3 glib libxml2 python3 python3.pkgs.pygobject3 + gnome3.gsettings_desktop_schemas + gdk_pixbuf gnome3.defaultIconTheme + ]; enableParallelBuilding = true; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=782161 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=351054; - sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn"; - }) - ]; - - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Glade; description = "User interface designer for GTK+ applications"; diff --git a/pkgs/desktops/gnome-3/apps/glade/src.nix b/pkgs/desktops/gnome-3/apps/glade/src.nix index d32dbd94d059..b244d2434c9e 100644 --- a/pkgs/desktops/gnome-3/apps/glade/src.nix +++ b/pkgs/desktops/gnome-3/apps/glade/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "glade-3.20.0"; + name = "glade-3.20.2"; src = fetchurl { - url = mirror://gnome/sources/glade/3.20/glade-3.20.0.tar.xz; - sha256 = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe"; + url = mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz; + sha256 = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 15f1f58b558c..a354c4f6316e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gjs, gdk_pixbuf, librsvg }: +, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; buildInputs = [ - gtk3 wrapGAppsHook intltool gjs gdk_pixbuf + gtk3 gjs gdk_pixbuf gobjectIntrospection librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 1d0a9b271c27..df8c6befc603 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils -, vala, gtk3, glib, gsound, libcanberra_gtk3 +, vala, gtk3, glib, gsound , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { @@ -8,14 +8,13 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils ]; - buildInputs = [ gtk3 glib libcanberra_gtk3 - gnome3.gsettings_desktop_schemas - gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather gsound ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ + vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils + ]; + buildInputs = [ + gtk3 glib gnome3.gsettings_desktop_schemas gdk_pixbuf gnome3.defaultIconTheme + gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather gsound + ]; prePatch = "patchShebangs build-aux/"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix index f30b88642fd3..b9bba1ab6a47 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-photos-3.26.2"; + name = "gnome-photos-3.26.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.2.tar.xz; - sha256 = "9001ed2794da44522a1d700c7b5aff40ede92f80ba17031f0dfa7f54d6d05657"; + url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.3.tar.xz; + sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab"; }; } diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix index 2812e7673b40..b185778fe860 100644 --- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }: +{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib +, gettext, gobjectIntrospection +}: stdenv.mkDerivation rec { name = "nautilus-sendto-${version}"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d"; }; - nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ]; + nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext gobjectIntrospection ]; buildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix index 1a388505674c..24f0955659ec 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "adwaita-icon-theme-3.26.0"; + name = "adwaita-icon-theme-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.0.tar.xz; - sha256 = "9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212"; + url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.1.tar.xz; + sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; }; } diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 62ccb6360341..bf39965bf779 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 130e8255edca..9a836869ec6e 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "dconf-${version}"; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; src = fetchurl { url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; - sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6"; + sha256 = "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym"; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index ea257ed69f0f..f9156053819a 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -4,55 +4,46 @@ , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts , gcr, libsecret, folks, libpulseaudio, telepathy_mission_control , telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server +, evolution_data_server, yelp_xsl , libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: +, bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee +, isocodes, enchant, libchamplain, geoclue2, geocode_glib, cheese, libgudev }: -# TODO: enable more features - -let - majorVersion = "3.12"; -in stdenv.mkDerivation rec { - name = "empathy-${majorVersion}.11"; + inherit (import ./src.nix fetchurl) name src; - src = fetchurl { - url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; - sha256 = "11yl8msyf017197fm6h15yw159yjp9i08566l967yashbx7gzr6i"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome_online_accounts shared_mime_info ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas - file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/lib/dbus-1.0/include" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; + propagatedUserEnvPkgs = [ + gnome_online_accounts shared_mime_info + ]; + propagatedBuildInputs = [ + folks telepathy_logger evolution_data_server telepathy_mission_control + ]; + nativeBuildInputs = [ + pkgconfig libtool intltool itstool file wrapGAppsHook + libxml2 libxslt yelp_xsl + ]; + buildInputs = [ + gtk3 glib webkitgtk icu gnome_online_accounts + telepathy_glib clutter_gtk clutter-gst cogl + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gcr libsecret libpulseaudio gdk_pixbuf + libnotify clutter libsoup gnutls libgee p11_kit + libcanberra_gtk3 telepathy_farstream farstream + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + librsvg + # Spell-checking + enchant isocodes + # Display maps, location awareness, geocode support + libchamplain geoclue2 geocode_glib + # Cheese webcam support, camera monitoring + cheese libgudev + ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Empathy; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; maintainers = gnome3.maintainers; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; + license = [ licenses.gpl2 ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/empathy/src.nix b/pkgs/desktops/gnome-3/core/empathy/src.nix new file mode 100644 index 000000000000..7e54ed38fd36 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/empathy/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "empathy-3.12.14"; + + src = fetchurl { + url = mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz; + sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; + }; +} diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 49ad25a8c5e7..ae0abfd71502 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif }: +, shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ]; buildInputs = with gnome3; [ libxml2 libjpeg gtk glib libpeas librsvg diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 8c87609f85cc..6dafa160b1f8 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { postFixup = '' # Patched meson does not add internal libraries to rpath - for f in bin/.epiphany-wrapped libexec/.epiphany-search-provider-wrapped libexec/epiphany/.ephy-profile-migrator-wrapped lib/epiphany/web-extensions/libephywebextension.so; do - patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $out/$f)" "$out/$f" + for f in $out/bin/.*-wrapped $out/libexec/.*-wrapped $out/libexec/epiphany/.*-wrapped $out/lib/epiphany/*.so $out/lib/epiphany/web-extensions/*.so; do + patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $f)" "$f" done ''; diff --git a/pkgs/desktops/gnome-3/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix index 15048ce269cb..3365261b7bcf 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/src.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "epiphany-3.26.3"; + name = "epiphany-3.26.4"; src = fetchurl { - url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.3.tar.xz; - sha256 = "cb50042496e704621db3d0213581b0f914c639e160522751f64c5e5f6e6040b5"; + url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.4.tar.xz; + sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea"; }; } diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index aca10516a388..fab46b35af66 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,47 +1,38 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 +{ fetchurl, stdenv, pkgconfig, intltool, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook -, librsvg, gobjectIntrospection +, poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook +, librsvg, gobjectIntrospection, yelp_tools , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps -, fetchpatch, autoreconfHook +, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - # missing help for now; fixing the autogen phase seemed too difficult - postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am"; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook/*for patches*/ ]; + nativeBuildInputs = [ + pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp_tools autoreconfHook + ]; buildInputs = [ - intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.adwaita-icon-theme + glib gtk3 pango atk gdk_pixbuf libxml2 gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas poppler ghostscriptX djvulibre libspectre - libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf + libsecret librsvg gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; configureFlags = [ - "--disable-nautilus" # Do not use nautilus + "--disable-nautilus" # Do not build nautilus plugin "--enable-introspection" (if supportXPS then "--enable-xps" else "--disable-xps") ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; + preConfigure = stdenv.lib.optionalString (recentListSize != null) '' + sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c + sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c + ''; preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") @@ -49,10 +40,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = false; # would need pythonPackages.dogTail, which is missing - meta = with stdenv.lib; { - homepage = https://www.gnome.org/projects/evince/; + homepage = https://wiki.gnome.org/Apps/Evince; description = "GNOME's document viewer"; longDescription = '' @@ -64,6 +53,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; + maintainers = gnome3.maintainers ++ [ maintainers.vcunat ]; }; } diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index ebe740a2167c..f6ee457dc63f 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf +{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true , vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }: @@ -6,21 +6,25 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ cmake pkgconfig intltool python gperf makeWrapper ]; - buildInputs = with gnome3; - [ glib libsoup libxml2 gtk gnome_online_accounts - (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata - icu sqlite gsettings_desktop_schemas kerberos openldap webkitgtk - libaccounts-glib json_glib ] - ++ stdenv.lib.optional valaSupport vala; + nativeBuildInputs = [ + cmake pkgconfig intltool python3 gperf makeWrapper + ] ++ stdenv.lib.optional valaSupport vala; + buildInputs = with gnome3; [ + glib libsoup libxml2 gtk gnome_online_accounts + gcr p11_kit libgweather libgdata libaccounts-glib json_glib + icu sqlite kerberos openldap webkitgtk + ]; propagatedBuildInputs = [ libsecret nss nspr libical db ]; # uoa irrelevant for now - cmakeFlags = [ "-DENABLE_UOA=OFF" ] - ++ stdenv.lib.optionals valaSupport [ - "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + cmakeFlags = [ + "-DENABLE_UOA=OFF" + ] ++ stdenv.lib.optionals valaSupport [ + "-DENABLE_VALA_BINDINGS=ON" + "-DENABLE_INTROSPECTION=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ]; enableParallelBuilding = true; @@ -33,8 +37,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - platforms = platforms.linux; + license = licenses.lgpl2; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix index 1828357159dc..906df1b2160a 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-data-server-3.26.2.1"; + name = "evolution-data-server-3.26.3"; src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.2.1.tar.xz; - sha256 = "09fb1c4ce20c62309e8ea2d80649f590492e88c1deb89118e715e155296baefd"; + url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.3.tar.xz; + sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"; }; } diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index 1729ec066233..99883c8a3f67 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: +, intltool, polkit, orbit, python, withGtk ? false }: assert withGtk -> (gnome3 != null); @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; + buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; propagatedBuildInputs = [ glib dbus_glib ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 9eaad021d320..3dbb4e32654f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index a6cc7ec962a0..9d20eb750ab9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,44 +1,43 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook -, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev +, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, gdk_pixbuf, librsvg, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev +, cracklib, libkrb5, networkmanagerapplet, networkmanager +, libwacom, samba, shared_mime_info, tzdata, libtool , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk , fontconfig, sound-theme-freedesktop, grilo }: -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, printers - stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = - [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - # https://bugzilla.gnome.org/show_bug.cgi?id=752596 - enableParallelBuilding = false; + nativeBuildInputs = [ + pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns + shared_mime_info + ]; - buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib glib_networking upower libcanberra_gtk2 gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality - accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk - gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook - networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker - cracklib ]; + buildInputs = with gnome3; [ + ibus gtk glib glib_networking upower gsettings_desktop_schemas + libxml2 gnome_desktop gnome_settings_daemon polkit libgtop + gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk + accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify + grilo libpwquality cracklib vino libcanberra_gtk3 libgudev + gdk_pixbuf defaultIconTheme librsvg clutter clutter_gtk + networkmanager modemmanager gnome-bluetooth tracker + ]; preBuild = '' substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" + substituteInPlace panels/region/cc-region-panel.c --replace "gkbd-keyboard-display" "${gnome3.libgnomekbd}/bin/gkbd-keyboard-display" + # hack to make test-endianess happy mkdir -p $out/share/locale substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" ''; - preFixup = with gnome3; '' + preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" # Thumbnailers (for setting user profile pictures) @@ -56,5 +55,4 @@ stdenv.mkDerivation rec { maintainers = gnome3.maintainers; platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch new file mode 100644 index 000000000000..ee9b012b6e45 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -0,0 +1,19 @@ +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -504,14 +504,10 @@ + g_return_val_if_fail (script->s_infile != NULL, FALSE); + + add_args (array, +- "bwrap", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/lib", "/lib", +- "--ro-bind", "/lib64", "/lib64", ++ "@BUBBLEWRAP_BIN@", ++ "--ro-bind", "/nix/store", "/nix/store", + "--proc", "/proc", + "--dev", "/dev", +- "--symlink", "usr/bin", "/bin", +- "--symlink", "usr/sbin", "/sbin", + "--chdir", "/", + "--setenv", "GIO_USE_VFS", "local", + "--unshare-all", diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index e8a7cb8ceb95..99ff1b6f3a16 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, libseccomp, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib +, intltool, gnome_doc_utils, xkeyboard_config, isocodes, itstool, wayland +, libseccomp, bubblewrap, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,15 +10,28 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python libxml2Python libxslt which libX11 - xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile - libseccomp gobjectIntrospection ]; + nativeBuildInputs = [ + pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection + ]; + buildInputs = [ + libX11 bubblewrap xkeyboard_config isocodes wayland + gtk3 glib libseccomp + ]; propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + patches = [ + ./bubblewrap-paths.patch + ]; + + postPatch = '' + substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \ + BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap" + ''; + meta = with stdenv.lib; { + description = "Library with common API for various GNOME modules"; + license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 4baafecadd0a..d4f5835ed3a2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt +{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook -, docbook_xsl_ns, docbook_xsl, gnome3 }: +, docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -8,21 +8,42 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring + dbus libgcrypt pam gtk3 libgnome_keyring pango gcr gdk_pixbuf atk p11_kit ]; + # In 3.20.1, tests do not support Python 3 + checkInputs = [ dbus python2 ]; + propagatedBuildInputs = [ glib libtasn1 libxslt ]; - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook + ] ++ stdenv.lib.optionals doCheck checkInputs; configureFlags = [ "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; + postPatch = '' + patchShebangs build + ''; + + # Tests are not deterministic https://bugzilla.gnome.org/show_bug.cgi?id=791932 + doCheck = false; + checkPhase = '' + export HOME=$(mktemp -d) + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; + homepage = https://wiki.gnome.org/Projects/GnomeKeyring; + license = licenses.gpl2; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 1f64e10aa25d..c6fa6cb16584 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common +, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common, gtk_doc , telepathy_glib, intltool, dbus_libs, icu, glib_networking -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 +, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos }: stdenv.mkDerivation rec { @@ -9,12 +9,26 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + outputs = [ "out" "man" "dev" "devdoc" ]; + + configureFlags = [ + "--enable-media-server" + "--enable-kerberos" + "--enable-lastfm" + "--enable-todoist" + "--enable-gtk-doc" + ]; + enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook - libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala - docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; + nativeBuildInputs = [ + pkgconfig vala gnome_common intltool wrapGAppsHook + libxslt docbook_xsl_ns docbook_xsl gtk_doc + ]; + buildInputs = [ + glib gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib glib_networking icu libsoup + gcr kerberos + ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix index 311ad8643395..c43183c7c57d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-online-accounts-3.26.1"; + name = "gnome-online-accounts-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.1.tar.xz; - sha256 = "603c110405cb89a01497a69967f10e3f3f36add3dc175b062ec4c5ed4485621b"; + url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.2.tar.xz; + sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 69a967d6d247..8d1ab65c04da 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3 , bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib -, gnome3, librsvg, gdk_pixbuf }: +, gnome3, librsvg, gdk_pixbuf, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 + wrapGAppsHook gobjectIntrospection ]; buildInputs = [ bash gtk3 glib libcanberra_gtk3 gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix index e4c5f8fd0955..c18bad6b4cd8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-user-docs-3.26.2"; + name = "gnome-user-docs-3.26.2.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.tar.xz; - sha256 = "e7d7f0434624ef6f21803c798d8672331f065485bdf59d44ac5b6b5f14fa1b78"; + url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.1.tar.xz; + sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; }; } diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh index 3291e38addb8..9337c520a207 100644 --- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh +++ b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh @@ -4,4 +4,4 @@ make_grilo_find_plugins() { fi } -envHooks+=(make_grilo_find_plugins) +addEnvHooks "$hostOffset" make_grilo_find_plugins diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix index 22760d2be113..1eca56c509bf 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gsettings-desktop-schemas-3.24.0"; + name = "gsettings-desktop-schemas-3.24.1"; src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz; - sha256 = "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90"; + url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz; + sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; }; } diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix index 7b934db85fdd..c8a65bfb48f5 100644 --- a/pkgs/desktops/gnome-3/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/core/gsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: let majVer = "1.0"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ]; - buildInputs = [ glib libcanberra_gtk2 ]; + buildInputs = [ glib libcanberra ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index a39464449485..45001e551273 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext, gnome3 }: +, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }: -stdenv.mkDerivation rec { +let + checkInputs = [ xvfb_run dbus ]; +in stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ + # Required by gtksourceview-3.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared_mime_info + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ atk cairo glib pango - libxml2Python perl intltool gettext ]; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ] + ++ stdenv.lib.optionals doCheck checkInputs; + + buildInputs = [ atk cairo glib pango libxml2 ]; preBuild = '' substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" @@ -16,6 +26,14 @@ stdenv.mkDerivation rec { patches = [ ./nix_share_path.patch ]; + doCheck = stdenv.isLinux; + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + meta = with stdenv.lib; { platforms = with platforms; linux ++ darwin; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix index 8648c595bb96..ec7a8a6aaa57 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gtksourceview-3.24.3"; + name = "gtksourceview-3.24.6"; src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.3.tar.xz; - sha256 = "3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd"; + url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz; + sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 58d9901ad012..731ff7e2688e 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 , glib, desktop_file_utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 -, callPackage, unzip }: +, callPackage, unzip, gobjectIntrospection }: # TODO: icons and theme still does not work # use packaged gnome3.adwaita-icon-theme @@ -15,11 +15,12 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools + gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection + ]; - buildInputs = [ gtk3 intltool itstool glib appdata-tools - gnome3.yelp_tools libxml2 desktop_file_utils - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ]; unicode-data = callPackage ./unicode-data.nix {}; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix index 67d00c269f53..fb38e3bf386b 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gucharmap-10.0.1"; + name = "gucharmap-10.0.3"; src = fetchurl { - url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.1.tar.xz; - sha256 = "51a2bf91c4590ea2159f828156864f088a0bd4c12e7a1c396002a23d48b2d5e2"; + url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz; + sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index 84770a17162c..72299b8a3690 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv}: +{ fetchurl, stdenv, gnome3 }: stdenv.mkDerivation { name = "unicode-data-10.0.0"; srcs = [ diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 4141afeb821d..744ec3c2fe62 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: +{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch }: stdenv.mkDerivation rec { name = "libcroco-0.6.12"; @@ -8,6 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-7960.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394"; + sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l"; + }) + (fetchpatch { + name = "CVE-2017-7961.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7"; + sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s"; + }) + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix index 74636708988b..319f089b9206 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file intltool glib gtk3 libxklavier makeWrapper ]; + nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; + buildInputs = [ glib gtk3 libxklavier ]; preFixup = '' wrapProgram $out/bin/gkbd-keyboard-display \ diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix index f2cb4c310afc..799713c28a4a 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgweather-3.26.0"; + name = "libgweather-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.0.tar.xz; - sha256 = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e"; + url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.1.tar.xz; + sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; }; } diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 8fddd8f7d5a6..998a1a02b3f9 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-python3" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; + buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ]; + propagatedBuildInputs = [ + # Required by libpeas-1.0.pc + gobjectIntrospection + ]; meta = with stdenv.lib; { description = "A GObject-based plugins engine"; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index be4a5e1087ad..39b2438a8f02 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,14 +1,11 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 -, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput +, pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3 +, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare"; - configureFlags = [ "--with-x" "--disable-static" @@ -28,12 +25,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; - [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 - gnome3.geocode_glib libudev libinput libgudev libwacom - libcanberra_gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon ]; + buildInputs = with gnome3; [ + glib gobjectIntrospection gtk gsettings_desktop_schemas upower + gnome_desktop cairo pango cogl clutter zenity libstartup_notification + gnome3.geocode_glib libinput libgudev libwacom + libcanberra_gtk3 zenity xkeyboard_config libxkbfile + libxkbcommon + ]; preFixup = '' wrapProgram "$out/bin/mutter" \ @@ -45,6 +43,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; + license = licenses.gpl2; }; - } diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix index 154e7221cc20..59f7a53e3e3e 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/core/rest/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "rest-${version}"; major = "0.8"; - version = "${major}.0"; + version = "${major}.1"; src = fetchurl { url = "mirror://gnome/sources/rest/${major}/${name}.tar.xz"; - sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"; + sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 27a1e4b0be5b..a30467c1862d 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,13 +1,17 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3 }: +, libxml2, sane-backends, vala, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb gtk libwebp packagekit sane-backends vala ]; - nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ]; + nativeBuildInputs = [ + meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 + # For setup hook + gobjectIntrospection + ]; postPatch = '' patchShebangs data/meson_compile_gschema.py diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 638c0cbe7dcd..37b311256bd9 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; + homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix index 58e2ad07532e..2935111df27d 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix @@ -5,6 +5,6 @@ fetchurl: { src = fetchurl { url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz; - sha256 = "1jzvq7s6qdsdpbc58jpcwvyj7qsq58r65kmnbknjzd79j4rsalzi"; + sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; }; } diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index b66405cf0510..651b7cff226d 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { doCheck = true; - enableParallelBuilding = true; + # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 + # https://bugzilla.gnome.org/show_bug.cgi?id=784236 + # https://github.com/mesonbuild/meson/issues/1994 + enableParallelBuilding = false; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix index 2b309161fd19..1c5ee9b35fa1 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "tracker-miners-2.0.2"; + name = "tracker-miners-2.0.3"; src = fetchurl { - url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.2.tar.xz; - sha256 = "cf417ece944c997f630dda41a7f5c449d609fa53dbb34fae7caa4c7af1e0e8ef"; + url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.3.tar.xz; + sha256 = "12413a9f8dfa705a48a2697dcbb3eef12ee91bb98f392a23ba4bda7813e41d1b"; }; } diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index bf3438db338a..59455f320b53 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig +{ stdenv, fetchurl, intltool, pkgconfig , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt , gnome3, icu, libuuid, networkmanager, libsoup, json_glib }: diff --git a/pkgs/desktops/gnome-3/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix index afec65a4f633..887ae9a865a9 100644 --- a/pkgs/desktops/gnome-3/core/tracker/src.nix +++ b/pkgs/desktops/gnome-3/core/tracker/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "tracker-2.0.1"; + name = "tracker-2.0.2"; src = fetchurl { - url = mirror://gnome/sources/tracker/2.0/tracker-2.0.1.tar.xz; - sha256 = "ac5c9f4dbb0741af5877ae2818d8c053aa9a431477a924a17976bb7e44411e47"; + url = mirror://gnome/sources/tracker/2.0/tracker-2.0.2.tar.xz; + sha256 = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda"; }; } diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index 73bbba3e72bc..c40972e955fa 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -11,7 +11,7 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; }; - preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; + preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ gtk_doc autoconf automake gettext libtool gperf ]; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index e0a4c2ed4e48..d60fddb589bb 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -74,10 +74,7 @@ let dconf = callPackage ./core/dconf { }; dconf-editor = callPackage ./core/dconf-editor { }; - # empathy = callPackage ./core/empathy { - # webkitgtk = webkitgtk24x-gtk3; - # clutter-gst = pkgs.clutter-gst; - # }; + empathy = callPackage ./core/empathy { }; epiphany = callPackage ./core/epiphany { }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 9ff98c2825e6..4347f72cc5f6 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,14 +1,19 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python2, makeWrapper }: + itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper + nativeBuildInputs = [ + pkgconfig intltool itstool python3 makeWrapper + # Required by python3 + ncurses + ]; + buildInputs = [ + flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview gnome3.gsettings_desktop_schemas ]; @@ -22,6 +27,7 @@ stdenv.mkDerivation rec { description = "Software development studio"; homepage = http://anjuta.org/; license = licenses.gpl2; + maintainers = with maintainers; []; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix index b90fc03e18da..15c4671e31fb 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "devhelp-3.26.0"; + name = "devhelp-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/devhelp/3.26/devhelp-3.26.0.tar.xz; - sha256 = "6bf2714f7f953b5858c643585383c4e4c8e9c65055527505abbf24fbf1ac8e38"; + url = mirror://gnome/sources/devhelp/3.26/devhelp-3.26.1.tar.xz; + sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix new file mode 100644 index 000000000000..3baedbf0c594 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, glib, gettext }: + +stdenv.mkDerivation rec { + name = "gnome-shell-dash-to-panel-${version}"; + version = "11"; + + src = fetchFromGitHub { + owner = "jderose9"; + repo = "dash-to-panel"; + rev = "v${version}"; + sha256 = "1bfcnrhw6w8yrz8sw520kwwshmplkg4awpvz07kg4d73m6zn4mw2"; + }; + + buildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "An icon taskbar for Gnome Shell"; + license = licenses.gpl2; + maintainers = with maintainers; [ mounium ]; + homepage = https://github.com/jderose9/dash-to-panel; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix new file mode 100644 index 000000000000..f64a0ef3f27e --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extensions-mediaplayer-${version}"; + version = "3.5"; + + src = fetchFromGitHub { + owner = "JasonLG1979"; + repo = "gnome-shell-extensions-mediaplayer"; + rev = version; + sha256 = "0b8smid9vdybgs0601q9chlbgfm1rzrj3vmd3i6p2a5d1n4fyvsc"; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + buildInputs = [ + glib + gettext + ]; + + postPatch = '' + rm build + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "Control MPRIS Version 2 Capable Media Players"; + license = licenses.gpl2Plus; + homepage = https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/; + maintainers = with maintainers; [ tiramiseb ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/games/aisleriot/src.nix index fbe6505b9a06..7fee97bae1df 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/src.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "aisleriot-3.22.0"; + name = "aisleriot-3.22.4"; src = fetchurl { - url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.0.tar.xz; - sha256 = "e7b603df0a482bdd0ab8083efc096a24a46aea1b36cc8608846e568b7a353eb7"; + url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.4.tar.xz; + sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb"; }; } diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix index e0e11bc2124c..9e2b23f3996b 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "four-in-a-row-3.22.0"; + name = "four-in-a-row-3.22.2"; src = fetchurl { - url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.0.tar.xz; - sha256 = "c2e26630f7b4e81cff087314edc0f39cd645dfbf4b31f826232bd8e9d57a7ff7"; + url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.2.tar.xz; + sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420"; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix index 17fabe2de26b..09e4ad6c9673 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-robots-3.22.0"; + name = "gnome-robots-3.22.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.0.tar.xz; - sha256 = "ddb02f9d04c970354d1836813f8c0d9ffc3ff509091d2580384e2275663e6f73"; + url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.2.tar.xz; + sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f"; }; } diff --git a/pkgs/desktops/gnome-3/games/hitori/src.nix b/pkgs/desktops/gnome-3/games/hitori/src.nix index 47989cf2eae5..93dcd5de62e3 100644 --- a/pkgs/desktops/gnome-3/games/hitori/src.nix +++ b/pkgs/desktops/gnome-3/games/hitori/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "hitori-3.22.0"; + name = "hitori-3.22.4"; src = fetchurl { - url = mirror://gnome/sources/hitori/3.22/hitori-3.22.0.tar.xz; - sha256 = "f70521c9a7a7c3e16b3951b64780eb0c5bce1bb1bb29de4482be06fb5e41adaa"; + url = mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz; + sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch deleted file mode 100644 index 23be404ea406..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch +++ /dev/null @@ -1,97 +0,0 @@ -From f7f7fe6bf36ca08c66192077bf964036eb02ffb5 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Tue, 19 Sep 2017 03:08:07 +0200 -Subject: [PATCH 1/3] Search for themes and icons in system data dirs - ---- - gtweak/tweaks/tweak_group_appearance.py | 17 ++++------------- - gtweak/utils.py | 17 +++++++++++++++++ - 2 files changed, 21 insertions(+), 13 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py -index ccadefc..0d12194 100644 ---- a/gtweak/tweaks/tweak_group_appearance.py -+++ b/gtweak/tweaks/tweak_group_appearance.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs - from gtweak.tweakmodel import Tweak - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - if gtk_ver % 2: # Want even number - gtk_ver += 1 - -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - (os.path.exists(os.path.join(d, "gtk-3.0")) or \ - os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) -@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_icon_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) - return valid -@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_cursor_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) - return valid -diff --git a/gtweak/utils.py b/gtweak/utils.py -index de6c345..6c60b88 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -21,6 +21,7 @@ import tempfile - import shutil - import subprocess - import glob -+import itertools - - import gtweak - from gtweak.gsettings import GSettingsSetting -@@ -117,6 +118,22 @@ def execute_subprocess(cmd_then_args, block=True): - stdout, stderr = p.communicate() - return stdout, stderr, p.returncode - -+def get_resource_dirs(resource): -+ """Returns a list of all known resource dirs for a given resource. -+ -+ :param str resource: -+ Name of the resource (e.g. "themes") -+ :return: -+ A list of resource dirs -+ """ -+ dirs = [os.path.join(dir, resource) -+ for dir in itertools.chain(GLib.get_system_data_dirs(), -+ (gtweak.DATA_DIR, -+ GLib.get_user_data_dir()))] -+ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] -+ -+ return [dir for dir in dirs if os.path.isdir(dir)] -+ - @singleton - class AutostartManager: - --- -2.14.1 - diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch deleted file mode 100644 index 77b952b4b1e9..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 8e75fe5f1ebd8a140a7306294d2219aea4ac47d2 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Tue, 19 Sep 2017 03:16:07 +0200 -Subject: [PATCH 2/3] Don't show multiple entries for a single theme - ---- - gtweak/tweaks/tweak_group_appearance.py | 8 ++++---- - gtweak/utils.py | 16 ++++++++++++++++ - 2 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py -index 0d12194..8e05077 100644 ---- a/gtweak/tweaks/tweak_group_appearance.py -+++ b/gtweak/tweaks/tweak_group_appearance.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources - from gtweak.tweakmodel import Tweak - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - (os.path.exists(os.path.join(d, "gtk-3.0")) or \ - os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) -- return valid -+ return get_unique_resources(valid) - - class IconThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) -- return valid -+ return get_unique_resources(valid) - - class CursorThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) -- return valid -+ return get_unique_resources(valid) - - class ShellThemeTweak(Gtk.Box, Tweak): - -diff --git a/gtweak/utils.py b/gtweak/utils.py -index 6c60b88..6fd7c6a 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -134,6 +134,22 @@ def get_resource_dirs(resource): - - return [dir for dir in dirs if os.path.isdir(dir)] - -+def get_unique_resources(dirs): -+ """Filter out duplicated resources. -+ -+ :param list dirs: -+ List of resource dirs (e.g. /usr/share/themes/Adwaita) -+ :return: -+ List of dirs without duplicated resources -+ """ -+ unique_dirs = {} -+ for dir in dirs: -+ basename = os.path.basename(dir) -+ if basename not in unique_dirs: -+ unique_dirs[basename] = dir -+ -+ return unique_dirs -+ - @singleton - class AutostartManager: - --- -2.14.1 - diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch deleted file mode 100644 index fcb35a026795..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a6a7d1c708a2f568277699c5b605fa03ccb5faa Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Tue, 19 Sep 2017 03:17:20 +0200 -Subject: [PATCH 3/3] Create config dir if it doesn't exist - ---- - gtweak/gtksettings.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py -index a11363b..2871c49 100644 ---- a/gtweak/gtksettings.py -+++ b/gtweak/gtksettings.py -@@ -36,6 +36,10 @@ class GtkSettingsManager: - def _get_keyfile(self): - keyfile = None - try: -+ config_dir = os.path.dirname(self._path) -+ if not os.path.isdir(config_dir): -+ os.makedirs(config_dir) -+ - keyfile = GLib.KeyFile() - keyfile.load_from_file(self._path, 0) - except MemoryError: --- -2.14.1 - diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix index 0ab752cf1ba7..4e8eaffde435 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix @@ -6,19 +6,18 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - doCheck = true; - - checkPhase = "meson test"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas - gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome_shell python3Packages.pygobject3 - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop gobjectIntrospection - ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook + ]; + buildInputs = [ + gtk3 glib gnome3.gsettings_desktop_schemas + gdk_pixbuf gnome3.defaultIconTheme librsvg + libnotify gnome3.gnome_shell python3Packages.pygobject3 + libsoup gnome3.gnome_settings_daemon gnome3.nautilus + gnome3.mutter gnome3.gnome_desktop gobjectIntrospection + ]; postPatch = '' patchShebangs meson-postinstall.py @@ -30,10 +29,21 @@ stdenv.mkDerivation rec { ''; patches = [ - ./find_gsettings.patch - ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch - ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch - ./0003-Create-config-dir-if-it-doesn-t-exist.patch + (fetchurl { + name = "find_gsettings.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=365642; + sha256 = "14ik1kad0w99xa2wn3d4ynrkhnwchjlqfbaij7p11y5zpiwhaha4"; + }) + (fetchurl { + name = "0001-Search-for-themes-and-icons-in-system-data-dirs.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=365643; + sha256 = "1phq3c7hc9lryih6rp3m5wmp88rfbl6iv42ng4g6bzm1jphgl89f"; + }) + (fetchurl { + name = "0001-appearance-Don-t-duplicate-the-cursor-theme-name.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=365648; + sha256 = "1n9vwsfz4sx72qsi1gd1y7460zmagwirvmi9qrfhc3ahanpyn4fr"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix index da1c01152113..8af28e17dcd1 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-tweak-tool-3.26.3"; + name = "gnome-tweak-tool-3.26.4"; src = fetchurl { - url = mirror://gnome/sources/gnome-tweak-tool/3.26/gnome-tweak-tool-3.26.3.tar.xz; - sha256 = "9406447850b14de204f9c5a6eaa6b63ba805ddb1a10fd863239841090af76430"; + url = mirror://gnome/sources/gnome-tweak-tool/3.26/gnome-tweak-tool-3.26.4.tar.xz; + sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df"; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix index dfeefe0def86..486898a4e1f2 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix @@ -2,15 +2,14 @@ stdenv.mkDerivation rec { name = "gnome-video-effects-${version}"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; - sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; + sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index b92aac4f9433..3e1c897ffff9 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gtk3 gnome3.gnome_control_center dbus clutter pango appstream-glib systemd gobjectIntrospection ]; - configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" + configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings" "--with-dbusservicesdir=$(out)/share/dbus-1/services" "--with-systemduserunitdir=$(out)/etc/systemd/user" ]; diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index 71e3ff19dc3f..2bbf219e3f3a 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; propagatedBuildInputs = [ enchant ]; # required for pkgconfig - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk3 isocodes vala ]; + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ]; + buildInputs = [ glib gtk3 isocodes ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/gspell/src.nix b/pkgs/desktops/gnome-3/misc/gspell/src.nix index fd55e654d551..9ae78f39e4e1 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/src.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/src.nix @@ -1,10 +1,10 @@ -fetchurl: rec { - major = "1.4"; - minor = "1"; - name = "gspell-${major}.${minor}"; +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gspell-1.6.1"; src = fetchurl { - url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; - sha256 = "1ghh1xdzf04mfgb13zqpj88krpa44xv2vbyhm6k017kzrpz8hbs4"; + url = mirror://gnome/sources/gspell/1.6/gspell-1.6.1.tar.xz; + sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de"; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix index 00e747500c61..d233dc3a4015 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgit2-glib-0.26.0"; + name = "libgit2-glib-0.26.2"; src = fetchurl { - url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz; - sha256 = "06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3"; + url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.2.tar.xz; + sha256 = "2ad6f20db2e38bbfdb6cb452704fe8a911036b86de82dc75bb0f3b20db40ce9c"; }; } diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix index abdcdef99379..2ea7a58ab665 100644 --- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix +++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix @@ -4,15 +4,15 @@ let majorVersion = "1.9"; in stdenv.mkDerivation rec { - name = "libmediaart-${majorVersion}.1"; + name = "libmediaart-${majorVersion}.4"; src = fetchurl { url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; - sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v"; + sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + buildInputs = [ glib gdk_pixbuf ]; meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index b6338d1f615a..5634d2a48d54 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus_glib, libcanberra_gtk2, gst_all_1, vala, gnome3, gtk3, libxml2, + dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, glib, gobjectIntrospection, libpeas }: @@ -14,24 +14,21 @@ stdenv.mkDerivation rec { sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1"; }; - configureScript = "./autogen.sh"; - nativeBuildInputs = [ - autoconf-archive libtool intltool appstream-glib + autoreconfHook vala autoconf-archive libtool intltool appstream-glib wrapGAppsHook pkgconfig libxml2 ]; buildInputs = [ glib gobjectIntrospection libpeas - dbus_glib libcanberra_gtk2 vala gst_all_1.gstreamer + dbus_glib libcanberra gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas - gnome3.gnome_common gnome3.gnome_shell gtk3 - gnome3.defaultIconTheme + gnome3.gnome_shell gtk3 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { - homepage = https://github.com/codito/gnome-shell-pomodoro; + homepage = http://gnomepomodoro.org/; description = "A time management utility for GNOME based on the pomodoro technique"; longDescription = '' This GNOME utility helps to manage time according to Pomodoro Technique. diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 71618ef960f9..531389011164 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -74,4 +74,4 @@ addEnvVars() { addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" fi } -envHooks=(${envHooks[@]} addEnvVars) +addEnvHooks "$targetOffset" addEnvVars diff --git a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff deleted file mode 100644 index 1fe26484605e..000000000000 --- a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/kioslave/bookmarks/kio_bookmarks.cpp -+++ b/kioslave/bookmarks/kio_bookmarks.cpp -@@ -22,6 +22,7 @@ - #include - - #include -+#include - - #include - #include -@@ -197,7 +198,7 @@ - echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); - } else { - echoHead(); -- echo("

" + i18n("Wrong request: %1",path) + "

"); -+ echo("

" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "

"); - } - finished(); - } diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix deleted file mode 100644 index 02cd509537d1..000000000000 --- a/pkgs/desktops/kde-4.14/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }: - -let - branch = "4.14"; - - # Need callPackageOrig to avoid infinite cycle - kde = callPackageOrig ./kde-package { - inherit release branch ignoreList extraSubpkgs callPackage; - }; - - # The list of igored individual modules - ignoreList = { - # Doesn't work yet - kdeutils = [ "ksecrets" ]; - # kdeadmin/strigi-analyzer has no real code - kdeadmin = [ "strigi-analyzer" ]; - # Most of kdebindings do not compile due to a bug in the buildsystem - kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ]; - }; - - # Extra subpackages in the manifest format - extraSubpkgs = {}; - -in - -kde.modules // kde.individual // -{ - akonadi = callPackage ./support/akonadi { }; - - inherit release; - - l10n = callPackage ./l10n { - inherit release branch; - inherit (kde.manifest) stable; - }; -} diff --git a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch deleted file mode 100644 index cd19b7e2d72a..000000000000 --- a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 18:55:44 -0500 -Subject: [PATCH] ksysguard disable signalplottertest - ---- - libs/ksysguard/tests/CMakeLists.txt | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt -index d472fd7..f178b71 100644 ---- a/libs/ksysguard/tests/CMakeLists.txt -+++ b/libs/ksysguard/tests/CMakeLists.txt -@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB - set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) - kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) - target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) -- -- --# KGraphicsSignalPlotter benchmark --set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) --kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) --target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) -- -- --# KSignalPlotter unit test --set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp) --kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} ) --target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ) -- -- -- -- --- -2.5.0 - diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix deleted file mode 100644 index dd14e0429ddb..000000000000 --- a/pkgs/desktops/kde-4.14/kactivities.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, kde, kdelibs }: - -kde { - - src = fetchurl { - url = "mirror://kde/stable/4.13.3/src/kactivities-4.13.3.tar.xz"; - sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7"; - }; - - outputs = [ "out" "dev" ]; - - outputInclude = "out"; - - setOutputFlags = false; - - propagatedBuildInputs = [ kdelibs ]; - - meta = { - description = "KDE activities library and daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix deleted file mode 100644 index df211f491993..000000000000 --- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }: - -kde { - postPatch = '' - substituteInPlace konq-plugins/validators/tidy_validator.cpp \ - --replace buffio.h tidybuffio.h - ''; - - buildInputs = [ kdelibs html-tidy kactivities libXt ]; - - meta = { - description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix deleted file mode 100644 index 5d9e2401ca82..000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ /dev/null @@ -1,71 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";} - {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";} - {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";} - {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";} - {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";} - {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";} - {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";} - {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";} - {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";} - {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";} -]; -versions=builtins.listToAttrs[ - {name="baloo";value="4.14.3";} - {name="kactivities";value="4.13.3";} - {name="kde-baseapps";value="4.14.3";} - {name="kdepimlibs";value="4.14.3";} - {name="kde-runtime";value="4.14.3";} - {name="kfilemetadata";value="4.14.3";} - {name="libkcddb";value="4.14.3";} - {name="libkdcraw";value="4.14.3";} - {name="libkexiv2";value="4.14.3";} - {name="marble";value="4.14.3";} - {name="okular";value="4.14.3";} - {name="svgpart";value="4.14.3";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="libkcddb"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name = "baloo"; } - { name = "kfilemetadata"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="marble"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdepimlibs"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix deleted file mode 100644 index 94f878097ded..000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig -, release, branch, ignoreList, extraSubpkgs -}: - -let - inherit (stdenv.lib) filter fold; - inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; - cmake = cmake_2_8; -in -rec { - manifest = import (./. + "/${release}.nix"); - - # src attribute for $name tarball - kdesrc = name: version: fetchurl { - url = "mirror://kde/" + (if manifest.stable then "" else "un") - + "stable/${release}/src/${name}-${version}.tar.xz"; - sha256 = getAttr name manifest.hashes; - }; - - # Default meta attribute - defMeta = { - homepage = http://www.kde.org; - inherit branch; - platforms = stdenv.lib.platforms.linux; - inherit (qt4.meta) maintainers; - }; - - # KDE package built from the whole tarball - # This function is used both for monolithic modules and modules which are - # released as individual tarballs - kdeMonoPkg = name: - let n_ = name; v_ = getAttr name manifest.versions; in - a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}: - stdenv.mkDerivation ({ - name = "${name}-${version}"; - src = kdesrc name version; - nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; - meta = defMeta // meta; - enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ])); - - # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs - # API. - kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; - - # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz - kdeSubdirPkg = module: - {name, subdir ? name, sane ? name}: - let name_ = name; version_ = getAttr module manifest.versions; in - a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc module version; - nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; - cmakeFlags = - [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" - "-DBUILD_${subdir}=TRUE" - ] ++ cmakeFlags; - meta = defMeta // meta; - enableParallelBuilding = module.enableParallelBuilding or true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ])); - - # A KDE monolithic module - kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; - - # Combine packages in one module. - # Arguments: - # * pkgFun --- a function of the following signature: - # module: manifest_attrs: manual_attrs: derivation; - # * module --- name of the module - # * pkgs --- list of packages in manifest format - combinePkgs = pkgFun: module: pkgs: - let - f = p@{name, ...}: - callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; }; - list = map f pkgs; - attrs = listToAttrs (map - ({name, sane ? name, ...}@p: { name = sane; value = f p; }) - pkgs); - in - runCommand "${module}-${release}" - ({passthru = attrs // { - propagatedUserEnvPackages = list; - projects = attrs; - };}) - '' - mkdir -pv $out/nix-support - printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages - ''; - - # Given manifest module data, return the module - kdeModule = { module, sane ? module, split, pkgs ? [] }: - let - pkgs_ = filterPkgs module pkgs; - in - # Module is splitted by upstream - if split then combinePkgs kdeSplittedPkg module pkgs_ - # Monolithic module - else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix") - # Module is splitted by us - else combinePkgs kdeSubdirPkg module pkgs_; - - # The same, as nameValuePair with sane name - kdeModuleNV = a@{ module, sane ? module, ... }: - { name = sane; value = kdeModule a; }; - - filterPkgs = module: (p: - removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p - ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs)); - - # Remove attrsets with x.name in subst. Optimized for empty subst. - removeNames = subst: big: - fold (s: out: filter (x: x.name != s) out) big subst; - - allModules = listToAttrs (map kdeModuleNV manifest.modules); - - modules = - let unsplit = filter (a: ! (a ? pkgs)) manifest.modules; - in listToAttrs (map kdeModuleNV unsplit); - - splittedModuleList = - let - splitted = filter (a: a ? pkgs) manifest.modules; - names = map ({module, sane ? module, ...}: sane) splitted; - in - map (m: m.projects) (stdenv.lib.attrVals names allModules); - - individual = - stdenv.lib.zipAttrsWith - ( - name: list: - if tail list == [] - then head list - else abort "Multiple modules define ${name}" - ) - splittedModuleList; -} diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh deleted file mode 100755 index 1da7bc810c32..000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh +++ /dev/null @@ -1,173 +0,0 @@ -#! /bin/sh - -# Usage: download kde release to $dir, then run -# $0 $dir - -dir="$1" - - -if [[ -z $(type -p xsltproc) ]]; then - echo "Please provide libxslt" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kdelibs-*.tar.xz | \ - sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//') - -# Detect release number & whether it is a stable release -if [[ $? -ne 0 || -z $release ]]; then - echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2 - exit 1 -fi - -if [[ ${release##*.} -gt 50 ]]; then - stable="false" -else - stable="true" -fi - -echo "Detected release ${release}" >&2 - -declare -A hash -declare -A version -declare -A modules -declare -a packages -declare -a top_level - -if [[ ! -f ${dir}/kde_projects.xml ]]; then - if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then - echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2 - exit 1 - fi -fi -# xsltproc output declares -A module -eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml` - -module[kde-baseapps]=kde-baseapps -unset module[kactivities] - -print_sane() { - echo "Called print_sane $1" >&2 - sane="${1//[^a-z0-9_]/_}" - if [[ "$sane" != "$1" ]]; then - echo "Sane version is $sane" >&2 - echo -n "sane=\"$sane\";" - fi -} - -for i in `cd "${dir}"; ls *.tar.xz`; do - package=${i%.tar.xz} - v=${package##*-} - package=${i%-*} - packages+=( "$package" ) - echo -n "${package}.. " >&2 - hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo -n ${hash[$package]} >&2 - - version[$package]=$v - - if [ -n "${module[$package]}" ]; then - m="${module[$package]}" - echo " (${m})" >&2 - modules[$m]=1 - else - top_level+=( "$package" ) - echo " (top-level)" >&2 - fi - nix-store --add-fixed sha256 "${dir}/${i}" >&2 -done - - -print_pkg_hash() { - echo " {name=\"${1}\";value=\"${hash[$1]}\";}" -} - -print_pkg_version() { - echo " {name=\"${1}\";value=\"${version[$1]}\";}" -} - -print_hashes(){ - echo "hashes=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_hash "$p"; done - echo "];" -} - -print_versions(){ - echo "versions=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_version "$p"; done - echo "];" -} - -print_split_module(){ - echo -n "$1:" >&2 - echo -e "{\n module=\"$1\";" - print_sane "$1" - echo " split=true;" - echo " pkgs=[" - for p in "${packages[@]}"; do - if [[ "${module[$p]}" == "$1" ]]; then - echo -n " { name=\"$p\"; " - print_sane "$p" - echo " }" - echo -n " $p" >&2 - fi - done - echo " ];" - echo "}" - echo >&2 -} - -print_mono_module(){ - echo -en "{ module=\"$1\"; " - print_sane "$1" - echo -n "$1 ... " >&2 - pkg=$(cd "$dir"; echo "$1"-*.tar.xz) - pkg="${pkg%.tar.xz}" - echo -n " split=false;" - cml="$pkg/CMakeLists.txt" - tar -xf "${dir}/$pkg.tar.xz" "$cml" - if grep '^[^#]*add_subdirectory' $cml >/dev/null; then - if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then - echo " is monolithic (has unconditionally added subdirs)" >&2 - else - subdirs=( `grep '^[^#]*add_subdirectory' $cml | - sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | - grep -v '\(doc\|cmake\)'` ) - echo " seems splittable, subdirs: ${subdirs[*]}" >&2 - echo -e "\n pkgs=[" - for s in "${subdirs[@]}"; do - echo -en " {" - echo -n " name=\"${s//\//-}\"; " - print_sane "$s" - if [[ $s != "${s//\//-}" ]]; then - echo -n "subdir=\"$s\"; " - fi - echo "}" - done - echo -e " ];\n" - fi - else - echo " is monolithic (has no subdirs)" >&2 - fi - rm $cml - rmdir "$pkg" - echo "}" -} - -print_modules(){ - echo "modules=[" - echo "Printing modules splitted by upstream" >&2 - for m in "${!modules[@]}"; do print_split_module "$m"; done - echo >&2 - echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 - for m in "${top_level[@]}"; do print_mono_module "$m"; done - echo "];" -} - -echo "Writing ${release}.nix" >&2 -exec > "${release}.nix" -echo "{stable=${stable};" -print_hashes -print_versions -print_modules -echo "}" diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt deleted file mode 100644 index 952a05a9d274..000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - declare -A module - - - - module[" - - "]=" - - " - - - - - diff --git a/pkgs/desktops/kde-4.14/kdeedu/marble.nix b/pkgs/desktops/kde-4.14/kdeedu/marble.nix deleted file mode 100644 index 2dc07d14a0d9..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/marble.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gpsd }: - -kde { - -# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip - - buildInputs = [ kdelibs gpsd ]; - - meta = { - description = "Marble Virtual Globe"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix deleted file mode 100644 index 18697e13b66c..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: - -kde { - - buildInputs = [ kdelibs libraw lcms2 ]; - - meta = { - description = "Library for decoding RAW images"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix deleted file mode 100644 index 46ec45fad01a..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, exiv2 }: - -kde { - buildInputs = [ kdelibs exiv2 ]; - - meta = { - description = "Exiv2 support library"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix deleted file mode 100644 index de7b77999936..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2 -, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: - -kde { - -# TODO: package activeapp, qmobipocket - - buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4 - qca2 qimageblitz libtiff kactivities libkexiv2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Okular, the KDE document viewer"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix deleted file mode 100644 index 2fc0e373dbdf..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "SVG KPart"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix deleted file mode 100644 index 8883c03274df..000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost -}: - -kde { - -# TODO: qmobipocket - - buildInputs = [ - kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost - ]; - - nativeBuildInputs = [ pkgconfig doxygen ]; - - meta = { - description = "Baloo"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix deleted file mode 100644 index 6068516ba2b2..000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }: - -kde { - buildInputs = [ - kdelibs poppler_qt4 taglib exiv2 ffmpeg - ]; - - nativeBuildInputs = [ pkgconfig doxygen ]; - - meta = { - description = "KFileMetaData"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix deleted file mode 100644 index 66b0cfe869f6..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { -#todo: libmusicbrainz5 - buildInputs = [ kdelibs ]; - meta = { - description = "A library used to retrieve audio CD meta data from the internet"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix deleted file mode 100644 index 1f412d3c766e..000000000000 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison -, kdelibs, akonadi, libxslt -, shared_mime_info, shared_desktop_ontologies, qjson -, automoc4, cmake_2_8, perl -}: - -kde { - outputs = [ "out" "dev" ]; - - outputInclude = "out"; - - setOutputFlags = false; - - nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ]; - - cmakeFlags = [ - "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3" - ]; - - buildInputs = - [ boost gpgme libical libxslt qjson prison - openldap cyrus_sasl akonadi shared_desktop_ontologies - shared_mime_info - ]; - - propagatedBuildInputs = [ kdelibs ]; - - # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev. - postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake"; - - meta = { - description = "KDE PIM libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.14/l10n/default.nix b/pkgs/desktops/kde-4.14/l10n/default.nix deleted file mode 100644 index b4c272cb328e..000000000000 --- a/pkgs/desktops/kde-4.14/l10n/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs, gettext, release, branch, stable -}: - -let - - inherit (stdenv.lib) attrByPath singleton; - - kdeL10nDerivation = - { lang, saneName, sha256 }: - - stdenv.mkDerivation rec { - name = "kde-l10n-${saneName}-${release}"; - - src = fetchurl { - url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz"; - name = "${name}.tar.xz"; - inherit sha256; - }; - - buildInputs = [ gettext kdelibs ]; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - cmakeFlags = [ - "-Wno-dev" - ]; - - meta = { - description = "KDE translation for ${lang}"; - inherit branch; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; - inherit (kdelibs.meta) maintainers homepage; - }; - }; - - kdeL10nRelease = - builtins.listToAttrs ( - map ({lang, saneName, sha256}: - { - name = saneName; - value = kdeL10nDerivation { inherit lang saneName sha256; }; - } - ) (import (./manifest + "-${release}.nix")) - ); - -in -{ - inherit kdeL10nDerivation; - recurseForDerivations = true; -} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh deleted file mode 100755 index ec159a1e2047..000000000000 --- a/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# Usage: download kde-l10n to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \ - sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do - lang=${i%-${release}.tar.xz} - lang=${lang#kde-l10n-} - echo -n "${lang}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " lang = \"${lang}\";" - echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix deleted file mode 100644 index a6d48ae51bf2..000000000000 --- a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix +++ /dev/null @@ -1,267 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1amzzwa4zhwm0r1b1fdi0fjp883wpbjh12wn9q42g04xzza6nq04"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "1x1yx6lw86bwv2d7lcfb061k1pqgqw6abqwrga7pnzfmk2fcaawb"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "148195dk6wmymk6jib467a10w9jajh3bmx1igxl29l7vp33xpgng"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "04bgjfwr5pwn79lh3wixajswmccfcqll5dnjhf84zw7p09138m0v"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "0p257jjilkmjrq9ddvwfdh41911b2yrcrid1j31g7gg9gp7iriq4"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "0kjn9pq9p8bfja6ca4pcpqgli9k1mfyh77j6i8p28i37wfmgv0cn"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1w0ylqnxkbqz6camk8045nrxpz1n4dbz8cgl559l31m7zacq1rmb"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "0i97h1jcm8lpv3pap7wiz8nvjwf00jav5z5ymsbklagvmbmwyfyk"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1br19741hmn08g3vzmx8dilx2kdfbg5zv1rjxnigdfwi0zphqyw9"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "1flp57prc12ri2rhh6vwf6hb5mqj8w1sj94pnji02ylmkghcc466"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0waccr5mih5nv4q31k6xn07iws2by8n67riij6k9nsfsrlrxv21g"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "1bqd4jaws8890r2zjzpf6pw1k9v7h2lr7xk1dzfs8ak7gny32fm9"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "0q4cac4vp1s7fda328xxyzhqll0iqinn5v9syb93xfj29kij4ja2"; -} -{ - lang = "fa"; - saneName = "fa"; - sha256 = "0avabmdm9bxyb5b5d0mrv8mmwp6j1r4ch7y0ab7b4zl380blw7d3"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0lk0r03r2wmqpf8n9zvwpsbl7s11dipa8kc3lmkh1yrjk8c4z2sw"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1gzwc6yj7x7x3jx0270ap5nf70ckl25lqccrxiyzwx3mqfxgfbx2"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "0bkf62cqj4rfgz81yj9jspv5jfa932hsyhk4kq0r2hqsm8gndddd"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "00m4m480fqls5i1cvdidkq3nb8xzqhgyqqp0zk3j3qybxfq98yg5"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1488lk7jniv0hj77wcfxplxw10srp3df6lv6llss8b5m3yqb061a"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "16ni7257b1ch0wabncvq17569c57ncz7pzqgqm830bj8ldpk9zzv"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1si90cnwjsvw553pmppb0aakfk7fan2jk44ag0j191kdiir2b3xk"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "1x2s2cd521ffp5azzrzq2w2cr4sjz6gpg1a1h9jg4749xwqfhc1a"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "1ybaihygv0lviw6bq3a6ki40glgs49gsk29abq4y95bi9ymlrryc"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1s8zliwc737avc04n2l27rhhh9isz9ag81nsajai27yxif0ncn7x"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "1x2mag8jwlmbh8v8y3rmvp9n69sv2xfwwsxw7c9vb8qg4cybax1c"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1ng2hzrbvcak3nhbmlb3h64a15h34zfrgabzwrjvi2b0fv8liycw"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "01klhf9bmha9x6s39r4wnd0hxn35jg5bh7h9rwqij3nf06rddfrj"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "149fi65z1x64svs00rn82njmw6l0pncgs4b5d66fb18ah3bjlfg2"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "17hjv0gi2fqa5gkjgmqkxb4k7z3zizrxax6inq8s03g4f2vfibaz"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "19yhacc0v5grxc35bmks9r4qy091qij26yfi2qvs3rca7cc374jp"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "0y0nkvqidc12paf8ghk4p6z213gxcyv27nvglk120l2602980idj"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "0msw54v8d9p08c7prw6m20w29qf8f0yb32s378knhsql6abv5gln"; -} -{ - lang = "mr"; - saneName = "mr"; - sha256 = "05kcm7x7jj4lppn6fd1jlzl37r3gs9wrz0cckwpscc2m6y2g7p55"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "0wsdr8yyjjik2h30xy7y38i5hagy4jya98cqjbcrrab35i677l9a"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0lr5z1r8v3fkqpkcjvnml2s9jh50wmqsqiyls9ivr46ygwm8wcbq"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "09w8cniq3z11900axjcdlm24jbzjjsqcpdwpvhvc9z78hfsjqp36"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "1b304wg1143pk7ib8k451g2riq87c1h0611khslghy428q4rviwd"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "02y56ld5hiywph88khh55hqg0gpcvmqcqrbpsidzx3qdgh5j40nl"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "137mfrr7wza2pg4yzqqi93bsmsrjvj0ar27gi3lk1qh6zniwyjai"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "1zb454rg4pigkldg9jp97r2r7k8azwxbal77zscky2q6rbw0sjcn"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1zrn09k99pfscnc5zyxh1jzyrbirhy8ilwacbgg913maaanjprny"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "1lkr14if7jmfcxmb10pf11a6xjxxqxrq45lwdx19kj3djgr5l4pc"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "1ldf4y9wck339n0jq8x43x9h57jvfg3qk0spfv9d5fw9qyxygwwi"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "1n4qjwvpkddwizl8k3gr1xwv8icwd6lqsg09cypax049g3q2sy4p"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1k111r9ssprgali6sg3wpbvp635hb56ckmcgpdhyvk6bbkcbnbmr"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "0pini77jlnrv2fhl0j99wjxylwlj77bihcbfvnkf5bganffgwc11"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "0ykxy95a4q0pp5ibmw20ckg33b3h89g2m86p6fcfnqf6350nxs2v"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "15vcfpyc30ia6bsjgwv3zhydv2nlnmggr8i2yjpnb5dlynn3sywh"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0qhzfbd3j0d7grg4ghzn7y5vrl031iz9krifv7dv6jgp68fzz1h0"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "03n2myhwx9lvm1vzqvrg2sgl3y1m0rrrskqa22m06fjmh4vxawhx"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "11b7gyy31n2zfhkaj304pd4lkr14sp1sgi4pzv86c824sr6lp01v"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "1r5gxadd94ckdpkwcchwa8k735g2y9x7bi6px6hm7qlxdbi9sjmq"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "04bvvb3na4arns483fz27npjs045hf3s53p2rkd2nvq9gwvn0kmi"; -} -] diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix deleted file mode 100644 index ecfb4913a429..000000000000 --- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite, pkgconfig }: - -stdenv.mkDerivation rec { - name = "akonadi-1.13.0"; - - src = fetchurl { - url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2"; - }; - - buildInputs = [ qt4 soprano libxslt boost sqlite ]; - - nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "KDE PIM Storage Service"; - license = "LGPL"; - homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.phreedom ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index aece5fefaecf..c06a99eb36c2 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; - homepage = http://lxde.org/; + homepage = https://lxde.org/; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 5b02c6ad117f..ab00cdce6714 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, caja, mate-desktop, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; @@ -23,12 +23,13 @@ stdenv.mkDerivation rec { libsecret libxml2 poppler + caja + mate-desktop hicolor_icon_theme - mate.mate-desktop ]; - - configureFlags = [ "--disable-caja" ]; + makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; + meta = { description = "A simple multi-page document viewer for the MATE desktop"; homepage = http://mate-desktop.org; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix new file mode 100644 index 000000000000..da5200eb3b32 --- /dev/null +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, caja, pythonPackages }: + +stdenv.mkDerivation rec { + name = "caja-dropbox-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "18wd8abjaxa68n1yjmvh9az1m8lqa2wing73xdymz0d5gmxmk25g"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + gtk3 + caja + pythonPackages.python + pythonPackages.pygtk + pythonPackages.docutils + ]; + + configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; + + meta = with stdenv.lib; { + description = "Dropbox extension for Caja file manager"; + homepage = https://github.com/mate-desktop/caja-dropbox; + license = with licenses; [ gpl3 cc-by-nd-30 ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index ab2831159f90..9bd86d962ecb 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, caja, mate-desktop, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-extensions-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0hgala7zkfsa60jflq3s4n9yd11dhfdcla40l83cmgc3r1az7cmw"; + sha256 = "065j3dyk7zp35rfvxxsdglx30i3xrma4d4saf7mn1rn1akdfgaba"; }; nativeBuildInputs = [ pkgconfig intltool + wrapGAppsHook ]; buildInputs = [ gtk3 dbus_glib gupnp - mate.caja - mate.mate-desktop + caja + mate-desktop imagemagick ]; diff --git a/pkgs/desktops/mate/caja/cajaWithExtensions.nix b/pkgs/desktops/mate/caja/cajaWithExtensions.nix deleted file mode 100644 index cb315d7f09a2..000000000000 --- a/pkgs/desktops/mate/caja/cajaWithExtensions.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ buildEnv, makeWrapper, caja, extensions ? [] }: - -buildEnv { - name = "cajaWithExtensions-${caja.version}"; - meta = caja.meta // { description = "File manager (including extensions) for the MATE desktop"; }; - paths = [ caja ] ++ extensions; - buildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram "$out/bin/caja" --set CAJA_EXTENSION_DIRS "$out/lib/caja/extensions-2.0" - ''; -} diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 8f38a5ef7e69..3c872e72091f 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "3"; + minor-ver = "5"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm"; + sha256 = "1ild2bslvnvxvl5q2xc1sa8bz1lyr4q4ksw3bwxrj0ymc16h7p50"; }; nativeBuildInputs = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { libexif exempi mate.mate-desktop + hicolor_icon_theme ]; patches = [ diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index acb3b31e8018..0c495fd190e5 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -7,31 +7,43 @@ let atril = callPackage ./atril { }; caja = callPackage ./caja { }; + caja-dropbox = callPackage ./caja-dropbox { }; caja-extensions = callPackage ./caja-extensions { }; - cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix { - extensions = [ caja-extensions ]; - }; engrampa = callPackage ./engrampa { }; eom = callPackage ./eom { }; libmatekbd = callPackage ./libmatekbd { }; libmatemixer = callPackage ./libmatemixer { }; libmateweather = callPackage ./libmateweather { }; marco = callPackage ./marco { }; + mate-applets = callPackage ./mate-applets { }; + mate-backgrounds = callPackage ./mate-backgrounds { }; + mate-calc = callPackage ./mate-calc { }; mate-common = callPackage ./mate-common { }; mate-control-center = callPackage ./mate-control-center { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { }; + mate-indicator-applet = callPackage ./mate-indicator-applet { }; mate-media = callPackage ./mate-media { }; mate-menus = callPackage ./mate-menus { }; + mate-netbook = callPackage ./mate-netbook { }; mate-notification-daemon = callPackage ./mate-notification-daemon { }; mate-panel = callPackage ./mate-panel { }; + mate-polkit = callPackage ./mate-polkit { }; mate-power-manager = callPackage ./mate-power-manager { }; + mate-sensors-applet = callPackage ./mate-sensors-applet { }; mate-session-manager = callPackage ./mate-session-manager { }; mate-settings-daemon = callPackage ./mate-settings-daemon { }; + mate-screensaver = callPackage ./mate-screensaver { }; + mate-system-monitor = callPackage ./mate-system-monitor { }; mate-terminal = callPackage ./mate-terminal { }; mate-themes = callPackage ./mate-themes { }; + mate-user-guide = callPackage ./mate-user-guide { }; + mate-user-share = callPackage ./mate-user-share { }; + mate-utils = callPackage ./mate-utils { }; + mozo = callPackage ./mozo { }; pluma = callPackage ./pluma { }; + python-caja = callPackage ./python-caja { }; basePackages = [ caja @@ -46,6 +58,7 @@ let mate-menus mate-notification-daemon mate-panel + mate-polkit mate-session-manager mate-settings-daemon mate-themes @@ -53,13 +66,25 @@ let extraPackages = [ atril - cajaWithExtensions + caja-extensions engrampa eom + mate-applets + mate-backgrounds + mate-calc mate-icon-theme-faenza + mate-indicator-applet mate-media + mate-netbook mate-power-manager + mate-screensaver + mate-sensors-applet + mate-system-monitor mate-terminal + mate-user-guide + #mate-user-share + mate-utils + mozo pluma ]; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 026890829890..b6b60fa24380 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "engrampa-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "2"; + minor-ver = "3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0d98zhqqc7qdnxcf0195kd04xmhijc0w2qrn6q61zd0daiswnv98"; + sha256 = "1ms6kz8k86hsj9zk5w3087l749022y0j5ba2s9hz8ah6gfx0mvn5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index c7651e1b5be8..e4d52183ab40 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -4,18 +4,17 @@ stdenv.mkDerivation rec { name = "eom-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "2"; + minor-ver = "3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "00ns7g7qykakc89lijrw2vwy9x9ijqiyvmnd4sw0j6py90zs8m87"; + sha256 = "1zr85ilv0f4x8iky002qvh00qhsq1vsfm5z1954gf31hi57z2j25"; }; nativeBuildInputs = [ pkgconfig intltool itstool - hicolor_icon_theme wrapGAppsHook ]; @@ -31,6 +30,7 @@ stdenv.mkDerivation rec { gnome3.gtk gnome3.libpeas mate.mate-desktop + hicolor_icon_theme ]; meta = { diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4d7c9dd61d6d..3ddbb8f6a02a 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "libmateweather-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0z6vfh42fv9rqjrraqfpf6h9nd9h662bxy3l3r48j19xvxrwmx3a"; + sha256 = "1q3rvmm533cgiif9hbdp6a92dm727g5i2dv5d8krfa0nl36i468y"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 1846bccacefb..522485fd22c2 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "marco-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5"; + sha256 = "173g9mrnkcgjc6a1maln13iqdl0cqcnca8ydr8767xrn9dlkx9f5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix new file mode 100644 index 000000000000..ba5ef927fb6f --- /dev/null +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, libmateweather, mate-panel, pythonPackages, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-applets-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "045cl62nnfsl14vnfydwqjssdakgdrahh5h0xiz5afmdcbq6cqgw"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.gtk + gnome3.gtksourceview + gnome3.gucharmap + libwnck3 + libgtop + libxml2 + libnotify + dbus_glib + polkit + upower + wirelesstools + libmateweather + mate-panel + pythonPackages.python + pythonPackages.pygobject3 + hicolor_icon_theme + ]; + + configureFlags = [ "--enable-suid=no" ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + meta = with stdenv.lib; { + description = "Applets for use with the MATE panel"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix new file mode 100644 index 000000000000..6ce78491d037 --- /dev/null +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, intltool }: + +stdenv.mkDerivation rec { + name = "mate-backgrounds-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "06q8ksjisijps2wn959arywsimhzd3j35mqkr048c26ck24d60zi"; + }; + + nativeBuildInputs = [ intltool ]; + + meta = with stdenv.lib; { + description = "Background images and data for MATE"; + homepage = http://mate-desktop.org; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix new file mode 100644 index 000000000000..b00bcc27ac51 --- /dev/null +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-calc-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1h6kr9qb1kaw8jvfm7xmqm1wqnxsw2iwha5vl38b986x4zm2b712"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libxml2 + ]; + + meta = with stdenv.lib; { + description = "Calculator for the MATE desktop"; + homepage = http://mate-desktop.org; + license = [ licenses.gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix new file mode 100644 index 000000000000..7d863a929e7a --- /dev/null +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-indicator-applet-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1h77f1gbz1a8l9xyq5fk75bs58mcwx6pbk6db33v0v1mwq6cidiv"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libindicator-gtk3 + mate-panel + hicolor_icon_theme + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mate-desktop/mate-indicator-applet; + description = "MATE panel indicator applet"; + longDescription = '' + A small applet to display information from various applications + consistently in the panel. + + The indicator applet exposes Ayatana Indicators in the MATE Panel. + Ayatana Indicators are an initiative by Canonical to provide crisp and + clean system and application status indication. They take the form of + an icon and associated menu, displayed (usually) in the desktop panel. + Existing indicators include the Message Menu, Battery Menu and Sound + menu. + ''; + license = with licenses; [ gpl3Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 039db57aebbe..0586a2e54ebf 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-media-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0v19aipqj24367mx82ghkvgnxy1505zd35h50pi30fws36b6plll"; + sha256 = "07v37jvrl8m5rhlasrdziwy15gcpn561d7zn5q1yfla2d5ddy0b1"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index a3da557f2a21..6f4bf48c672a 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-menus-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "05kyr37xqv6hm1rlvnqd5ng0x1n883brqynkirkk5drl56axnz7h"; + sha256 = "03fwv0fvg073dmdbrcbpwjhxpj98aqna804m9nqybhvj3cfyhaz6"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix new file mode 100644 index 000000000000..0a2a0e472020 --- /dev/null +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate-panel, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-netbook-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0xy5mhkg0xfgyr7gnnjrfzqhmdnhyqscrl2h496p06cflknm17vb"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libwnck3 + libfakekey + libXtst + mate-panel + ]; + + meta = with stdenv.lib; { + description = "MATE utilities for netbooks"; + longDescription = '' + MATE utilities for netbooks are an applet and a daemon to maximize + windows and move their titles on the panel. + + Installing these utilities is recommended for netbooks and similar + devices with low resolution displays. + ''; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl3 lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 5a64727419c6..c5e53cf57914 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-notification-daemon-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0rhhv99ipxy7l4fdgwvqp3g0c3d4njq0fhkag2vs1nwc6kx0h7sc"; + sha256 = "102nmd6mnf1fwvw11ggdlgcblq612nd4aar3gdjzqn1fw37591i5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index d3e6f11fd947..ec934b1fc637 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-panel-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "4"; + minor-ver = "7"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1"; + sha256 = "1m0fxyzbvg239dddmz3ksd8871lhkd7n3fxvdgdf4hv9rlvm1klv"; }; nativeBuildInputs = [ @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { libwnck3 librsvg libxml2 - hicolor_icon_theme gnome3.gtk gnome3.dconf mate.libmateweather mate.mate-desktop mate.mate-menus + hicolor_icon_theme ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix new file mode 100644 index 000000000000..b0405043815e --- /dev/null +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libappindicator-gtk3, libindicator-gtk3, polkit }: + +stdenv.mkDerivation rec { + name = "mate-polkit-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "01mxl7wj1501d3clrwlwa54970vpkahp5968xpaxwfb2zbnqgjbd"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + gtk3 + libappindicator-gtk3 + libindicator-gtk3 + polkit + ]; + + meta = with stdenv.lib; { + description = "Integrates polkit authentication for MATE desktop"; + homepage = http://mate-desktop.org; + license = [ licenses.gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 62b991632840..8b60226d9590 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1gmka9ybxvkrdjaga1md6pbw6q1cx5yxb58ai5315a0f5p45y36x"; + sha256 = "1sybc4j9bdnb2axmvpbbm85ixhdfa1k1yh769gns56ix0ryd9nr5"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix new file mode 100644 index 000000000000..dbaebb4c7be4 --- /dev/null +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate-desktop, mate-menus, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-screensaver-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "03za7ssww095i49braaq0di5ir9g6wxh1n5hfgy6b3w9nb0j1y2p"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + dbus_glib + libXScrnSaver + libnotify + pam + systemd + mate-desktop + mate-menus + ]; + + configureFlags = "--without-console-kit"; + + makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; + + meta = with stdenv.lib; { + description = "Screen saver and locker for the MATE desktop"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix new file mode 100644 index 000000000000..ed98ffaa645b --- /dev/null +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate-panel, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-sensors-applet-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "3"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1nm68rhp73kgvs7wwsgs5zbvq3lzaanl5s5nnn28saiknjbz1mcx"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + # maybe add nvidia-settings later on + buildInputs = [ + gtk3 + libxml2 + libxslt + libatasmart + libnotify + dbus_glib + lm_sensors + mate-panel + hicolor_icon_theme + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mate-desktop/mate-sensors-applet; + description = "MATE panel applet for hardware sensors"; + license = with licenses; [ gpl2Plus ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 48d2890388a7..f15a78120cba 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd, + libSM, libXtst, gtk3, mate-desktop, hicolor_icon_theme, + wrapGAppsHook +}: stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll"; + sha256 = "11ii7azl8rn9mfymcmcbpysyd12vrxp4s8l3l6yk4mwlr3gvzxj0"; }; nativeBuildInputs = [ pkgconfig intltool + xtrans wrapGAppsHook ]; buildInputs = [ dbus_glib systemd - xtrans + libSM + libXtst + gtk3 + mate-desktop hicolor_icon_theme - xorg.libSM - gnome3.gtk3 - gnome3.gsettings_desktop_schemas - mate.mate-desktop ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ffa01d1dba88..86eec907651c 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "mate-settings-daemon-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6"; + sha256 = "0v2kdzfmfqq0avlrxnxysmkawy83g7sanmyhivisi5vg4rzsr0a4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix new file mode 100644 index 000000000000..1378cc7f3ba5 --- /dev/null +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-system-monitor-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1xhz7d9045xfh431rn27kh1sd1clbzkfrw1zkjgfnpad6v3aaaks"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtkmm3 + libxml2 + libgtop + libwnck3 + librsvg + systemd + ]; + + configureFlags = "--enable-systemd"; + + meta = with stdenv.lib; { + description = "System monitor for the MATE desktop"; + homepage = http://mate-desktop.org; + license = [ licenses.gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 9d620b283018..590ae7c7f813 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1"; + sha256 = "053jdcjalywcq4fvqlb145sfp5hmnd6yyk9ckzvkh6fl3gyp54gc"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 3967a8c9ca2b..c29c0560cd1d 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -7,22 +7,23 @@ stdenv.mkDerivation rec { # There is no 3.24 release. major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22"; minor-ver = { - "3.20" = "22"; - "3.22" = "13"; + "3.20" = "23"; + "3.22" = "14"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.20" = "1yjj5w7zvyjyg0k21nwk438jjsnj0qklsf0z5pmmp1jff1vxyck4"; - "3.22" = "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i"; + "3.20" = "0xmcm1kmkhbakhwy5vvx3gll5v2gvihwnbf0gyjf75fys6h3818g"; + "3.22" = "09fqvlnmrvc73arl7jv9ygkxi46lw7c1q8qra6w3ap7x83f9zdak"; }."${major-ver}"; }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gtk-engine-murrine - gdk_pixbuf librsvg ]; + buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk_pixbuf librsvg ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; meta = { description = "A set of themes from MATE"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix new file mode 100644 index 000000000000..ce8029fb2152 --- /dev/null +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }: + +stdenv.mkDerivation rec { + name = "mate-user-guide-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0f3b46r9a3cywm7rpj08xlkfnlfr9db58xfcpix8i33qp50fxqmb"; + }; + + nativeBuildInputs = [ itstool intltool libxml2 ]; + + buildInputs = [ yelp ]; + + meta = with stdenv.lib; { + description = "MATE User Guide"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus fdl12 ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix new file mode 100644 index 000000000000..afacad527782 --- /dev/null +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, caja, mod_dnssd, apacheHttpd, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-user-share-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0w7r7jmm12n41hcxj1pfk3f0xy69cddx7ga490x191rdpcb3ry1n"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + dbus_glib + libnotify + libcanberra_gtk3 + libxml2 + caja + hicolor_icon_theme + # Should mod_dnssd and apacheHttpd be runtime dependencies? + # In gnome-user-share they are not. + #mod_dnssd + #apacheHttpd + ]; + + preConfigure = '' + sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ + -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ + -i data/dav_user_2.4.conf + ''; + + configureFlags = [ + "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-cajadir=$(out)/lib/caja/extensions-2.0" + ]; + + meta = with stdenv.lib; { + description = "User level public file sharing for the MATE desktop"; + homepage = https://github.com/mate-desktop/mate-user-share; + license = with licenses; [ gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix new file mode 100644 index 000000000000..281fef42e612 --- /dev/null +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-utils-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "3"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1nw8rcq3x67v73cmy44zz6r2ikz46wsx834qzkbq4i2ac96kdkfz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libgtop + libcanberra_gtk3 + libxml2 + mate-panel + hicolor_icon_theme + ]; + + meta = with stdenv.lib; { + description = "Utilities for the MATE desktop"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix new file mode 100644 index 000000000000..b376736c473d --- /dev/null +++ b/pkgs/desktops/mate/mozo/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, intltool, mate-menus, pythonPackages }: + +stdenv.mkDerivation rec { + name = "mozo-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "04yn9bw64q5a5kvpmkb7rb3mlp11pmnvkbphficsgb0368fj895b"; + }; + + pythonPath = [ mate-menus pythonPackages.pygobject3 ]; + + nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; + + buildInputs = [ pythonPackages.python ] ++ pythonPath; + + preFixup = "wrapPythonPrograms"; + + meta = with stdenv.lib; { + description = "MATE Desktop menu editor"; + homepage = https://github.com/mate-desktop/mozo; + license = with licenses; [ lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index a290c404469c..d6d3d46f7cd6 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "pluma-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "2"; + minor-ver = "3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1z0938yiygxipj2a77n9dv8v4253snrc5gbbnarcnim9xba2j3zz"; + sha256 = "1bz2jvjfz761hcvhcbkz8sc4xf0iyixh5w0k7bx69qkwwdc0gxi0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix new file mode 100644 index 000000000000..4eb9b72b8b5f --- /dev/null +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, caja, pythonPackages }: + +stdenv.mkDerivation rec { + name = "python-caja-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0n43cvvv29gq31hgrsf9al184cr87c3hzskrh2593rid52kwyz44"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + pythonPackages.wrapPython + ]; + + buildInputs = [ + gtk3 + caja + pythonPackages.python + pythonPackages.pygobject3 + ]; + + configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + + meta = with stdenv.lib; { + description = "Python binding for Caja components"; + homepage = https://github.com/mate-desktop/python-caja; + license = [ licenses.gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index b7c27ec3d0a9..13a34f90fcdd 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }: stdenv.mkDerivation rec { majorVersion = "0.4"; @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ]; + nativeBuildInputs = [ + perl cmake vala_0_38 pkgconfig makeWrapper + # For setup hook + gobjectIntrospection + ]; buildInputs = with gnome3; [ glib gtk3 granite libnotify gettext vte_290 libgee gsettings_desktop_schemas defaultIconTheme diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix deleted file mode 100644 index 6c31398037b0..000000000000 --- a/pkgs/desktops/plasma-5/breeze-qt4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - mkDerivation, lib, - automoc4, cmake, perl, pkgconfig, - kdelibs4, qt4, xproto -}: - -mkDerivation { - name = "breeze-qt4"; - sname = "breeze"; - buildInputs = [ kdelibs4 qt4 xproto ]; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DUSE_KDE4=ON" - "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" - ]; -} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index cae5c74b4428..0972673b7b87 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -100,7 +100,6 @@ let in { bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt4 = callPackage ./breeze-qt4.nix {}; breeze-qt5 = callPackage ./breeze-qt5.nix {}; breeze-grub = callPackage ./breeze-grub.nix {}; breeze-plymouth = callPackage ./breeze-plymouth {}; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 494b84923534..921441c02922 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 598f043dcd53..d951c03b5d3d 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -8,7 +8,7 @@ index 7e2d9758..40a5797b 100644 import org.kde.kcoreaddons 1.0 as KCoreAddons -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batteryItem diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml @@ -21,7 +21,7 @@ index ae6d5919..c2f99c86 100644 import org.kde.kquickcontrolsaddons 2.0 -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batterymonitor diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml @@ -34,7 +34,7 @@ index 80e7e53b..0083cf01 100644 import org.kde.kquickcontrolsaddons 2.0 -import "data.js" as Data +import "../code/data.js" as Data - + Flow { id: lockout diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml @@ -42,12 +42,12 @@ index acdda88f..989de8ab 100644 --- a/applets/notifications/package/contents/ui/main.qml +++ b/applets/notifications/package/contents/ui/main.qml @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - + import org.kde.plasma.private.notifications 1.0 - + -import "uiproperties.js" as UiProperties +import "../code/uiproperties.js" as UiProperties - + MouseEventListener { id: notificationsApplet diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in @@ -59,7 +59,7 @@ index 85715214..294eab08 100644 Name=org.kde.krunner -Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner +Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner - + diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in index 7a86d07f..5b3030cc 100644 --- a/kuiserver/org.kde.kuiserver.service.in @@ -76,7 +76,7 @@ index fe29f57a..247db953 100644 @@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) add_subdirectory(ksyncdbusenv) add_subdirectory(waitforname) - + -#FIXME: reconsider, looks fishy -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") - set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") @@ -106,7 +106,7 @@ index e9fa0bee..79e50a96 100644 -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + +if test "x$1" = x--failsafe; then + KDE_FAILSAFE=1 # General failsafe flag + KWIN_COMPOSE=N # Disable KWin's compositing @@ -117,7 +117,7 @@ index e9fa0bee..79e50a96 100644 # When the X server dies we get a HUP signal from xinit. We must ignore it # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP - + -# Check if a Plasma session already is running and whether it's possible to connect to X -kcheckrunning +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading @@ -140,12 +140,12 @@ index e9fa0bee..79e50a96 100644 + echo "\$DISPLAY is not set or cannot connect to the X server." + exit 1 fi - + # Boot sequence: @@ -33,59 +42,132 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence - + -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; @@ -174,7 +174,7 @@ index e9fa0bee..79e50a96 100644 +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then + @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf fi - + -mkdir -p $configDir +@NIXPKGS_KBUILDSYCOCA5@ + @@ -227,7 +227,7 @@ index e9fa0bee..79e50a96 100644 +cursorSize=0 +EOF +fi - + #This is basically setting defaults so we can use them with kstartupconfig5 -cat >$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" </plasma-workspace/env/*.sh -# (where correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config @@ -451,9 +451,9 @@ index e9fa0bee..79e50a96 100644 - export GS_LIB -fi +@NIXPKGS_XSETROOT@ -cursor_name left_ptr - + echo 'startkde: Starting up...' 1>&2 - + -# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -# to set it to a list of paths *not* including the KDE prefix if it's not /usr or @@ -472,19 +472,19 @@ index e9fa0bee..79e50a96 100644 export KDE_FULL_SESSION -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - + KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - + -KDE_SESSION_UID=`id -ru` +KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) export KDE_SESSION_UID - + XDG_CURRENT_DESKTOP=KDE export XDG_CURRENT_DESKTOP - + +# Enforce xcb QPA. Helps switching between Wayland and X sessions. +export QT_QPA_PLATFORM=xcb + @@ -527,7 +527,7 @@ index e9fa0bee..79e50a96 100644 - xmessage -geometry 500x100 "Could not sync environment to dbus." exit 1 fi - + # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup @@ -539,10 +539,10 @@ index e9fa0bee..79e50a96 100644 - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi - + -qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - + # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence @@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & @@ -568,12 +568,12 @@ index e9fa0bee..79e50a96 100644 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." fi - + #Anything after here is logout/shutdown - + -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - + -if test x"$wait_drkonqi"x = x"true"x ; then +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) @@ -595,18 +595,18 @@ index e9fa0bee..79e50a96 100644 break fi @@ -339,15 +369,17 @@ fi - + echo 'startkde: Shutting down...' 1>&2 # just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +if [ -n "$ksplash_pid" ]; then + kill "$ksplash_pid" 2>/dev/null +fi - + # Clean up -kdeinit5_shutdown +@NIXPKGS_KDEINIT5_SHUTDOWN@ - + unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION @@ -614,24 +614,24 @@ index e9fa0bee..79e50a96 100644 -xprop -root -remove KDE_SESSION_VERSION +@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID - + echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index fd232bdf..e1c8fff6 100644 +index 9f875110..2a7a2a70 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ #!/bin/sh # -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + # Boot sequence: -@@ -17,17 +17,13 @@ +@@ -17,28 +17,26 @@ # # * Then ksmserver is started which takes control of the rest of the startup sequence - + -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; @@ -641,19 +641,19 @@ index fd232bdf..e1c8fff6 100644 +if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then + . "$XDG_CONFIG_HOME/startupconfig" fi - + -[ -r $configDir/startupconfig ] && . $configDir/startupconfig - --if test "$kcmfonts_general_forcefontdpi" -ne 0; then -- xrdb -quiet -merge -nocpp <&2 - + # export our session variables to the Xwayland server -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 +@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - + # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup @@ -749,13 +749,13 @@ index fd232bdf..e1c8fff6 100644 - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi - + -qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit +@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit - + # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit +@@ -143,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit # If the session should be locked from the start (locked autologin), # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS=" --no-lockscreen" @@ -767,10 +767,10 @@ index fd232bdf..e1c8fff6 100644 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." fi - + -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - + -if test x"$wait_drkonqi"x = x"true"x ; then +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) @@ -791,19 +791,19 @@ index fd232bdf..e1c8fff6 100644 done break fi -@@ -174,15 +117,17 @@ fi - +@@ -172,15 +117,17 @@ fi + echo 'startplasma: Shutting down...' 1>&2 # just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +if [ -n "$ksplash_pid" ]; then + kill "$ksplash_pid" 2>/dev/null +fi - + # Clean up -kdeinit5_shutdown +@NIXPKGS_KDEINIT5_SHUTDOWN@ - + unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION @@ -811,7 +811,7 @@ index fd232bdf..e1c8fff6 100644 -xprop -root -remove KDE_SESSION_VERSION +@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID - + echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake index 417a87d4..3f62745a 100644 @@ -823,7 +823,7 @@ index 417a87d4..3f62745a 100644 -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + -# in case we have been started with full pathname spec without being in PATH -bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` -if [ -n "$bindir" ]; then @@ -861,7 +861,7 @@ index 417a87d4..3f62745a 100644 +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then + @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf fi - + -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; @@ -891,7 +891,7 @@ index 417a87d4..3f62745a 100644 +gtk-button-images=1 +EOF fi - + -mkdir -p $configDir +# Set the default GTK 3 theme +gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini" @@ -919,7 +919,7 @@ index 417a87d4..3f62745a 100644 +cursorSize=0 +EOF +fi - + #This is basically setting defaults so we can use them with kstartupconfig5 -cat >$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" </plasma-workspace/env/*.sh -# (where correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config @@ -1093,7 +1093,7 @@ index 417a87d4..3f62745a 100644 -done - echo 'startplasmacompositor: Starting up...' 1>&2 - + -# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -# to set it to a list of paths *not* including the KDE prefix if it's not /usr or @@ -1114,16 +1114,16 @@ index 417a87d4..3f62745a 100644 @@ -202,7 +200,7 @@ export KDE_FULL_SESSION KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION - + -KDE_SESSION_UID=`id -ru` +KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) export KDE_SESSION_UID - + XDG_CURRENT_DESKTOP=KDE @@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP QT_QPA_PLATFORM=wayland export QT_QPA_PLATFORM - + +# Source scripts found in /plasma-workspace/env/*.sh +# (where correspond to the system and user's configuration +# directories, as identified by Qt's qtpaths, e.g. $HOME/.config @@ -1165,12 +1165,12 @@ index 417a87d4..3f62745a 100644 + echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 + exit 1 fi - + -@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma +@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@ - + echo 'startplasmacompositor: Shutting down...' 1>&2 - + unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION @@ -1178,7 +1178,7 @@ index 417a87d4..3f62745a 100644 -xprop -root -remove KDE_SESSION_VERSION +@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID - + echo 'startplasmacompositor: Done.' 1>&2 diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in index 0a51b84b..f48b5d8a 100644 diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index c4f526a3e8cd..ee605bdba8a2 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/bluedevil-5.11.3.tar.xz"; - sha256 = "1sgnj3z4s1k7h2ddvcq9r67qc8gbd4yv7zb9a24gi3x3iwd5hsf3"; - name = "bluedevil-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/bluedevil-5.11.5.tar.xz"; + sha256 = "0xzdf1qrf2nlpvn2hr9zk72hw027i318s9pnzgmqg1lwhdr276h5"; + name = "bluedevil-5.11.5.tar.xz"; }; }; breeze = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-5.11.3.tar.xz"; - sha256 = "1xlh8m9fw3009gdi0v1nn945rm1zg908apv8v9lgkgks6s2sspxk"; - name = "breeze-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-5.11.5.tar.xz"; + sha256 = "0xxwnhxpkdf4nyc1rvsjrnqsv1cgzs3a88mwfwpvci4snfva8jp1"; + name = "breeze-5.11.5.tar.xz"; }; }; breeze-grub = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-grub-5.11.3.tar.xz"; - sha256 = "1v1ha0j9kh4vcxknnwk78lzigvpqdrcj4gv6h86pxmwsipr5l2bl"; - name = "breeze-grub-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-grub-5.11.5.tar.xz"; + sha256 = "1l3dv1acgs6ssydg985d90136p9n4h0xry3xlx12g5wg07i8s89g"; + name = "breeze-grub-5.11.5.tar.xz"; }; }; breeze-gtk = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-gtk-5.11.3.tar.xz"; - sha256 = "1f9xlmc6mhr25mji8ir46qslnfa0i7q7pqkzp1hm5ss3kzdd45gb"; - name = "breeze-gtk-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-gtk-5.11.5.tar.xz"; + sha256 = "0mkd1gqih5irmabxly2y744sr1iwxy7r7hx68jrd452nbvqvyrqq"; + name = "breeze-gtk-5.11.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-plymouth-5.11.3.tar.xz"; - sha256 = "11m65cg74cfhglsppahnppisqp4rnj528b93k78pgvb4xazm7s76"; - name = "breeze-plymouth-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-plymouth-5.11.5.tar.xz"; + sha256 = "0ydfrrsqvzn71j9x1f26771x99yiq59h745k476dcqajj2m0ari3"; + name = "breeze-plymouth-5.11.5.tar.xz"; }; }; discover = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/discover-5.11.3.tar.xz"; - sha256 = "1bavw2hynmznd72wmh4cmy6zs4a13gxcsh6gznd99g6shry8svix"; - name = "discover-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/discover-5.11.5.tar.xz"; + sha256 = "0yxsp4jimyrsxf72hinqa51ycg4hmfxrxdicm9n8qfz47srcgkml"; + name = "discover-5.11.5.tar.xz"; }; }; drkonqi = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/drkonqi-5.11.3.tar.xz"; - sha256 = "1683h4nzk9kgwzwjzkr0bmk8vmq07991x4239z3p39z4gnvsmb0h"; - name = "drkonqi-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/drkonqi-5.11.5.tar.xz"; + sha256 = "1kngafr1hdq6r02mpd4bj5lgbgzk2cd10f5zqsvdfgsirz91vfsf"; + name = "drkonqi-5.11.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kactivitymanagerd-5.11.3.tar.xz"; - sha256 = "1syprfgbcg1821v0mqnalnn3gr40sfvi3m9wcy1hbffqm2k561qq"; - name = "kactivitymanagerd-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kactivitymanagerd-5.11.5.tar.xz"; + sha256 = "11nnmqpw4kq96912rys2a539yzgncc5vp7b52wgc4is9i5czsr50"; + name = "kactivitymanagerd-5.11.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kde-cli-tools-5.11.3.tar.xz"; - sha256 = "0yhghfsyvx0xlmyigjm8hvp8d4s6pp8h6wbqrbfngslayq624cvi"; - name = "kde-cli-tools-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kde-cli-tools-5.11.5.tar.xz"; + sha256 = "0d4d360pq6winykjp6lgq77k9yc435d5g71dj7bivkyilqc4cp8c"; + name = "kde-cli-tools-5.11.5.tar.xz"; }; }; kdecoration = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kdecoration-5.11.3.tar.xz"; - sha256 = "0ik62pavf9bw1mahiyqlc9qh2za31l4qa3fyz42y81phmr8hbj4a"; - name = "kdecoration-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kdecoration-5.11.5.tar.xz"; + sha256 = "0hl9mqwyfkh1r5nbl46g5axi446fdf7fw09b7v6l3jg9c5xbx89d"; + name = "kdecoration-5.11.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kde-gtk-config-5.11.3.tar.xz"; - sha256 = "09k02ghsrc5bwk05a7jlyzgwr6a1mzwypy6q1yhkl8jcqaim18ff"; - name = "kde-gtk-config-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kde-gtk-config-5.11.5.tar.xz"; + sha256 = "1y9ji82qlvp2z00xw0l32zj8asbg85n6azw8ringg2l6376r01l6"; + name = "kde-gtk-config-5.11.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kdeplasma-addons-5.11.3.tar.xz"; - sha256 = "13vmr5m3gx2b757bnb74qjjr6faj2bn1qb9cngj0gnk9gbdgrwh1"; - name = "kdeplasma-addons-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kdeplasma-addons-5.11.5.tar.xz"; + sha256 = "1vp9r7ia5wriw5srpyq89nqdp82akz3jnh7dcbh2h0gdagw7hb94"; + name = "kdeplasma-addons-5.11.5.tar.xz"; }; }; kgamma5 = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kgamma5-5.11.3.tar.xz"; - sha256 = "18g8rj4l1y1lwl2wrk4cdlpdn6gibbwbipdkmlk0hb4ad1bxkc96"; - name = "kgamma5-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kgamma5-5.11.5.tar.xz"; + sha256 = "16vlx51n52j5q1nfsz4ji6bz4x6sfagxzn6q3r6ckj41rkwmp9gg"; + name = "kgamma5-5.11.5.tar.xz"; }; }; khotkeys = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/khotkeys-5.11.3.tar.xz"; - sha256 = "1bykjywj6yass35xv858azv9pw74wlqsss6hs9ra4sx0yh0n9ffp"; - name = "khotkeys-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/khotkeys-5.11.5.tar.xz"; + sha256 = "051yjqkf5bigz6cz2qbq0lggw9i6ydfaxrvy4xh40mw2c6x3xmvh"; + name = "khotkeys-5.11.5.tar.xz"; }; }; kinfocenter = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kinfocenter-5.11.3.tar.xz"; - sha256 = "1ip6zkrl81v987z7bj0mvkjmydyarxgih4gzkbgnpppl7746bs5n"; - name = "kinfocenter-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kinfocenter-5.11.5.tar.xz"; + sha256 = "0ym7i64k48x8dcln0lajj0379blp3c3a0axfcjibp3ya2xcaqdif"; + name = "kinfocenter-5.11.5.tar.xz"; }; }; kmenuedit = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kmenuedit-5.11.3.tar.xz"; - sha256 = "1nks0lk1xnywx5r3bzr5npzapg5d25l73ygxq8988q1f4q39jlj6"; - name = "kmenuedit-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kmenuedit-5.11.5.tar.xz"; + sha256 = "0wh4hk51k2mz1gqm9brvdy16gp2ap2iz5b6yjiqbkpz6giy88kwc"; + name = "kmenuedit-5.11.5.tar.xz"; }; }; kscreen = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kscreen-5.11.3.tar.xz"; - sha256 = "03wcrqvqcsw47x504ydk3dkqw6x9dc2n3skh7asznmpda8ryb6dp"; - name = "kscreen-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kscreen-5.11.5.tar.xz"; + sha256 = "0qa23qs8v8hm91190ssdnlg7dyljra7csgykb7d8la30yxa9vzc7"; + name = "kscreen-5.11.5.tar.xz"; }; }; kscreenlocker = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kscreenlocker-5.11.3.tar.xz"; - sha256 = "0i0xcakzznxsk0zqa664xavp64wbqgqim57bkp01wl82s3aik82v"; - name = "kscreenlocker-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kscreenlocker-5.11.5.tar.xz"; + sha256 = "0qrby8jxmvmnr1abkry8h5xapdswabj27n35s9l71d9lp9p96naz"; + name = "kscreenlocker-5.11.5.tar.xz"; }; }; ksshaskpass = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/ksshaskpass-5.11.3.tar.xz"; - sha256 = "1ij2xspd6clf8plqqgzx6zjq7c1sxrlf7ch9brnxprw29h5qfz34"; - name = "ksshaskpass-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/ksshaskpass-5.11.5.tar.xz"; + sha256 = "08jf6f1i9xn0zsz2j2czgdzcr203wrlj1nlam26dakrphhaj8vm2"; + name = "ksshaskpass-5.11.5.tar.xz"; }; }; ksysguard = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/ksysguard-5.11.3.tar.xz"; - sha256 = "17b5lddmas5n1726xa5r8v0v6gmw6bzpvhcljk2r4yrly6gy3pv9"; - name = "ksysguard-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/ksysguard-5.11.5.tar.xz"; + sha256 = "161bcmsw4bjlsgkr3izfsqbiwambmm3za8mln3m96nf70gpqpa6i"; + name = "ksysguard-5.11.5.tar.xz"; }; }; kwallet-pam = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwallet-pam-5.11.3.tar.xz"; - sha256 = "04ps2p3hjvkca8miqmg0xwh3i5van0jld2hb1xp737hy1dfpi9h4"; - name = "kwallet-pam-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwallet-pam-5.11.5.tar.xz"; + sha256 = "0wqnaszvwclz2gn74nmhqmci39525hwvpc3igxzjhdccnkfb5ac4"; + name = "kwallet-pam-5.11.5.tar.xz"; }; }; kwayland-integration = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwayland-integration-5.11.3.tar.xz"; - sha256 = "0j5czhq5r8pxy7pw00by0v75kk4lbijn7mrdnydlca3jjrdcgz6f"; - name = "kwayland-integration-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwayland-integration-5.11.5.tar.xz"; + sha256 = "0xisgzymlhmbngvmv3dkh6a51dqnhcwrjj2480f0yxsmhvknxrps"; + name = "kwayland-integration-5.11.5.tar.xz"; }; }; kwin = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwin-5.11.3.tar.xz"; - sha256 = "1xgx7xn27lzqdwla45scfcnyxva97j2y2m7hgj60cd1mz686pill"; - name = "kwin-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwin-5.11.5.tar.xz"; + sha256 = "06bz2vm78i1x0i0ljdqd2a0bnnrfwz9zvlg7r86qlmhkzn2dpc4z"; + name = "kwin-5.11.5.tar.xz"; }; }; kwrited = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwrited-5.11.3.tar.xz"; - sha256 = "0qm3x6ahnis1b98q9h53wdldsj7nqw35s1hcgfqzjqk7nnxzim5i"; - name = "kwrited-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwrited-5.11.5.tar.xz"; + sha256 = "0sx5v1apambb8w6mndkkp2lvwlqwzbpxxp5d5zsz96lxndjx6sbv"; + name = "kwrited-5.11.5.tar.xz"; }; }; libkscreen = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/libkscreen-5.11.3.tar.xz"; - sha256 = "01wbl1kinsvxfw5lq0wrhsk0fmv8gvkhr7m0w4lq1827wx68lfzw"; - name = "libkscreen-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/libkscreen-5.11.5.tar.xz"; + sha256 = "03cnr7z74j2kjwbg1ddavmj0l8hpxg7bg2ipglirnzvp2ihv1wzg"; + name = "libkscreen-5.11.5.tar.xz"; }; }; libksysguard = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/libksysguard-5.11.3.tar.xz"; - sha256 = "1jbcd2n1zd6ijybaffm5vs5b80130vii562s98xhinmifzsahzmy"; - name = "libksysguard-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/libksysguard-5.11.5.tar.xz"; + sha256 = "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f"; + name = "libksysguard-5.11.5.tar.xz"; }; }; milou = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/milou-5.11.3.tar.xz"; - sha256 = "02j6f4ip7hgb5qpq9812g1pnm8fjd83dc923gyfpzb4i0nf6j93g"; - name = "milou-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/milou-5.11.5.tar.xz"; + sha256 = "0ja7a668wv67vb3mgsd2nbjdcp0lm7aix5dpc496wr1jy47pxv8a"; + name = "milou-5.11.5.tar.xz"; }; }; oxygen = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/oxygen-5.11.3.tar.xz"; - sha256 = "0zg3qdnip1ad6980ga0lmxndbph3y4dw0qk73dd8022qw5f3ysyp"; - name = "oxygen-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/oxygen-5.11.5.tar.xz"; + sha256 = "1n2xr3a0002xfiy99gjqlny76nxjlss1d3sgcj8adpza44j91228"; + name = "oxygen-5.11.5.tar.xz"; }; }; plasma-desktop = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-desktop-5.11.3.tar.xz"; - sha256 = "1igmq8zj71wf34ap2g0iakpjfq08mlg6yf1ly06111ygsinbg55a"; - name = "plasma-desktop-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-desktop-5.11.5.tar.xz"; + sha256 = "0djzs80mr0radmhai3k7jnlwlp76maf7vvrgkfckzs63n1jhdhb3"; + name = "plasma-desktop-5.11.5.tar.xz"; }; }; plasma-integration = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-integration-5.11.3.tar.xz"; - sha256 = "0bqw5xp71yxciqzd3bmlgsd4mkjl4vcysd9s6bka5mxrlhkqxgx1"; - name = "plasma-integration-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-integration-5.11.5.tar.xz"; + sha256 = "1rmq8i0flrvqcl21fnn94d58zyw55scagrzbjw92p34i1mllhif1"; + name = "plasma-integration-5.11.5.tar.xz"; }; }; plasma-nm = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-nm-5.11.3.tar.xz"; - sha256 = "1zqlg5jm3pgiirr98j3fl1h6wbhf4f06qainpy42b5w42vhizspk"; - name = "plasma-nm-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-nm-5.11.5.tar.xz"; + sha256 = "11lw26nd1rp2wbmqlf37wgk8qzv4fcc5x04g1i1h7c6hmjf5svqv"; + name = "plasma-nm-5.11.5.tar.xz"; }; }; plasma-pa = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-pa-5.11.3.tar.xz"; - sha256 = "07rwlqpmvbvdidhfhw8xk6lvarimd1mhm085vjk7g2wmzw5n69wl"; - name = "plasma-pa-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-pa-5.11.5.tar.xz"; + sha256 = "1gdkz9yx21skg3c95nwh1mwacvrklgpfl0cspsmyyfnbnv93cz94"; + name = "plasma-pa-5.11.5.tar.xz"; }; }; plasma-sdk = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-sdk-5.11.3.tar.xz"; - sha256 = "17h42223agz4vvbff13xd1p7xa5swnhcrmh1779mswl1rfznrkys"; - name = "plasma-sdk-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-sdk-5.11.5.tar.xz"; + sha256 = "013dc8dg0nhgdjlflgpqi28jsyparnwrj5am8lzvc0kkd9f69yhk"; + name = "plasma-sdk-5.11.5.tar.xz"; }; }; plasma-tests = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-tests-5.11.3.tar.xz"; - sha256 = "0ac2i66f3mywvkf7041sg3hsa97f69y5aibpk0fz41q9zi5jwzv3"; - name = "plasma-tests-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-tests-5.11.5.tar.xz"; + sha256 = "00n1i6s1811w5h37i2iyy924495d2w24vfsl348cxplfxpxhcqf0"; + name = "plasma-tests-5.11.5.tar.xz"; }; }; plasma-vault = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-vault-5.11.3.tar.xz"; - sha256 = "12y2331lpp7i3fl6nbm78n6qh7hd7vmrvc94jkzwx5pbql6nx2ia"; - name = "plasma-vault-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-vault-5.11.5.tar.xz"; + sha256 = "1pg891fahslnjn5jdsjjlw8i2l71ddznxjg96l9wycvh6nn7k0v6"; + name = "plasma-vault-5.11.5.tar.xz"; }; }; plasma-workspace = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-5.11.3.tar.xz"; - sha256 = "0skn3mg90ghx3bmlj7snbhap9z2fq0hab0gfi4pv80ggyl5jf9sp"; - name = "plasma-workspace-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-5.11.5.tar.xz"; + sha256 = "1ipklc6v2ml095sy80rgq4123vkk3famjwf8s3rgkk172s76qm98"; + name = "plasma-workspace-5.11.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-wallpapers-5.11.3.tar.xz"; - sha256 = "1xbfghhb6bjlqs2fk3z8k3q0lfirqmyqyxym2w8k69im2fscg0rl"; - name = "plasma-workspace-wallpapers-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-wallpapers-5.11.5.tar.xz"; + sha256 = "0zhcpbb74phnmr24kxcp0k6gr7gjzdfbrrv4xjjb2qpg2d00l3pm"; + name = "plasma-workspace-wallpapers-5.11.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plymouth-kcm-5.11.3.tar.xz"; - sha256 = "1sbxwvi402lcnzxalgr85srh8vd4wy26gav7q23qbhd5axh26f06"; - name = "plymouth-kcm-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plymouth-kcm-5.11.5.tar.xz"; + sha256 = "152fyg5hc3rzvqw0z88pgapnhc64jx34vcqgsslsfja8mwk9h0ql"; + name = "plymouth-kcm-5.11.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.11.3"; + version = "1-5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/polkit-kde-agent-1-5.11.3.tar.xz"; - sha256 = "088ch67syimxqlda0nczrrj1hb7ynsrwdcb0bq1pcndp57p71vzl"; - name = "polkit-kde-agent-1-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/polkit-kde-agent-1-5.11.5.tar.xz"; + sha256 = "0bwv567czi9h3rxgn19aw10nq5c674zd8wgk9nj006km1yyxrgy6"; + name = "polkit-kde-agent-1-5.11.5.tar.xz"; }; }; powerdevil = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/powerdevil-5.11.3.tar.xz"; - sha256 = "1807x3vzq24vip7dnl87cd1hn368vqk7cbyhai492irf20j7hn82"; - name = "powerdevil-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/powerdevil-5.11.5.tar.xz"; + sha256 = "0jqf85bain8vj5plxvvbdwiwc2jyb1r6idajhr6igcpjryfa75hj"; + name = "powerdevil-5.11.5.tar.xz"; }; }; sddm-kcm = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/sddm-kcm-5.11.3.tar.xz"; - sha256 = "1c9dm8819yaynq6cbzcg0j77cz0cf2cwrz9cfmr4w65ypl937va5"; - name = "sddm-kcm-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/sddm-kcm-5.11.5.tar.xz"; + sha256 = "1ln1h4r614rg4w6b7g5l7yqqijkaaj04s4g4m41d8rg8z5ywq4v0"; + name = "sddm-kcm-5.11.5.tar.xz"; }; }; systemsettings = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/systemsettings-5.11.3.tar.xz"; - sha256 = "1abza0qmdhfdlr2k53lc4ymr42ri1pfv0yyf9plxhra7f7f2ylf7"; - name = "systemsettings-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/systemsettings-5.11.5.tar.xz"; + sha256 = "0ycdfl585853481bjix63nnj7qvg767qpbyr015k32c1v3vllx8y"; + name = "systemsettings-5.11.5.tar.xz"; }; }; user-manager = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/user-manager-5.11.3.tar.xz"; - sha256 = "0d2i3ndq9vwr2m39i6qdn18bg4c19rqhfy2a38lhm30g288wxfbr"; - name = "user-manager-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/user-manager-5.11.5.tar.xz"; + sha256 = "1r4q411g2r6cz4z6bm5jwygfbvrfrl8dawdd69s6h93ixs7697s4"; + name = "user-manager-5.11.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.11.3"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/xdg-desktop-portal-kde-5.11.3.tar.xz"; - sha256 = "01jcya7xyrn3d99raqvbzfwllihzdpyizx757f87pgg43dmbggwm"; - name = "xdg-desktop-portal-kde-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/xdg-desktop-portal-kde-5.11.5.tar.xz"; + sha256 = "07xwb4zbf0cp4a672vs631dh9cqyvn0j9wwlknc21jzr619mnkap"; + name = "xdg-desktop-portal-kde-5.11.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/applications/mousepad-12134.patch b/pkgs/desktops/xfce/applications/mousepad-12134.patch new file mode 100644 index 000000000000..74a28ecf61af --- /dev/null +++ b/pkgs/desktops/xfce/applications/mousepad-12134.patch @@ -0,0 +1,90 @@ +diff -urNZ a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c +--- a/mousepad/mousepad-action-group.c 2014-09-01 20:50:07.000000000 +0000 ++++ b/mousepad/mousepad-action-group.c 2017-12-18 16:57:46.836538403 +0000 +@@ -302,11 +302,6 @@ + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + self->locked = FALSE; + +- /* update the setting when the active action is changed */ +- self->locked = TRUE; +- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme)); +- self->locked = FALSE; +- + g_object_notify (G_OBJECT (self), "active-style-scheme"); + } + +@@ -473,6 +468,8 @@ + mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self, + MousepadStyleSchemeAction *action) + { ++ const gchar *scheme_name = NULL; ++ + /* only update the active action if we're not already in the process of + * setting it and the sender action is actually active */ + if (! self->locked && +@@ -481,7 +478,14 @@ + GtkSourceStyleScheme *scheme; + + scheme = mousepad_style_scheme_action_get_style_scheme (action); +- mousepad_action_group_set_active_style_scheme (self, scheme); ++ ++ /* update the setting when the active action is changed */ ++ if (scheme != NULL) ++ scheme_name = gtk_source_style_scheme_get_id(scheme); ++ ++ self->locked = TRUE; ++ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name); ++ self->locked = FALSE; + } + } + +diff -urNZ a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c +--- a/mousepad/mousepad-window.c 2014-09-01 20:58:02.000000000 +0000 ++++ b/mousepad/mousepad-window.c 2017-12-18 17:07:51.099321408 +0000 +@@ -712,32 +712,6 @@ + + + static void +-mousepad_window_action_group_style_scheme_changed (MousepadWindow *window, +- GParamSpec *pspec, +- MousepadActionGroup *group) +-{ +- GtkSourceStyleScheme *scheme; +- const gchar *scheme_id; +- gint npages, i; +- +- /* get the new active language */ +- scheme = mousepad_action_group_get_active_style_scheme (group); +- scheme_id = gtk_source_style_scheme_get_id (scheme); +- +- /* update the color scheme on all the documents */ +- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook)); +- for (i = 0; i < npages; i++) +- { +- MousepadDocument *document; +- +- document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i)); +- mousepad_view_set_color_scheme (document->textview, scheme_id); +- } +-} +- +- +- +-static void + mousepad_window_create_style_schemes_menu (MousepadWindow *window) + { + GtkWidget *menu, *item; +@@ -751,13 +725,6 @@ + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + gtk_widget_show_all (menu); + gtk_widget_show (item); +- +- /* watch for activations of the style schemes actions */ +- g_signal_connect_object (window->action_group, +- "notify::active-style-scheme", +- G_CALLBACK (mousepad_window_action_group_style_scheme_changed), +- window, +- G_CONNECT_SWAPPED); + } + + diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index c15ab310f47b..a2b91aaaa79e 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; + patches = [ ./mousepad-12134.patch ]; + buildInputs = [ pkgconfig intltool libxfce4util gtk gtksourceview dbus dbus_glib makeWrapper diff --git a/pkgs/desktops/xfce/core/garcon-10967.patch b/pkgs/desktops/xfce/core/garcon-10967.patch new file mode 100644 index 000000000000..aea123255478 --- /dev/null +++ b/pkgs/desktops/xfce/core/garcon-10967.patch @@ -0,0 +1,14 @@ +diff -urNZ a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c +--- a/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:22:33.551926068 +0000 ++++ b/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:23:33.055497211 +0000 +@@ -676,6 +676,9 @@ + G_CALLBACK (garcon_gtk_menu_deactivate), menu); + gtk_widget_show (mi); + ++ /* submenu are child items, too. */ ++ has_children = TRUE; ++ + if (menu->priv->show_menu_icons) + { + icon_name = garcon_menu_element_get_icon_name (li->data); +Binary files a/.git/index and b/.git/index differ diff --git a/pkgs/desktops/xfce/core/garcon-12700.patch b/pkgs/desktops/xfce/core/garcon-12700.patch new file mode 100644 index 000000000000..b95a65cc2194 --- /dev/null +++ b/pkgs/desktops/xfce/core/garcon-12700.patch @@ -0,0 +1,44 @@ +From 222080e6d5fce85eb2a8a5c33df671bd9f21add8 Mon Sep 17 00:00:00 2001 +From: Yegor Timoshenko +Date: Thu, 14 Dec 2017 22:04:04 +0000 +Subject: [PATCH] Decrement allocation counter on item unref (#12700) + +--- + garcon/garcon-menu-item-pool.c | 7 ++++++- + garcon/garcon-menu-item.c | 2 ++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c +index 2017180..355e520 100644 +--- a/garcon/garcon-menu-item-pool.c ++++ b/garcon/garcon-menu-item-pool.c +@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id, + g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); + g_return_val_if_fail (node != NULL, FALSE); + +- return garcon_menu_node_tree_rule_matches (node, item); ++ gboolean matches = garcon_menu_node_tree_rule_matches (node, item); ++ ++ if (matches) ++ garcon_menu_item_increment_allocated (item); ++ ++ return matches; + } + + +diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c +index 66a86bf..d61c88f 100644 +--- a/garcon/garcon-menu-item.c ++++ b/garcon/garcon-menu-item.c +@@ -1516,6 +1516,8 @@ garcon_menu_item_unref (GarconMenuItem *item) + { + g_return_if_fail (GARCON_IS_MENU_ITEM (item)); + ++ garcon_menu_item_decrement_allocated (item); ++ + /* Decrement the reference counter */ + g_object_unref (G_OBJECT (item)); + } +-- +2.15.1 + diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 46b9a3720090..d9c918c0fdc1 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; + patches = [ ./garcon-10967.patch ./garcon-12700.patch ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ]; @@ -24,4 +25,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch index 4e1dcc1efa71..0fabdffd7ed6 100644 --- a/pkgs/desktops/xfce/core/xfce4-light-locker.patch +++ b/pkgs/desktops/xfce/core/xfce4-light-locker.patch @@ -1,16 +1,25 @@ --- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100 +++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100 -@@ -24,10 +24,11 @@ +@@ -24,12 +24,19 @ PATH=/bin:/usr/bin export PATH - + -# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running -+# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective daemon is running ++# First test for the command set in the session's xfconf channel ++LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand) ++ ++# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running for lock_cmd in \ ++ "$LOCK_CMD" \ "xscreensaver-command -lock" \ - "gnome-screensaver-command --lock" + "gnome-screensaver-command --lock" \ + "light-locker-command -l" do - $lock_cmd >/dev/null 2>&1 && exit +- $lock_cmd >/dev/null 2>&1 && exit ++ if [ ! -z "$lock_cmd" ]; then ++ $lock_cmd >/dev/null 2>&1 && exit ++ fi done + + # else run another access locking utility, if installed diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 8802862eddde..165381451425 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify , hicolor_icon_theme }: let @@ -14,10 +14,15 @@ stdenv.mkDerivation rec { sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac"; }; - buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf - libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme - ]; + buildInputs = [ + pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf + libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme + ]; + + patches = [(fetchpatch { + url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27; + sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x"; + })]; enableParallelBuilding = true; @@ -29,4 +34,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; }; } - diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 6fa9c991dbd9..b18f3466770a 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -58,17 +58,14 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od parole = callPackage ./applications/parole.nix { }; ristretto = callPackage ./applications/ristretto.nix { }; terminal = xfce4terminal; # it has changed its name - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { - pulseaudioSupport = config.pulseaudio or false; - }; + xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; + xfce4mixer_pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; }; xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; - xfce4volumed = let - gst = callPackage ./applications/xfce4-volumed.nix { }; - pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; - in if config.pulseaudio or false then pulse else gst; + xfce4volumed = callPackage ./applications/xfce4-volumed.nix { }; + xfce4volumed_pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index fdb9d1be6ad2..a427023df56e 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -20,8 +20,8 @@ let externalDownloads = import ./downloads.nix {inherit fetchurl; inherit (lib) optionalAttrs; inherit (stdenv) system;}; # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand patchelfInJars = - lib.optional (stdenv.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} - ++ lib.optional (stdenv.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} + lib.optional (stdenv.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} + ++ lib.optional (stdenv.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; @@ -54,25 +54,25 @@ let + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.2"; + version = "1.8.5"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "1ssznjmzmahayslj2xnci9b5wpsl53nyg85say54akng93qipmfb"; + sha256 = "0ww72qfk7fyvprz15lc80i1axfdacb5fij4h5j5pakrg76mng2c3"; }; teensyduino_src = fetchurl { - url = "https://www.pjrc.com/teensy/td_136/TeensyduinoInstall.${teensy_architecture}"; + url = "https://www.pjrc.com/teensy/td_140/TeensyduinoInstall.${teensy_architecture}"; sha256 = lib.optionalString ("${teensy_architecture}" == "linux64") - "0qvb5z9y6nsqy0kzib9fvvbn8dakl50vib6r3nm6bnpvyxzwjl2r" + "0127a1ak31252dbmr5niqa5mkvbm8dnz1cfcnmydzx9qn9rk00ir" + lib.optionalString ("${teensy_architecture}" == "linux32") - "14ca62vq7cpx269vfd92shi80qj8spf0dzli8gfcb39ss2zc4jf1" + "01mxj5xsr7gka652c9rp4szy5mkcka8mljk044v4agk3sxvx3v3i" + lib.optionalString ("${teensy_architecture}" == "linuxarm") - "122z1gxcgkmwjb8wdklb2w8c3qkj5rc1ap5n4a8fi3kjz29va9rx"; + "1dff3alhvk9x8qzy3n85qrg6rfmy6l9pj6fmrlzpli63lzykvv4i"; }; buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index f74da9773724..e71c898dd555 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -1,5 +1,8 @@ {fetchurl, optionalAttrs, system}: - +# This file preloads all the archives which Arduino's build/build.xml +# would otherwise try to download itself. When updating this for a new +# version of Arduino, check build.xml for version numbers and new +# urls. { "build/shared/reference-1.6.6-3.zip" = fetchurl { url = "https://downloads.arduino.cc/reference-1.6.6-3.zip"; @@ -21,17 +24,17 @@ url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; }; - "build/Robot_Control-1.0.3.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.3.zip"; - sha256 = "1pc3b8skbpx7j32jnxa67mfqhnsmfz3876pc9mdyzpsad4mmcn62"; + "build/Robot_Control-1.0.4.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip"; + sha256 = "1pkabrghx3h8l60x571vwkbhfm02nhyn5x2vqz4vhx9cczr70zq7"; }; - "build/Robot_Motor-1.0.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip"; - sha256 = "0da21kfzy07kk2qnkprs3lj214fgkcjxlkk3hdp306jfv8ilmvy2"; + "build/Robot_Motor-1.0.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip"; + sha256 = "1pkvrimg77jrhdsz4l81y59hv50h6cl7hvhk9w8ac7ckg70lvxkw"; }; - "build/RobotIRremote-1.0.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip"; - sha256 = "0wkya7dy4x0xyi7wn5aghmr1gj0d0wszd61pq18zgfdspz1gi6xn"; + "build/RobotIRremote-2.0.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip"; + sha256 = "0j5smap74j8p3wc6k0h73b1skj4gkr7r25jbjh1j1cg052dxri86"; }; "build/SpacebrewYun-1.0.1.zip" = fetchurl { url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip"; @@ -61,9 +64,13 @@ url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip"; sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7"; }; - "build/Adafruit_CircuitPlayground-1.6.4.zip" = fetchurl { - url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.4.zip"; - sha256 = "1ph7m0l1sfx9db56n2h6vi78pn3zyah813lfhqiqghncx34amrhj"; + "build/LiquidCrystal-1.0.7.zip" = fetchurl { + url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip"; + sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n"; + }; + "build/Adafruit_CircuitPlayground-1.6.8.zip" = fetchurl { + url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"; + sha256 = "0zm667xiaygx8v1ygcls43s6qd5n7pf21n0998n1z7nf18s35j41"; }; "build/libastylej-2.05.1-3.zip" = fetchurl { url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip"; @@ -73,9 +80,9 @@ url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"; sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv"; }; - "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" = fetchurl { - url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip"; - sha256 = "1nkk87q2l3bs9y387hdxzgqllm0lqpmc5kdmr6my4hjz5lcpgbza"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip"; + sha256 = "15przp8z1dp6lamcvqdx4daq6fqi3c1algc3sbinyh25pm69pq74"; }; } // optionalAttrs (system == "x86_64-linux") { diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 187899b89647..a37206192417 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -18,8 +18,8 @@ buildFHSUserEnv { python27Packages.setuptools python27Packages.pip python27Packages.bottle - zlib python27Packages.platformio + zlib ]); meta = with stdenv.lib; { @@ -30,5 +30,9 @@ buildFHSUserEnv { platforms = with platforms; linux; }; + extraInstallCommands = '' + ln -s $out/bin/platformio $out/bin/pio + ''; + runScript = "platformio"; } diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 1d4cef685148..6839bef3460a 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -44,6 +44,11 @@ let # BEAM-based languages. elixir = elixir_1_5; + elixir_1_6_rc = lib.callElixir ../interpreters/elixir/1.6.nix { + inherit rebar erlang; + debugInfo = true; + }; + elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { inherit rebar erlang; debugInfo = true; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 7db75d129781..1e7791c84c44 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2017.11.05"; + version = "2017.12.06"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "1e81432830c75c505c76e419619f605a6c4c7583"; - sha256 = "0lzblmi1klbsmd32h8nh027npm1z1a199lng13lcrqwr17lhb7my"; + rev = "a32dd2c137b2bb6ba6704b25109790ac76bc2f45"; + sha256 = "16pfm8spcm3nsrdsjdj22v7dddnwzlhbj1y71wflvvb84xnbga2y"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 3abd5c8c82a9..6c523ebb4f14 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.3.0" ; + versionPkg = "0.3.7" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ; + sha256 = "1w59ir9ij5bvvnxj6fb1rvzycfqa57i31wmpwawxbsb10bqwzyr6"; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d"; + sha256 = "19nxyi39fn42sp38kl14a6pvbxq9wr8y405wx0zz7mqb77r0m0h5"; }; - patches = [ ./install-postiats-contrib.patch ]; - buildInputs = [ gmp ]; setupHook = with stdenv.lib; diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch deleted file mode 100644 index cb280d028b52..000000000000 --- a/pkgs/development/compilers/ats2/install-postiats-contrib.patch +++ /dev/null @@ -1,19 +0,0 @@ -Install the parts of the contrib that have been moved to Postiats. -diff -Naur ATS2-Postiats-0.3.0-upstream/Makefile_dist ATS2-Postiats-0.3.0/Makefile_dist ---- ATS2-Postiats-0.3.0-upstream/Makefile_dist 2017-01-20 10:23:54.000000000 -0400 -+++ ATS2-Postiats-0.3.0/Makefile_dist 2017-01-21 13:14:27.614723335 -0400 -@@ -124,12 +124,12 @@ - cd "$(abs_top_srcdir)" && \ - $(MKDIR_P) $(PATSLIBHOME2)/bin && \ - if [ ! -d $(bindir2) ] ; then $(MKDIR_P) $(bindir2) ; fi && \ -- for x in share ccomp prelude libc libats ; do \ -+ for x in share ccomp prelude libc libats contrib atscntrb ; do \ - find "$$x" -type d -exec $(MKDIR_P) $(PATSLIBHOME2)/\{} \; -print; \ - done - - install_files_0: install_dirs ; \ -- for x in share ccomp/runtime prelude libc libats ; do \ -+ for x in share ccomp/runtime prelude libc libats contrib atscntrb ; do \ - cd "$(abs_top_srcdir)" && \ - $(INSTALL) -d $(PATSLIBHOME2)/"$$x" && \ - find "$$x" -type l -exec cp -d \{} $(PATSLIBHOME2)/\{} \; -print && \ diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 792ecc739a50..4a2893c303f4 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: let - version = "4.11.0"; + version = "4.13.0"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; - sha256 = "12ddyiikqknpr8h6llsxbg2fz75xnayvcnsvr1cwv8xnjn7jpp73"; + sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; diff --git a/pkgs/development/compilers/chicken/setup-hook.sh b/pkgs/development/compilers/chicken/setup-hook.sh index d7f28539dc64..b0d9b53b5378 100644 --- a/pkgs/development/compilers/chicken/setup-hook.sh +++ b/pkgs/development/compilers/chicken/setup-hook.sh @@ -4,4 +4,4 @@ addChickenRepositoryPath() { export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH" } -envHooks=(${envHooks[@]} addChickenRepositoryPath) +addEnvHooks "$targetOffset" addChickenRepositoryPath diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 6ac5165b7e9e..3f25041f1753 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "cmdstan-2.9.0"; + name = "cmdstan-2.17.1"; src = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v2.9.0/cmdstan-2.9.0.tar.gz"; - sha256 = "08bim6nxgam989152hm0ga1rfb33mr71pwsym1nmfmavma68bwm9"; + url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz"; + sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; }; buildFlags = "build"; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { ''; homepage = http://mc-stan.org/interfaces/cmdstan.html; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index ee9224b380c8..06c4b62e2946 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "A programming language for the analysis and transformation of computer languages"; homepage = http://www.colm.net/open-source/colm; license = licenses.gpl2; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 17d91f36875c..0681e8210a6a 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dotnet.github.io/core/; + homepage = https://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kuznero ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 7bb0ed1bf617..3c3124cea174 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,29 +2,33 @@ stdenv.mkDerivation rec { name = "crystal-${version}"; - version = "0.23.1"; + version = "0.24.1"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "8cf1b9a4eab29fca2f779ea186ae18f7ce444ce189c621925fa1a0c61dd5ff55"; + sha256 = "1n375cwzb9rfqbjiimfbj4h5q4rsgh2rf6rmm2zbzizzm79a96a9"; }; - prebuiltName = "crystal-0.23.0-1"; + prebuiltName = "crystal-0.24.1-2"; prebuiltSrc = let arch = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); in fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/0.23.0/${prebuiltName}-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/v0.24.1/${prebuiltName}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; - "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; - "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; + "x86_64-linux" = "19xchfzsyxh0gqi89y6d73iqc06bl097idz6905jf0i35x9ghpdp"; + "i686-linux" = "15zaxgc1yc9ixbsgy2d8g8d7x2w4vbnndi1ms3wf0ss8azmghiag"; + "x86_64-darwin" = "1818ahalahcbh974ai09hyfsns6njkpph4sbn4xwv2235x35dqib"; }."${stdenv.system}"; }; - srcs = [ src prebuiltSrc ]; + unpackPhase = '' + mkdir ${prebuiltName} + tar --strip-components=1 -C ${prebuiltName} -xf ${prebuiltSrc} + tar xf ${src} + ''; # crystal on Darwin needs libiconv to build libs = [ @@ -41,25 +45,17 @@ stdenv.mkDerivation rec { sourceRoot = "${name}"; - fixPrebuiltBinary = if stdenv.isDarwin then '' - wrapProgram ../${prebuiltName}/embedded/bin/crystal \ - --suffix DYLD_LIBRARY_PATH : $libPath - '' - else '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - ../${prebuiltName}/embedded/bin/crystal - patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ - ../${prebuiltName}/embedded/bin/crystal - ''; - preBuild = '' patchShebangs bin/crystal patchShebangs ../${prebuiltName}/bin/crystal - ${fixPrebuiltBinary} export PATH="$(pwd)/../${prebuiltName}/bin:$PATH" ''; - makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" "release=1" "all" "doc" ]; + makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" + "FLAGS=--no-debug" + "release=1" + "all" "docs" + ]; installPhase = '' install -Dm755 .build/crystal $out/bin/crystal @@ -70,7 +66,7 @@ stdenv.mkDerivation rec { cp -r src/* $out/lib/crystal/ install -dm755 $out/share/doc/crystal/api - cp -r doc/* $out/share/doc/crystal/api/ + cp -r docs/* $out/share/doc/crystal/api/ cp -r samples $out/share/doc/crystal/ install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 62b2e7c18508..fd8930bc8547 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -94,6 +94,9 @@ let # Change the #error on GCC > 4.9 to a #warning. sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/' + # Fix builds with newer glibc version + sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" + # Ensure that cmake can find CUDA. mkdir -p $out/nix-support echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix deleted file mode 100644 index 29a8618dc7b9..000000000000 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ stdenv, fetchFromGitHub -, makeWrapper, unzip, which -, curl, tzdata -}: - -stdenv.mkDerivation rec { - name = "dmd-${version}"; - # This is the last version of dmd which is buildable without a D compiler. - # So we use this as a bootstrap version. - # The DMD frontend has been ported to D in 2.069.0 but idgen was already - # ported in 2.068.0. - version = "2.067.1"; - - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; - name = "dmd-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; - name = "druntime-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; - name = "phobos-v${version}-src"; - }) - ]; - - sourceRoot = "."; - - postUnpack = '' - mv dmd-v${version}-src dmd - mv druntime-v${version}-src druntime - mv phobos-v${version}-src phobos - ''; - - # Compile with PIC to prevent colliding modules with binutils 2.28. - # https://issues.dlang.org/show_bug.cgi?id=17375 - usePIC = "-fPIC"; - ROOT_HOME_DIR = "$(echo ~root)"; - - postPatch = '' - # Ugly hack so the dlopen call has a chance to succeed. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so - - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/datetime.d \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - - substituteInPlace druntime/test/shared/Makefile \ - --replace "DFLAGS:=" "DFLAGS:=${usePIC} " - - # phobos uses curl, so we need to patch the path to the lib. - substituteInPlace phobos/posix.mak \ - --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4" - - # Use proper C++ compiler - substituteInPlace dmd/src/posix.mak \ - --replace g++ $CXX - '' - - + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace dmd/src/root/port.c \ - --replace "#include " "#include " - - # See https://github.com/NixOS/nixpkgs/issues/29443 - substituteInPlace phobos/std/path.d \ - --replace "\"/root" "\"${ROOT_HOME_DIR}" - '' - - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace dmd/src/posix.mak \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ - - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace dmd/src/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ makeWrapper unzip which ]; - buildInputs = [ curl tzdata ]; - - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -f posix.mak INSTALL_DIR=$out - export DMD=$PWD/src/dmd - cd ../druntime - make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd ../phobos - make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd .. - ''; - - # disable check phase because some tests are not working with sandboxing - doCheck = false; - - checkPhase = '' - cd dmd - export DMD=$PWD/src/dmd - cd ../druntime - make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd ../phobos - make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd .. - ''; - - installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - cp $PWD/src/dmd $out/bin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; - extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in - "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib" - } - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" - - cd $out/bin - tee dmd.conf << EOF - [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF - ''; - - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index ff19a5b872cc..e8e6b5224de9 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,173 +1,285 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, overrideCC, gcc5 , makeWrapper, unzip, which , curl, tzdata, gdb, darwin -# Versions 2.070.2 and up require a working dmd compiler to build: -, bootstrapDmd }: +, callPackage +, bootstrapVersion ? false +, version ? "2.078.0" +, dmdSha256 ? "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr" +, druntimeSha256 ? "0inyvcjc5qn8277d1zlfvgdgiss86rkjg9mhkw5l31hix8yan372" +, phobosSha256 ? "1vb5xnysja9l8hvv9gy4c05vihmblz7ga005761jbazxkmlfirj4" +}: -stdenv.mkDerivation rec { - name = "dmd-${version}"; - version = "2.075.1"; +let - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; - name = "dmd-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; - name = "druntime-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; - name = "phobos-v${version}-src"; - }) - ]; + bootstrapDmd = if !bootstrapVersion then + # Versions 2.070.2 and up require a working dmd compiler to build so we just + # use the last dmd without any D code to bootstrap the actual build. + callPackage ./default.nix { + stdenv = if stdenv.hostPlatform.isDarwin then + stdenv + else + # Doesn't build with gcc6 on linux + overrideCC stdenv gcc5; + bootstrapVersion = true; + version = "2.067.1"; + dmdSha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; + druntimeSha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; + phobosSha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; + } + else + ""; - sourceRoot = "."; + dmdBuild = stdenv.mkDerivation rec { + name = "dmdBuild-${version}"; + inherit version; - postUnpack = '' - mv dmd-v${version}-src dmd - mv druntime-v${version}-src druntime - mv phobos-v${version}-src phobos + enableParallelBuilding = true; - # Remove cppa test for now because it doesn't work. - rm dmd/test/runnable/cppa.d - rm dmd/test/runnable/extra-files/cppb.cpp - ''; + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = dmdSha256; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = druntimeSha256; + name = "druntime"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) + ]; - # Compile with PIC to prevent colliding modules with binutils 2.28. - # https://issues.dlang.org/show_bug.cgi?id=17375 - usePIC = "-fPIC"; + sourceRoot = "."; - postPatch = '' - # Ugly hack so the dlopen call has a chance to succeed. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so + postUnpack = '' + patchShebangs . - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/datetime/timezone.d \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - - substituteInPlace druntime/test/common.mak \ - --replace "DFLAGS:=" "DFLAGS:=${usePIC} " - - # phobos uses curl, so we need to patch the path to the lib. - substituteInPlace phobos/posix.mak \ - --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4" - - # Use proper C++ compiler - substituteInPlace dmd/posix.mak \ - --replace g++ $CXX - '' - - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace dmd/posix.mak \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + # Remove cppa test for now because it doesn't work. + rm dmd/test/runnable/cppa.d + rm dmd/test/runnable/extra-files/cppb.cpp ''; - nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ] + # Compile with PIC to prevent colliding modules with binutils 2.28. + # https://issues.dlang.org/show_bug.cgi?id=17375 + usePIC = "-fPIC"; + ROOT_HOME_DIR = "$(echo ~root)"; - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); + datetimePath = if bootstrapVersion then + "phobos/std/datetime.d" + else + "phobos/std/datetime/timezone.d"; - buildInputs = [ curl tzdata ]; + phobosPatches = '' + substituteInPlace ${datetimePath} \ + --replace "import core.time;" "import core.time;import std.path;" - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "export DMD=$PWD/generated/${osname}/release/${bits}/dmd" - } - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd ../phobos - make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd .. - ''; + substituteInPlace ${datetimePath} \ + --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\"" - # disable check phase because some tests are not working with sandboxing - doCheck = false; + # Ugly hack to fix the hardcoded path to zoneinfo in the source file. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace ${datetimePath} \ + --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - checkPhase = '' - cd dmd - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "export DMD=$PWD/generated/${osname}/release/${bits}/dmd" - } - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=${usePIC} DMD=$DMD BUILD=release SHARED=0 - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd ../phobos - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd .. - ''; + # Ugly hack so the dlopen call has a chance to succeed. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace phobos/std/net/curl.d \ + --replace libcurl.so ${curl.out}/lib/libcurl.so + + # phobos uses curl, so we need to patch the path to the lib. + substituteInPlace phobos/posix.mak \ + --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4" + + '' + + + stdenv.lib.optionalString (bootstrapVersion) '' + substituteInPlace ${datetimePath} \ + --replace "import std.traits;" "import std.traits;import std.path;" + + substituteInPlace ${datetimePath} \ + --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\"" + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + # See https://github.com/NixOS/nixpkgs/issues/29443 + substituteInPlace phobos/std/path.d \ + --replace "\"/root" "\"${ROOT_HOME_DIR}" + ''; + + dmdPath = if bootstrapVersion then + "dmd/src" + else + "dmd"; + + postPatch = '' + # Use proper C++ compiler + substituteInPlace ${dmdPath}/posix.mak \ + --replace g++ $CXX + '' + + + stdenv.lib.optionalString (!bootstrapVersion) '' + substituteInPlace druntime/test/common.mak \ + --replace "DFLAGS:=" "DFLAGS:=${usePIC} " + '' + + + phobosPatches + + + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) '' + substituteInPlace ${dmdPath}/root/port.c \ + --replace "#include " "#include " + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace ${dmdPath}/posix.mak \ + --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + '' + + + stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin && bootstrapVersion) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + substituteInPlace ${dmdPath}/root/port.c --replace __inline_isnanl __inline_isnan + ''; + + nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + buildInputs = [ curl tzdata ]; + + bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; + osname = if stdenv.hostPlatform.isDarwin then + "osx" + else + stdenv.hostPlatform.parsed.kernel.name; + top = "$(echo $NIX_BUILD_TOP)"; + pathToDmd = if bootstrapVersion then + "${top}/dmd/src/dmd" + else + "${top}/dmd/generated/${osname}/release/${bits}/dmd"; + + # Buid and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd ../phobos + make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd .. + ''; + + doCheck = !bootstrapVersion; + + checkPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + cd .. + ''; + + extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; + + installPhase = '' + cd dmd + mkdir $out + mkdir $out/bin + cp ${pathToDmd} $out/bin + + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 + cp -r docs/man/man1/* $out/share/man/man1/ + cp -r docs/man/man5/* $out/share/man/man5/ + + cd ../druntime + mkdir $out/include + mkdir $out/include/d2 + cp -r import/* $out/include/d2 + + cd ../phobos + mkdir $out/lib + cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib + + cp -r std $out/include/d2 + cp -r etc $out/include/d2 + + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" + + cd $out/bin + tee dmd.conf << EOF + [Environment] + DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC + EOF + ''; + + meta = with stdenv.lib; { + description = "Official reference compiler for the D language"; + homepage = http://dlang.org/; + # Everything is now Boost licensed, even the backend. + # https://github.com/dlang/dmd/pull/6680 + license = licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; + }; + + # Need to test Phobos in a fixed-output derivation, otherwise the + # network stuff in Phobos would fail if sandbox mode is enabled. + phobosUnittests = stdenv.mkDerivation rec { + name = "phobosUnittests-${version}"; + version = dmdBuild.version; + + enableParallelBuilding = dmdBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = dmdBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; + + srcs = dmdBuild.srcs; + + sourceRoot = "."; + + postPatch = dmdBuild.phobosPatches; + + nativeBuildInputs = dmdBuild.nativeBuildInputs; + buildInputs = dmdBuild.buildInputs; + + buildPhase = '' + cd phobos + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${dmdBuild}/bin/dmd BUILD=release + ''; + + installPhase = '' + echo -n $inputString > $out + ''; + }; + +in + +stdenv.mkDerivation rec { + inherit phobosUnittests; + name = "dmd-${version}"; + phases = "installPhase"; + buildInputs = dmdBuild.buildInputs; installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "cp $PWD/generated/${osname}/release/${bits}/dmd $out/bin" - } - - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; - extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in - "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib" - } - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" - - cd $out/bin - tee dmd.conf << EOF - [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF + mkdir $out + cp -r --symbolic-link ${dmdBuild}/* $out/ ''; - - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; - platforms = platforms.unix; - }; + meta = dmdBuild.meta; } + diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index b3e2ff909b7f..4b87beb08794 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libuuid, python2, iasl }: +{ stdenv, fetchFromGitHub, fetchpatch, libuuid, python2, iasl }: let pythonEnv = python2.withPackages(ps: [ps.tkinter]); @@ -11,16 +11,24 @@ else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2014-12-10"; + name = "edk2-2017-12-05"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; - rev = "vUDK2017"; - sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g"; + rev = "f71a70e7a4c93a6143d7bad8ab0220a947679697"; + sha256 = "0k48xfwxcgcim1bhkggc19hilvsxsf5axvvcpmld0ng1fcfg0cr6"; }; - buildInputs = [ libuuid pythonEnv]; + patches = [ + (fetchpatch { + name = "short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch"; + url = "https://github.com/tianocore/edk2/commit/9e2a8e928995c3b1bb664b73fd59785055c6b5f6"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + ]; + + buildInputs = [ libuuid pythonEnv ]; makeFlags = "-C BaseTools"; @@ -33,10 +41,13 @@ edk2 = stdenv.mkDerivation { mv -v edksetup.sh $out ''; + enableParallelBuilding = true; + meta = { description = "Intel EFI development kit"; homepage = https://sourceforge.net/projects/edk2/; license = stdenv.lib.licenses.bsd2; + branch = "UDK2017"; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index 5d952073740e..490dace2faaf 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, wrapCC, wrapCCWith, symlinkJoin }: +{ newScope, stdenv, binutils-raw, wrapCCWith, symlinkJoin }: let callPackage = newScope (self // {inherit stdenv;}); @@ -6,6 +6,8 @@ let emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; emscriptenfastcomp-wrapped = wrapCCWith { cc = self.emscriptenfastcomp-unwrapped; + # Never want Apple's cctools for WASM target + bintools = binutils-raw; libc = stdenv.cc.libc; extraBuildCommands = '' # hardening flags break WASM support diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 704d9d5be645..e646debd9d7e 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -8,10 +8,10 @@ stdenv, fetchurl let s = rec { - version = "1.6"; - versionSuffix = ".0-0"; + version = "1.8.0"; + versionSuffix = ""; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; - sha256 = "1a1w9yibi0rsr51bl7csnq6mr59x0934850kiabs80nr3sz05knb"; + sha256 = "0i58ngrr1vjyazirfmz0cgikglc02z1m0gcrsfw9awpi3ax8h21j"; name = "lazarus-${version}"; }; buildInputs = [ diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index af33039d341a..5c1f931da9a2 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,4 +1,4 @@ -# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it +# Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 79f57c42c50d..b70d3649bb9a 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.8-300db59"; + version = "4.8.8-415-g29ed48bb"; bootstrap = import ./bootstrap.nix ( pkgs ); src = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "300db59e1d3b66bcd597f617849df0274d2a4472"; - sha256 = "1mhy49lasakgvdaswkxasdssik11lx3hfx4h1gs2b6881488ssdp"; + rev = "29ed48bb688e8302d2430b5d24a2fc7c2039aeec"; + sha256 = "1h3kmczvjir0pi6cmqa2bsc09n68jhw0bxq7m6w4b1f0xvgvn3fr"; }; buildInputs = [ openssl git autoconf bootstrap ]; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 088a64ff5438..6b2718f5e692 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -25,6 +25,7 @@ , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -63,16 +64,26 @@ let version = "4.5.4"; javaAwtGtk = langJava && gtk2 != null; + /* Platform flags */ + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; + in + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + /* Cross-gcc settings */ - gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform; - gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatform; - gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null targetPlatform; crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"); crossConfigureFlags = - optional (gccArch != null) "--with-arch=${gccArch}" ++ - optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ - optional (gccAbi != null) "--with-abi=${gccAbi}" ++ # Ensure that -print-prog-name is able to find the correct programs. [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ @@ -107,7 +118,7 @@ let version = "4.5.4"; "--enable-sjlj-exceptions" "--enable-hash-synchronization" "--enable-version-specific-runtime-libs" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" ] else [ @@ -218,11 +229,22 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ optional (perl != null) perl; - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (ppl != null) ppl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (zlib != null) zlib) ++ (optional langJava boehmgc) @@ -236,7 +258,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; @@ -248,6 +270,8 @@ stdenv.mkDerivation ({ "--with-mpc=${libmpc}" ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -288,7 +312,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross-compilation + platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ # Platform-specific flags @@ -299,72 +323,26 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR = "${targetPlatform.config}-ar"; - LD = "${targetPlatform.config}-ld"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-gcc"; - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; - configureFlags = - optional (!enableMultilib) "--disable-multilib" ++ - optional (!enableShared) "--disable-shared" ++ - optional langJava "--with-ecj-jar=${javaEcj.crossDrv}" ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr.crossDrv}" ++ - optional (ppl != null) "--with-ppl=${ppl.crossDrv}" ++ - optional (cloogppl != null) "--with-cloog=${cloogppl.crossDrv}" ++ - - [ - "--with-gmp=${gmp.crossDrv}" - "--with-mpfr=${mpfr.crossDrv}" - "--with-mpc=${libmpc.crossDrv}" - "--disable-libstdcxx-pch" - "--without-included-gettext" - "--with-system-zlib" - "--enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - }" - ] ++ - optional langAda "--enable-libada" ++ - optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ - optional (targetPlatform != hostPlatform) crossConfigureFlags - ; }; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; - CC = "gcc"; - - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. # # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -375,42 +353,44 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread); + ++ optional (libpthread != null) libpthread) + ); - EXTRA_TARGET_CFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${libcCross.dev}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); - EXTRA_TARGET_LDFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ "-B${libcCross.out}/lib" ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); - passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; isGNU = true; }; + passthru = { + inherit langC langCC langAda langFortran langVhdl enableMultilib version; + isGNU = true; + hardeningUnsupportedFlags = [ "stackprotector" ]; + }; enableParallelBuilding = !langAda; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 7003ace28905..0105a159877a 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -23,7 +23,7 @@ , x11Support ? langJava , gnatboot ? null , enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false @@ -33,6 +33,7 @@ , gnused ? null , darwin ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -108,14 +109,14 @@ let version = "4.8.5"; javaAwtGtk = langJava && x11Support; /* Platform flags */ - mkPlatformFlags = platform: let - gccArch = platform.gcc.arch or null; - gccCpu = platform.gcc.cpu or null; - gccAbi = platform.gcc.abi or null; - gccFpu = platform.gcc.fpu or null; - gccFloat = platform.gcc.float or null; - gccMode = platform.gcc.mode or null; - in + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; + in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++ @@ -127,8 +128,6 @@ let version = "4.8.5"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = - mkPlatformFlags targetPlatform ++ - # Ensure that -print-prog-name is able to find the correct programs. [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ @@ -164,13 +163,9 @@ let version = "4.8.5"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - "--disable-shared" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else @@ -186,7 +181,7 @@ let version = "4.8.5"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = targetPlatform == hostPlatform && !hostPlatform.isArm && !hostPlatform.isMips; + bootstrap = targetPlatform == hostPlatform; in @@ -272,6 +267,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); @@ -304,7 +300,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; @@ -318,6 +314,8 @@ stdenv.mkDerivation ({ "--with-mpc=${libmpc}" ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -343,14 +341,6 @@ stdenv.mkDerivation ({ }" ] ++ - # Optional features - optional (isl != null) "--with-isl=${isl}" ++ - optionals (cloog != null) [ - "--with-cloog=${cloog}" - "--disable-cloog-version-check" - "--enable-cloog-backend=isl" - ] ++ - (if enableMultilib then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ @@ -359,6 +349,14 @@ stdenv.mkDerivation ({ then ["--enable-plugin"] else ["--disable-plugin"]) ++ + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + optionals (cloog != null) [ + "--with-cloog=${cloog}" + "--disable-cloog-version-check" + "--enable-cloog-backend=isl" + ] ++ + # Java options optionals langJava [ "--with-ecj-jar=${javaEcj}" @@ -374,15 +372,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross-compilation - optional (targetPlatform == hostPlatform) ( - let incDir = if hostPlatform.isDarwin - then "${darwin.usr-include}" - else "${getDev stdenv.cc.libc}/include"; - in "--with-native-system-header-dir=${incDir}" - ) ++ - - optional (targetPlatform == hostPlatform) (mkPlatformFlags stdenv.platform) ++ + platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -406,81 +396,30 @@ stdenv.mkDerivation ({ then "install-strip" else "install"; - crossAttrs = let - xgccArch = targetPlatform.gcc.arch or null; - xgccCpu = targetPlatform.gcc.cpu or null; - xgccAbi = targetPlatform.gcc.abi or null; - xgccFpu = targetPlatform.gcc.fpu or null; - xgccFloat = targetPlatform.gcc.float or null; - in { - AR = "${targetPlatform.config}-ar"; - LD = "${targetPlatform.config}-ld"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-gcc"; - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; + /* For cross-built gcc (build != host == target) */ + crossAttrs = { dontStrip = true; - configureFlags = - optional (!enableMultilib) "--disable-multilib" ++ - optional (!enableShared) "--disable-shared" ++ - optional langJava "--with-ecj-jar=${javaEcj.crossDrv}" ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr.crossDrv}" ++ - optional (cloog != null) "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" ++ - [ - "--with-gmp=${gmp.crossDrv}" - "--with-mpfr=${mpfr.crossDrv}" - "--with-mpc=${libmpc.crossDrv}" - "--disable-libstdcxx-pch" - "--without-included-gettext" - "--with-system-zlib" - "--enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - }" - ] ++ - optional langAda "--enable-libada" ++ - optional (xgccArch != null) "--with-arch=${xgccArch}" ++ - optional (xgccCpu != null) "--with-cpu=${xgccCpu}" ++ - optional (xgccAbi != null) "--with-abi=${xgccAbi}" ++ - optional (xgccFpu != null) "--with-fpu=${xgccFpu}" ++ - optional (xgccFloat != null) "--with-float=${xgccFloat}" - ; buildFlags = ""; }; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. # # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -491,42 +430,44 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread); + ++ optional (libpthread != null) libpthread) + ); - EXTRA_TARGET_CFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${libcCross.dev}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); - EXTRA_TARGET_LDFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ "-B${libcCross.out}/lib" ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); - passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + passthru = { + inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; + isGNU = true; + hardeningUnsupportedFlags = [ "stackprotector" ]; + }; inherit enableParallelBuilding enableMultilib; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 362670ff5dbd..1b1492686d0e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -23,7 +23,7 @@ , x11Support ? langJava , gnatboot ? null , enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false @@ -33,6 +33,7 @@ , gnused ? null , darwin ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -99,14 +100,14 @@ let version = "4.9.4"; javaAwtGtk = langJava && x11Support; /* Platform flags */ - mkPlatformFlags = platform: let - gccArch = platform.gcc.arch or null; - gccCpu = platform.gcc.cpu or null; - gccAbi = platform.gcc.abi or null; - gccFpu = platform.gcc.fpu or null; - gccFloat = platform.gcc.float or null; - gccMode = platform.gcc.mode or null; - in + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; + in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++ @@ -118,8 +119,6 @@ let version = "4.9.4"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = - mkPlatformFlags targetPlatform ++ - # Ensure that -print-prog-name is able to find the correct programs. [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ @@ -155,13 +154,9 @@ let version = "4.9.4"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - "--disable-shared" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else @@ -267,12 +262,23 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (cloog != null) cloog) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (cloog != null) cloog) ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) @@ -303,7 +309,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; @@ -316,6 +322,8 @@ stdenv.mkDerivation ({ "--with-mpc=${libmpc}" ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -372,15 +380,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross-compilation - optional (targetPlatform == hostPlatform) ( - let incDir = if hostPlatform.isDarwin - then "${darwin.usr-include}" - else "${getDev stdenv.cc.libc}/include"; - in "--with-native-system-header-dir=${incDir}" - ) ++ - - optional (targetPlatform == hostPlatform) (mkPlatformFlags stdenv.platform) ++ + platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -405,81 +405,29 @@ stdenv.mkDerivation ({ else "install"; /* For cross-built gcc (build != host == target) */ - crossAttrs = let - xgccArch = targetPlatform.gcc.arch or null; - xgccCpu = targetPlatform.gcc.cpu or null; - xgccAbi = targetPlatform.gcc.abi or null; - xgccFpu = targetPlatform.gcc.fpu or null; - xgccFloat = targetPlatform.gcc.float or null; - in { - AR = "${targetPlatform.config}-ar"; - LD = "${targetPlatform.config}-ld"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-gcc"; - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; + crossAttrs = { dontStrip = true; - configureFlags = - optional (!enableMultilib) "--disable-multilib" ++ - optional (!enableShared) "--disable-shared" ++ - optional langJava "--with-ecj-jar=${javaEcj.crossDrv}" ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr.crossDrv}" ++ - optional (cloog != null) "--with-cloog=${cloog.crossDrv}" "--enable-cloog-backend=isl" ++ - [ - "--with-gmp=${gmp.crossDrv}" - "--with-mpfr=${mpfr.crossDrv}" - "--with-mpc=${libmpc.crossDrv}" - "--disable-libstdcxx-pch" - "--without-included-gettext" - "--with-system-zlib" - "--enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - }" - ] ++ - optional langAda "--enable-libada" ++ - optional (xgccArch != null) "--with-arch=${xgccArch}" ++ - optional (xgccCpu != null) "--with-cpu=${xgccCpu}" ++ - optional (xgccAbi != null) "--with-abi=${xgccAbi}" ++ - optional (xgccFpu != null) "--with-fpu=${xgccFpu}" ++ - optional (xgccFloat != null) "--with-float=${xgccFloat}" - ; buildFlags = ""; }; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. # # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -490,39 +438,38 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread); + ++ optional (libpthread != null) libpthread) + ); - EXTRA_TARGET_CFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); - EXTRA_TARGET_LDFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ "-B${libcCross.out}/lib" ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index c9b49c0ede63..0636ce7381ae 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -23,7 +23,7 @@ , x11Support ? langJava , gnatboot ? null , enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false @@ -49,9 +49,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -103,14 +100,14 @@ let version = "5.5.0"; javaAwtGtk = langJava && x11Support; /* Platform flags */ - mkPlatformFlags = platform: let - gccArch = platform.gcc.arch or null; - gccCpu = platform.gcc.cpu or null; - gccAbi = platform.gcc.abi or null; - gccFpu = platform.gcc.fpu or null; - gccFloat = platform.gcc.float or null; - gccMode = platform.gcc.mode or null; - in + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; + in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++ @@ -122,8 +119,6 @@ let version = "5.5.0"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = - mkPlatformFlags targetPlatform ++ - # Ensure that -print-prog-name is able to find the correct programs. [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ @@ -159,13 +154,9 @@ let version = "5.5.0"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - "--disable-shared" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else @@ -201,8 +192,6 @@ stdenv.mkDerivation ({ inherit sha256; }; - hardeningDisable = [ "format" ]; - inherit patches; outputs = [ "out" "lib" "man" "info" ]; @@ -211,6 +200,8 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; + hardeningDisable = [ "format" ]; + # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' @@ -283,17 +274,27 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) @@ -317,7 +318,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; @@ -331,6 +332,8 @@ stdenv.mkDerivation ({ "--with-mpc=${libmpc}" ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -356,9 +359,6 @@ stdenv.mkDerivation ({ }" ] ++ - # Optional features - optional (isl != null) "--with-isl=${isl}" ++ - (if enableMultilib then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ @@ -367,6 +367,9 @@ stdenv.mkDerivation ({ then ["--enable-plugin"] else ["--disable-plugin"]) ++ + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + # Java options optionals langJava [ "--with-ecj-jar=${javaEcj}" @@ -382,15 +385,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross-compilation - optional (targetPlatform == hostPlatform) ( - let incDir = if hostPlatform.isDarwin - then "${darwin.usr-include}" - else "${getDev stdenv.cc.libc}/include"; - in "--with-native-system-header-dir=${incDir}" - ) ++ - - optional (targetPlatform == hostPlatform) (mkPlatformFlags stdenv.platform) ++ + platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -415,82 +410,31 @@ stdenv.mkDerivation ({ else "install"; /* For cross-built gcc (build != host == target) */ - crossAttrs = let - xgccArch = targetPlatform.gcc.arch or null; - xgccCpu = targetPlatform.gcc.cpu or null; - xgccAbi = targetPlatform.gcc.abi or null; - xgccFpu = targetPlatform.gcc.fpu or null; - xgccFloat = targetPlatform.gcc.float or null; - in { - AR = "${targetPlatform.config}-ar"; - LD = "${targetPlatform.config}-ld"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-gcc"; - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; + crossAttrs = { dontStrip = true; - configureFlags = - optional (!enableMultilib) "--disable-multilib" ++ - optional (!enableShared) "--disable-shared" ++ - optional langJava "--with-ecj-jar=${javaEcj.crossDrv}" ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr.crossDrv}" ++ - [ - "--with-gmp=${gmp.crossDrv}" - "--with-mpfr=${mpfr.crossDrv}" - "--with-mpc=${libmpc.crossDrv}" - "--disable-libstdcxx-pch" - "--without-included-gettext" - "--with-system-zlib" - "--enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - }" - ] ++ - optional langAda "--enable-libada" ++ - optional (xgccArch != null) "--with-arch=${xgccArch}" ++ - optional (xgccCpu != null) "--with-cpu=${xgccCpu}" ++ - optional (xgccAbi != null) "--with-abi=${xgccAbi}" ++ - optional (xgccFpu != null) "--with-fpu=${xgccFpu}" ++ - optional (xgccFloat != null) "--with-float=${xgccFloat}" - ; buildFlags = ""; }; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. # # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optionals langJava [ boehmgc ] + ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread @@ -499,39 +443,38 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread); + ++ optional (libpthread != null) libpthread) + ); - EXTRA_TARGET_CFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${getDev libcCross}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); - EXTRA_TARGET_LDFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ "-B${libcCross.out}/lib" ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index a68946a6f345..2614e96e1b7c 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -23,7 +23,7 @@ , x11Support ? langJava , gnatboot ? null , enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false @@ -34,6 +34,7 @@ , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -48,9 +49,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -100,13 +98,13 @@ let version = "6.4.0"; javaAwtGtk = langJava && x11Support; /* Platform flags */ - mkPlatformFlags = platform: let - gccArch = platform.gcc.arch or null; - gccCpu = platform.gcc.cpu or null; - gccAbi = platform.gcc.abi or null; - gccFpu = platform.gcc.fpu or null; - gccFloat = platform.gcc.float or null; - gccMode = platform.gcc.mode or null; + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ @@ -119,8 +117,6 @@ let version = "6.4.0"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = - mkPlatformFlags targetPlatform ++ - # Ensure that -print-prog-name is able to find the correct programs. [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ @@ -156,13 +152,9 @@ let version = "6.4.0"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - "--disable-shared" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else @@ -181,7 +173,7 @@ let version = "6.4.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = targetPlatform == hostPlatform; + bootstrap = targetPlatform == hostPlatform; in @@ -281,12 +273,23 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) @@ -318,7 +321,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; @@ -332,6 +335,8 @@ stdenv.mkDerivation ({ "--with-mpc=${libmpc}" ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -383,20 +388,13 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross compilation - optional (targetPlatform == hostPlatform) ( - let incDir = if hostPlatform.isDarwin - then "${darwin.usr-include}" - else "${getDev stdenv.cc.libc}/include"; - in "--with-native-system-header-dir=${incDir}" - ) ++ - + platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ # Platform-specific flags optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ - optionals (hostPlatform.isSunOS) [ + optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred "--with-gnu-as" "--without-gnu-ld" @@ -414,80 +412,29 @@ stdenv.mkDerivation ({ else "install"; /* For cross-built gcc (build != host == target) */ - crossAttrs = let - xgccArch = targetPlatform.gcc.arch or null; - xgccCpu = targetPlatform.gcc.cpu or null; - xgccAbi = targetPlatform.gcc.abi or null; - xgccFpu = targetPlatform.gcc.fpu or null; - xgccFloat = targetPlatform.gcc.float or null; - in { - AR = "${targetPlatform.config}-ar"; - LD = "${targetPlatform.config}-ld"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-gcc"; - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; + crossAttrs = { dontStrip = true; - configureFlags = - optional (!enableMultilib) "--disable-multilib" ++ - optional (!enableShared) "--disable-shared" ++ - optional langJava "--with-ecj-jar=${javaEcj.crossDrv}" ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr.crossDrv}" ++ - [ - "--with-gmp=${gmp.crossDrv}" - "--with-mpfr=${mpfr.crossDrv}" - "--with-mpc=${libmpc.crossDrv}" - "--disable-libstdcxx-pch" - "--without-included-gettext" - "--with-system-zlib" - "--enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - }" - ] ++ - optional langAda "--enable-libada" ++ - optional (xgccArch != null) "--with-arch=${xgccArch}" ++ - optional (xgccCpu != null) "--with-cpu=${xgccCpu}" ++ - optional (xgccAbi != null) "--with-abi=${xgccAbi}" ++ - optional (xgccFpu != null) "--with-fpu=${xgccFpu}" ++ - optional (xgccFloat != null) "--with-float=${xgccFloat}" - ; buildFlags = ""; }; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. # # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -498,39 +445,38 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread); + ++ optional (libpthread != null) libpthread) + ); - EXTRA_TARGET_CFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${getDev libcCross}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); - EXTRA_TARGET_LDFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ "-B${libcCross.out}/lib" ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c201ca6373b7..9ce3808b73f2 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -23,7 +23,7 @@ , x11Support ? langJava , gnatboot ? null , enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false @@ -35,6 +35,7 @@ , darwin ? null , flex ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -49,9 +50,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -98,14 +96,14 @@ let version = "7.2.0"; javaAwtGtk = langJava && x11Support; /* Platform flags */ - mkPlatformFlags = platform: let - gccArch = platform.gcc.arch or null; - gccCpu = platform.gcc.cpu or null; - gccAbi = platform.gcc.abi or null; - gccFpu = platform.gcc.fpu or null; - gccFloat = platform.gcc.float or null; - gccMode = platform.gcc.mode or null; - in + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; + in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++ @@ -117,8 +115,6 @@ let version = "7.2.0"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = - mkPlatformFlags targetPlatform ++ - # Ensure that -print-prog-name is able to find the correct programs. [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ @@ -154,13 +150,9 @@ let version = "7.2.0"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - "--disable-shared" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else @@ -278,12 +270,23 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf flex ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf flex + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) @@ -311,7 +314,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; @@ -325,6 +328,8 @@ stdenv.mkDerivation ({ "--with-mpc=${libmpc}" ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -376,15 +381,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross-compilation - optional (targetPlatform == hostPlatform) ( - let incDir = if hostPlatform.isDarwin - then "${darwin.usr-include}" - else "${getDev stdenv.cc.libc}/include"; - in "--with-native-system-header-dir=${incDir}" - ) ++ - - optional (targetPlatform == hostPlatform) (mkPlatformFlags stdenv.platform) ++ + platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -409,80 +406,29 @@ stdenv.mkDerivation ({ else "install"; /* For cross-built gcc (build != host == target) */ - crossAttrs = let - xgccArch = targetPlatform.gcc.arch or null; - xgccCpu = targetPlatform.gcc.cpu or null; - xgccAbi = targetPlatform.gcc.abi or null; - xgccFpu = targetPlatform.gcc.fpu or null; - xgccFloat = targetPlatform.gcc.float or null; - in { - AR = "${targetPlatform.config}-ar"; - LD = "${targetPlatform.config}-ld"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-gcc"; - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, targetPlatform != hostPlatform - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + crossAttrs = { dontStrip = true; - configureFlags = - optional (!enableMultilib) "--disable-multilib" ++ - optional (!enableShared) "--disable-shared" ++ - optional langJava "--with-ecj-jar=${javaEcj.crossDrv}" ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr.crossDrv}" ++ - [ - "--with-gmp=${gmp.crossDrv}" - "--with-mpfr=${mpfr.crossDrv}" - "--with-mpc=${libmpc.crossDrv}" - "--disable-libstdcxx-pch" - "--without-included-gettext" - "--with-system-zlib" - "--enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - }" - ] ++ - optional langAda "--enable-libada" ++ - optional (xgccArch != null) "--with-arch=${xgccArch}" ++ - optional (xgccCpu != null) "--with-cpu=${xgccCpu}" ++ - optional (xgccAbi != null) "--with-abi=${xgccAbi}" ++ - optional (xgccFpu != null) "--with-fpu=${xgccFpu}" ++ - optional (xgccFloat != null) "--with-float=${xgccFloat}" - ; buildFlags = ""; }; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. # # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -493,39 +439,38 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread); + ++ optional (libpthread != null) libpthread) + ); - EXTRA_TARGET_CFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${getDev libcCross}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); - EXTRA_TARGET_LDFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ "-B${libcCross.out}/lib" ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index ee56425f00b4..1796c83385e5 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -1,153 +1,156 @@ source $stdenv/setup -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY +oldOpts="$(shopt -po nounset)" || true +set -euo pipefail + + +export NIX_FIXINC_DUMMY="$NIX_BUILD_TOP/dummy" +mkdir "$NIX_FIXINC_DUMMY" if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" else - EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib" + EXTRA_LDFLAGS="-Wl,-rpath,${!outputLib}/lib" fi # GCC interprets empty paths as ".", which we don't want. -if test -z "$CPATH"; then unset CPATH; fi -if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi -echo "\$CPATH is \`$CPATH'" -echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" +if test -z "${CPATH-}"; then unset CPATH; fi +if test -z "${LIBRARY_PATH-}"; then unset LIBRARY_PATH; fi +echo "\$CPATH is \`${CPATH-}'" +echo "\$LIBRARY_PATH is \`${LIBRARY_PATH-}'" if test "$noSysDirs" = "1"; then - if test -e $NIX_CC/nix-support/orig-libc; then + declare \ + EXTRA_BUILD_FLAGS EXTRA_FLAGS EXTRA_TARGET_FLAGS \ + EXTRA_BUILD_LDFLAGS EXTRA_TARGET_LDFLAGS - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before || true)" + # Extract flags from Bintools Wrappers + for pre in 'BUILD_' ''; do + curBintools="NIX_${pre}BINTOOLS" - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$libc_dev/include + declare -a extraLDFlags=() + if [[ -e "${!curBintools}/nix-support/orig-libc" ]]; then + # Figure out what extra flags when linking to pass to the gcc + # compilers being generated to make sure that they use our libc. + extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true)) - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" - - else - # Hack: support impure environments. - extraFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - glibc_libdir="/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, - # make sure to explictly add them so that files compiled with the - # bootstrap compiler are optimized and (optionally) contain - # debugging information (info "(gccinstall) Building"). - if test -n "$dontStrip"; then - extraFlags="-O2 -g $extraFlags" - else - # Don't pass `-g' at all; this saves space while building. - extraFlags="-O2 $extraFlags" - fi - - EXTRA_FLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" + # The path to the Libc binaries such as `crti.o'. + libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib" + else + # Hack: support impure environments. + extraLDFlags=("-L/usr/lib64" "-L/usr/lib") + libc_libdir="/usr/lib" + fi + extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" + "${extraLDFlags[@]}") + for i in "${extraLDFlags[@]}"; do + declare EXTRA_${pre}LDFLAGS+=" -Wl,$i" + done done - if test -n "$targetConfig"; then - # Cross-compiling, we need gcc not to read ./specs in order to build - # the g++ compiler (after the specs for the cross-gcc are created). - # Having LIBRARY_PATH= makes gcc read the specs from ., and the build - # breaks. Having this variable comes from the default.nix code to bring - # gcj in. - unset LIBRARY_PATH - unset CPATH - else - if test -z "$NIX_CC_CROSS"; then - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" + # Extract flags from CC Wrappers + for pre in 'BUILD_' ''; do + curCC="NIX_${pre}CC" + curFIXINC="NIX_${pre}FIXINC_DUMMY" + + declare -a extraFlags=() + if [[ -e "${!curCC}/nix-support/orig-libc" ]]; then + # Figure out what extra compiling flags to pass to the gcc compilers + # being generated to make sure that they use our libc. + extraFlags=($(< "${!curCC}/nix-support/libc-cflags")) + + # The path to the Libc headers + libc_devdir="$(< "${!curCC}/nix-support/orig-libc-dev")" + + # Use *real* header files, otherwise a limits.h is generated that + # does not include Libc's limits.h (notably missing SSIZE_MAX, + # which breaks the build). + declare NIX_${pre}FIXINC_DUMMY="$libc_devdir/include" else - # This the case of cross-building the gcc. - # We need special flags for the target, different than those of the build - # Assertion: - test -e $NIX_CC_CROSS/nix-support/orig-libc - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" - - # The path to the Glibc binaries such as `crti.o'. - glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" - glibc_libdir="$glibc_dir/lib" - glibc_devdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc-dev)" - configureFlags="$configureFlags --with-native-system-header-dir=$glibc_devdir/include" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS="$glibc_devdir/include" - - extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - EXTRA_TARGET_CFLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" - done + # Hack: support impure environments. + extraFlags=("-isystem" "/usr/include") + declare NIX_${pre}FIXINC_DUMMY=/usr/include fi + + extraFlags=("-I${!curFIXINC}" "${extraFlags[@]}") + + # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, make + # sure to explictly add them so that files compiled with the bootstrap + # compiler are optimized and (optionally) contain debugging information + # (info "(gccinstall) Building"). + if test -n "${dontStrip-}"; then + extraFlags=("-O2" "-g" "${extraFlags[@]}") + else + # Don't pass `-g' at all; this saves space while building. + extraFlags=("-O2" "${extraFlags[@]}") + fi + + declare EXTRA_${pre}FLAGS="${extraFlags[*]}" + done + + if test -z "${targetConfig-}"; then + # host = target, so the flags are the same + EXTRA_TARGET_FLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" fi # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find # the startfiles. # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx # for the startfiles. - makeFlagsArray+=( \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) + makeFlagsArray+=( + "BUILD_SYSTEM_HEADER_DIR=$NIX_BUILD_FIXINC_DUMMY" + "SYSTEM_HEADER_DIR=$NIX_BUILD_FIXINC_DUMMY" + "NATIVE_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY" - if test -z "$targetConfig"; then - makeFlagsArray+=( \ - BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) + "LDFLAGS_FOR_BUILD=$EXTRA_BUILD_LDFLAGS" + #"LDFLAGS=$EXTRA_LDFLAGS" + "LDFLAGS_FOR_TARGET=$EXTRA_TARGET_LDFLAGS" + + "CFLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" + "CXXFLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" + "FLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" + + # It seems there is a bug in GCC 5 + #"CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + #"CXXFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + + "CFLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + "CXXFLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + "FLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + ) + + if test -z "${targetConfig-}"; then + makeFlagsArray+=( + "BOOT_CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + "BOOT_LDFLAGS=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + ) fi - if test -n "$targetConfig" -a "$crossStageStatic" == 1; then + if test -n "${targetConfig-}" -a "$crossStageStatic" == 1; then # We don't want the gcc build to assume there will be a libc providing # limits.h in this stagae - makeFlagsArray+=( \ - LIMITS_H_TEST=false \ - ) + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) else - makeFlagsArray+=( \ - LIMITS_H_TEST=true \ - ) + makeFlagsArray+=( + 'LIMITS_H_TEST=true' + ) fi fi -if test -n "$targetConfig"; then +if test -n "${targetConfig-}"; then # The host strip will destroy some important details of the objects dontStrip=1 fi +eval "$oldOpts" + providedPreConfigure="$preConfigure"; preConfigure() { if test -n "$newlibSrc"; then diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 38df9de08c2c..c1306d374d5d 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -23,7 +23,7 @@ , x11Support ? langJava , gnatboot ? null , enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false @@ -35,6 +35,7 @@ , darwin ? null , flex ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -49,9 +50,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -98,14 +96,14 @@ let version = "7-20170409"; javaAwtGtk = langJava && x11Support; /* Platform flags */ - mkPlatformFlags = platform: let - gccArch = platform.gcc.arch or null; - gccCpu = platform.gcc.cpu or null; - gccAbi = platform.gcc.abi or null; - gccFpu = platform.gcc.fpu or null; - gccFloat = platform.gcc.float or null; - gccMode = platform.gcc.mode or null; - in + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; + in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++ @@ -117,8 +115,6 @@ let version = "7-20170409"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = - mkPlatformFlags targetPlatform ++ - # Ensure that -print-prog-name is able to find the correct programs. [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ @@ -154,13 +150,9 @@ let version = "7-20170409"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - "--disable-shared" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else @@ -265,12 +257,23 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf flex ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf flex + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) @@ -298,7 +301,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; @@ -312,6 +315,8 @@ stdenv.mkDerivation ({ "--with-mpc=${libmpc}" ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -363,15 +368,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross-compilation - optional (targetPlatform == hostPlatform) ( - let incDir = if hostPlatform.isDarwin - then "${darwin.usr-include}" - else "${getDev stdenv.cc.libc}/include"; - in "--with-native-system-header-dir=${incDir}" - ) ++ - - optional (targetPlatform == hostPlatform) (mkPlatformFlags stdenv.platform) ++ + platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -396,80 +393,29 @@ stdenv.mkDerivation ({ else "install"; /* For cross-built gcc (build != host == target) */ - crossAttrs = let - xgccArch = targetPlatform.gcc.arch or null; - xgccCpu = targetPlatform.gcc.cpu or null; - xgccAbi = targetPlatform.gcc.abi or null; - xgccFpu = targetPlatform.gcc.fpu or null; - xgccFloat = targetPlatform.gcc.float or null; - in { - AR = "${targetPlatform.config}-ar"; - LD = "${targetPlatform.config}-ld"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-gcc"; - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; + crossAttrs = { dontStrip = true; - configureFlags = - optional (!enableMultilib) "--disable-multilib" ++ - optional (!enableShared) "--disable-shared" ++ - optional langJava "--with-ecj-jar=${javaEcj.crossDrv}" ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr.crossDrv}" ++ - [ - "--with-gmp=${gmp.crossDrv}" - "--with-mpfr=${mpfr.crossDrv}" - "--with-mpc=${libmpc.crossDrv}" - "--disable-libstdcxx-pch" - "--without-included-gettext" - "--with-system-zlib" - "--enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - }" - ] ++ - optional langAda "--enable-libada" ++ - optional (xgccArch != null) "--with-arch=${xgccArch}" ++ - optional (xgccCpu != null) "--with-cpu=${xgccCpu}" ++ - optional (xgccAbi != null) "--with-abi=${xgccAbi}" ++ - optional (xgccFpu != null) "--with-fpu=${xgccFpu}" ++ - optional (xgccFloat != null) "--with-float=${xgccFloat}" - ; buildFlags = ""; }; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. # # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -480,39 +426,38 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread); + ++ optional (libpthread != null) libpthread) + ); - EXTRA_TARGET_CFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${getDev libcCross}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); - EXTRA_TARGET_LDFLAGS = - if targetPlatform != hostPlatform && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ "-B${libcCross.out}/lib" ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 59cafee3b3a9..23089ddda4e8 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,25 +1,27 @@ { stdenv, fetchurl, fetchgit, gambit, coreutils, rsync, bash, - openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }: # TODO: distinct packages for gerbil-release and gerbil-devel stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.12-DEV-777-gd855915"; + version = "0.12-DEV-836-gcde6802"; src = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "9db6187dc996eec4087f83b86339e7b17bb69bad"; - sha256 = "1hqmsy77d62dvil3az4vdr0rmwvxhinjl1dbcxzamz2c2kcjv1jg"; + rev = "2904b0014fac344409d0ae2ba5835d0e67ac83b5"; + sha256 = "1nnirqdd11n6pkvidnf8pb39m45jjnpmwj2qy62di024r7ha3y18"; }; buildInputs = [ gambit coreutils rsync bash - openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb + openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb ]; + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; + postPatch = '' echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm @@ -52,9 +54,9 @@ stdenv.mkDerivation rec { export GERBIL_HOME=$out case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac if [[ \$# = 0 ]] ; then - ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ; + exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ; else - ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" + exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" fi EOF runHook postInstall diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 84250c1a6d33..03831f3b6b6f 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -1,8 +1,12 @@ { stdenv , fetchurl, perl , libedit, ncurses5, gmp +, enableIntegerSimple ? false }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "6.10.2"; @@ -22,7 +26,11 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform")); - buildInputs = [perl]; + nativeBuildInputs = [ perl ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ libedit ncurses5 gmp ]; postUnpack = # Strip is harmful, see also below. It's important that this happens @@ -40,17 +48,19 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' - find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; + find . -type f -perm -0100 -exec patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done ''; - configurePhase = '' - ./configure --prefix=$out --with-gmp-libraries=${stdenv.lib.getLib gmp}/lib --with-gmp-includes=${stdenv.lib.getDev gmp}/include - ''; + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ]; # Stripping combined with patchelf breaks the executables (they die # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) @@ -63,7 +73,17 @@ stdenv.mkDerivation rec { postInstall = '' # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp.out}/lib\",\2@" $out/lib/ghc-${version}/package.conf + ''; + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + find "$out" -type f -executable \ + -exec patchelf --set-rpath "${LD_LIBRARY_PATH}" {} \; + ''; + + doInstallCheck = true; + installCheckPhase = '' # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc @@ -76,6 +96,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index c56762edd24e..0308edbd56c0 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -1,12 +1,15 @@ {stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "6.10.4"; name = "ghc-${version}"; src = fetchurl { - url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; }; @@ -22,6 +25,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index a46ef66a8cb7..16d6d39e95f4 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -1,12 +1,15 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "6.12.3"; name = "ghc-${version}"; src = fetchurl { - url = "http://darcs.haskell.org/download/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0s2y1sv2nq1cgliv735q2w3gg4ykv1c0g1adbv8wgwhia10vxgbc"; }; @@ -33,6 +36,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 394e4239e9a0..d9b4ff167825 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -3,6 +3,19 @@ , ncurses5, gmp, libiconv }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + +in + stdenv.mkDerivation rec { version = "7.0.4"; @@ -28,7 +41,11 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform")); - buildInputs = [perl]; + nativeBuildInputs = [ perl ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib @@ -57,41 +74,25 @@ stdenv.mkDerivation rec { find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. + # Rename needed libraries and binaries, fix interpreter stdenv.lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \; + find . -type f -perm -0100 -exec patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + + paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - fix () { - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1 - } - - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp - - for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do - fix $(find . -type f -name $file) - done - - for file in $(find . -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done ''; - configurePhase = '' - ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \ - ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} - ''; + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; # Stripping combined with patchelf breaks the executables (they die # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) @@ -101,7 +102,26 @@ stdenv.mkDerivation rec { # calls install-strip ... dontBuild = true; - postInstall = '' + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + find "$out" -type f -executable \ + -exec patchelf --set-rpath "${libPath}" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc @@ -114,6 +134,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 9d052ddb246f..0f560313007f 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "7.0.4"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed"; }; @@ -42,6 +45,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix deleted file mode 100644 index 51274dd60598..000000000000 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - inherit (bootPkgs) ghc; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - -in - -stdenv.mkDerivation rec { - version = "7.10.2"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz"; - sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; - }; - - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; - - patches = [ ./relocation.patch ]; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - preConfigure = '' - echo >mk/build.mk "${buildMK}" - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix new file mode 100644 index 000000000000..b68c84711b0d --- /dev/null +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -0,0 +1,159 @@ +{ stdenv +, fetchurl, perl +, ncurses5, gmp, libiconv +, gcc, llvm_35 +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + +in + +stdenv.mkDerivation rec { + version = "7.10.3"; + + name = "ghc-${version}-binary"; + + src = fetchurl ({ + "i686-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-i386-deb7-linux.tar.bz2"; + sha256 = "20b32912fb7e57910a3c908f99a9519b57a4872e1ea0f4f2265b2f7b30e8a3cd"; + }; + "x86_64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-deb8-linux.tar.bz2"; + sha256 = "5e163c557e9236cce68be41c984eab0fcdbdc1602e39040ca9ae325e6bdec1c3"; + }; + "armv7l-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.bz2"; + sha256 = "2913763eef88e4d1843a1e4c34225afb1866310d1a1956c08a4131f4593518f6"; + }; + "x86_64-darwin" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-apple-darwin.tar.bz2"; + sha256 = "4b537228d49b5ea0f8e8dbcc440a5b3c3cb19a92579d607291cc0041422fa5c3"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optionals stdenv.isArm [ llvm_35 ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + '' + + + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#! ${stdenv.shell}' > "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libtinfo.so libtinfo.so.5 \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + + paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + ''; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { targetPrefix = ""; }; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"]; +} diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index d573a22e0ae8..dd5acfa16f1f 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -1,14 +1,28 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, hscolour, llvm_35 +, coreutils, fetchurl, fetchpatch, perl +, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + docFixes = fetchurl { url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch"; sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0"; @@ -18,10 +32,10 @@ in stdenv.mkDerivation rec { version = "7.10.3"; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"; }; @@ -30,7 +44,7 @@ stdenv.mkDerivation rec { ./relocation.patch ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ] ++ stdenv.lib.optionals stdenv.isArm [ llvm_35 ]; enableParallelBuilding = true; @@ -58,11 +72,11 @@ stdenv.mkDerivation rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; postInstall = '' # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -73,7 +87,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index dd3b5cb2ebcb..cb8470bcff12 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + stdenv.mkDerivation rec { version = "7.2.2"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; }; @@ -51,6 +55,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 9d85253f6309..70c8797c264e 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -1,8 +1,21 @@ { stdenv -, fetchurl, perl, makeWrapper +, fetchurl, perl , ncurses5, gmp, libiconv }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + +in + stdenv.mkDerivation rec { version = "7.4.2"; @@ -28,7 +41,11 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform")); - buildInputs = [perl]; + nativeBuildInputs = [ perl ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib @@ -57,14 +74,11 @@ stdenv.mkDerivation rec { find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. + # Rename needed libraries and binaries, fix interpreter stdenv.lib.optionalString stdenv.isLinux '' - mkdir -p "$out/lib" - ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" - find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 @@ -73,30 +87,13 @@ stdenv.mkDerivation rec { for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - fix () { - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1 - } - - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist-install/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist-install/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp - - for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do - fix $(find . -type f -name $file) - done - - for file in $(find . -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done ''; - configurePhase = '' - ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \ - ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} - ''; + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; # Stripping combined with patchelf breaks the executables (they die # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) @@ -106,15 +103,26 @@ stdenv.mkDerivation rec { # calls install-strip ... dontBuild = true; - preInstall = stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p $out/lib/ghc-${version} - mkdir -p $out/bin - ln -s ${libiconv}/lib/libiconv.dylib $out/bin - ln -s ${libiconv}/lib/libiconv.dylib $out/lib/ghc-${version}/libiconv.dylib - ln -s ${libiconv}/lib/libiconv.dylib utils/ghc-cabal/dist-install/build/tmp + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + find "$out" -type f -executable \ + -exec patchelf --set-rpath "${libPath}" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done ''; - postInstall = '' + doInstallCheck = true; + installCheckPhase = '' # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc @@ -128,6 +136,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index e5bc4724c9eb..6f30b03efb91 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -1,17 +1,21 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + stdenv.mkDerivation rec { version = "7.4.2"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/7.4.2/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj"; }; @@ -52,6 +56,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index fde4ca2aa37d..78202297686e 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + let # The "-Wa,--noexecstack" options might be needed only with GNU ld (as opposed # to the gold linker). It prevents binaries' stacks from being marked as @@ -18,7 +22,7 @@ in stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx"; }; @@ -78,6 +82,8 @@ in stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix deleted file mode 100644 index 50b0108861f0..000000000000 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, ncurses, libiconv - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -stdenv.mkDerivation rec { - version = "7.8.3"; - name = "ghc-${version}"; - - src = fetchurl { - url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.xz"; - sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh"; - }; - - patches = [ ./relocation.patch ]; - - buildInputs = [ ghc perl ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp; - - enableParallelBuilding = true; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - DYNAMIC_BY_DEFAULT = NO - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.8.4-binary.nix b/pkgs/development/compilers/ghc/7.8.4-binary.nix new file mode 100644 index 000000000000..58a9370b3213 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.8.4-binary.nix @@ -0,0 +1,156 @@ +{ stdenv +, fetchurl, perl +, ncurses5, gmp, libiconv +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + +in + +stdenv.mkDerivation rec { + version = "7.8.4"; + + name = "ghc-${version}-binary"; + + src = fetchurl ({ + "i686-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux-deb7.tar.bz2"; + sha256 = "5da2cf45986f33319a92a666f1f0149915334a7b64b41892ab94f4557242b406"; + }; + "x86_64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux-deb7.tar.bz2"; + sha256 = "20b5731d268613bbf6e977dbb192a3a3b7b78d954c35edbfca4fb36b652e24f7"; + }; + "x86_64-darwin" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; + sha256 = "dfa161c2a136ee16214a49d5902e2377407c8292dbbdbb14fa0fa6b17220cae6"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe + for file in $(find . -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + '' + + + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#! ${stdenv.shell}' > "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libtinfo.so libtinfo.so.5 \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + + paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + ''; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { targetPrefix = ""; }; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; +} diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 5a380c75c69f..b5e2ac256a7a 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + stdenv.mkDerivation (rec { version = "7.8.4"; name = "ghc-${version}"; src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; }; @@ -49,6 +53,8 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index d475e3438b4b..bb706aa6bbc3 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,21 +1,33 @@ -{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, hscolour, patchutils, sphinx +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, hscolour, llvm_37 +, coreutils, fetchurl, fetchpatch, patchutils, perl, sphinx + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -, cross ? null + enableIntegerSimple ? false, gmp ? null }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; in stdenv.mkDerivation rec { version = "8.0.2"; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.2/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; }; @@ -23,7 +35,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; - buildInputs = [ ghc perl hscolour sphinx ]; + buildInputs = [ ghc perl hscolour sphinx ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_37 ]; enableParallelBuilding = true; @@ -47,19 +59,20 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + "--disable-large-address-space" + ]; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -70,7 +83,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix new file mode 100644 index 000000000000..ec2694a00286 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -0,0 +1,162 @@ +{ stdenv +, fetchurl, perl, gcc, llvm_39 +, ncurses5, gmp, libiconv +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + +in + +stdenv.mkDerivation rec { + version = "8.2.1"; + + name = "ghc-${version}-binary"; + + src = fetchurl ({ + "i686-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; + sha256 = "d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e"; + }; + "x86_64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; + sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130"; + }; + "armv7l-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; + sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019"; + }; + "aarch64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz"; + sha256 = "61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2"; + }; + "x86_64-darwin" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "900c802025fb630060dbd30f9738e5d107a4ca5a50d5c1262cd3e69fe4467188"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + '' + + + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#! ${stdenv.shell}' > "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libtinfo.so libtinfo.so.5 \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + + paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + ''; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { targetPrefix = ""; }; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; +} diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix deleted file mode 100644 index bcc801c98ea5..000000000000 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, autoconf, automake, happy, alex, python3, sphinx, hscolour -, buildPlatform, targetPlatform , selfPkgs, cross ? null - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - inherit (bootPkgs) ghc; - version = "8.2.1"; - - commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; - commonPreConfigure = '' - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk - ''; -in stdenv.mkDerivation (rec { - inherit version; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; - sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng"; - }; - - postPatch = "patchShebangs ."; - - patches = [ ./ghc-gold-linker.patch ]; - - preConfigure = commonPreConfigure; - - buildInputs = commonBuildInputs; - - enableParallelBuilding = true; - - configureFlags = [ - "CC=${stdenv.cc}/bin/cc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - outputs = [ "out" "doc" ]; - - passthru = { - inherit bootPkgs; - } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { - crossCompiler = selfPkgs.ghc.override { - cross = targetPlatform; - bootPkgs = selfPkgs; - }; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs (cross != null) { - name = "${cross.config}-ghc-${version}"; - - preConfigure = commonPreConfigure + '' - sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk - ''; - - configureFlags = [ - "CC=${stdenv.ccCross}/bin/${cross.config}-cc" - "LD=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ld" - "AR=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ar" - "NM=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-nm" - "RANLIB=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ranlib" - "--target=${cross.config}" - "--enable-bootstrap-with-devel-snapshot" - ] ++ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - - buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.targetPackages.stdenv.cc.bintools ]; - - dontSetConfigureCross = true; - - passthru = { - inherit bootPkgs cross; - cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; - ld = "${stdenv.targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ld"; - }; -}) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 736a6edc365b..5ef71804b570 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -1,18 +1,40 @@ -{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex, python3, sphinx, hscolour -, buildPlatform, targetPlatform , selfPkgs, cross ? null +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform +, selfPkgs, cross ? null - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, alex, happy, hscolour, llvm_39 +, autoconf, automake, coreutils, fetchurl, perl, python3, sphinx + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; - version = "8.2.2"; - commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; - commonPreConfigure = '' + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; +in +stdenv.mkDerivation (rec { + version = "8.2.2"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; + }; + + postPatch = "patchShebangs ."; + + preConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" @@ -20,21 +42,11 @@ let export NIX_LDFLAGS+=" -no_dtrace_dof" '' + stdenv.lib.optionalString enableIntegerSimple '' echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk ''; -in stdenv.mkDerivation (rec { - inherit version; - name = "ghc-${version}"; - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.2.2/${name}-src.tar.xz"; - sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; - }; - - postPatch = "patchShebangs ."; - - preConfigure = commonPreConfigure; - - buildInputs = commonBuildInputs; + buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ]; enableParallelBuilding = true; @@ -46,32 +58,34 @@ in stdenv.mkDerivation (rec { "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optional stdenv.isArm [ + "LD=${stdenv.cc}/bin/ld.gold" ]; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; outputs = [ "out" "doc" ]; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { crossCompiler = selfPkgs.ghc.override { cross = targetPlatform; @@ -87,31 +101,23 @@ in stdenv.mkDerivation (rec { }; } // stdenv.lib.optionalAttrs (cross != null) { - name = "${cross.config}-ghc-${version}"; - - preConfigure = commonPreConfigure + '' - sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk - ''; - configureFlags = [ - "CC=${stdenv.ccCross}/bin/${cross.config}-cc" - "LD=${stdenv.binutils}/bin/${cross.config}-ld" - "AR=${stdenv.binutils}/bin/${cross.config}-ar" - "NM=${stdenv.binutils}/bin/${cross.config}-nm" - "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib" + "CC=${stdenv.cc}/bin/${cross.config}-cc" + "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" + "AR=${stdenv.cc.bintools}/bin/${cross.config}-ar" + "NM=${stdenv.cc.bintools}/bin/${cross.config}-nm" + "RANLIB=${stdenv.cc.bintools}/bin/${cross.config}-ranlib" "--target=${cross.config}" "--enable-bootstrap-with-devel-snapshot" ] ++ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; - - dontSetConfigureCross = true; + configurePlatforms = []; passthru = { inherit bootPkgs cross; - cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; - ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + cc = "${stdenv.cc}/bin/${cross.config}-cc"; + ld = "${stdenv.cc}/bin/${cross.config}-ld"; }; }) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 92ba3f6a46ed..9b4c932eb115 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,21 +1,45 @@ -{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform , selfPkgs, cross ? null - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchgit, perl, python3 + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -, version ? "8.3.20170808" + enableIntegerSimple ? false, gmp ? null + +, version ? "8.5.20171209" }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; - commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; + rev = "4335c07ca7e64624819b22644d7591853826bd75"; - rev = "14457cf6a50f708eecece8f286f08687791d51f7"; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; +in +stdenv.mkDerivation (rec { + inherit version rev; + name = "${targetPrefix}ghc-${version}"; - commonPreConfigure = '' + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + inherit rev; + sha256 = "19csad94sk0bw2nj97ppmnwh4c193jg0jmg5w2sx9rqm9ih4yg85"; + }; + + postPatch = "patchShebangs ."; + + preConfigure = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID ./boot @@ -26,22 +50,11 @@ let export NIX_LDFLAGS+=" -no_dtrace_dof" '' + stdenv.lib.optionalString enableIntegerSimple '' echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk ''; -in stdenv.mkDerivation (rec { - inherit version rev; - name = "ghc-${version}"; - src = fetchgit { - url = "git://git.haskell.org/ghc.git"; - inherit rev; - sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y"; - }; - - postPatch = "patchShebangs ."; - - preConfigure = commonPreConfigure; - - buildInputs = commonBuildInputs; + buildInputs = [ ghc perl autoconf automake happy alex python3 ]; enableParallelBuilding = true; @@ -57,15 +70,15 @@ in stdenv.mkDerivation (rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -78,7 +91,7 @@ in stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { crossCompiler = selfPkgs.ghc.override { cross = targetPlatform; @@ -94,33 +107,23 @@ in stdenv.mkDerivation (rec { }; } // stdenv.lib.optionalAttrs (cross != null) { - name = "${cross.config}-ghc-${version}"; - - preConfigure = commonPreConfigure + '' - sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk - ''; - configureFlags = [ "CC=${stdenv.cc}/bin/${cross.config}-cc" - "LD=${stdenv.cc}/bin/${cross.config}-ld" - "AR=${stdenv.cc}/bin/${cross.config}-ar" - "NM=${stdenv.cc}/bin/${cross.config}-nm" - "RANLIB=${stdenv.cc}/bin/${cross.config}-ranlib" + "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" + "AR=${stdenv.cc.bintools}/bin/${cross.config}-ar" + "NM=${stdenv.cc.bintools}/bin/${cross.config}-nm" + "RANLIB=${stdenv.cc.bintools}/bin/${cross.config}-ranlib" "--target=${cross.config}" "--enable-bootstrap-with-devel-snapshot" ] ++ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - - buildInputs = commonBuildInputs; + stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; configurePlatforms = []; passthru = { inherit bootPkgs cross; - cc = "${stdenv.cc}/bin/${cross.config}-cc"; - ld = "${stdenv.cc}/bin/${cross.config}-ld"; }; }) diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index d4418b058d92..4a583af0cfe7 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -175,6 +175,9 @@ in mkDerivation (rec { inherit nodejs ghcjsBoot; socket-io = pkgs.nodePackages."socket.io"; + # let us assume ghcjs is never actually cross compiled + targetPrefix = ""; + inherit stage1Packages; mkStage2 = stage2 { inherit ghcjsBoot; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 20e156a72e43..151f42a7aa7b 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2017-03-29"; + version = "2017-08-31"; # `vulkan-loader` requires a specific version of `glslang` as specified in # `/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "714e58b2fc5a45714596e6aa2f6ac8f64260365c"; - sha256 = "0ihnd0c4mr6ppbv9g7z1abrn8vx66simfzx5q48nqcpnywn35jxv"; + rev = "3a21c880500eac21cdf79bef5b80f970a55ac6af"; + sha256 = "1i15m17r0acmzjrkybris2rgw15il05a4w5h7vhhsiyngcvajcyn"; }; buildInputs = [ cmake bison ]; diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index f82fc17634da..3ac14565946c 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -1,35 +1,40 @@ { stdenv, fetchurl, gcc, makeWrapper , db, gmp, ncurses }: -let version = { - maj = "2.0"; - min = "rc-2"; -}; -in +let + version = "2.2"; + lib = stdenv.lib; +in stdenv.mkDerivation rec { - name = "gnu-cobol-${version.maj}${version.min}"; + name = "gnu-cobol-${version}"; + inherit version; src = fetchurl { - url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version.maj}/gnu-cobol-${version.maj}_${version.min}.tar.gz"; - sha256 = "1pj7mjnp3l76zvzrh1xa6d4kw3jkvzqh39sbf02kiinq4y65s7zj"; + url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version}/gnucobol-${version}.tar.gz"; + sha256 = "1jrjmdx0swssjh388pp08awhiisbrs2i7gx4lcm4p1k5rpg3hn4j"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ db gmp ncurses ]; + cflags = stdenv.lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs; + ldflags = stdenv.lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs; + + cobolCCFlags = "-I$out/include ${ldflags} -L$out/lib ${cflags}"; + postInstall = with stdenv.lib; '' wrapProgram "$out/bin/cobc" \ - --prefix PATH ':' "${gcc}/bin" \ - --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ - --prefix NIX_CFLAGS_COMPILE ' ' "'$NIX_CFLAGS_COMPILE'" + --set COB_CC "${gcc}/bin/gcc" \ + --prefix COB_LDFLAGS " " "${cobolCCFlags}" \ + --prefix COB_CFLAGS " " "${cobolCCFlags}" ''; meta = with stdenv.lib; { description = "An open-source COBOL compiler"; homepage = https://sourceforge.net/projects/open-cobol/; license = licenses.gpl3; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ericsagnes the-kenny ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 210f259df89a..23fd3b0f2912 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isArm '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 8708bd762c4d..e908a8725e2a 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isArm '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/compilers/go/setup-hook.sh b/pkgs/development/compilers/go/setup-hook.sh index 1b91c8312b88..7dce15eeb102 100644 --- a/pkgs/development/compilers/go/setup-hook.sh +++ b/pkgs/development/compilers/go/setup-hook.sh @@ -2,4 +2,4 @@ addToGoPath() { addToSearchPath GOPATH $1/share/go } -envHooks=(${envHooks[@]} addToGoPath) +addEnvHooks "$targetOffset" addToGoPath diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh index 21cc0206859f..e6496107a5ee 100644 --- a/pkgs/development/compilers/haxe/setup-hook.sh +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -4,4 +4,4 @@ addHaxeLibPath() { fi } -envHooks+=(addHaxeLibPath) +addEnvHooks "$targetOffset" addHaxeLibPath diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 4159b7bd52b7..a66b2264f073 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchgit, fetchurl, cmake, pkgconfig, boost, libunwind, libmemcached +{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit +, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit , libvpx, imagemagick, fribidi, gperf, which, ocamlPackages }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.21"; + version = "3.23.2"; # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "56483773e2edd9e61782f1901ce40e47959e71b8"; - sha256 = "0dmdk98nv04m0fv6909gfbsxqlkckn369yi7kadhir0r7vxsj7wa"; + rev = "HHVM-${version}"; + sha256 = "1nic49j8nghx82lgvz0b95r78sqz46qaaqv4nx48p8yrj9ysnd7i"; fetchSubmodules = true; }; buildInputs = - [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl + [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 @@ -29,10 +29,6 @@ stdenv.mkDerivation rec { patches = [ ./flexible-array-members-gcc6.patch - (fetchurl { - url = https://github.com/facebook/hhvm/commit/b506902af2b7c53de6d6c92491c2086472292004.patch; - sha256 = "1br7diczqks6b1xjrdsac599fc62m9l17gcx7dvkc0qj54lq7ys4"; - }) ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index aa3f49ca4d9f..7f23a4d507e7 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -16,7 +16,7 @@ let drv = stdenv.mkDerivation rec { sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; } else - abort "unsupported system: ${stdenv.system}"; + throw "unsupported system: ${stdenv.system}"; nativeBuildInputs = [ file ]; @@ -73,7 +73,7 @@ let drv = stdenv.mkDerivation rec { your own risk. ''; homepage = "https://bintray.com/jetbrains/intellij-jdk/"; - licenses = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = with platforms; [ "x86_64-linux" ]; }; diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix deleted file mode 100644 index 6b8c6599062e..000000000000 --- a/pkgs/development/compilers/jhc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, perl, ghcWithPackages }: - -let ghc = ghcWithPackages (hpkgs: with hpkgs; [ - binary zlib utf8-string readline fgl regex-compat HsSyck random - ]); -in - -stdenv.mkDerivation rec { - name = "jhc-${version}"; - version = "0.8.2"; - - src = fetchurl { - url = "http://repetae.net/dist/${name}.tar.gz"; - sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz"; - }; - - buildInputs = [ perl ghc ]; - - preConfigure = '' - configureFlagsArray+=("CC=cc") - configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc") - ''; - - meta = { - description = "Whole-program, globally optimizing Haskell compiler"; - homepage = http://repetae.net/computer/jhc/; - license = stdenv.lib.licenses.bsd3; - platforms = ["x86_64-linux"]; # 32 bit builds are broken - maintainers = with stdenv.lib.maintainers; [ aforemny thoughtpolice ]; - broken = true; # https://hydra.nixos.org/build/61700723 - }; -} diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 790f9a4827ae..d46646733064 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, emscripten }: -let version = "0.9.4"; in +let version = "0.9.5"; in stdenv.mkDerivation { name = "jsonnet-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "1bh9x8d3mxnic31b6gh4drn5l6qpyqfgsn2l48sv0jknhinm1a7l"; + sha256 = "193sa4hdhvml0c32nmdkjii41hbyc5l0zisdn699ar0gaq7yiqan"; }; buildInputs = [ emscripten ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 8f2bbefc2bc7..5015f4900774 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.1.60"; - release = "55"; + version = "1.2.10"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { - url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}-release-${release}.zip"; - sha256 = "04vlhpc92pg0bcgapd5w2b3039sgv52km8i0m4mc5yf0ik6hx1s9"; + url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; + sha256 = "1qr61i5fjd5p7bi05hplagmcxgb05k4xdh5yjjvaq8cij5l4b1wm"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 5c283dd4380c..73d798bb66fd 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,103 +1,261 @@ -{ stdenv, fetchFromGitHub, cmake, llvm, dmd, curl, tzdata, python, - lit, gdb, unzip, darwin }: +{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata +, python, libconfig, lit, gdb, unzip, darwin, bash +, callPackage +, bootstrapVersion ? false +, version ? "1.5.0" +, ldcSha256 ? "1150sgns03vplni2wd4afk3rgw3rap8rsiipspw0rzxgki5rlr83" +}: + +let + + bootstrapLdc = if !bootstrapVersion then + # LDC 0.17.x is the last version which doesn't need a working D compiler to + # build so we use that version to bootstrap the actual build. + callPackage ./default.nix { + bootstrapVersion = true; + version = "0.17.5"; + ldcSha256 = "0200r5y8hs5yv2cx24csgyh00dlg18877b9cfblixypr6nhl19bs"; + } + else + ""; + + ldcBuild = stdenv.mkDerivation rec { + name = "ldcBuild-${version}"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + sourceRoot = "."; + + postUnpack = '' + cd ldc-${version}-src/ + + patchShebangs . + + # Remove cppa test for now because it doesn't work. + rm tests/d2/dmd-testsuite/runnable/cppa.d + rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp + '' + + + stdenv.lib.optionalString (bootstrapVersion) '' + # ... runnable/variadic.d () + #Test failed. The logged output: + #/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/bin/ldmd2 -conf= -m64 -Irunnable -od/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable -of/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable/variadic_0 runnable/variadic.d + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #runnable/variadic.d(84): Error: template instance variadic.Foo3!(int, int, int) error instantiating + # + # + #============================== + #Test failed: expected rc == 0, exited with rc == 1 + rm tests/d2/dmd-testsuite/runnable/variadic.d + '' + + + stdenv.lib.optionalString (!bootstrapVersion) '' + # https://github.com/NixOS/nixpkgs/issues/29611 + rm tests/sanitizers/asan_* + ''; + + ROOT_HOME_DIR = "$(echo ~root)"; + + datetimePath = if bootstrapVersion then + "phobos/std/datetime.d" + else + "phobos/std/datetime/timezone.d"; + + postPatch = '' + substituteInPlace cmake/Modules/FindLLVM.cmake \ + --replace "llvm_set(LIBRARY_DIRS" "#llvm_set(LIBRARY_DIRS" + + substituteInPlace runtime/${datetimePath} \ + --replace "import core.time;" "import core.time;import std.path;" + + substituteInPlace runtime/${datetimePath} \ + --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\"" + + substituteInPlace runtime/phobos/std/net/curl.d \ + --replace libcurl.so ${curl.out}/lib/libcurl.so + + # Ugly hack to fix the hardcoded path to zoneinfo in the source file. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace runtime/${datetimePath} \ + --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ + + substituteInPlace tests/d2/dmd-testsuite/Makefile \ + --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + # See https://github.com/NixOS/nixpkgs/issues/29443 + substituteInPlace runtime/phobos/std/path.d \ + --replace "\"/root" "\"${ROOT_HOME_DIR}" + + # TODO + substituteInPlace runtime/druntime/src/core/memory.d \ + --replace "assert(z is null);" "//assert(z is null);" + '' + + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/ldc-developers/ldc/pull/2306 + # Can be removed on bootstrap version > 0.17.5 + substituteInPlace gen/programs.cpp \ + --replace "gcc" "clang" + + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + '' + + + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) '' + substituteInPlace dmd2/root/port.c \ + --replace "#include " "#include " + '' + + + stdenv.lib.optionalString (bootstrapVersion) '' + substituteInPlace runtime/${datetimePath} \ + --replace "import std.traits;" "import std.traits;import std.path;" + + substituteInPlace runtime/${datetimePath} \ + --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\"" + ''; + + nativeBuildInputs = [ cmake llvm bootstrapLdc python lit gdb unzip ] + + ++ stdenv.lib.optional (bootstrapVersion) [ + libconfig + ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + + buildInputs = [ curl tzdata stdenv.cc ]; + + preConfigure = '' + cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_SKIP_RPATH=ON" + "-DBUILD_SHARED_LIBS=OFF" + "-DLDC_WITH_LLD=OFF" + # Xcode 9.0.1 fixes that bug according to ldc release notes + "-DRT_ARCHIVE_WITH_LDC=OFF" + "-DLLVM_LIBRARY_DIRS=${llvm}/lib" + ) + ''; + + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + doCheck = true; + + checkPhase = '' + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + # Run LIT testsuite. + ctest -V -R "lit-tests" + # Run DMD testsuite. + DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = https://github.com/ldc-developers/ldc; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; + }; + + # Need to test Phobos in a fixed-output derivation, otherwise the + # network stuff in Phobos would fail if sandbox mode is enabled. + ldcUnittests = stdenv.mkDerivation rec { + name = "ldcUnittests-${version}"; + + enableParallelBuilding = ldcBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = ldcBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; + + src = ldcBuild.src; + + sourceRoot = "."; + + postUnpack = ldcBuild.postUnpack; + + postPatch = ldcBuild.postPatch; + + nativeBuildInputs = ldcBuild.nativeBuildInputs + + ++ [ + ldcBuild + ]; + + buildInputs = ldcBuild.buildInputs; + + preConfigure = '' + cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_SKIP_RPATH=ON" + "-DBUILD_SHARED_LIBS=OFF" + "-DLDC_WITH_LLD=OFF" + # Xcode 9.0.1 fixes that bug according to ldc release notes + "-DRT_ARCHIVE_WITH_LDC=OFF" + "-DLLVM_LIBRARY_DIRS=${llvm}/lib" + "-DD_COMPILER=${ldcBuild}/bin/ldmd2" + ) + ''; + + postConfigure = ldcBuild.postConfigure; + + makeFlags = ldcBuild.makeFlags; + + buildCmd = if bootstrapVersion then + "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" + else + "make -j$NIX_BUILD_CORES DMD=${ldcBuild}/bin/ldc2 druntime-test-runner druntime-test-runner-debug phobos2-test-runner phobos2-test-runner-debug"; + + testCmd = if bootstrapVersion then + "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" + else + "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; + + buildPhase = '' + ${buildCmd} + ${testCmd} + ''; + + installPhase = '' + echo -n $inputString > $out + ''; + }; + +in stdenv.mkDerivation rec { + inherit ldcUnittests; name = "ldc-${version}"; - version = "1.3.0"; + phases = "installPhase"; + buildInputs = ldcBuild.buildInputs; - srcs = [ - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "ldc"; - rev = "v${version}"; - sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; - name = "ldc-v${version}-src"; - }) - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "druntime"; - rev = "ldc-v${version}"; - sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; - name = "druntime-ldc-v${version}-src"; - }) - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "phobos"; - rev = "ldc-v${version}"; - sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; - name = "phobos-ldc-v${version}-src"; - }) - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "dmd-testsuite"; - rev = "ldc-v${version}"; - sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; - name = "dmd-testsuite-ldc-v${version}-src"; - }) - ]; - - sourceRoot = "."; - - postUnpack = '' - mv ldc-v${version}-src/* . - - mv druntime-ldc-v${version}-src/* runtime/druntime - - mv phobos-ldc-v${version}-src/* runtime/phobos - - mv dmd-testsuite-ldc-v${version}-src/* tests/d2/dmd-testsuite - - # Remove cppa test for now because it doesn't work. - rm tests/d2/dmd-testsuite/runnable/cppa.d - rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp + installPhase = '' + mkdir $out + cp -r --symbolic-link ${ldcBuild}/* $out/ ''; - postPatch = '' - substituteInPlace runtime/phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so - - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace runtime/phobos/std/datetime.d \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - '' - - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace driver/tool.cpp \ - --replace "gcc" "clang" - ''; - - nativeBuildInputs = [ cmake llvm dmd python lit gdb unzip ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - buildInputs = [ curl tzdata stdenv.cc ]; - - preConfigure = '' - cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc") - ''; - - postConfigure = '' - export DMD=$PWD/bin/ldc2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - # disable check phase because some tests are not working with sandboxing - doCheck = false; - - checkPhase = '' - ctest -j $NIX_BUILD_CORES -V DMD=$DMD - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = https://github.com/ldc-developers/ldc; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = platforms.unix; - }; + meta = ldcBuild.meta; } + diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 741ecc3856f8..10510c750354 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation { # GCC_INSTALL_PREFIX points here, so just use it even though it may not # actually be a gcc gcc = stdenv.cc.cc; + hardeningUnsupportedFlags = [ "stackprotector" ]; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 432443e1a89a..5cac04c044de 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -30,29 +30,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 453d2c1f04b4..a660d4aea5fd 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -27,29 +27,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 755b417c78d4..c58adc3f92da 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -27,29 +27,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 25bb008567f7..5a44cb868253 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -42,29 +42,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index fa8502ebd67a..b003d2f334ac 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0w09s8fn3lkn6i04nj0cisgp821r815fk5b5fjn97xrd371277q1"} + unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 1d5cc0e504b7..a7e16c08ce96 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -6,7 +6,7 @@ let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "5.0.0"; + release_version = "5.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,8 +14,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1cy0y389zxn7mk8vffqvfirk9bbcbc8ziwc1nf1a8d118rk55bfm"; - clang-tools-extra_src = fetch "clang-tools-extra" "1ikkv6k8cfgpjqlm24iqz52i5nyafzsc4dyikzzyb9n4b6wpil47"; + compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf"; + clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs"; # Add man output without introducing extra dependencies. overrideManOutput = drv: @@ -42,29 +42,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 036161f7b889..6f03e225ad65 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1cf953msb0vwgjjrapw06950dnsdb2ps305czkn0vvr1k8g9irga"; + src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 5a2a269345d6..166f4260291f 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "04c9dfmrr8diih73x0wq99dk9xb99mg0bvsnbhx5q912xg3ihs8p"; + src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index f19a9afc8044..1d00b16cce1f 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "15rqsmfw0jlsri7hszbs8l0j7v1030cy9xvvdb245397llh7k6ir"; + src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index fac23b290bcb..03e65dde0e4d 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0zcbav39srf6awv9znvzr7nqdrj704i8da3wdgc8362y20rcm860"; + src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 8358b6b18c35..6c7fd9eb0a38 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -22,7 +22,7 @@ }: let - src = fetch "llvm" "1nin64vz21hyng6jr19knxipvggaqlkl2l9jpd5czbc4c2pcnpg3"; + src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 9ba42eed2e2e..5a01c191b5ae 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1igplg89bl6k6r9q88hnpcznq3g9lb79w7bix025lwp00ldhivy0"; + src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/multi.nix b/pkgs/development/compilers/llvm/multi.nix new file mode 100644 index 000000000000..b4f2f8f9d6f6 --- /dev/null +++ b/pkgs/development/compilers/llvm/multi.nix @@ -0,0 +1,48 @@ +{ runCommand, +clang, +gcc64, +gcc32, +glibc_multi +}: + +let + combine = basegcc: runCommand "combine-gcc-libc" {} '' + mkdir -p $out + cp -r ${basegcc.cc}/lib $out/lib + + chmod u+rw -R $out/lib + cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*) + ''; + gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} '' + mkdir -p $out/lib/gcc + + ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/ + ln -s ${combine gcc32}/lib/gcc/* $out/lib/gcc/ + # XXX: This shouldn't be needed, clang just doesn't look for "i686-unknown" + ln -s $out/lib/gcc/i686-unknown-linux-gnu $out/lib/gcc/i686-pc-linux-gnu + + + # includes + ln -s ${glibc_multi.dev}/include $out/ + + # dynamic linkers + mkdir -p $out/lib/32 + ln -s ${glibc_multi.out}/lib/ld-linux* $out/lib + ln -s ${glibc_multi.out}/lib/32/ld-linux* $out/lib/32/ + ''; + + clangMulti = clang.override { + # Only used for providing expected structure re:dynamic linkers, AFAIK + # Most of the magic is done by setting the --gcc-toolchain option below + libc = gcc_multi_sysroot; + + bintools = clang.bintools.override { + libc = gcc_multi_sysroot; + }; + + extraBuildCommands = '' + sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags + ''; + }; + +in clangMulti diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 74905c6ffae4..7cd3c1793661 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -46,7 +46,7 @@ let meta = with stdenv.lib; { inherit description; - homepage = http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; + homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 076f3c956750..4670f39eac18 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }: +{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake, + enableX11 ? false, xlibsWrapper ? null }: let version = "9.2"; @@ -9,7 +10,7 @@ let else ""; in stdenv.mkDerivation { - name = "mit-scheme-${version}"; + name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from # the platform-specific tarballs, which contain pre-built binaries. It @@ -29,6 +30,8 @@ stdenv.mkDerivation { sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; }; + buildInputs = if enableX11 then [xlibsWrapper] else []; + configurePhase = '' (cd src && ./configure) (cd doc && ./configure) diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix index 1ec679e6e41b..f80cffe220ea 100644 --- a/pkgs/development/compilers/mono/4.4.nix +++ b/pkgs/development/compilers/mono/4.4.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.4.2.11"; sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737 }) diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix index 283c34efb321..7c9918cdd397 100644 --- a/pkgs/development/compilers/mono/4.6.nix +++ b/pkgs/development/compilers/mono/4.6.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.6.2.16"; sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511 }) diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix index 6d870ae30680..c3ba316cd13b 100644 --- a/pkgs/development/compilers/mono/4.8.nix +++ b/pkgs/development/compilers/mono/4.8.nix @@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 }) diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix index 911ba0ae02a7..d10d6e3e6053 100644 --- a/pkgs/development/compilers/mono/5.0.nix +++ b/pkgs/development/compilers/mono/5.0.nix @@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; version = "5.0.1.1"; sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 }) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index f6e3f5a0100b..de19e4b633e7 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -1,4 +1,4 @@ -{ 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 }: +{ 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 { }; @@ -45,9 +45,6 @@ stdenv.mkDerivation rec { # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; - # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 - enableParallelBuilding = false; - # We want pkg-config to take priority over the dlls in the Mono framework and the GAC # because we control pkg-config patches = [ ./pkgconfig-before-gac.patch ]; @@ -83,6 +80,8 @@ stdenv.mkDerivation rec { ln -s $out/bin/mcs $out/bin/gmcs ''; + inherit enableParallelBuilding; + meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 3bc962859e28..51e39593fe14 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256 }: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11 +, callPackage, ncurses, zlib +, cacert, Foundation, libobjc, python + +, version, sha256 +, withLLVM ? false +, enableParallelBuilding ? true +}: let llvm = callPackage ./llvm.nix { }; @@ -40,9 +47,6 @@ stdenv.mkDerivation rec { # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; - # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 - enableParallelBuilding = false; - # We want pkg-config to take priority over the dlls in the Mono framework and the GAC # because we control pkg-config patches = [ ./pkgconfig-before-gac.patch ]; @@ -79,6 +83,8 @@ stdenv.mkDerivation rec { ln -s $out/bin/mcs $out/bin/gmcs ''; + inherit enableParallelBuilding; + meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index a84c5bbf7605..5394f2bcbbfb 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.01"; + version = "2.13.02"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88"; + sha256 = "1gmvjckxvkmx1kbglgrakc98qhy55xlqlk5flrdihz5yhv92hc4d"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 5b90dc7debc1..4dce11f93b13 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,55 +1,31 @@ -{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig -, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2 +{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig +, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { name = "neko-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "http://nekovm.org/media/neko-${version}-src.tar.gz"; - sha256 = "15ng9ad0jspnhj38csli1pvsv3nxm75f0nlps7i10194jvzdb4qc"; + sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g"; }; - # Patches backported with reference to https://github.com/HaxeFoundation/neko/issues/131 - # They can probably be removed when bumping to next version - patches = [ - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/" - + "a8c71ad97faaccff6c6e9e09eba2d5efd022f8dc.patch"; - sha256 = "0mnx15cdjs8mnl01mhc9z2gpzh4d1q0ygqnjackrqxz6x235ydyp"; - }) - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/" - + "fe87462d9c7a6ee27e28f5be5e4fc0ac87b34574.patch"; - sha256 = "1jbmq6j32vg3qv20dbh82cp54886lgrh7gkcqins8a2y4l4dl3sc"; - }) - # https://github.com/HaxeFoundation/neko/pull/165 - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/" - + "c6d9c6d796200990b3b6a53a4dc716c9192398e6.patch"; - sha256 = "1pq0qhhb9gbhc3zbgylwp0amhwsz0q0ggpj6v2xgv0hfy7d63rcd"; - }) - # Glibc 2.26 no longer has xlocale.h, patch backported from upstream commit - # e286c8f3301fa443255a3101d14b7392467051b8. - ./xlocale-fix.patch - ]; - + nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = - [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil - mariadb.client mbedtls openssl ] + [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil + mysql.connector-c mbedtls openssl libpthreadstubs ] ++ stdenv.lib.optional stdenv.isLinux gtk2 ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; - prePatch = '' - sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' vm/load.c - ''; - checkPhase = '' + installCheckPhase = '' bin/neko bin/test.n ''; + doInstallCheck = true; + dontPatchELF = true; dontStrip = true; meta = with stdenv.lib; { @@ -60,4 +36,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; } - diff --git a/pkgs/development/compilers/neko/xlocale-fix.patch b/pkgs/development/compilers/neko/xlocale-fix.patch deleted file mode 100644 index f4c53f3a43d6..000000000000 --- a/pkgs/development/compilers/neko/xlocale-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 31d3ac3d691b2a1b07991e67302fd52b0f409cac -Author: Andy Li -Date: Thu Jul 13 13:23:33 2017 +0800 - - include xlocale.h only if it is available since it is removed in recent glibc - - see: https://bugzilla.redhat.com/show_bug.cgi?id=1464244 - - (Backported from e286c8f3301fa443255a3101d14b7392467051b8) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8de1702..d64cab9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,6 @@ - cmake_minimum_required(VERSION 2.8.7) - -+include(CheckIncludeFile) - project(neko C) - - set(CMAKE_OSX_ARCHITECTURES x86_64) -@@ -48,6 +49,8 @@ set(NEKO_VERSION_MAJOR 2) - set(NEKO_VERSION_MINOR 1) - set(NEKO_VERSION_PATCH 0) - -+check_include_file(xlocale.h HAVE_XLOCALE_H) -+ - configure_file ( - "${CMAKE_SOURCE_DIR}/vm/neko.h.in" - "${CMAKE_BINARY_DIR}/neko.h" -diff --git a/libs/std/sys.c b/libs/std/sys.c -index 8003d41..ae0cfee 100644 ---- a/libs/std/sys.c -+++ b/libs/std/sys.c -@@ -41,7 +41,11 @@ - # include - # include - # include -+#ifdef HAVE_XLOCALE_H - # include -+#else -+# include -+#endif - #endif - - #ifdef NEKO_MAC -diff --git a/vm/neko.h.in b/vm/neko.h.in -index bb9ec1b..147ecce 100644 ---- a/vm/neko.h.in -+++ b/vm/neko.h.in -@@ -88,6 +88,8 @@ - # include - #endif - -+#cmakedefine HAVE_XLOCALE_H -+ - #define NEKO_VERSION_MAJOR @NEKO_VERSION_MAJOR@ - #define NEKO_VERSION_MINOR @NEKO_VERSION_MINOR@ - #define NEKO_VERSION_PATCH @NEKO_VERSION_PATCH@ diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index fde4861e982f..a49b1b824394 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.17.2"; src = fetchurl { - url = "http://nim-lang.org/download/${name}.tar.xz"; + url = "https://nim-lang.org/download/${name}.tar.xz"; sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa"; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Statically typed, imperative programming language"; - homepage = http://nim-lang.org/; + homepage = https://nim-lang.org/; license = licenses.mit; maintainers = with maintainers; [ ehmry peterhoeg ]; platforms = with platforms; linux ++ darwin; # arbitrary diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix similarity index 58% rename from pkgs/development/compilers/ocaml/ber-metaocaml-003.nix rename to pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index c95d29326a4e..81c8cd534025 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, xlibsWrapper }: +{ stdenv, fetchurl, ncurses, libX11, xproto, buildEnv }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -7,52 +7,65 @@ let in stdenv.mkDerivation rec { - + name = "ber-metaocaml-${version}"; - version = "003"; - + version = "104"; + src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2"; - sha256 = "0hw1yp1mmfyn1pmda232d0ry69m7ln1z0fn5lgi8nz3y1mx3iww6"; + url = "http://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.tar.gz"; - sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf"; + 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 ""; - patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; + x11env = buildEnv { name = "x11env"; paths = [libX11 xproto];}; + x11lib = x11env + "/lib"; + x11inc = x11env + "/include"; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; + configureFlags = optionals useX11 [ "-x11lib" x11lib + "-x11include" x11inc ]; + + dontStrip = true; + buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; installFlags = "-i"; installTargets = "install"; # + optionalString useNativeCompilers " installopt"; - prePatch = '' - CAT=$(type -tp cat) - sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - patch -p0 < ${./mips64.patch} - ''; + postConfigure = '' tar -xvzf $metaocaml cd ${name} make patch cd .. ''; - postBuild = '' + 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 - ''; - postInstall = '' cd ${name} make all make install + make install.opt + cd .. + ''; + installPhase = ""; + postBuild = '' + ''; + checkPhase = '' + cd ${name} make test make test-compile + make test-native cd .. ''; @@ -67,6 +80,5 @@ stdenv.mkDerivation rec { A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run ''; - broken = true; }; } diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 17b3033c31df..03ae6e518d0b 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -10,14 +10,18 @@ let safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); in -{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }: +{ stdenv, fetchurl, ncurses, buildEnv +, libX11, xproto, useX11 ? safeX11 stdenv +, flambdaSupport ? false +}: assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; - name = "ocaml-${version}"; + inherit (stdenv.lib) optional optionals optionalString; + name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; in stdenv.mkDerivation (args // rec { @@ -36,7 +40,9 @@ stdenv.mkDerivation (args // rec { prefixKey = "-prefix "; configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ]; + "-x11include" x11inc ] + ++ optional flambdaSupport "-flambda" + ; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix index 8697712de988..f76d1e8ffb5c 100644 --- a/pkgs/development/compilers/openjdk/9.nix +++ b/pkgs/development/compilers/openjdk/9.nix @@ -21,45 +21,45 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = ""; - build = "181"; - baseurl = "http://hg.openjdk.java.net/jdk9/jdk9"; - repover = "jdk-9${update}+${build}"; + update = "9.0.1"; + build = "11"; + baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u"; + repover = "jdk-${update}+${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk9 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0c7jwz4qvl93brs6c2v4dfc2v3lsv6ic0y72lkh04bnxg9343z82"; + sha256 = "13zqai3kpk5yi7yg3f7n2ss8spzyq0zy9431y97ni0j72h8ddsvy"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "1wa5rjan6lcs8nnxndbwpw6gkx3qbw013s6zisjjczkcaiq044pp"; + sha256 = "1w2djchv3dr8hv815kxfi1458n1nbq23yzv4p8rxpl1fzxrcd5pm"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "00jnj19rim1gxpsxrpr8ifx1glwrbma3qjiy1ya7n5f08fb263hs"; + sha256 = "1kb4h9w0xbxvndi5rk3byv3v95883nkqdzjadbw1cvqvzp3kgaw8"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1gvx6dblzj7rb8648iqwdiv36x97ibykgs323dd9044n3vbqihvj"; + sha256 = "0hqzmlg6dmr67ghrlh515iam34d9jx4jcdbhchbl2ny00q42diy2"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "15pwdw6s03rfyw2gx06xg4f70bjl8j19ycssxiigj39h524xc9aw"; + sha256 = "0km0k9hi8wfv2d10i08jgb4kf0l8jhp1174dsmmc9yh0ig1vij08"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0jz32pjbgr77ybb2v1vwr1n9ljdrc3y0d5lrj072g3is1hmn2wbh"; + sha256 = "1crsr3hcq4j0xbmn1jcsw0m6hxqqkxxsib86i63vvcha94336iyp"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1jdxr9hcqx6va56ll5s2x9bx9dnlrs7zyvhjk1zgr5hxg5yfcqzr"; + sha256 = "1w9i1zl72nq7aw9l50fc7dlggiy7iq52p8xh44hv50mdvn0xsa4k"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "12lihmw9ga6yhz0h26fvfablcjkkma0k3idjggmap97xha8zgd6n"; + sha256 = "0rm50mk6935iqx2rla6j8j8kjs0p4f7rff0wsp0qvbf6g0pwwks1"; }; openjdk9 = stdenv.mkDerivation { - name = "openjdk-9${update}-b${build}"; + name = "openjdk-${update}-b${build}"; srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ]; sourceRoot = "."; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index c2866446f76f..04fe377fab3b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -1,9 +1,7 @@ { productVersion , patchVersion , downloadUrl -, sha256_i686 -, sha256_x86_64 -, sha256_armv7l +, sha256 , jceName , jceDownloadUrl , sha256JCE @@ -36,26 +34,19 @@ , setJavaClassPath }: -assert stdenv.system == "i686-linux" - || stdenv.system == "x86_64-linux" - || stdenv.system == "armv7l-linux"; assert swingSupport -> xorg != null; let - abortArch = abort "jdk requires i686-linux, x86_64-linux, or armv7l-linux"; /** * The JRE libraries are in directories that depend on the CPU. */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else if stdenv.system == "armv7l-linux" then - "arm" - else - abortArch; + architecture = { + i686-linux = "i386"; + x86_64-linux = "amd64"; + armv7l-linux = "arm"; + aarch64-linux = "aarch64"; + }.${stdenv.system}; jce = if installjce then @@ -80,27 +71,16 @@ let result = stdenv.mkDerivation rec { name = if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}"; - src = - if stdenv.system == "i686-linux" then - requireFile { - name = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz"; - url = downloadUrl; - sha256 = sha256_i686; - } - else if stdenv.system == "x86_64-linux" then - requireFile { - name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; - url = downloadUrl; - sha256 = sha256_x86_64; - } - else if stdenv.system == "armv7l-linux" then - requireFile { - name = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz"; - url = downloadUrl; - sha256 = sha256_armv7l; - } - else - abortArch; + 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"; + }.${stdenv.system}; + url = downloadUrl; + sha256 = sha256.${stdenv.system}; + }; nativeBuildInputs = [ file ] ++ stdenv.lib.optional installjce unzip; @@ -116,7 +96,7 @@ let result = stdenv.mkDerivation rec { # 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" + 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 @@ -212,7 +192,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" ]; # some inherit jre.meta.platforms + platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-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 f8f37160a26f..096fe9dbb2ba 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -2,9 +2,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; patchVersion = "151"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0"; - sha256_x86_64 = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7"; - sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; + sha256.i686-linux = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0"; + sha256.x86_64-linux = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7"; + sha256.armv7l-linux = "0fdkvg1al7g9lqbq10rlw400aqr0xxi2a802319sw5n0zipkrjic"; + sha256.aarch64-linux = "1xva22cjjpwa95h7x3xzyymn1bgxp1q67j5j304kn6cqah4k31j1"; 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 863621bf6b07..6c2816c8b87a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -2,9 +2,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; patchVersion = "152"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w"; - sha256_x86_64 = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1"; - sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; + sha256.i686-linux = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w"; + sha256.x86_64-linux = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1"; + sha256.armv7l-linux = "1w0hwslsd3z0kvb3z7gmbh20xsyiz73vglmdqz2108y7alim7arm"; + sha256.aarch64-linux = "13qpxa8nxsnikmm7h6ysnsdqg5vl8j7hzfa8kgh20z8a17fhj9kk"; 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/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 525d2bb33a58..9fc9007abb9e 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc ''; - doCheck = true; + # https://bugzilla.gnome.org/show_bug.cgi?id=728129#c15 + doCheck = stdenv.system != "i686-linux"; # not sure about cross-compiling meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index b01914afc295..4e2f8b2af5b4 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - descripton = "A functional lisp"; + description = "A functional lisp"; homepage = https://github.com/aoh/owl-lisp; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 8c744e7038e8..e65c8438ed72 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.20.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0shln9v0bp0q9qfipm3834vl284q5vwz9333yzgx46d0l2ivggyi"; + sha256 = "0gdkm1mihn266km3q5ma7nhvjpzwdzmy39cxb7kkz8aal2nmvwri"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch index 38740cf963eb..d15561721e22 100644 --- a/pkgs/development/compilers/ponyc/disable-tests.patch +++ b/pkgs/development/compilers/ponyc/disable-tests.patch @@ -1,19 +1,27 @@ -diff -Naur a/packages/net/_test.pony b/packages/net/_test.pony ---- a/packages/net/_test.pony 1970-01-01 01:00:01.000000000 +0100 -+++ b/packages/net/_test.pony 2016-12-01 22:25:59.102433053 +0100 -@@ -5,14 +5,7 @@ +diff --git a/packages/net/_test.pony b/packages/net/_test.pony +index baf29e7..b63f368 100644 +--- a/packages/net/_test.pony ++++ b/packages/net/_test.pony +@@ -5,9 +5,6 @@ actor Main is TestList new make() => None fun tag tests(test: PonyTest) => -- test(_TestBroadcast) -- test(_TestTCPWritev) -- test(_TestTCPExpect) -- test(_TestTCPMute) -- test(_TestTCPUnmute) -- ifdef not windows then -- test(_TestTCPThrottle) +- ifdef not osx then +- test(_TestBroadcast) - end -+ None + test(_TestTCPWritev) + test(_TestTCPExpect) + test(_TestTCPMute) +diff --git a/packages/net/http/_test.pony b/packages/net/http/_test.pony +index e55d5a7..40a4cb6 100644 +--- a/packages/net/http/_test.pony ++++ b/packages/net/http/_test.pony +@@ -29,8 +29,6 @@ actor Main is TestList + test(_Valid) + test(_ToStringFun) + +- test(_HTTPConnTest) +- + class iso _Encode is UnitTest + fun name(): String => "net/http/URLEncode.encode" - class _TestPing is UDPNotify - let _h: TestHelper diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 8b2a0a0eb391..5e298dbf2cee 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.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "0m1vcxa5zs4sqnnwgmxkhw1isdlmirp12yimn5345vwfvlxkc8kp"; + sha256 = "15g0l8g8l6m5x4f73w68r9iav091x12b3wjxh0rx3ggnj093g6j1"; }; isLibrary = false; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 54d39d8fa631..649f4bc4582b 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -3,13 +3,13 @@ buildOcaml rec { name = "reason"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; rev = version; - sha256 = "19kp1cnxi6dq89xh07c14q7kzkawbxdkwrvn1rl48l78d04agnxx"; + sha256 = "15qhx85him5rr4j0ygj3jh3qv9ijrn82ibr9scbn0qrnn43kj047"; }; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; @@ -34,7 +34,7 @@ buildOcaml rec { ''; meta = with stdenv.lib; { - homepage = https://facebook.github.io/reason/; + homepage = https://reasonml.github.io/; description = "Facebook's friendly syntax to OCaml"; license = licenses.bsd3; maintainers = [ maintainers.volth ]; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 8dfe26f72f4a..c8af0d979e22 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -12,26 +12,6 @@ let bootstrapping = versionType == "bootstrap"; - patchBootstrapCargo = '' - ${optionalString (stdenv.isLinux && bootstrapping) '' - patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" - ''} - ${optionalString (stdenv.isDarwin && bootstrapping) '' - install_name_tool \ - -change /usr/lib/libiconv.2.dylib '${getLib libiconv}/lib/libiconv.2.dylib' \ - "$out/bin/cargo" - install_name_tool \ - -change /usr/lib/libcurl.4.dylib '${getLib curl}/lib/libcurl.4.dylib' \ - "$out/bin/cargo" - install_name_tool \ - -change /usr/lib/libz.1.dylib '${getLib zlib}/lib/libz.1.dylib' \ - "$out/bin/cargo" - ''} - ''; - installComponents = "rustc,rust-std-${platform}" + (optionalString bootstrapping ",rust-docs,cargo") @@ -56,7 +36,7 @@ rec { phases = ["unpackPhase" "installPhase" "fixupPhase"]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; installPhase = '' ./install.sh --prefix=$out \ @@ -69,14 +49,21 @@ rec { patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" - ''} - ${optionalString (stdenv.isDarwin && bootstrapping) '' - install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" - install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" - install_name_tool -change /usr/lib/libz.1.dylib '${stdenv.lib.getLib zlib}/lib/libz.1.dylib' "$out/bin/cargo" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" ''} - ${patchBootstrapCargo} + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc" + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" + for f in $out/lib/lib*.dylib; do + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f" + done + ''} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads @@ -101,14 +88,23 @@ rec { phases = ["unpackPhase" "installPhase" "fixupPhase"]; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; installPhase = '' ./install.sh --prefix=$out \ --components=cargo - ${patchBootstrapCargo} + ${optionalString (stdenv.isLinux && bootstrapping) '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" + ''} wrapProgram "$out/bin/cargo" \ --suffix PATH : "${rustc}/bin" diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index a707fe2e69e0..7814bc94828f 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,15 +3,15 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.20.0"; + version = "1.21.0"; - # fetch hashes by running `print-hashes.sh 1.20.0` + # fetch hashes by running `print-hashes.sh 1.21.0` hashes = { - i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668"; - x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8"; - aarch64-unknown-linux-gnu = "eaab3df489d4d8f976c4327d812b9870730eed6d0bbd52712767083d02be7472"; - i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5"; - x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5"; + i686-unknown-linux-gnu = "b7caed0f602cdb8ef22e0bfa9125a65bec411e15c0b8901d937e43303ec7dbee"; + x86_64-unknown-linux-gnu = "b41e70e018402bc04d02fde82f91bea24428e6be432f0df12ac400cfb03108e8"; + aarch64-unknown-linux-gnu = "491ee6c43cc672006968d665bd34c94cc2219ef3592d93d38097c97eaaa864c3"; + i686-apple-darwin = "c8b0fabeebcde66b683f3a871187e614e07305adda414c2862cb332aecb2b3bf"; + x86_64-apple-darwin = "75a7f4bd7c72948030bb9e421df27e8a650dea826fb5b836cf59d23d6f985a0d"; }; platform = diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 76dafd953537..b5550a96a835 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,7 +6,7 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.21.0"; + version = "1.22.1"; in rec { rustc = callPackage ./rustc.nix { @@ -18,7 +18,7 @@ rec { src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"; + sha256 = "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb"; }; patches = [ @@ -30,9 +30,9 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.22.0"; - srcSha = "0x9pm73hkkd1hq4qrmz8iv91djgpdsxzwll7jari0h77vpwajmw4"; - cargoSha256 = "0xd0rb8gcqy6xngsx9l30jg3fqrcwccgv904ksqs9c4d44hga0gd"; + version = "0.23.0"; + srcSha = "14b2n1msxma19ydchj54hd7f2zdsr524fg133dkmdn7j65f1x6aj"; + cargoSha256 = "1sj59z0w172qvjwg1ma5fr5am9dgw27086xwdnrvlrk4hffcr7y7"; 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 ec0f100fb568..b7808ab6ec0f 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -17,13 +17,13 @@ let inherit (stdenv.lib) optional optionalString; + inherit (darwin.apple_sdk.frameworks) Security; procps = if stdenv.isDarwin then darwin.ps else args.procps; llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); - in stdenv.mkDerivation { @@ -55,7 +55,6 @@ stdenv.mkDerivation { # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" "--default-ar=${targetPackages.stdenv.cc.bintools}/bin/ar" ] ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ] - ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; @@ -112,6 +111,10 @@ stdenv.mkDerivation { # 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 + + # error: No such file or directory + rm -v src/test/run-pass/issue-45731.rs # Disable tests that fail when sandboxing is enabled. substituteInPlace src/libstd/sys/unix/ext/net.rs \ @@ -122,12 +125,6 @@ stdenv.mkDerivation { rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? ''; - preConfigure = '' - # Needed flags as the upstream configure script has a broken prefix substitution - configureFlagsArray+=("--datadir=$out/share") - configureFlagsArray+=("--infodir=$out/share/info") - ''; - # rustc unfortunately need cmake for compiling llvm-rt but doesn't # use it for the normal build. This disables cmake in Nix. dontUseCmakeConfigure = true; @@ -141,6 +138,7 @@ stdenv.mkDerivation { ++ optional (!stdenv.isDarwin) gdb; buildInputs = [ ncurses ] ++ targetToolchains + ++ optional stdenv.isDarwin Security ++ optional (!forceBundledLLVM) llvmShared; outputs = [ "out" "man" "doc" ]; @@ -168,7 +166,7 @@ stdenv.mkDerivation { # enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; + homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index b800d71198af..cd3120ed8312 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. setupHook = writeText "setupHook.sh" '' - envHooks+=(_setSbclHome) + addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' } diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix new file mode 100644 index 000000000000..60cb3e9a2029 --- /dev/null +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = "0.4.0-RC1"; + name = "dotty-bare-${version}"; + + src = fetchurl { + url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; + sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b"; + }; + + propagatedBuildInputs = [ jre ] ; + buildInputs = [ makeWrapper ] ; + + installPhase = '' + mkdir -p $out + mv * $out + ''; + + fixupPhase = '' + bin_files=$(find $out/bin -type f ! -name common) + for f in $bin_files ; do + wrapProgram $f --set JAVA_HOME ${jre} + done + ''; + + meta = with stdenv.lib; { + description = "Research platform for new language concepts and compiler technologies for Scala."; + longDescription = '' + Dotty is a platform to try out new language concepts and compiler technologies for Scala. + The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), + and try to boil down Scala’s types into a smaller set of more fundamental constructs. + The theory behind these constructs is researched in DOT, a calculus for dependent object types. + ''; + homepage = http://dotty.epfl.ch/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [maintainers.karolchmist]; + }; +} diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index cb0c43550022..a999bd422e63 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -1,46 +1,22 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, callPackage }: -stdenv.mkDerivation rec { - version = "0.4.0-RC1"; - name = "dotty-${version}"; - - src = fetchurl { - url = "https://github.com/lampepfl/dotty/releases/download/${version}/${name}.tar.gz"; - sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b"; +let + dotty-bare = callPackage ./dotty-bare.nix { + inherit stdenv fetchurl makeWrapper jre; }; +in - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; +stdenv.mkDerivation { + name = "dotty-${dotty-bare.version}"; + + unpackPhase = ":"; installPhase = '' - mkdir -p $out - mv * $out - - mkdir -p $out/shared - mv $out/bin/common $out/shared + mkdir -p $out/bin + ln -s ${dotty-bare}/bin/dotc $out/bin/dotc + ln -s ${dotty-bare}/bin/dotd $out/bin/dotd + ln -s ${dotty-bare}/bin/dotr $out/bin/dotr ''; - fixupPhase = '' - for file in $out/bin/* ; do - substituteInPlace $file \ - --replace '$PROG_HOME/bin/common' $out/shared/common - - wrapProgram $file \ - --set JAVA_HOME ${jre} - done - ''; - - meta = with stdenv.lib; { - description = "Research platform for new language concepts and compiler technologies for Scala."; - longDescription = '' - Dotty is a platform to try out new language concepts and compiler technologies for Scala. - The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), - and try to boil down Scala’s types into a smaller set of more fundamental constructs. - The theory behind these constructs is researched in DOT, a calculus for dependent object types. - ''; - homepage = http://dotty.epfl.ch/; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [maintainers.karolchmist]; - }; + inherit (dotty-bare) meta; } diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index e88246ecb939..da706d502e6f 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,20 +1,14 @@ { stdenv, fetchFromRepoOrCz, perl, texinfo }: with stdenv.lib; -let - date = "20171016"; - rev = "da8c62f75d893449e232944fc62566c020b4d010"; - sha256 = "0pdvyhrx7g9imxpc7gr75116imi6ifn0ihsl4fbffsji2dpi61y2"; - version = "0.9.27pre-${date}"; -in - stdenv.mkDerivation rec { name = "tcc-${version}"; + version = "0.9.27"; src = fetchFromRepoOrCz { repo = "tinycc"; - inherit rev; - inherit sha256; + rev = "release_0_9_27"; + sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977"; }; nativeBuildInputs = [ perl texinfo ]; diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 79b22214eccd..bf48abb923fb 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -49,5 +49,6 @@ in stdenv.mkDerivation rec { # On Darwin, the GNU libtool is used, which does not # support the -static flag and thus breaks the build. platforms = ["x86_64-linux"]; + broken = true; }; } diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 74ca5dc4c4b0..f2b6016ceb70 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb"; }; - buildInputs = [ openssl mlton mysql.client postgresql sqlite ]; + buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h"; + export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export CC="${gcc}/bin/gcc"; export CCARGS="-I$out/include \ -L${openssl.out}/lib \ - -L${lib.getLib mysql.client}/lib \ + -L${mysql.connector-c}/lib \ -L${postgresql.lib}/lib \ -L${sqlite.out}/lib"; ''; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 57c22f08550f..f42cdcabae3f 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -31,8 +31,8 @@ in rec { vala_0_23 = generic { major = "0.23"; - minor = "2"; - sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; + minor = "3"; + sha256 = "101xjbc818g4849n9a80c2aai13zakj7mpnd7470xnkvz5jwqq96"; }; vala_0_26 = generic { @@ -43,8 +43,8 @@ in rec { vala_0_28 = generic { major = "0.28"; - minor = "0"; - sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; + minor = "1"; + sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; }; vala_0_32 = generic { @@ -55,14 +55,20 @@ in rec { vala_0_34 = generic { major = "0.34"; - minor = "1"; - sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; + minor = "13"; + sha256 = "0ahbnhgwhhjkndmbr1d039ws0g2bb324c60fk6wgx7py5wvmgcd2"; + }; + + vala_0_36 = generic { + major = "0.36"; + minor = "8"; + sha256 = "1nz5a8kcb22ss9idb7k1higwpvghd617xwf40fi0a9ggws614lfz"; }; vala_0_38 = generic { major = "0.38"; - minor = "1"; - sha256 = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h"; + minor = "4"; + sha256 = "1sg5gaq3jhgr9vzh2ypiw475167k150wmyglymr7wwqppmikmcrc"; extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ]; extraBuildInputs = [ graphviz ]; }; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index b1c36f841a4b..117319c1ad5c 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -4,22 +4,22 @@ stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2017.11.05"; + version = "2017.12.06"; srcs = [ (fetchFromGitHub { - owner = "cliffordwolf"; - repo = "yosys"; - rev = "4f31cb6daddedcee467d85797d81b79360ce1826"; - sha256 = "1a5n0g5kpjsy8f99f64w81gkrr450wvffp407r1pddl8pmb0c3r7"; - name = "yosys"; + owner = "cliffordwolf"; + repo = "yosys"; + rev = "8f2638ae2f12a48dcad14f24b0211c16ac724762"; + sha256 = "0synbskclgn97hp28myvl0hp8pqp66awp37z4cv7zl154ipysfl1"; + name = "yosys"; }) (fetchFromBitbucket { - owner = "alanmi"; - repo = "abc"; - rev = "f6838749f234"; - sha256 = "0n7ywvih958h1c4n7a398a9w3qikhkv885fx5j3y2a0xwqc86m4y"; - name = "yosys-abc"; + owner = "alanmi"; + repo = "abc"; + rev = "31fc97b0aeed"; + sha256 = "0ljmclr4hfh3iiyfw7ji0fm8j983la8021xfpnfd20dyc807hh65"; + name = "yosys-abc"; }) ]; sourceRoot = "yosys"; diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index ec190d5a1d6a..3f5ec69235f8 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, coq, coqPackages }: - -if !stdenv.lib.versionAtLeast coq.coq-version "8.6" -then throw "CoLoR is not available for Coq ${coq.coq-version}" -else +{ stdenv, fetchurl, coq, bignums }: stdenv.mkDerivation { name = "coq${coq.coq-version}-CoLoR-1.4.0"; @@ -12,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1jsp9adsh7w59y41ihbwchryjhjpajgs9bhf8rnb4b3hzccqxgag"; }; - buildInputs = [ coq coqPackages.bignums ]; + buildInputs = [ coq bignums ]; enableParallelBuilding = false; installPhase = '' @@ -25,4 +21,8 @@ stdenv.mkDerivation { maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; } diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index cb77ac3deac9..fb01da8d59cc 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, coq }: -if !stdenv.lib.versionAtLeast coq.coq-version "8.6" -then throw "This version of HoTT requires Coq 8.6" -else stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "coq${coq.coq-version}-HoTT-${version}"; version = "20170921"; @@ -56,4 +54,8 @@ else stdenv.mkDerivation rec { maintainers = with maintainers; [ siddharthist ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: v == "8.6"; + }; } diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index af7ef8001d39..2a0c3ade5612 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "20160529"; - rev = "a9e89f1d4246a787bf1d8873072077a319635c3e"; - sha256 = "14ng71p890q12xvsj00si2a3fjcbsap2gy0r8sxpw4zndnlq74wa"; - }; - "8.5" = { version = "20170512"; rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03"; @@ -21,9 +15,9 @@ let param = }; "8.7" = { - version = "20171102"; - rev = "ddf746809c211fa7edfdbfe459d5a7e1cca47a44"; - sha256 = "0jg3x0w8p088b8369qx492hjpq09f9h2i0li6ph3pny6hdkpdzsi"; + version = "20171212"; + rev = "195e550a1cf0810497734356437a1720ebb6d744"; + sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1"; }; }."${coq.coq-version}" diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix deleted file mode 100644 index fc3c16d00492..000000000000 --- a/pkgs/development/coq-modules/bedrock/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, coq}: - -stdenv.mkDerivation rec { - - name = "coq-bedrock-${coq.coq-version}-${version}"; - version = "20140722"; - - src = fetchurl { - url = "http://plv.csail.mit.edu/bedrock/bedrock-${version}.tgz"; - sha256 = "0aaa98q42rsy9hpsxji21bqznizfvf6fplsw6jq42h06j0049k80"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - enableParallelBuilding = true; - - buildPhase = '' - make -j$NIX_BUILD_CORES -C src/reification - make -j$NIX_BUILD_CORES -C src - make -j$NIX_BUILD_CORES -C src native - # make -j$NIX_BUILD_CORES -C platform - # make -j$NIX_BUILD_CORES -C platform -f Makefile.cito - ''; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Bedrock - cp -pR src/* $COQLIB/user-contrib/Bedrock - ''; - - meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/bedrock/; - description = "A library that turns Coq into a tool much like classical verification systems"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix new file mode 100644 index 000000000000..766a10c9579d --- /dev/null +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit, coq, ssreflect }: + +let param = + { + "8.6" = { + version = "20171214"; + rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00"; + sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd"; + }; + + "8.7" = { + version = "20171214"; + rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00"; + sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd"; + }; + + }."${coq.coq-version}" +; in + +stdenv.mkDerivation rec { + + name = "coq${coq.coq-version}-category-theory-${param.version}"; + + src = fetchgit { + url = git://github.com/jwiegley/category-theory.git; + inherit (param) rev sha256; + }; + + buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ]; + propagatedBuildInputs = [ coq ssreflect ]; + + enableParallelBuilding = false; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + ''; + + meta = with stdenv.lib; { + homepage = git://github.com/jwiegley/category-theory.git; + description = "A formalization of category theory in Coq for personal study and practical work"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; + }; + +} diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix deleted file mode 100644 index d2ef82c55875..000000000000 --- a/pkgs/development/coq-modules/contribs/all.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ -AACTactics = "0v18kf7xjys4g3z8m2sfiyipyn6mz75wxl2zgqk7nv1jr8i03min"; -ABP = "06cn70lbdivn1hxnlsqpiibq9nlwl6dggcn967q6n3nph37m4pdp"; -AILS = "1g0hc27kizrwm6x35j3w721cllfl4rvhiqifn3ljy868mwxwsiva"; -AMM11262 = "15rxr5bzyswxfznml4vij3pflqm3v2bl1xzg9m1p5gmd0385zh6l"; -ATBR = "1xfhc70m9qm51gwi7cls8znx37y5cp1m0wak1h0r51g1d2lxr7a6"; -Additions = "0bhl1wqbqigq0m6zj1yhdm5j0rsn75xy510kz9qy4dv5277wc7ab"; -Algebra = "061szlbg5zh5h0ksgmw34hqrvqy6794p3r1ijg0xi8mqa2wpbjd8"; -Angles = "1grqx88mibz4lg7k9ba89vpg4kwrm3s87wy0ls39i3d3wgx18n97"; -AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531"; -Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm"; -AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b"; -BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy"; -Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k"; -Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94"; -CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97"; -CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m"; -CTLTCTL = "0il1hhizvd2zvh2bhjaa2f43q1qz5sjfdin00yx5l1a8867wjs05"; -CanonBDDs = "1l9yqj0dfqkq49acsy17cvz4rjj86wjbhsdbr4qw2qvn4shllc23"; -Cantor = "1ys81ivigsbsg5cfx9jvm0qprdwc3jm69xm3whq5v9b6skn958yp"; -CatsInZFC = "06rkhns5gz397mafxina52h9z35r0n5bpryk5yfja0kfiyjvp4cr"; -Checker = "0hvfmpy3w4jj4zi3bm9q2yy4361q0lg0znqa22n5l7hzvi28q796"; -Chinese = "191c1bcslxrjxcxvpcz0mzklrl1cwh0lzkd2nq5m0ch3vxar6rq4"; -Circuits = "1a091g5vvmg579mmbfbvhj0scv7zw4n5brmj8dmiwfayfscdh5vg"; -ClassicalRealizability = "1zgivy679rl3ay9mf5ahs0lzrwfg19pcmz5nqm9hq0dpfn9avd6a"; -CoLoR = "05x1drvvhrspj2wzh8v1abblmb9fxy0yx6gg9y4nldkc24widjr7"; -CoRN = "1wv8y67bm2072bd6i3gbvy4sc665sci5kzd1zwv9n2ffxzhy0l5j"; -Coalgebras = "1wzwadfii9mm11bifjbg6f23qbab1ix3valysgq2b4myxlnpwdfz"; -CoinductiveExamples = "1iw6jsxvshsmn52xac3dspkw8f95214f0dcx0y6gi13ln02h8njy"; -CoinductiveReals = "149nsygwlb80s2805qgn85a6mcp7rxifbicbr84l3nyzilfyr6lk"; -ConCaT = "0537r0lamfz657llarxjl030qw29dnya7rb73kx0bdbyphxszr71"; -ConstructiveGeometry = "0cfz64yciyma6jrskc37md4mnv2vbx9hw7y69vyxzy7xdax55j64"; -Containers = "07pjbnzhh418ypppvfkls2x0ycslgl274a913xwi3rb1wrg6q84g"; -Continuations = "0l35xl9kvmq8l9gx3rmcx11p22inw76m1s18y0dnhc6qnhhkq1qg"; -CoqInCoq = "0d5m71xq66rfaa6xr51bsv9hykzfv4dwpclxpnqc7a7ss1q9ccqz"; -Coqoban = "1xp6wblg31asbqbkvbha94lbzn6xnhl0v5y0f3qh4nbmv6hslc54"; -Counting = "150la62c1j4yg8myr7nrp1qwp4z15rfg788j9vraz5q6f2n8c8ph"; -CoursDeCoq = "1qgc03ngzyd138s2cmcwrwrmyq0lf3z3vwhiaq5p371al34fk0d9"; -#Dblib = "00704xi5348fbw9bc0cy5bqx5w4a7aqwpcwdd3740i15ihk60mrl"; -Demos = "0j5ndysvhsj57971yz7xz5mmnzwymgigr3b9mr6nh9iids98g9vy"; -DescenteInfinie = "0is6kclxhfd9n4sdpfkzm4kcc740ifkylg11b8z90frwq79a8yzb"; -Dictionaries = "13zhjvgl20f0hj2pp0zkczm9pwdgh174248jgbqj87rn5alyr2iy"; -DistributedReferenceCounting = "1kw6fb7rvkkrh5rz1839jwf9hrpnrsdnhjlpx3634d5a5kbbdj6a"; -DomainTheory = "1g39bgyxfj9r51vrmrxhrq1xqr36j5q8x0zgz2a12b0k3fj8bswn"; -Ergo = "0xkza35n3f05gkfywaisnis70zsrkh1kwq5idsb2k0rw8m4hq9ki"; -EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb"; -EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6"; -ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1"; -Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p"; -FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6"; -FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy"; -FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js"; -Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6"; -Fermat4 = "0d5lkkrw3vqw6dip1mrgn8imq861xaipirzwpd35jgdkamds802v"; -FingerTree = "1kzfv97mc9sbprgg76lb5lk71gr4a5q10q8yaj57qw3m5hvmdhmw"; -FiringSquad = "0y2dy75j97x0592dxcbcd00ffwnf61f92yiap68xszv3dixl9i9x"; -Float = "1xmskkfd9w3j0bynlmadsrv997988k17bcs0r3zxaazm7vvw2sci"; -FreeGroups = "00pskmp0kfnnafldzcw8vak5v2n0nsjl9pfbw8qkj1xzzbvym2wk"; -FunctionsInZFC = "1vfs27m5f2cx0q2qjlxj3nim1bv53mk241pqz9mpj4plcj0g838l"; -FundamentalArithmetics = "1vvgl5c7rcg3bxizcjdix0fn20vdqy73ixcvm714llb8p986lan5"; -GC = "11kwn43nm58bv7v3p8xg2ih4x0gvgigz26gzh8l8w3lgmriqmzx0"; -GenericEnvironments = "1w05ysx0rl17fgxq3fc0p7p3h70c94qxa6yq88ppyhwm1cqqgihw"; -Goedel = "0b1dfmxp9q5z2l59yz5bn37m0zz4307kq94a7fs8s0lbbwrgyhrf"; -GraphBasics = "1f2bsfkhlyzjvy6ln62sf6hpy9dh8azrnlfpjq6jn667nfb7cbf6"; -Graphs = "0smhsas27llkmfkn4vs8ygb9w19ci2q4ps0f2q969xv8n8n0bj4z"; -GroupTheory = "141w3zbf7jczbk1lrpz6dnpk8yh1vr4f7kw55siawwaai11bh7c1"; -Groups = "00zmn1q9lz7dz8p5wk34svwki9xwn62xkgnhw4bcx8awlbx1pw3a"; -Hardware = "1bp9bnvlv54ksngmgzyxaqw1idxw5snmwrcifqcd6088w6hd9w1n"; -Hedges = "1abbf8v0i8akmhbi2hmb1l9wxvql275c9mxf0r5lzxigwmf0qrbv"; -HighSchoolGeometry = "09n70n0sb1dxnss9xz7xj2z1070gzxs4ap1h0kjcrfkiqss11fpy"; -HigmanCF = "05qg4ci8bvd6s9nmj80imj3b9kfwy4xzfy8ckr5870505mkzxyxv"; -HigmanNW = "0i3mmyh20iib7pglalf4l2p62qyqa6w0mz557n53aa2zx6l0dw18"; -HigmanS = "1c9db1jrpwzqw0arsiljskx3pcxpc1flkdql87fn55lgypbfz5gk"; -HistoricalExamples = "16alm4cv9hj59jyn1rnmb1dnbwp488wpzbnkq6hrnl5drr78gx08"; -HoareTut = "1mazqhb0hclknnzbr4ka1aafkk36hl6n4vixkf5kfvyymr094d0a"; -Huffman = "1h14qdbmawjn9hw813hsywxz0az80nx620rr35mb9wg8hy4xw7jj"; -IEEE754 = "06xrpzg2q9x2bzm7h16k0czm56sgsdn1rxpdgcl44743q3mvpi5p"; -IPC = "1xcgrln8nn2h98qyqz36d0zszjs33kcclv9vamz8mc163agk6jxy"; -IZF = "12inbpihh35hbrh4prs93r4avxlgsj5019n7bndi4fgn09m839bm"; -Icharate = "0giak87mv7g0312i05r7v06wb8wmfkrd2ai54r4c80497f72d17l"; -IdxAssoc = "0gdaxnwyw8phi97izx0wfbpccql73yjdzqqygc4i6nfw4lwanx38"; -IntMap = "1zmlcqv2mz488vpxa6iwbi6sqcljkmb55mywb5pabjjwjj745jhx"; -JProver = "0vz07sclzx0izwm5klwmd0amxhzqly6aknh876vvh3033jp62ik0"; -JordanCurveTheorem = "0varv6ib4f0l3jjq71rafb071ivzcnyxjb5ri8bf6vbjl4fqr335"; -Karatsuba = "02190l3dl0k6qxi3djr2imy4h31kcr5kj94l2ys3xqg1kjjajcmj"; -Kildall = "0lbby3gd3pwivkhr6v8c73915cswmvh50nj3ch10f0zix8lsxrpa"; -LTL = "0bk4232pa6mkbmxjazknfbnmzh2pcjccr68dkf8a2ndd06yfaii1"; -Lambda = "1wy9r95acwf7srs54y5kgmgl9d48j8b871n4z26xpbhdi2pvv9a4"; -Lambek = "0f6nd3fsxsaij9wypwd3cxmgn3larkxg4xww9c0yvjqxpgc5s552"; -LesniewskiMereology = "11wgw93fxwnbvwmpnscvgg9caakhr3wbvqwzqkk1p8wfslpvf7pj"; -LinAlg = "0gl081rx0iikhaghjny3g04aaqgiv0wq6r6c34qpcr5jc6i40mdr"; -MapleMode = "0a50dx473mmg7ksmghbjqs2rg4334dqdd2rkydicw8fl406z19ab"; -Markov = "06aacr8ghycjm68r36hip4rjhwfnbz7az2k8pa92pakjm0am78lq"; -MathClasses = "1gj6dznlc2ma5b5qn9mlinavlrl4xq18dilzd0l9j8jrxfdk1q7n"; -Maths = "15qbv7dxj4ygmw38gnmyf2kwdmy75a21yf991c8lw6fzx334b4dv"; -Matrices = "1q3683xvsgjqlav6kfxx7y05lvr5gp60hpbx4ypwa0hsl6w14mn0"; -#Micromega = "0h2ybdlbdvy30l5kzkfvp5kwsf236fxd3xi87pl4pl3dzylzsbh4"; -MiniC = "1gg9jinay9i3jbsi8bbwxzr9584wycdadf02c5al5yv281ywjar0"; -MiniCompiler = "0yq0k8c0rp120pfssdwfpmz017vq2w8s0rzk9gls476gywjmdvgf"; -MiniML = "1fd4k6rzn5cr24d11dnyy9jp2wf3n8d8l7q7bxk94lbrj6lhrzw2"; -ModRed = "1khg29cm83npasxqlm13bv2w2kfkn9hrvf5q2wch9l1l4ghys4rk"; -Multiplier = "07bj7j4agq2cvhfbkwgrvg39jlzlj1mzlm0ykqjwljd7hi4f6yv9"; -MutualExclusion = "1j3fmf0zvnxg0yzj956jfpjqccnk9l2393q6as80a5gfqhlb3rcr"; -Nfix = "1mpn1fbx15naa2d5lbcxl88xsgp1p88xx4g94f8cjzhg6kdnz7cc"; -OrbStab = "06gg3d2f9qybs2c49mm7srzqx5r9dxail92bcxdi6lr0k74y75ml"; -OtwayRees = "1d39yxppnpzpn5yxdk6rinrgxwgsnr348cggyhwjmgyjm8mr9gcp"; -PAutomata = "0hlzvdi9kb291g36lgyy3vlpn7i8rphpwjisy3wh19j4yqqc7ddf"; -PTS = "12y9niiks4rzpvzzvgfwc1z37480c4l9nvsmh4wx6gsvpnjqvyl3"; -PTSATR = "10jsfbsdaiqrdgp9vnc84wwkxjyfin35kr1qckbax6599xgyk7vj"; -PTSF = "0yz7sh2d4ldcqblnvb96yyimsb4351qqjl8di1cy785mnxa1zfla"; -Paradoxes = "03b22vhkra038z3nfbv9wpbr63x984qyrfvrg58lwqq87s5kgv1d"; -ParamPi = "1p64yj2pqqvyx5b5xm0pv0pm9lqp7hc5hb3wjnwvzi3qchqf7hwi"; -PersistentUnionFind = "1ljdnsm6h3zfn43vla13ibx42kfvgmy6n9qyfn7cgkcw5yv4fh6m"; -PiCalc = "1af8ws86mqs55dldcpm7x4qhk11k0f8l88z2bv6hylfvy6fpbpiy"; -Pocklington = "18zx1ca3pn3vn763smmrnfi395007ddzicrr0cydrph6g4agdw3g"; -Presburger = "1n3nqrplgx1r2vvpcbp91l02c7zc297fkpsqgx1x1msqrldnac9y"; -Prfx = "1nyh134hlh6cdxpys9kv0ngiiibgigh2mifwf8rdz6aj6xj7dgyv"; -ProjectiveGeometry = "01x409rbh3rqxyz53v0kdixnqqv7b890va04a21862g8bml7ls6k"; -QArith = "0xvkw3d3kgiyw6b255f6zbkali1023a9wmn12ga3bgak24jsa8lg"; -QArithSternBrocot = "1kvzww76nxgq7b3b3v2wrjxaxskfrzk55zpg6mj1jjcpgydfqwjr"; -QuicksortComplexity = "0c5gj65rxnxydspc4jqq20c8v9mjbnjrkjkk220yxymbv5n3nqd1"; -RSA = "0b56ipivbbdwc0w7bp4v4lwl0fhhb73k2b62ybmb3x7alc599mc0"; -RailroadCrossing = "0z5cnw1d8jbg30lc9p1hsgrnjwjc4yhpxl74m2pcjscrrnr01zsf"; -Ramsey = "0sd3cihzfx7mn7wcsng15y4jqvp1ql49fy1ch997wfbchp6515ld"; -Random = "0b7gwz38fbk9j5sfa76c2n4781kcb18r65v9vzz8qigx37gm89w4"; -Rational = "0v1zjcf22ij9daxharmaavwp2msgl77y5ad46lskshpypd1ysrsc"; -RecursiveDefinition = "1y4gy2ksxkvmz16zrnblwd1axi7gdjw171n8xfw4f8400my1qhm0"; -ReflexiveFirstOrder = "156a6kmds25kc645w6kkhn3a4bvryp307b76ghz5m5wv2wsajgrn"; -RegExp = "0gya2kckr6325hykd12vwpbwwf7cf04yyjrr2dvmcc81dkygrwxb"; -RelationAlgebra = "1nrhkvypkk7k48gb18c2q9cwbgy02ldfg6s3j74f5rgff1i6c9in"; -RelationExtraction = "1g6hvmsfal17pppqf9v8zh2i1dph0lj5a1r3xiszqr4biiig09ch"; -ReleasedSsreflect = "17wirznfsizmw6gjb54vk9bp97a3bc1l2sb4gdxfbzvxmabx1a9l"; -Rem = "03559q60ibf4dr1np82341xfrw134d27dx8dim84q9fszr4gy8sx"; -RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr"; -SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1"; -Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6"; -SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb"; -Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580"; -Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq"; -SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl"; -Ssreflect = "07hv0ixv68d8vrpf9s6gxazxaz5fwpmhqrd6cqw7xp8m8gspxifz"; -Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz"; -Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc"; -String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni"; -Subst = "1wxscjhz2y2jv5rdga80ldx2kc954sklip4jsbsd2fim5gwxzl23"; -Sudoku = "0f9h8gwzrdzk5j76nhvlnvpll81zar3pk84r2bf1xfav4yvj8sj7"; -SumOfTwoSquare = "1lxf9wdmvpi0vz4d21p6v9h2vvkk9v8113mvr2cdxd0j43l4ra18"; -Tait = "0bwxl894isndwadbbc3664j51haj3c0i57zmmycnxmhnmsx5pnjj"; -TarskiGeometry = "1vkznrjla943wcyddzyq0pqraiklgn62n1720msxp7cs13ckzpy0"; -ThreeGap = "01nj27xs348126ynsnva1jnvk0nin61xzyi6hwcybj5n46r7nlcv"; -Topology = "1kchddfiksjnkvwdr2ffpqcvmqkd6gf359r09yngf340sa15p5wk"; -TortoiseHareAlgorithm = "1ldm1z48j59lxz60szpy64d0928j4fmygp5npfksvwkvghijchq8"; -TreeAutomata = "0jzfa6rxv7lw1nzrqaxv08h9mpyvc2g4cbdc09ncyhazincrix0z"; -TreeDiameter = "0xdansrbmxrwicvqjjr9ivgs0255nd4ic6jkfv37m1c10vxcjq2n"; -WeakUpTo = "1baaapciaqhyjx8bqa4l04l1vwycyy1bvjr2arrc9myqacifmnpp"; -ZChinese = "0v7gffmcj9yazbbssb2i2iha1dr82b4bl8df9g021s40da49k09k"; -ZF = "0am15lgpn127pzx6ghm76axy75w7m9a8wqa26msgkczjk4x497ni"; -ZFC = "0s11g9rzacng2xg9ygx9lxyqv2apxyirnf7cg3iz95531n46ppn2"; -ZSearchTrees = "1lh6jlzm53jnsg91aa60f6gir6bsx77hg8xwl24771jg8a9b9mcl"; -ZornsLemma = "0dxizjfjx4qsdwc60k6k9fnq8hj4m13vi0llsv9xk3lj3izhpil1"; -lazyPCF = "0wzpv41nv3gdd07g9pr7wydfjv1wxz8kylzmyn07ab38kahhhzh9"; -lc = "05zr0y2ivznmf1ijszq249v4rw6kvdx6jz4s2hhnaiqvx35g4cqg"; -} diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 289a4d759214..88ef8011aa8e 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1,261 +1,1019 @@ -contribs: +{ stdenv, fetchFromGitHub, coq }: -let - mkContrib = import ./mk-contrib.nix; - all = import ./all.nix; - overrides = { - Additions = self: { - patchPhase = '' - for p in binary_strat dicho_strat generation log2_implementation shift - do - substituteInPlace $p.v \ - --replace 'Require Import Euclid.' 'Require Import Coq.Arith.Euclid.' - done - ''; +let mkContrib = repo: revs: param: + stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-${repo}-${version}"; + version = "${param.version}"; + + src = fetchFromGitHub { + owner = "coq-contribs"; + repo = "${repo}"; + rev = "${param.rev}"; + sha256 = "${param.sha256}"; }; - BDDs = self: { - buildInputs = self.buildInputs ++ [ contribs.IntMap ]; - patchPhase = '' - patch Make < -custom "\$(CAMLOPTLINK) -pp 'camlp5o' -o unif unif.mli unif.ml main.ml" unif.ml unif - EOF - coq_makefile -f Make -o Makefile - ''; - postInstall = '' - mkdir -p $out/bin - cp unif $out/bin/ - ''; - }; - Goedel = self: { - buildInputs = self.buildInputs ++ [ contribs.Pocklington ]; - patchPhase = '' - patch Make < interp.mli - EOF - ''; - configurePhase = '' - coq_makefile -f Make -o Makefile - make extract_interpret.vo - rm -f str_little.ml.d - ''; - }; - SMC = self: { - buildInputs = self.buildInputs ++ [ contribs.IntMap ]; - patchPhase = '' - patch Make < -R . CoqEAL - EOF - ''; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = http://www.maximedenes.fr/content/coqeal-coq-effective-algebra-library; - description = "A Coq library for effective algebra, by which is meant formally verified computer algebra algorithms that can be run inside Coq on concrete inputs"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 84f95d4ddea3..7f5111462bd5 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,27 +1,11 @@ { stdenv, fetchurl, which, coq, ssreflect }: -let param = - let - v2_1_1 = { - version = "2.1.1"; - url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; - sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; - }; - v3_0_1 = { - version = "3.0.1"; +stdenv.mkDerivation { + name = "coq${coq.coq-version}-coquelicot-3.0.1"; + src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; }; - in { - "8.4" = v2_1_1; - "8.5" = v3_0_1; - "8.6" = v3_0_1; - "8.7" = v3_0_1; -}."${coq.coq-version}"; in - -stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-${param.version}"; - src = fetchurl { inherit (param) url sha256; }; nativeBuildInputs = [ which ]; buildInputs = [ coq ]; diff --git a/pkgs/development/coq-modules/domains/darcs_context b/pkgs/development/coq-modules/domains/darcs_context deleted file mode 100644 index 5dac711c0c0a..000000000000 --- a/pkgs/development/coq-modules/domains/darcs_context +++ /dev/null @@ -1,809 +0,0 @@ - -Context: - -[additional facts about limits on cuts -robdockins@fastmail.fm**20140818025955 - Ignore-this: 6f9c952db425df6ae9d2a14139a8a3d1 -] - -[work on limits -robdockins@fastmail.fm**20140817221707 - Ignore-this: 9811e0cd669b48f3beb7a56d47cbe3c3 -] - -[finish proving that Q field ops commute with injq -robdockins@fastmail.fm**20140817060600 - Ignore-this: a1f6c62b39983e6f6f01d28aca5f8534 -] - -[split up realdom.v and perform associated code motion -robdockins@fastmail.fm**20140817030034 - Ignore-this: 24c74cd459d2ab15dcd3d83ba06f7081 -] - -[recip is canonical and converges -robdockins@fastmail.fm**20140725211947 - Ignore-this: c100dbd94114cca9576b2a3f46c9ddc7 -] - -[improve the proof that 1 is a unit for multiplication -robdockins@fastmail.fm**20140724150124 - Ignore-this: c5ec976f8a9858a7ba1f704b4e84d02e -] - -[complete proof the interval multiplication converges; other minor stuff -robdockins@fastmail.fm**20140724015132 - Ignore-this: bc717baa4c8f9ec31b821c5cfae5b499 -] - -[further progress in realdom.v -robdockins@fastmail.fm**20140723004023 - Ignore-this: f33e18d22ae69c9b6209e28151d18017 -] - -[unmessify rational_intervals patch -robdockins@fastmail.fm**20140721123718 - Ignore-this: 4a125b192a9964a508a1063845e9f160 -] - -[messy updates to rational_intervals.v -robdockins@fastmail.fm**20140721015810 - Ignore-this: 858dac9c55426167c6f397a71ef3fda5 -] - -[implicit arguments for "fixes" -robdockins@fastmail.fm**20140721015739 - Ignore-this: 229ecdd48265fc855319141e399bc522 -] - -[metadata -robdockins@fastmail.fm**20140714201441 - Ignore-this: aa16faaf09c1c404bdc6eaf0d0c39912 -] - -[further beautification -robdockins@fastmail.fm**20140714200516 - Ignore-this: 47d74c51d9fe130a5ac12706b1ddb1d4 -] - -[start working on the recripricol function -robdockins@fastmail.fm**20140714180055 - Ignore-this: c7f93cea17f46daa78a1ea14e86dfcaf -] - -[tweaks to the lambda models -robdockins@fastmail.fm**20140714180031 - Ignore-this: 219788fe70f42f0f6e60176cab464f19 -] - -[beauty edits in st_lam* -robdockins@fastmail.fm**20140714180006 - Ignore-this: a40aa7ae00ed27595ee04073918bd028 -] - -[move stuff to rational_intervals.v / define real_mult and prove some properties -robdockins@fastmail.fm**20140712053232 - Ignore-this: 398c5c03aac9ff37526d4d7c9e1a82c0 -] - -[finish correctness proof for interval multiplication -robdockins@fastmail.fm**20140711191547 - Ignore-this: c9ab138a0ca43fe0b133b208419bbcc4 -] - -[break out facts about rational intervals -robdockins@fastmail.fm**20140711012320 - Ignore-this: b7fe6e9377629a89b5debe3019ae1aa -] - -[updates to ideal completion -robdockins@fastmail.fm**20140707053800 - Ignore-this: 90d1efbd0e5833d8c83f0df056d7a74c -] - -[a pile of additional properties in realdom.v -robdockins@fastmail.fm**20140707053519 - Ignore-this: 7edba1e72a1856f297ef11e698ed989f -] - -[some properties of converging prereals -robdockins@fastmail.fm**20140706041401 - Ignore-this: 273bfbb245302becd7ff402831827ffb -] - -[make realdom compile -robdockins@fastmail.fm**20140630015439 - Ignore-this: 8bfc8eaeed4a1596450b0bb9ddef9aaa -] - -[renaming -robdockins@fastmail.fm**20140630011639 - Ignore-this: a287e083af095790cbf2b48df7a58739 -] - -[reorganize some code -robdockins@fastmail.fm**20140630011446 - Ignore-this: f1375b9e7ad822cb92f0c83d4001eddd -] - -[build the retract for realdom -robdockins@fastmail.fm**20140630001245 - Ignore-this: 4eb9da621588417d1b7b2fc980c7bf70 -] - -[fill out lemmas about cPLT -robdockins@fastmail.fm**20140630001140 - Ignore-this: add9e45c14621e3d6328684098bf8461 -] - -[more facts about cPLT -robdockins@fastmail.fm**20140628073731 - Ignore-this: 101a131ed114902924a1707eff7ebc70 -] - -[continuous domains as retracts of bifinite domains -robdockins@fastmail.fm**20140628035522 - Ignore-this: 5e7c61d49cf8424412b0d94f5fcb5ee6 -] - -[start implementing arithmetic operations in RealDom -robdockins@fastmail.fm**20140620003249 - Ignore-this: c28479b8a933cba263765bdddb112264 -] - -[define the domain of rational intervals -robdockins@fastmail.fm**20140619040809 - Ignore-this: 6cbe1a9cc690e5a9d77f37ee299154b - this domain is useful for describing the semantics of exact real arithmetic. -] - -[show that every effective CUSL is Plotkin -robdockins@fastmail.fm**20140619034433 - Ignore-this: d529a4b1d6d698f79572caa805072394 -] - -[fix notation for octothorpe -robdockins@fastmail.fm**20140614222130 - Ignore-this: 3dc815825f11ceaf4f4f53e4668e6382 -] - -[fix for coq 8.4pl4 -robdockins@fastmail.fm**20140614222049 - Ignore-this: 9745904845aaf54e5569df982fc93d65 -] - -[move swelling lemma into finsets -robdockins@fastmail.fm**20140504080535 - Ignore-this: ffa560e9aa4e4f8b15a55c1f9b1da72e -] - -[documentation improvements and code motion -robdockins@fastmail.fm**20140504070008 - Ignore-this: da7847f82403990342732a8ce226315c -] - -[replace the old finprod -robdockins@fastmail.fm**20140504005534 - Ignore-this: 606cf44422f68d66c8d2d90049e67b93 -] - -[remove the old finprod -robdockins@fastmail.fm**20140504005137 - Ignore-this: 38bd54e16c87d27bbede08496c37bfba -] - -[update st_lam_fix to use the new finprod -robdockins@fastmail.fm**20140504003627 - Ignore-this: 95d0a66e99ccead89bdfef09a1c8c109 -] - -[update st_lam to use the new termmodel -robdockins@fastmail.fm**20140503230854 - Ignore-this: c3d6b2155674b414c5c2e14b85b13760 -] - -[new version of finprod with a better term model -robdockins@fastmail.fm**20140503222035 - Ignore-this: db63e3a063bdb6f2f579644c7b63bd1b -] - -[a few more (hopefully final) lemmas about union -robdockins@fastmail.fm**20140422223924 - Ignore-this: 7b95c75abef9b0d45863b5e33d1c5a37 -] - -[finish proofs about union -robdockins@fastmail.fm**20140422065034 - Ignore-this: 2929c3cdb013c028a48022b0293b2f18 -] - -[powerdomain progress -robdockins@fastmail.fm**20140421064325 - Ignore-this: 592f9c6046f05a27897b460edb2efe10 - Show that powerdomains are endofunctors on PLT. Further, they are monads with - the 'singleton' and 'join' operations. Also make some progress on the additive - portion of the theory, dealing with emptyset and union. -] - -[tweak makefile -robdockins@fastmail.fm**20140420031337 - Ignore-this: d5954b26f731bfed3d79cefacab322fb -] - -[show that semvalue is the weakest condition allowing beta-reduction of strict functions -robdockins@fastmail.fm**20140420020447 - Ignore-this: 16a7ed23f04879f1fb324bdac8a2ffaf -] - -[some additional operations relating to the PLT adjunction -robdockins@fastmail.fm**20140420020351 - Ignore-this: db8eec6e3f74cce3acb67d2b660b104e -] - -[finish building power domain fmap -robdockins@fastmail.fm**20140420020217 - Ignore-this: 556e1cb87576de36cb26f8add3a1b163 -] - -[fix up st_lam.v -robdockins@fastmail.fm**20140329015058 - Ignore-this: 1c31d674b759fbd0cc74fb3125579f96 -] - -[push some proofs into finprod -robdockins@fastmail.fm**20140329000401 - Ignore-this: 49070fdd951e49473e60d3cd0ec431c6 -] - -[documentation and aesthetic changeds -robdockins@fastmail.fm**20140327043141 - Ignore-this: be27b24b78ea6af722a307117e59f5b3 -] - -[finish the st_lam_fix example -robdockins@fastmail.fm**20140322011153 - Ignore-this: e702f564b6eab2f8c11ab16bcb62504b -] - -[clarafications re: countable choice; remove unfinished example from build order -robdockins@fastmail.fm**20140321212852 - Ignore-this: 2a9d5c79c05ba088e1815feab99a5f6c -] - -[break the "fixes" operator into a separate file and prove some facts about it -robdockins@fastmail.fm**20140318013247 - Ignore-this: 80c506cef0719a974a049a1f5870f676 -] - -[minor fix to skiy.v -robdockins@fastmail.fm**20140317054057 - Ignore-this: ffef6fcaf5fa7f8cea80d2808caf4f4c -] - -[add the fixpoint operator; admit proofs -robdockins@fastmail.fm**20140317044648 - Ignore-this: 97ca18e980cdf46a9b40c8252badef14 -] - -[remove the evaluation case for variables -robdockins@fastmail.fm**20140317032932 - Ignore-this: e46d634e735e5b21a18518a48777168d -] - -[start on STLC with fixpoints -- but without fixpoints for now -robdockins@fastmail.fm**20140317031953 - Ignore-this: 3458bc18c73d967bef58418bc73e06cb -] - -[add the eliminator for booleans to st_lam; other additional utility lemmas -robdockins@fastmail.fm**20140317031753 - Ignore-this: 369dd375755cbd9ae5e3c969f3ef6ec -] - -[some minor code motion -robdockins@fastmail.fm**20140228064927 - Ignore-this: 804828472ddb0c5fafc72460fce8387b -] - -[plug final holes in st_lam and add to build order -robdockins@fastmail.fm**20140228044729 - Ignore-this: 3edc7f36bfa97775ba33ffa27c80df59 -] - -[reduce st_lam.v to facts I believe about fresh variables -robdockins@fastmail.fm**20140228010832 - Ignore-this: bde3e73291ddd32337d6fb999e4b1c02 -] - -[fix breakages -robdockins@fastmail.fm**20140226073930 - Ignore-this: 9be54f5255f8ed9d53a79260e9bdf565 -] - -[more work on lambdas -robdockins@fastmail.fm**20140226043753 - Ignore-this: 7f7452670221e2643067a3c7cc180998 -] - -[use new finprod implementation -robdockins@fastmail.fm**20140226043700 - Ignore-this: c9e05df5fcfd31254ed7318fe693490c -] - -[remove old finprod -robdockins@fastmail.fm**20140226043642 - Ignore-this: 2705703a2c782da21a152fbb27c8a972 -] - -[rearrange the interfact to finprod -robdockins@fastmail.fm**20140226043541 - Ignore-this: c44d7c478948f42b188eb8d06469abbf -] - -[fill remaining holes in finprod2 -robdockins@fastmail.fm**20140225205242 - Ignore-this: 1eeb9b8beef92790c28918292f2a9cf4 -] - -[rework some stuff dealing with semidecidable predicates -robdockins@fastmail.fm**20140225092149 - Ignore-this: 32b5ccb2927e08979ea92b9ef67c40f4 -] - -[lots of work on alpha-congrunce in lambdas -robdockins@fastmail.fm**20140225035601 - Ignore-this: fbbec9dac4cb328ff4e0b25df646e0c7 -] - -[terminate is universal in PLT -robdockins@fastmail.fm**20140225035538 - Ignore-this: abc6cd1a60578c435bf9ca596d8d0922 -] - -[new attack on nominal finite products -robdockins@fastmail.fm**20140225035516 - Ignore-this: 3875e713acc6aa5193696612f3ede76d -] - -[push forward a little on lambdas -robdockins@fastmail.fm**20140221095249 - Ignore-this: c690a1b03075702e3fd84aac7e268211 -] - -[update finprod for various changes -robdockins@fastmail.fm**20140221095230 - Ignore-this: a6d787930ed356ae2b0a003af1f4d44 -] - -[better discrete cases lemma -robdockins@fastmail.fm**20140219051301 - Ignore-this: f0ec88e8207257e7657ced933cf687e7 -] - -[start working on simply-typed lambdas -robdockins@fastmail.fm**20140219051238 - Ignore-this: 69bea345376ea39cd1addc0849a43077 -] - -[more messing about with advanced category theory stuff -robdockins@fastmail.fm**20140211095003 - Ignore-this: 9cd3c9d961349e8797f109f716c5f678 -] - -[minor rearrangements and code motion -robdockins@fastmail.fm**20140211041724 - Ignore-this: 642ad6f1395fde7ecd81e5a905fd5428 -] - -[some basic bicategory theory -robdockins@fastmail.fm**20140210083634 - Ignore-this: f47a898fa045a397d3ee70e1512b8baa -] - -[even more notation futzing -robdockins@fastmail.fm**20140209072416 - Ignore-this: d2061652cb3e80f6994f567a9e677b32 -] - -[additional notational futzing -robdockins@fastmail.fm**20140209043308 - Ignore-this: ac42cbbc94df227e6d5e70b96ae65fd3 -] - -[futz around with notations, various other cleanup activities -robdockins@fastmail.fm**20140209005551 - Ignore-this: 3f41a52650aadd956ac490b62e59c1c3 -] - -[complete adequacy for SKI+Y -robdockins@fastmail.fm**20140206050414 - Ignore-this: f730587ac7a42f3e35740976a1439f2e -] - -[minor changes in cpo -robdockins@fastmail.fm**20140206014745 - Ignore-this: 95244704faf1e6c336d62dc7912f9022 -] - -[push through most of SKI+Y adequacy -robdockins@fastmail.fm**20140205214805 - Ignore-this: dc998ef45f2e919e9373bfa21a5ef8c7 -] - -[major simplification of the adequacy proof for SKI -robdockins@fastmail.fm**20140205185605 - Ignore-this: f1f0dc46274db05f3393038dfe2775e2 -] - -[push forward on SKI+Y -robdockins@fastmail.fm**20140205044216 - Ignore-this: daf255aa940b42c1c68ba947a356370d -] - -[continue futzing with the LR statement -robdockins@fastmail.fm**20140203055601 - Ignore-this: f5ef9f06d3b1a11d76317b52cec691ab -] - -[start pushing on adequacy for SKI+Y -robdockins@fastmail.fm**20140202085948 - Ignore-this: 956844809340fad0c13c19e9fa729b5c -] - -[mostly finish soundness for SKI+Y -robdockins@fastmail.fm**20140202060633 - Ignore-this: 4c75fd9eeefa1d6dad6866662abea0fd -] - -[start working on a CCL example -robdockins@fastmail.fm**20140202020748 - Ignore-this: 44c5d7854cc19b0f90414c2be6b3df68 -] - -[make id(A) a parsing-only notation -robdockins@fastmail.fm**20140202020724 - Ignore-this: 68f51f754c0b89e2e815da47b901e4b1 -] - -[the PLT adjunction is strong monodial -robdockins@fastmail.fm**20140202020637 - Ignore-this: 7b29b9a6a5e8efa07440c528ec12d7bd -] - -[fix my broken version of lfp and fixup proofs -robdockins@fastmail.fm**20140202020615 - Ignore-this: 3ac283481318622cbf38378e815a4f09 -] - -[more work on SKI + Y -robdockins@fastmail.fm**20140202020516 - Ignore-this: d1f63e2ef610c6f93d03806c5426cfa5 -] - -[start work on SKI + Y -robdockins@fastmail.fm**20140201085039 - Ignore-this: fb7a405830cf90526cddd8ce37f4da40 -] - -[doc corrections -robdockins@fastmail.fm**20140130015908 - Ignore-this: bca4c04267bfdac8cb202651a0960d92 -] - -[lots of additional inline documentation -robdockins@fastmail.fm**20140129234834 - Ignore-this: ab2c59add5514f44a898de1f0eece98b -] - -[powerdomains form continuous functors in EMBED -robdockins@fastmail.fm**20140126234115 - Ignore-this: d2ee08902f0bdb52efd7f7ce2c594469 -] - -[complete the powerdomain constructions; build some operations -robdockins@fastmail.fm**20140125225202 - Ignore-this: 9c8f2632df05e84fc3794a338ff8720d -] - -[construct the basic powerdomains--still some holes left -robdockins@fastmail.fm**20140125064541 - Ignore-this: c3206d2e1e925096b3e9ff49afacef2f -] - -[generalize the lfp construction to a generic chain_sup operation -robdockins@fastmail.fm**20140124183103 - Ignore-this: 4cc2c1011b9f79365dcb7c76784fbfa6 -] - -[update makefile -robdockins@fastmail.fm**20140124073734 - Ignore-this: a0b7db8383262caa314c21b99e146222 -] - -[new file for recursive lambda domains -robdockins@fastmail.fm**20140124070023 - Ignore-this: 300c02b4da83b6ebd734aa2ccb21cd2d -] - -[more lemmas about antistrict homs -robdockins@fastmail.fm**20140124065953 - Ignore-this: 483c7b350dc3cab59c8ff50e1ac73b8c -] - -[fix breakage related to implicit arguments -robdockins@fastmail.fm**20140124065805 - Ignore-this: 561693d3280851299c6a49a2a34546b3 -] - -[notation tweaks in cpo.v -robdockins@fastmail.fm**20140124053800 - Ignore-this: 83e92d8c14568448074a940ceafbe2c9 -] - -[add if/then/else to the SKI system -robdockins@fastmail.fm**20140124023630 - Ignore-this: 37a9737932a05393a6338380226ca346 -] - -[case analysis for finite types -robdockins@fastmail.fm**20140124012505 - Ignore-this: 6ec1076b2a74f5832501a105a28a6dba -] - -[finish adequacy proof for SKI -robdockins@fastmail.fm**20140123211322 - Ignore-this: 1fe3e626e33431c27e2aa186b3bf91d2 -] - -[additional lemmas about domains -robdockins@fastmail.fm**20140123090037 - Ignore-this: fcad2dd816f805b8b5e7d1be3df60db8 -] - -[most of a proof of adequacy for SKI -robdockins@fastmail.fm**20140123085839 - Ignore-this: d1595c02a6387297018e7f316a3e751 -] - -[more work on finite products -robdockins@fastmail.fm**20140121061158 - Ignore-this: c2f8212e041478104dd4c81c225b42d5 -] - -[begin work on a more flexible "finprod" domain -robdockins@fastmail.fm**20140119021653 - Ignore-this: 249718a2c31964733171b21c84d2effb -] - -[mess with implicit arguments in categories.v -robdockins@fastmail.fm**20140113041450 - Ignore-this: 314cad9207f706e949bd686aaa5c5e1b -] - -[products for CPO, uniformity of lfp -robdockins@fastmail.fm**20140113041421 - Ignore-this: e533abe995e634c732a35e71d66ddb6a -] - -[define the LFP in pointed CPOs, prove the Scott induction principle -robdockins@fastmail.fm**20140112231843 - Ignore-this: 2014174b1c6914bef376d614f34d073f -] - -[build the forgetful functor from EMBED to PLT -robdockins@fastmail.fm**20140110014909 - Ignore-this: 1dacbfc0383e48f4ab35fe0a5fd11cec -] - -[notation changes, prove sum_cases and curry preserve order and equality -robdockins@fastmail.fm**20140110014820 - Ignore-this: d1c6a1d0346a9eba14f3529ac30b5e2f -] - -[prove addl facts about pairs, tweak implicit arguments -robdockins@fastmail.fm**20140110010319 - Ignore-this: 9f0af8abc268b2b22d8b5450d6a4136 -] - -[make 'ob' a coercion -robdockins@fastmail.fm**20140110010204 - Ignore-this: 467c0b0a8b086a7f44bf98875a4380d6 -] - -[copyright notices -robdockins@fastmail.fm**20140106232333 - Ignore-this: f59bafa0ec99e259bd9b4319f2cdbc67 -] - -[add ord_dec coercion -robdockins@fastmail.fm**20140104052750 - Ignore-this: 4ed1cacfd27979f0fe518862be5ac27c -] - -[define the model for CBV lambda calculus -robdockins@fastmail.fm**20140104050626 - Ignore-this: 88ca796d4697bfebb044d3fae27d6129 -] - -[proof a fixpoint lemma for unpointed domains -robdockins@fastmail.fm**20140103231818 - Ignore-this: 4939eb02d09b6a4eecf145c887c64393 -] - -[prove that the adjoint functors between PLT and PPLT extend to continuous functors in EMBED -robdockins@fastmail.fm**20140103000915 - Ignore-this: 54da0101f581731ebe512ed514e0603e -] - -[notation changes for PLT -robdockins@fastmail.fm**20140102234446 - Ignore-this: ad1f82f22d1bf0e057f11c3508a81716 -] - -[move embeddings into their own file; pull TPLT and PPLT into profinite.v -robdockins@fastmail.fm**20140102234424 - Ignore-this: 3704996af47ae32415ba3e539d67cf5c -] - -[Show that PLT is cocartesian; rearrange proof that EMBED(true) is terminated -robdockins@fastmail.fm**20140102213805 - Ignore-this: 3470df6910e7a3e4bda478c0c6ecea62 -] - -[remove unnecessary "inh" hypothesis in the definition of Plotkin order; fixup the fallout -robdockins@fastmail.fm**20140102213646 - Ignore-this: b6a5ad59296f938b377d71852120d48b -] - -[move proofs that empty and unit preorders are effective plotkin -robdockins@fastmail.fm**20140102205530 - Ignore-this: 7324843510fd938d356aa82003c9ec68 -] - -[make epi/mono/iso morphisms into categories -robdockins@fastmail.fm**20131228082442 - Ignore-this: ee75a2b6eb1f3d6fa47f17d6734e5015 -] - -[define the cocartesian and distributive categories -robdockins@fastmail.fm**20131226001612 - Ignore-this: 11e9d8a88bef42bcb800b31d85d28d16 -] - -[remove uses of maximally implict arguments -robdockins@fastmail.fm**20131226001536 - Ignore-this: c0d93a5398aea58cbcc4fbbca3b59b17 -] - -[fixpoints and binary sums for NOMINAL -robdockins@fastmail.fm**20131121092931 - Ignore-this: 8a660dfe2ab16a8208ae559dcf2b7ed0 -] - -[modify bilimit.v to use the general construction from cont_functors.v -robdockins@fastmail.fm**20131120075848 - Ignore-this: 17ea36107ade1646eab5c99aec3561a9 -] - -[generic fixpoint construction for categories with initial objects and directed colimits -robdockins@fastmail.fm**20131119092522 - Ignore-this: 25674dff855a1cecdb4ee919f8bf3a5d -] - -[remove some irritating unit parameters, fix doc typos -robdockins@fastmail.fm**20131118093204 - Ignore-this: 38342d58567d8a13471620d5b7c2b7d4 -] - -[improvements to categories; complete some constructions in nominal -robdockins@fastmail.fm**20131118085737 - Ignore-this: e58cb49a01d0210dabdb021250910adb -] - -[build fixes -robdockins@fastmail.fm**20131113004305 - Ignore-this: 5abffcd1d6b44f816749c5e0cfd5b6e9 -] - -[Documentation additions -robdockins@fastmail.fm**20131113004254 - Ignore-this: 79a913d3a8652866f3fdc64891f6304d -] - -[lots of inline documentation additions -robdockins@fastmail.fm**20131112192736 - Ignore-this: 6aa38112c10ceed3bf43e35dbda98312 -] - -[update makefiles -robdockins@fastmail.fm**20131112192706 - Ignore-this: d834beaa532cdf994cfa0a0b5a562e4f -] - -[continuous functors for binary sum and products -robdockins@fastmail.fm**20131112192605 - Ignore-this: 61520e6e315df909465a02f854816366 -] - -[add the category of nominal types -robdockins@fastmail.fm**20131112192520 - Ignore-this: f0351c5eb0bdacdfe192a6863d9c0bc6 -] - -[split the proof that expF is a continuous functor into a separate file; rearrange some defintions -robdockins@fastmail.fm**20130924013328 - Ignore-this: 4eacee37bb6474d1bdfffe416b98b4c1 -] - -[rearrange definitions of continuous functors. Prove enough plumbing to build the model: D = D->D -robdockins@fastmail.fm**20130924002837 - Ignore-this: a66f9e8833601e244048b70e8bfaab96 -] - -[show that the function space is a continuous functor; other junk -robdockins@fastmail.fm**20130923060521 - Ignore-this: d8f406450688c633ebc1fe1eb0343c91 -] - -[some name changes, other cosmetic fixes -robdockins@fastmail.fm**20130909043234 - Ignore-this: cdd24d1c96a34fb3573c1806153df9fb -] - -[additional cosmetic changes and rearrangements -robdockins@fastmail.fm**20130909020137 - Ignore-this: 77d28bc9452f6c93915194033118dab7 -] - -[reorganize profinite code -robdockins@fastmail.fm**20130909011437 - Ignore-this: 8511bf92ca6998ff8c69d5537624bdb8 -] - -[cosmetic changes -robdockins@fastmail.fm**20130908183909 - Ignore-this: e19039701e58fd26ca4eab79d7b49d14 -] - -[complete the bilimit construction, show how to take fixpoints of continuous functors -robdockins@fastmail.fm**20130908175228 - Ignore-this: 82feab8fdc0c944f13d91605c6a8e571 -] - -[find a MUCH easier path to a bilimit construction -robdockins@fastmail.fm**20130907012151 - Ignore-this: fcc72ad140b045ef37e4b03ad38a8fb0 -] - -[lots of progress, mostly on defining bilimits -robdockins@fastmail.fm**20130905204959 - Ignore-this: abf4bcf03a49fa009f9fb2200ee3abf2 -] - -[start working on the theory of finite preorders, which form a basis for plokin orders -robdockins@fastmail.fm**20130812054451 - Ignore-this: 5be36257a8fdf486bcc31f587d93c457 -] - -[parameterize plotkin orders, build category PPLT -robdockins@fastmail.fm**20130811063623 - Ignore-this: 3f273841bc72098acee0fd618627dbd5 -] - -[complete the details showing PLT is cartesian closed -robdockins@fastmail.fm**20130809230336 - Ignore-this: 13fd1b5a8172dd263cf655421f7584f7 -] - -[add files missed in the first import -robdockins@fastmail.fm**20130809080742 - Ignore-this: 6b59cce866a486d70559f7c80fe99053 -] - -[initial import of development -robdockins@fastmail.fm**20130809080409 - Ignore-this: 44cb5a0df2f1643d289f07dcd4227cbf - First major steps toward a fully effective and usable formalized - domain theory. We formalize the plotkin preorders and show that - they form a cartesian closed category. -] diff --git a/pkgs/development/coq-modules/domains/default.nix b/pkgs/development/coq-modules/domains/default.nix deleted file mode 100644 index 975260c839bd..000000000000 --- a/pkgs/development/coq-modules/domains/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchdarcs, coq}: - -stdenv.mkDerivation rec { - - name = "coq-domains-${coq.coq-version}-${version}"; - version = "ce1a9806"; - - src = fetchdarcs { - url = http://hub.darcs.net/rdockins/domains; - context = ./darcs_context; - sha256 = "0zdqiw08b453i8gdxwbk7nia2dv2r3pncmxsvgr0kva7f3dn1rnc"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = http://rwd.rdockins.name/domains/; - description = "A Coq library for domain theory"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index eb05a1be53e2..1867d9605661 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -3,15 +3,15 @@ let param = { "8.6" = { - version = "1.0-beta"; - rev = "v1.0-beta"; - sha256 = "00pzlh5ij7s2hmpvimq1hjq3fjf0nrk997l3dl51kigx5r5dnvxd"; + version = "1.0"; + rev = "v1.0"; + sha256 = "19ylw9v9g35607w4hm86j7mmkghh07hmkc1ls5bqlz3dizh5q4pj"; }; "8.7" = { - version = "cdf8c53"; - rev = "cdf8c53f1f2274b29506f53bff476409ce717dc5"; - sha256 = "0ipjzmviwnp0ippbkn03ld4j4j0dkzmyidmj4dvpdvymrkv31ai1"; + version = "1.0"; + rev = "v1.0-8.7"; + sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h"; }; }."${coq.coq-version}" @@ -42,4 +42,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index dc411763da5c..b970747c7726 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; - broken = stdenv.lib.versionAtLeast coq.coq-version "8.6"; }; + passthru = { + compatibleCoqVersions = v: v == "8.5"; + }; } diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix deleted file mode 100644 index e084497cbf81..000000000000 --- a/pkgs/development/coq-modules/fiat/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{stdenv, fetchurl, coq}: - -stdenv.mkDerivation rec { - - name = "coq-fiat-${coq.coq-version}-${version}"; - version = "20141031"; - - src = fetchurl { - url = "http://plv.csail.mit.edu/fiat/releases/fiat-${version}.tar.gz"; - sha256 = "0c5jrcgbpdj0gfzg2q4naqw7frf0xxs1f451fnic6airvpaj0d55"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - enableParallelBuilding = false; - doCheck = !stdenv.isi686; - - unpackPhase = '' - mkdir fiat - cd fiat - tar xvzf ${src} - ''; - - buildPhase = "make -j$NIX_BUILD_CORES sources"; - checkPhase = "make -j$NIX_BUILD_CORES examples"; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Fiat - cp -pR src/* $COQLIB/user-contrib/Fiat - ''; - - meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/fiat/; - description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 683ab80b36bb..5faf8093b153 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,24 +1,12 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp , bignums ? null }: -let param = - if stdenv.lib.versionAtLeast coq.coq-version "8.5" - then { - version = "3.3.0"; - url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; - sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; - } else { - version = "3.1.1"; - url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz"; - sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; - }; -in - stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-${param.version}"; + name = "coq${coq.coq-version}-interval-3.3.0"; src = fetchurl { - inherit (param) url sha256; + url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index d045ec4223b2..1831cd0c5714 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchFromGitHub, coq, coqPackages }: - -if ! stdenv.lib.versionAtLeast coq.coq-version "8.6" then - throw "Math-Classes requires Coq 8.6 or later." -else +{ stdenv, fetchFromGitHub, coq, bignums }: stdenv.mkDerivation rec { @@ -16,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi"; }; - buildInputs = [ coq coqPackages.bignums ]; + buildInputs = [ coq bignums ]; enableParallelBuilding = true; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; @@ -26,4 +22,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ siddharthist jwiegley ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; + } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 48cb2c4d33fb..79bced9ad0ee 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - "8.5" = { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 0304cb48b3b9..f6316f77a1fa 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, coq, ocamlPackages, haskellPackages, which, ott +{ stdenv, fetchgit, coq, haskellPackages, which, ott }: stdenv.mkDerivation rec { @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; }; - buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott ] - ++ (with ocamlPackages; [ findlib ]); + buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott coq.findlib ]; propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; @@ -50,4 +49,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; + } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix new file mode 100644 index 000000000000..aa22c96256f5 --- /dev/null +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-multinomials-${version}"; + version = "1.0"; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "multinomials"; + rev = version; + sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.cecill-b; + inherit (coq.meta) platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; +} diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 35c23842158d..3b53a2831e8c 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - "8.5" = { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 2d30db5a80d4..4748a0dd2385 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,38 +1,27 @@ -{stdenv, fetchsvn, coq}: +{ stdenv, fetchurl, coq }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "20171206"; + name = "coq${coq.coq-version}-tlc-${version}"; - name = "coq-tlc-${coq.coq-version}"; - - src = fetchsvn { - url = svn://scm.gforge.inria.fr/svn/tlc/branches/v3.1; - rev = 240; - sha256 = "0mjnb6n9wzb13y2ix9cvd6irzd9d2gj8dcm2x71wgan0jcskxadm"; + src = fetchurl { + url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz"; + sha256 = "1wc44qb5zmarafp56gdrbka8gllipqna9cj0a6d99jzb361xg4mf"; }; - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; + buildInputs = [ coq ]; - preConfigure = '' - patch Makefile < \$(COQC) -R . Tlc \$< - EOF - ''; + installFlags = "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib"; - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Tlc - cp -p *.vo $COQLIB/user-contrib/Tlc - ''; - - meta = with stdenv.lib; { - homepage = http://www.chargueraud.org/softs/tlc/; - description = "A general purpose Coq library that provides an alternative to Coq's standard library"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; + meta = { + homepage = "http://www.chargueraud.org/softs/tlc/"; + description = "A non-constructive library for Coq"; + license = stdenv.lib.licenses.free; + 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/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix deleted file mode 100644 index 8bd6cf5a84dd..000000000000 --- a/pkgs/development/coq-modules/unimath/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchgit, coq}: - -stdenv.mkDerivation rec { - - name = "coq-unimath-${coq.coq-version}-${version}"; - version = "a2714eca"; - - src = fetchgit { - url = git://github.com/UniMath/UniMath.git; - rev = "a2714eca29444a595cd280ea961ec33d17712009"; - sha256 = "0v7dlyipr6bhwgp9v366nxdan018acafh13pachnjkgzzpsjnr7g"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = https://github.com/UniMath/UniMath; - description = "A formalization of a substantial body of mathematics using the univalent point of view"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix deleted file mode 100644 index d83e2c5c7909..000000000000 --- a/pkgs/development/coq-modules/ynot/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchgit, coq}: - -stdenv.mkDerivation rec { - - name = "coq-ynot-${coq.coq-version}-${version}"; - version = "ce1a9806"; - - src = fetchgit { - url = git://github.com/Ptival/ynot.git; - rev = "ce1a9806c26ffc6e7def41da50a9aac1433cb2f8"; - sha256 = "1pcmcl5zamiimkcg1xvynxnfbv439y02vg1mnz79hqq9mnjyfnpw"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - preBuild = "cd src"; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Ynot - cp -pR coq/*.vo $COQLIB/user-contrib/Ynot - ''; - - meta = with stdenv.lib; { - homepage = http://ynot.cs.harvard.edu/; - description = "A library for writing and verifying imperative programs"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 0d70113727c2..6de85495bee3 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -220,6 +220,7 @@ go.stdenv.mkDerivation ( meta = { # Add default meta information + homepage = "https://${goPackagePath}"; platforms = go.meta.platforms or lib.platforms.all; } // meta // { # add an extra maintainer to every package diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 37b9feb84f02..7c7ac763dab1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -15,13 +15,6 @@ with haskellLib; self: super: { - attoparsec-time_1 = super.attoparsec-time_1.override { - doctest = super.doctest_0_13_0; - }; - attoparsec-data = super.attoparsec-data.override { - attoparsec-time = self.attoparsec-time_1; - }; - # This used to be a core package provided by GHC, but then the compiler # dropped it. We define the name here to make sure that old packages which # depend on this library still evaluate (even though they won't compile @@ -39,9 +32,8 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with - # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; }); + # hackage-security's test suite does not compile with Cabal 2.x. + # See https://github.com/haskell/hackage-security/issues/188. hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. @@ -56,28 +48,23 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; - hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; + 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; http-streams = dontCheck super.http-streams; nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; - - # https://github.com/gilith/hol/pull/1 - hol = appendPatch (doJailbreak super.hol) (pkgs.fetchpatch { - name = "hol.patch"; - url = "https://github.com/gilith/hol/commit/a5171bdcacdbe93c46c9f82ec5a38f2a2b69e632.patch"; - sha256 = "0xkgbhc4in38hspxgz2wcvk56pjalw43gig7lzkjfhgavwxv3jyj"; - }); + vector-builder = dontCheck super.vector-builder; # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); # check requires mysql server mysql-simple = dontCheck super.mysql-simple; @@ -88,14 +75,12 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = (overrideCabal (super.git-annex.overrideScope (self: super: { - optparse-applicative = self.optparse-applicative_0_14_0_0; - })) (drv: { + git-annex = (overrideCabal super.git-annex (drv: { src = pkgs.fetchgit { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1bnnrwamw3d37fz7cwykxhi1ryy22dq8r6ld59gsbgcv23drqzax"; + sha256 = "1fd7lyrwr60dp55swc5iwl0mkkzmdzpmj9qmx1qca2r7y9wc5w5k"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -115,15 +100,9 @@ self: super: { # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; - # https://github.com/haskell-works/hw-xml/issues/23 - # Disable building the hw-xml-example executable: - hw-xml = (overrideCabal super.hw-xml (drv: { - postPatch = "sed -i 's/ hs-source-dirs: app/" + - " hs-source-dirs: app\\n" + - " buildable: false/' hw-xml.cabal"; - })); - + # Test suite doesn't terminate hzk = dontCheck super.hzk; + # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; # Depends on broken "lss" package. @@ -152,40 +131,12 @@ self: super: { extraLibraries = [ pkgs.openblasCompat ]; }); - LambdaHack = super.LambdaHack.override { sdl2-ttf = super.sdl2-ttf_2_0_2; }; - # The Haddock phase fails for one reason or another. - acme-one = dontHaddock super.acme-one; - attoparsec-conduit = dontHaddock super.attoparsec-conduit; - base-noprelude = dontHaddock super.base-noprelude; - blaze-builder-conduit = dontHaddock super.blaze-builder-conduit; - BNFC-meta = dontHaddock super.BNFC-meta; bytestring-progress = dontHaddock super.bytestring-progress; - comonads-fd = dontHaddock super.comonads-fd; - comonad-transformers = dontHaddock super.comonad-transformers; deepseq-magic = dontHaddock super.deepseq-magic; - diagrams = dontHaddock super.diagrams; - either = dontHaddock super.either; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 - gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unreleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133 - groupoids = dontHaddock super.groupoids; - hamlet = dontHaddock super.hamlet; - HaXml = dontHaddock super.HaXml; hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; - http-client-conduit = dontHaddock super.http-client-conduit; - http-client-multipart = dontHaddock super.http-client-multipart; - markdown-unlit = dontHaddock super.markdown-unlit; - network-conduit = dontHaddock super.network-conduit; - shakespeare-js = dontHaddock super.shakespeare-js; - shakespeare-text = dontHaddock super.shakespeare-text; - swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw - swagger2 = dontHaddock super.swagger2; - wai-test = dontHaddock super.wai-test; - zlib-conduit = dontHaddock super.zlib-conduit; - - # https://github.com/massysett/rainbox/issues/1 - rainbox = dontCheck super.rainbox; # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; @@ -222,9 +173,6 @@ self: super: { inline-java = addBuildDepend super.inline-java pkgs.jdk; - # tests don't compile for some odd reason - jwt = dontCheck super.jwt; - # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; @@ -269,8 +217,9 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; - # https://github.com/NICTA/digit/issues/3 - digit = dontCheck super.digit; + # base bound + digit = doJailbreak super.digit; + # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -453,11 +402,6 @@ self: super: { # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; - # https://github.com/NixOS/nixpkgs/issues/32138 - purescript = super.purescript.override { - optparse-applicative = self.optparse-applicative_0_14_0_0; - }; - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 @@ -492,32 +436,18 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) - unlambda = dontHyperlinkSource super.unlambda; - # https://github.com/PaulJohnson/geodetics/issues/1 geodetics = dontCheck super.geodetics; - # https://github.com/AndrewRademacher/aeson-casing/issues/1 - aeson-casing = dontCheck super.aeson-casing; - # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # Relax overspecified constraints. Unfortunately, jailbreak won't work. - pandoc = overrideCabal super.pandoc (drv: { - preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal"; - }); - # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; # https://github.com/afcowie/locators/issues/1 locators = dontCheck super.locators; - # https://github.com/anton-k/csound-expression-dynamic/issues/1 - csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; - # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; @@ -532,8 +462,8 @@ self: super: { doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover); tasty-discover = addBuildTool super.tasty-discover (dontCheck super.tasty-discover); - # https://github.com/bos/aeson/issues/253 - aeson = dontCheck super.aeson; + # generic-deriving bound is too tight + aeson = doJailbreak super.aeson; # Won't compile with recent versions of QuickCheck. inilist = dontCheck super.inilist; @@ -557,7 +487,7 @@ self: super: { # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # https://github.com/jaspervdj/websockets/issues/104 + # QuickCheck version, also set in cabal2nix websockets = dontCheck super.websockets; # Avoid spurious test suite failures. @@ -586,8 +516,8 @@ self: super: { # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; - # https://github.com/qnikst/imagemagick/issues/34 - imagemagick = dontCheck super.imagemagick; + # vector dependency < 0.12 + imagemagick = doJailbreak super.imagemagick; # https://github.com/liyang/thyme/issues/36 thyme = dontCheck super.thyme; @@ -610,8 +540,18 @@ self: super: { # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; - # https://github.com/lens/lens-aeson/issues/18 - lens-aeson = dontCheck super.lens-aeson; + # Install icons and metadata, remove broken hgettext dependency. + # https://github.com/vasylp/hgettext/issues/10 + bustle = overrideCabal super.bustle (drv: { + configureFlags = drv.configureFlags or [] ++ ["-f-hgettext"]; + executableHaskellDepends = pkgs.lib.remove self.hgettext drv.executableHaskellDepends; + buildDepends = [ pkgs.libpcap ]; + buildTools = with pkgs; [ gettext perl help2man intltool ]; + doCheck = false; # https://github.com/wjt/bustle/issues/6 + postInstall = '' + make install PREFIX=$out + ''; + }); # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal super.ghc-mod (drv: { @@ -627,7 +567,8 @@ self: super: { ''; }); - # Fine-tune the build. + # Build the latest git version instead of the official release. This isn't + # ideal, but Chris doesn't seem to make official releases any more. structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: { src = pkgs.fetchFromGitHub { owner = "chrisdone"; @@ -648,9 +589,7 @@ self: super: { mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; - })).override { - haskell-src-exts = self.haskell-src-exts_1_19_1; - }; + })); # Make elisp files available at a location where people expect it. hindent = (overrideCabal super.hindent (drv: { @@ -663,7 +602,7 @@ self: super: { ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 })).override { - haskell-src-exts = self.haskell-src-exts_1_19_1; + haskell-src-exts = self.haskell-src-exts_1_20_1; }; # https://github.com/bos/configurator/issues/22 @@ -678,28 +617,18 @@ self: super: { # https://github.com/pxqr/base32-bytestring/issues/4 base32-bytestring = dontCheck super.base32-bytestring; - # https://github.com/JohnLato/listlike/pull/6#issuecomment-137986095 - ListLike = dontCheck super.ListLike; - # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; - # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52 - hpc-coveralls = disableSharedExecutables super.hpc-coveralls; - # https://github.com/fpco/stackage/issues/838 cryptonite = dontCheck super.cryptonite; # We cannot build this package w/o the C library from . phash = markBroken super.phash; - # https://github.com/sol/hpack/issues/53 - hpack = dontCheck super.hpack; - # https://github.com/deech/fltkhs/issues/16 - fltkhs = overrideCabal super.fltkhs (drv: { - broken = true; # linking fails because the build doesn't pull in the mesa libraries - }); + # linking fails because the build doesn't pull in the mesa 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. @@ -730,14 +659,9 @@ self: super: { ''; }); - # test suite cannot find its own "idris" binary + # The standard libraries are compiled separately idris = doJailbreak (dontCheck super.idris); - idris_1_1_1 = overrideCabal (doJailbreak (dontCheck super.idris_1_1_1)) (drv: { - # The standard libraries are compiled separately - configureFlags = (drv.configureFlags or []) ++ [ "-fexeconly" ]; - }); - # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; @@ -781,6 +705,7 @@ self: super: { applicative-quoters = doJailbreak super.applicative-quoters; # https://github.com/roelvandijk/terminal-progress-bar/issues/13 + # Still needed because of HUnit < 1.6 terminal-progress-bar = doJailbreak super.terminal-progress-bar; # https://hydra.nixos.org/build/42769611/nixlog/1/raw @@ -806,6 +731,7 @@ self: super: { hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; # https://github.com/basvandijk/lifted-base/issues/34 + # Still needed as HUnit < 1.5 lifted-base = doJailbreak super.lifted-base; # https://github.com/aslatter/parsec/issues/68 @@ -816,57 +742,23 @@ self: super: { system-filepath = dontCheck super.system-filepath; # https://github.com/basvandijk/case-insensitive/issues/24 + # Still needed as HUnit < 1.6 case-insensitive = doJailbreak super.case-insensitive; # https://github.com/hvr/uuid/issues/28 uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # https://github.com/hspec/hspec/issues/307 - hspec-contrib = dontCheck super.hspec-contrib; - # https://github.com/ekmett/lens/issues/713 lens = disableCabalFlag super.lens "test-doctests"; # https://github.com/haskell/fgl/issues/60 + # Needed for QuickCheck < 2.10 fgl = doJailbreak super.fgl; fgl-arbitrary = doJailbreak super.fgl-arbitrary; - # https://github.com/Gabriel439/Haskell-DirStream-Library/issues/8 - dirstream = doJailbreak super.dirstream; - - # https://github.com/xmonad/xmonad-extras/issues/3 - xmonad-extras = doJailbreak super.xmonad-extras; - - # https://github.com/int-e/QuickCheck-safe/issues/2 - QuickCheck-safe = doJailbreak super.QuickCheck-safe; - - # https://github.com/mokus0/dependent-sum-template/issues/7 - dependent-sum-template = doJailbreak super.dependent-sum-template; - - # https://github.com/jcristovao/newtype-generics/issues/13 - newtype-generics = doJailbreak super.newtype-generics; - - # https://github.com/lambdabot/lambdabot/issues/158 - lambdabot-core = doJailbreak super.lambdabot-core; - - # https://github.com/lambdabot/lambdabot/issues/159 - lambdabot = doJailbreak super.lambdabot; - - # https://github.com/jswebtools/language-ecmascript/pull/81 - language-ecmascript = doJailbreak super.language-ecmascript; - - # https://github.com/choener/DPutils/pull/1 - DPutils = doJailbreak super.DPutils; - - # fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0 - machines = doJailbreak super.machines; - - # fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab - OrderedBits = doJailbreak super.OrderedBits; - - # https://github.com/haskell-distributed/rank1dynamic/issues/17 - rank1dynamic = doJailbreak super.rank1dynamic; + # The tests spuriously fail + libmpd = dontCheck super.libmpd; # https://github.com/dan-t/cabal-lenses/issues/6 cabal-lenses = doJailbreak super.cabal-lenses; @@ -883,16 +775,9 @@ self: super: { # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; - # strict-io is too cautious with it's deepseq dependency - # strict-io doesn't have a working bug tracker, the author has been emailed however. - strict-io = doJailbreak super.strict-io; - # https://github.com/danidiaz/tailfile-hinotify/issues/2 tailfile-hinotify = dontCheck super.tailfile-hinotify; - # build liquidhaskell with the proper (new) aeson version - liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_3_0; }; - # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. hastache = overrideCabal super.hastache (drv: { @@ -906,66 +791,33 @@ self: super: { # https://github.com/diagrams/diagrams-solve/issues/4 diagrams-solve = dontCheck super.diagrams-solve; - # version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7 - ChasingBottoms = doJailbreak super.ChasingBottoms; - # test suite does not compile with recent versions of QuickCheck integer-logarithms = dontCheck (super.integer-logarithms); - # https://github.com/vincenthz/hs-tls/issues/247 - tls = dontCheck super.tls; - # missing dependencies: blaze-html >=0.5 && <0.9, blaze-markup >=0.5 && <0.8 digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; + digestive-functors = doJailbreak super.digestive-functors; # missing dependencies: doctest ==0.12.* html-entities = doJailbreak super.html-entities; - # Needs a version that's newer than what we have in lts-9. - sbv = super.sbv.override { doctest = self.doctest_0_13_0; }; - # https://github.com/takano-akio/filelock/issues/5 filelock = dontCheck super.filelock; - # https://github.com/alpmestan/taggy/issues/{19,20} - taggy = appendPatch super.taggy (pkgs.fetchpatch { - name = "blaze-markup.patch"; - url = "https://github.com/alpmestan/taggy/commit/5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed.patch"; - sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; - }); - # cryptol-2.5.0 doesn't want happy 1.19.6+. cryptol = super.cryptol.override { happy = self.happy_1_19_5; }; - # https://github.com/jtdaugherty/text-zipper/issues/11 - text-zipper = dontCheck super.text-zipper; - - # https://github.com/graknlabs/grakn-haskell/pull/1 + # Tests try to invoke external process and process == 1.4 grakn = dontCheck (doJailbreak super.grakn); - # cryptonite == 0.24.x, protolude == 0.2.x - wai-secure-cookies = super.wai-secure-cookies.override { - cryptonite = super.cryptonite_0_24; - protolude = super.protolude_0_2; - }; - # test suite requires git and does a bunch of git operations - restless-git = dontCheck super.restless-git; - - # This tool needs the latest hackage-db version. Using the latest version of - # optparse-applicative allows us to generate completions for fish and zsh. - cabal2nix = super.cabal2nix.overrideScope (self: super: { - hackage-db = self.hackage-db_2_0; - optparse-applicative = self.optparse-applicative_0_14_0_0; - }); + # doJailbreak because of hardcoded time, seems to be fixed upstream + restless-git = dontCheck (doJailbreak super.restless-git); # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; fluid-idl-scotty = markBroken super.fluid-idl-scotty; - # depends on amqp >= 0.17 - amqp-utils = super.amqp-utils.override { amqp = dontCheck super.amqp_0_18_1; }; - # Build with gi overloading feature disabled. ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; }); @@ -984,38 +836,103 @@ self: super: { }; }).override { language-c = self.language-c_0_7_0; }; - hocker = - overrideCabal - # Not checking because it's failing on a test that needs a data - # file not included in its source distribution; this will be - # removed when that is fixed - ( dontCheck super.hocker ) - ( oldDerivation: { - testToolDepends = - (oldDerivation.testToolDepends or []) ++[ pkgs.nix ]; - buildDepends = - (oldDerivation.buildDepends or []) ++ [ pkgs.makeWrapper ]; + # Needs pginit to function and pgrep to verify. + tmp-postgres = overrideCabal super.tmp-postgres (drv: { + libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.postgresql]; + testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; + }); - postInstall = - (oldDerivation.postInstall or "") + '' - # Globbing for hocker-* fails with: Builder called die: - # makeWrapper doesn't understand the arg /nix/store/rsic1v6y6v63q6lkmpn3xmn7cnzx8irk-hocker-1.0.2/bin/hocker-image - wrapProgram $out/bin/hocker-image \ - --suffix PATH : ${pkgs.nix}/bin + # https://github.com/fpco/stackage/issues/3126 + stack = doJailbreak super.stack; - wrapProgram $out/bin/hocker-layer \ - --suffix PATH : ${pkgs.nix}/bin + # Hoogle needs a newer version than lts-10 provides. + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; }; - wrapProgram $out/bin/hocker-config \ - --suffix PATH : ${pkgs.nix}/bin + # These packages depend on each other, forming an infinite loop. + scalendar = markBroken (super.scalendar.override { SCalendar = null; }); + SCalendar = markBroken (super.SCalendar.override { scalendar = null; }); - wrapProgram $out/bin/hocker-manifest \ - --suffix PATH : ${pkgs.nix}/bin + # Needs QuickCheck <2.10, which we don't have. + edit-distance = doJailbreak super.edit-distance; + blaze-markup = doJailbreak super.blaze-markup; + blaze-html = doJailbreak super.blaze-html; + attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails + int-cast = doJailbreak super.int-cast; + nix-derivation = doJailbreak super.nix-derivation; + graphviz = doJailbreak super.graphviz; - wrapProgram $out/bin/docker2nix \ - --suffix PATH : ${pkgs.nix}/bin - ''; - } - ); + # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 + pointfree = doJailbreak super.pointfree; + # Needs time<1.7 + taffybar = doJailbreak super.taffybar; + + # Needs tasty-quickcheck ==0.8.*, which we don't have. + cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + cryptohash-sha1 = doJailbreak super.cryptohash-sha1; + cryptohash-md5 = doJailbreak super.cryptohash-md5; + text-short = doJailbreak super.text-short; + + # https://github.com/aisamanra/config-ini/issues/12 + config-ini = dontCheck super.config-ini; + + # doctest >=0.9 && <0.12 + genvalidity-property = doJailbreak super.genvalidity-property; + path = dontCheck super.path; + + # Test suite fails due to trying to create directories + path-io = dontCheck super.path-io; + + # Duplicate instance with smallcheck. + store = dontCheck super.store; + + # With ghc-8.2.x haddock would time out for unknown reason + # See https://github.com/haskell/haddock/issues/679 + language-puppet = dontHaddock super.language-puppet; + + # 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/strake/lenz.hs/issues/2 + lenz = + let patch = pkgs.fetchpatch + { url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch; + sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn"; + }; + in overrideCabal super.lenz (drv: + { patches = (drv.patches or []) ++ [ patch ]; + editedCabalFile = null; + }); + + # 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". + darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; }); + + # https://github.com/Twinside/Juicy.Pixels/issues/149 + JuicyPixels = dontHaddock super.JuicyPixels; + + # armv7l fixes. + happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if pkgs.stdenv.isArm then dontCheck super.swagger2 else super.swagger2; + + # Tries to read a file it is not allowed to in the test suite + load-env = dontCheck super.load-env; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix deleted file mode 100644 index 47c8e7fa69ec..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # LLVM is not supported on this GHC; use the latest one. - inherit (pkgs) llvmPackages; - - # Disable GHC 6.12.x core libraries. - array = null; - base = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - directory = null; - dph-base = null; - dph-par = null; - dph-prim-interface = null; - dph-prim-par = null; - dph-prim-seq = null; - dph-seq = null; - extensible-exceptions = null; - ffi = null; - filepath = null; - ghc-binary = null; - ghc-prim = null; - haskell98 = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - random = null; - rts = null; - syb = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - binary = self.binary_0_8_5_1; - deepseq = self.deepseq_1_3_0_1; - haskeline = self.haskeline_0_7_3_1; - hoopl = self.hoopl_3_10_2_0; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # We have no working cabal-install at the moment. - cabal-install = markBroken super.cabal-install; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # https://github.com/glguy/utf8-string/issues/9 - utf8-string = overrideCabal super.utf8-string (drv: { - configureFlags = drv.configureFlags or [] ++ ["-f-bytestring-in-base" "--ghc-option=-XUndecidableInstances"]; - preConfigure = "sed -i -e 's|base >= .* < .*,|base,|' utf8-string.cabal"; - }); - - # https://github.com/haskell/HTTP/issues/80 - HTTP = doJailbreak super.HTTP; - - # 6.12.3 doesn't support the latest version. - primitive = self.primitive_0_5_1_0; - parallel = self.parallel_3_2_0_3; - vector = self.vector_0_10_9_3; - - # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1]; - network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7; - stm = addBuildTool super.stm self.Cabal_1_18_1_7; - split = super.split_0_1_4_3; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix deleted file mode 100644 index 6bb96704cc20..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.0.x core libraries. - array = null; - base = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - directory = null; - extensible-exceptions = null; - ffi = null; - filepath = null; - ghc-binary = null; - ghc-prim = null; - haskell2010 = null; - haskell98 = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - random = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - binary = self.binary_0_7_6_1; - deepseq = self.deepseq_1_3_0_1; - haskeline = self.haskeline_0_7_3_1; - hoopl = self.hoopl_3_10_2_0; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { - Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; }; - }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # https://github.com/haskell/containers/issues/134 - containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1; - - # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1]; - - # Setup: Can't find transitive deps for haddock - doctest = dontHaddock super.doctest; - hsdns = dontHaddock super.hsdns; - - # Newer versions require bytestring >=0.10. - tar = super.tar_0_4_1_0; - - # These builds need additional dependencies on old compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - conduit = addBuildDepend super.conduit self.void; - reflection = addBuildDepend super.reflection self.tagged; - semigroups = addBuildDepend super.semigroups self.nats; - text = addBuildDepend super.text self.bytestring-builder; - - # Newer versions don't compile any longer. - network_2_6_3_1 = dontCheck super.network_2_6_3_1; - network = self.network_2_6_3_1; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 1a9158fa6651..fc41fc0b3d30 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -161,8 +161,7 @@ self: super: { 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-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ]; # vector with ghc < 8.0 needs semigroups vector = addBuildDepend super.vector self.semigroups; @@ -182,30 +181,39 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # GHC versions prior to 8.x require additional build inputs. - dependent-map = addBuildDepend super.dependent-map self.semigroups; - distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; - mono-traversable = addBuildDepend super.mono-traversable self.semigroups; - attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); - Glob = addBuildDepends super.Glob (with self; [semigroups]); 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; + 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; - optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; + 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]; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); 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 ]; }); - natural-transformation = addBuildDepend super.natural-transformation self.semigroups; - # cereal must have `fail` in pre-ghc-8.0.x versions - # also tests require bytestring>=0.10.8.1 + + # 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; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix deleted file mode 100644 index de47086409be..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.2.x core libraries. - array = null; - base = null; - binary = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - directory = null; - extensible-exceptions = null; - ffi = null; - filepath = null; - ghc-prim = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - deepseq = self.deepseq_1_3_0_1; - haskeline = self.haskeline_0_7_3_1; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; }; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { - Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; }; - }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # The old containers version won't compile against newer versions of deepseq. - containers_0_4_2_1 = super.containers_0_4_2_1.override { deepseq = self.deepseq_1_3_0_1; }; - - # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1]; - - # Setup: Can't find transitive deps for haddock - doctest = dontHaddock super.doctest; - hsdns = dontHaddock super.hsdns; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # Newer versions require bytestring >=0.10. - tar = super.tar_0_4_1_0; - - # These builds need additional dependencies on old compilers. - conduit = addBuildDepend super.conduit self.void; - reflection = addBuildDepend super.reflection self.tagged; - semigroups = addBuildDepend super.semigroups self.nats; - optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; - text = addBuildDepend super.text self.bytestring-builder; - - # Newer versions don't compile any longer. - network_2_6_3_1 = dontCheck super.network_2_6_3_1; - network = self.network_2_6_3_1; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix deleted file mode 100644 index 4b6baed49737..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.4.x core libraries. - array = null; - base = null; - binary = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - extensible-exceptions = null; - filepath = null; - ghc-prim = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - haskeline = self.haskeline_0_7_3_1; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; }; - - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # https://github.com/haskell/primitive/issues/16 - primitive = dontCheck super.primitive; - - # https://github.com/tibbe/unordered-containers/issues/96 - unordered-containers = dontCheck super.unordered-containers; - - # The test suite depends on time >=1.4.0.2. - cookie = dontCheck super.cookie ; - - # Work around bytestring >=0.10.2.0 requirement. - streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder; - - # Choose appropriate flags for our version of 'bytestring'. - bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; - - # Newer versions require a more recent compiler. - control-monad-free = super.control-monad-free_0_5_3; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # Test suite won't compile. - unix-time = dontCheck super.unix-time; - - # The test suite depends on mockery, which pulls in logging-facade, which - # doesn't compile with this older version of base: - # https://github.com/sol/logging-facade/issues/14 - doctest = dontCheck super.doctest; - - # Avoid depending on tasty-golden. - monad-par = dontCheck super.monad-par; - - # Newer versions require bytestring >=0.10. - tar = super.tar_0_4_1_0; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - - # Needs tagged on pre 7.6.x compilers. - reflection = addBuildDepend super.reflection self.tagged; - - # These builds need additional dependencies on old compilers. - semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]); - QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); - optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; - text = addBuildDepend super.text self.bytestring-builder; - vector = addBuildDepend super.vector self.semigroups; - - # Newer versions don't compile any longer. - network_2_6_3_1 = dontCheck super.network_2_6_3_1; - network = self.network_2_6_3_1; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix deleted file mode 100644 index 43a1b1b70bd1..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.6.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-prim = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - haskeline = self.haskeline_0_7_3_1; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # Later versions require a newer version of bytestring than we have. - aeson = self.aeson_0_7_0_6; - - # The test suite depends on time >=1.4.0.2. - cookie = dontCheck super.cookie; - - # Work around bytestring >=0.10.2.0 requirement. - streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder; - - # Choose appropriate flags for our version of 'bytestring'. - bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; - - # Tagged is not part of base in this environment. - contravariant = addBuildDepend super.contravariant self.tagged; - reflection = dontHaddock (addBuildDepend super.reflection self.tagged); - - # The compat library is empty in the presence of mtl 2.2.x. - mtl-compat = dontHaddock super.mtl-compat; - - # Newer versions require a more recent compiler. - control-monad-free = super.control-monad-free_0_5_3; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # https://github.com/magthe/sandi/issues/7 - sandi = overrideCabal super.sandi (drv: { - postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; - }); - - # These packages require additional build inputs on older compilers. - blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder; - text = addBuildDepend super.text self.bytestring-builder; - - # available convertible package won't build with the available - # bytestring and ghc-mod won't build without convertible - convertible = markBroken super.convertible; - ghc-mod = markBroken super.ghc-mod; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - - # Needs additional inputs on old compilers. - semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]); - lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); - distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; - QuickCheck = addBuildDepend super.QuickCheck self.semigroups; - void = addBuildDepends super.void (with self; [hashable semigroups]); - optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; - vector = addBuildDepend super.vector self.semigroups; - - # Need a newer version of Cabal to interpret their build instructions. - cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0; - extra = addSetupDepend super.extra self.Cabal_1_24_2_0; - hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0; - - # Haddock doesn't cope with the new markup. - bifunctors = dontHaddock super.bifunctors; - - # Breaks a dependency cycle between QuickCheck and semigroups - unordered-containers = dontCheck super.unordered-containers; - - # The test suite requires Cabal 1.24.x or later to compile. - comonad = dontCheck super.comonad; - semigroupoids = dontCheck super.semigroupoids; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix deleted file mode 100644 index 372155a8791c..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ /dev/null @@ -1,171 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.8.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-prim = null; - haskeline = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - terminfo = null; - time = null; - transformers = null; - unix = null; - xhtml = null; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; }; - - # mtl 2.2.x needs the latest transformers. - mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; - - # Configure mtl 2.1.x. - mtl = self.mtl_2_1_3_1; - transformers-compat = addBuildDepend (enableCabalFlag super.transformers-compat "three") self.mtl; - mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat; - - # haddock-api 2.16 requires ghc>=7.10 - haddock-api = super.haddock-api_2_15_0_2; - - # This is part of bytestring in our compiler. - bytestring-builder = dontHaddock super.bytestring-builder; - - # Won't compile against mtl 2.1.x. - imports = super.imports.override { mtl = self.mtl_2_2_1; }; - - # Newer versions require mtl 2.2.x. - mtl-prelude = self.mtl-prelude_1_0_3; - - # purescript requires mtl 2.2.x. - purescript = overrideCabal (super.purescript.overrideScope (self: super: { - mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); - mtl = super.mtl_2_2_1; - transformers = super.transformers_0_4_3_0; - haskeline = self.haskeline_0_7_3_1; - transformers-compat = disableCabalFlag super.transformers-compat "three"; - })) (drv: {}); - - # The test suite pulls in mtl 2.2.x - command-qq = dontCheck super.command-qq; - - # Doesn't support GHC < 7.10.x. - bound-gen = dontDistribute super.bound-gen; - ghc-exactprint = dontDistribute super.ghc-exactprint; - ghc-typelits-natnormalise = dontDistribute super.ghc-typelits-natnormalise; - - # Needs directory >= 1.2.2.0. - idris = markBroken super.idris; - - # Newer versions require transformers 0.4.x. - seqid = super.seqid_0_1_0; - seqid-streams = super.seqid-streams_0_1_0; - - # These packages need mtl 2.2.x directly or indirectly via dependencies. - amazonka = markBroken super.amazonka; - apiary-purescript = markBroken super.apiary-purescript; - clac = dontDistribute super.clac; - highlighter2 = markBroken super.highlighter2; - hypher = markBroken super.hypher; - miniforth = markBroken super.miniforth; - xhb-atom-cache = markBroken super.xhb-atom-cache; - xhb-ewmh = markBroken super.xhb-ewmh; - yesod-purescript = markBroken super.yesod-purescript; - yet-another-logger = markBroken super.yet-another-logger; - - # https://github.com/frosch03/arrowVHDL/issues/2 - ArrowVHDL = markBroken super.ArrowVHDL; - - # https://ghc.haskell.org/trac/ghc/ticket/9625 - wai-middleware-preprocessor = dontCheck super.wai-middleware-preprocessor; - incremental-computing = dontCheck super.incremental-computing; - - # Newer versions require base > 4.7 - gloss = super.gloss_1_9_2_1; - - # 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 ]; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # needs mtl-compat to build with mtl 2.1.x - cgi = addBuildDepend super.cgi self.mtl-compat; - - # https://github.com/magthe/sandi/issues/7 - sandi = overrideCabal super.sandi (drv: { - postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; - }); - - # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable. - ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; }; - - # The network library is required in configurations that don't have network-uri. - hxt = addBuildDepend super.hxt self.network; - hxt_9_3_1_7 = addBuildDepend super.hxt_9_3_1_7 self.network; - hxt_9_3_1_10 = addBuildDepend super.hxt_9_3_1_10 self.network; - hxt_9_3_1_12 = addBuildDepend super.hxt_9_3_1_12 self.network; - xss-sanitize = addBuildDepend super.xss-sanitize self.network; - xss-sanitize_0_3_5_4 = addBuildDepend super.xss-sanitize_0_3_5_4 self.network; - xss-sanitize_0_3_5_5 = addBuildDepend super.xss-sanitize_0_3_5_5 self.network; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - conduit_1_2_5 = addBuildDepend super.conduit_1_2_5 self.void; - - # Breaks a dependency cycle between QuickCheck and semigroups - hashable = dontCheck super.hashable; - unordered-containers = dontCheck super.unordered-containers; - - # Needs additional inputs on old compilers. - semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [nats tagged unordered-containers]); - lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); - distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; - QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); - void = addBuildDepends super.void (with self; [hashable semigroups]); - optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; - vector = addBuildDepend super.vector self.semigroups; - - # Haddock doesn't cope with the new markup. - bifunctors = dontHaddock super.bifunctors; - - # extra-test: : hFlush: invalid argument (Bad file descriptor) - extra = dontCheck super.extra; - - # The test suite requires Cabal 1.24.x or later to compile. - comonad = dontCheck super.comonad; - semigroupoids = dontCheck super.semigroupoids; - - # https://github.com/simonmar/happy/issues/103 - happy = super.happy.override { mtl = self.mtl_2_2_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 index 51276ce8c89d..804da79f5689 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_35; + llvmPackages = pkgs.llvmPackages_37; # Disable GHC 8.0.x core libraries. array = null; @@ -60,6 +60,12 @@ self: super: { 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_0; }); + 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; } 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 c44edf6b02a3..4538d8471c00 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -56,26 +56,34 @@ self: super: { # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 vector-algorithms = dontCheck super.vector-algorithms; - # 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; - # Work around overly restrictive constraints on the version of 'base'. - ChasingBottoms = doJailbreak super.ChasingBottoms; - hashable = doJailbreak super.hashable; - protolude = doJailbreak super.protolude; - quickcheck-instances = doJailbreak super.quickcheck-instances; + # Upstream failed to distribute the testsuite for 8.2 + # https://github.com/alanz/ghc-exactprint/pull/60 + ghc-exactprint = dontCheck super.ghc-exactprint; - # https://github.com/aristidb/aws/issues/238 - aws = doJailbreak super.aws; + # Reduction stack overflow; size = 38 + # https://github.com/jystic/hadoop-tools/issues/31 + hadoop-rpc = + let patch = pkgs.fetchpatch + { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch; + sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; + stripLen = 1; + }; + in appendPatch super.hadoop-rpc patch; - # LTS-9 versions do not compile. - path = dontCheck super.path; - path-io = super.path-io_1_3_3; - trifecta = super.trifecta_1_7_1_1; - aeson-compat = dontCheck super.aeson-compat_0_3_7_1; # test suite needs QuickCheck 2.10.* - binary-orphans = dontCheck super.binary-orphans_0_1_8_0; # test suite needs QuickCheck 2.10.* + # Custom Setup.hs breaks with Cabal 2 + # https://github.com/NICTA/coordinate/pull/4 + coordinate = + let patch = pkgs.fetchpatch + { url = https://github.com/NICTA/coordinate/pull/4.patch; + sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy"; + }; + in appendPatch super.coordinate patch; + + # https://github.com/purescript/purescript/issues/3189 + purescript = doJailbreak (super.purescript); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index f81920edd61a..99003102ec58 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -47,10 +47,6 @@ self: super: { # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; - # Show works differently for record syntax now, breaking haskell-src-exts' parser tests - # https://github.com/haskell-suite/haskell-src-exts/issues/224 - haskell-src-exts = dontCheck super.haskell-src-exts; - # 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"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b02b0b602676..8894ede82f15 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,35 +1,36 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.0.2 +compiler: ghc-8.2.2 core-packages: - - array-0.5.1.1 - - base-4.9.1.0 - - binary-0.8.3.0 - - bytestring-0.10.8.1 - - Cabal-1.24.2.0 - - containers-0.5.7.1 - - deepseq-1.4.2.0 - - directory-1.3.0.0 - - filepath-1.4.1.1 - - ghc-8.0.2 - - ghc-boot-8.0.2 - - ghc-boot-th-8.0.2 - - ghci-8.0.2 - - ghc-prim-0.5.0.0 - - haskeline-0.7.3.0 - - hoopl-3.10.2.1 + - array-0.5.2.0 + - base-4.10.1.0 + - binary-0.8.5.1 + - bytestring-0.10.8.2 + - Cabal-2.0.1.0 + - containers-0.5.10.2 + - deepseq-1.4.3.0 + - directory-1.3.0.2 + - filepath-1.4.1.2 + - ghc-8.2.2 + - ghc-boot-8.2.2 + - ghc-boot-th-8.2.2 + - ghc-compact-0.1.0.0 + - ghc-prim-0.5.1.1 + - ghci-8.2.2 + - haskeline-0.7.4.0 + - hoopl-3.10.2.2 - hpc-0.6.0.3 - - integer-gmp-1.0.0.1 + - integer-gmp-1.0.1.0 - pretty-1.1.3.3 - - process-1.4.3.0 + - process-1.6.1.0 - rts-1.0 - - template-haskell-2.11.1.0 - - terminfo-0.4.0.2 - - time-1.6.0.1 + - template-haskell-2.12.0.0 + - terminfo-0.4.1.0 + - time-1.8.0.2 - transformers-0.5.2.0 - - unix-2.7.2.1 - - xhtml-3000.2.1 + - unix-2.7.2.2 + - xhtml-3000.2.2 # 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 @@ -37,155 +38,171 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.14 + # LTS Haskell 10.3 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 - - accelerate ==1.0.0.0 + - accelerate ==1.1.1.0 + - accelerate-arithmetic ==1.0 + - accelerate-bignum ==0.1.0.0 + - accelerate-blas ==0.1.0.1 + - accelerate-examples ==1.1.0.0 + - accelerate-fft ==1.1.0.0 + - accelerate-fftw ==1.0 + - accelerate-fourier ==1.0.0.2 + - accelerate-io ==1.0.0.1 + - accelerate-llvm ==1.1.0.0 + - accelerate-llvm-native ==1.1.0.1 + - accelerate-llvm-ptx ==1.1.0.0 + - accelerate-utility ==1.0 - accuerr ==0.2.0.2 - ace ==0.6 - action-permutations ==0.0.0.1 - active ==0.2.0.13 - - AC-Vector ==2.3.2 - ad ==4.3.4 - adjunctions ==4.3 - adler32 ==0.1.1.0 - - aeson ==1.1.2.0 + - aern2-mp ==0.1.2.0 + - aern2-real ==0.1.1.0 + - aeson ==1.2.3.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - - aeson-compat ==0.3.6 + - aeson-compat ==0.3.7.1 - aeson-diff ==1.1.0.4 - - aeson-extra ==0.4.0.0 - - aeson-generic-compat ==0.0.1.0 - - aeson-injector ==1.0.10.0 - - aeson-lens ==0.5.0.0 + - aeson-extra ==0.4.1.0 + - aeson-generic-compat ==0.0.1.1 + - aeson-injector ==1.1.0.0 - aeson-pretty ==0.8.5 - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 + - aeson-yak ==0.1.1.3 - Agda ==2.5.3 - - airship ==0.6.0 + - airship ==0.9.2 - alarmclock ==0.4.0.3 - - alerta ==0.1.0.5 + - alerta ==0.1.0.6 + - alerts ==0.1.0.0 - alex ==3.2.3 - algebraic-graphs ==0.0.5 - alsa-core ==0.5.0.1 - alsa-mixer ==0.2.0.3 - alsa-pcm ==0.6.0.4 - alsa-seq ==0.6.0.7 - - alternators ==0.1.1.1 + - alternative-vector ==0.0.0 + - alternators ==0.1.2.0 - ALUT ==2.4.0.2 - - amazonka ==1.4.5 - - amazonka-apigateway ==1.4.5 - - amazonka-application-autoscaling ==1.4.5 - - amazonka-appstream ==1.4.5 - - amazonka-autoscaling ==1.4.5 - - amazonka-budgets ==1.4.5 - - amazonka-certificatemanager ==1.4.5 - - amazonka-cloudformation ==1.4.5 - - amazonka-cloudfront ==1.4.5 - - amazonka-cloudhsm ==1.4.5 - - amazonka-cloudsearch ==1.4.5 - - amazonka-cloudsearch-domains ==1.4.5 - - amazonka-cloudtrail ==1.4.5 - - amazonka-cloudwatch ==1.4.5 - - amazonka-cloudwatch-events ==1.4.5 - - amazonka-cloudwatch-logs ==1.4.5 - - amazonka-codebuild ==1.4.5 - - amazonka-codecommit ==1.4.5 - - amazonka-codedeploy ==1.4.5 - - amazonka-codepipeline ==1.4.5 - - amazonka-cognito-identity ==1.4.5 - - amazonka-cognito-idp ==1.4.5 - - amazonka-cognito-sync ==1.4.5 - - amazonka-config ==1.4.5 - - amazonka-core ==1.4.5 - - amazonka-datapipeline ==1.4.5 - - amazonka-devicefarm ==1.4.5 - - amazonka-directconnect ==1.4.5 - - amazonka-discovery ==1.4.5 - - amazonka-dms ==1.4.5 - - amazonka-ds ==1.4.5 - - amazonka-dynamodb ==1.4.5 - - amazonka-dynamodb-streams ==1.4.5 - - amazonka-ec2 ==1.4.5 - - amazonka-ecr ==1.4.5 - - amazonka-ecs ==1.4.5 - - amazonka-efs ==1.4.5 - - amazonka-elasticache ==1.4.5 - - amazonka-elasticbeanstalk ==1.4.5 - - amazonka-elasticsearch ==1.4.5 - - amazonka-elastictranscoder ==1.4.5 - - amazonka-elb ==1.4.5 - - amazonka-elbv2 ==1.4.5 - - amazonka-emr ==1.4.5 - - amazonka-gamelift ==1.4.5 - - amazonka-glacier ==1.4.5 - - amazonka-health ==1.4.5 - - amazonka-iam ==1.4.5 - - amazonka-importexport ==1.4.5 - - amazonka-inspector ==1.4.5 - - amazonka-iot ==1.4.5 - - amazonka-iot-dataplane ==1.4.5 - - amazonka-kinesis ==1.4.5 - - amazonka-kinesis-analytics ==1.4.5 - - amazonka-kinesis-firehose ==1.4.5 - - amazonka-kms ==1.4.5 - - amazonka-lambda ==1.4.5 - - amazonka-lightsail ==1.4.5 - - amazonka-marketplace-analytics ==1.4.5 - - amazonka-marketplace-metering ==1.4.5 - - amazonka-ml ==1.4.5 - - amazonka-opsworks ==1.4.5 - - amazonka-opsworks-cm ==1.4.5 - - amazonka-pinpoint ==1.4.5 - - amazonka-polly ==1.4.5 - - amazonka-rds ==1.4.5 - - amazonka-redshift ==1.4.5 - - amazonka-rekognition ==1.4.5 - - amazonka-route53 ==1.4.5 - - amazonka-route53-domains ==1.4.5 - - amazonka-s3 ==1.4.5 - - amazonka-s3-streaming ==0.2.0.3 - - amazonka-sdb ==1.4.5 - - amazonka-servicecatalog ==1.4.5 - - amazonka-ses ==1.4.5 - - amazonka-shield ==1.4.5 - - amazonka-sms ==1.4.5 - - amazonka-snowball ==1.4.5 - - amazonka-sns ==1.4.5 - - amazonka-sqs ==1.4.5 - - amazonka-ssm ==1.4.5 - - amazonka-stepfunctions ==1.4.5 - - amazonka-storagegateway ==1.4.5 - - amazonka-sts ==1.4.5 - - amazonka-support ==1.4.5 - - amazonka-swf ==1.4.5 - - amazonka-test ==1.4.5 - - amazonka-waf ==1.4.5 - - amazonka-workspaces ==1.4.5 - - amazonka-xray ==1.4.5 - - amqp ==0.15.1 + - amazonka ==1.5.0 + - amazonka-apigateway ==1.5.0 + - amazonka-application-autoscaling ==1.5.0 + - amazonka-appstream ==1.5.0 + - amazonka-autoscaling ==1.5.0 + - amazonka-budgets ==1.5.0 + - amazonka-certificatemanager ==1.5.0 + - amazonka-cloudformation ==1.5.0 + - amazonka-cloudfront ==1.5.0 + - amazonka-cloudhsm ==1.5.0 + - amazonka-cloudsearch ==1.5.0 + - amazonka-cloudsearch-domains ==1.5.0 + - amazonka-cloudtrail ==1.5.0 + - amazonka-cloudwatch ==1.5.0 + - amazonka-cloudwatch-events ==1.5.0 + - amazonka-cloudwatch-logs ==1.5.0 + - amazonka-codebuild ==1.5.0 + - amazonka-codecommit ==1.5.0 + - amazonka-codedeploy ==1.5.0 + - amazonka-codepipeline ==1.5.0 + - amazonka-cognito-identity ==1.5.0 + - amazonka-cognito-idp ==1.5.0 + - amazonka-cognito-sync ==1.5.0 + - amazonka-config ==1.5.0 + - amazonka-core ==1.5.0 + - amazonka-datapipeline ==1.5.0 + - amazonka-devicefarm ==1.5.0 + - amazonka-directconnect ==1.5.0 + - amazonka-discovery ==1.5.0 + - amazonka-dms ==1.5.0 + - amazonka-ds ==1.5.0 + - amazonka-dynamodb ==1.5.0 + - amazonka-dynamodb-streams ==1.5.0 + - amazonka-ec2 ==1.5.0 + - amazonka-ecr ==1.5.0 + - amazonka-ecs ==1.5.0 + - amazonka-efs ==1.5.0 + - amazonka-elasticache ==1.5.0 + - amazonka-elasticbeanstalk ==1.5.0 + - amazonka-elasticsearch ==1.5.0 + - amazonka-elastictranscoder ==1.5.0 + - amazonka-elb ==1.5.0 + - amazonka-elbv2 ==1.5.0 + - amazonka-emr ==1.5.0 + - amazonka-gamelift ==1.5.0 + - amazonka-glacier ==1.5.0 + - amazonka-health ==1.5.0 + - amazonka-iam ==1.5.0 + - amazonka-importexport ==1.5.0 + - amazonka-inspector ==1.5.0 + - amazonka-iot ==1.5.0 + - amazonka-iot-dataplane ==1.5.0 + - amazonka-kinesis ==1.5.0 + - amazonka-kinesis-analytics ==1.5.0 + - amazonka-kinesis-firehose ==1.5.0 + - amazonka-kms ==1.5.0 + - amazonka-lambda ==1.5.0 + - amazonka-lightsail ==1.5.0 + - amazonka-marketplace-analytics ==1.5.0 + - amazonka-marketplace-metering ==1.5.0 + - amazonka-ml ==1.5.0 + - amazonka-opsworks ==1.5.0 + - amazonka-opsworks-cm ==1.5.0 + - amazonka-pinpoint ==1.5.0 + - amazonka-polly ==1.5.0 + - amazonka-rds ==1.5.0 + - amazonka-redshift ==1.5.0 + - amazonka-rekognition ==1.5.0 + - amazonka-route53 ==1.5.0 + - amazonka-route53-domains ==1.5.0 + - amazonka-s3 ==1.5.0 + - amazonka-sdb ==1.5.0 + - amazonka-servicecatalog ==1.5.0 + - amazonka-ses ==1.5.0 + - amazonka-shield ==1.5.0 + - amazonka-sms ==1.5.0 + - amazonka-snowball ==1.5.0 + - amazonka-sns ==1.5.0 + - amazonka-sqs ==1.5.0 + - amazonka-ssm ==1.5.0 + - amazonka-stepfunctions ==1.5.0 + - amazonka-storagegateway ==1.5.0 + - amazonka-sts ==1.5.0 + - amazonka-support ==1.5.0 + - amazonka-swf ==1.5.0 + - amazonka-test ==1.5.0 + - amazonka-waf ==1.5.0 + - amazonka-workspaces ==1.5.0 + - amazonka-xray ==1.5.0 + - amqp ==0.18.1 - annotated-wl-pprint ==0.7.0 - - anonymous-sums ==0.6.0.0 - - ansigraph ==0.3.0.4 - - ansi-terminal ==0.6.3.1 - - ansi-wl-pprint ==0.6.7.3 + - ansigraph ==0.3.0.5 + - ansi-terminal ==0.7.1.1 + - ansi-wl-pprint ==0.6.8.1 + - apecs ==0.2.4.7 - api-field-json-th ==0.1.0.2 - appar ==0.1.4 + - apply-refact ==0.4.1.0 - apportionment ==0.0.0.2 - approximate ==0.3.1 - app-settings ==0.2.0.11 - - arbtt ==0.9.0.13 - - arithmoi ==0.5.0.0 + - arithmoi ==0.6.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrow-list ==0.7 - - arrowp-qq ==0.1.1 + - arrowp-qq ==0.2.1.1 + - arrows ==0.4.4.1 - asciidiagram ==1.3.3 - ascii-progress ==0.3.3.0 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 + - assert-failure ==0.1.2.2 - astro ==0.4.2.0 - async ==2.1.1.1 - async-dejafu ==0.1.3.0 @@ -194,31 +211,33 @@ default-package-overrides: - async-refresh-tokens ==0.3.0.1 - async-timer ==0.1.4.0 - atom-basic ==0.2.5 - - atom-conduit ==0.4.0.3 - - atomic-primops ==0.8.1 + - atom-conduit ==0.5.0.1 + - atomic-primops ==0.8.1.1 - atomic-write ==0.2.0.5 - - attoparsec ==0.13.1.0 + - attoparsec ==0.13.2.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 + - attoparsec-ip ==0.0.1 - attoparsec-iso8601 ==1.0.0.0 - - attoparsec-time ==0.1.4 + - attoparsec-path ==0.0.0.1 + - attoparsec-uri ==0.0.3 - audacity ==0.0.1.2 - - authenticate ==1.3.3.2 + - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.2 + - autoexporter ==1.1.3 - auto-update ==0.1.4 - avers ==0.0.17.1 - - avers-api ==0.0.18.0 - - avers-api-docs ==0.0.18.0 - - avers-server ==0.0.19.0 + - avers-api ==0.1.0 + - avers-server ==0.1.0 - avwx ==0.3.0.2 - - aws ==0.16 + - aws ==0.18 - axiom ==0.4.6 - b9 ==0.5.35 - backprop ==0.0.3.0 - bake ==0.5 - bank-holidays-england ==0.1.0.6 + - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 - base58string ==0.10.0 @@ -226,34 +245,35 @@ default-package-overrides: - base64-string ==0.2 - base-compat ==0.9.3 - basement ==0.0.4 - - base-noprelude ==4.9.1.0 - base-orphans ==0.6 - base-prelude ==1.2.0.1 - base-unicode-symbols ==0.2.2.4 - - basic-prelude ==0.6.1.1 - - bcrypt ==0.0.10 - - bench ==1.0.6 + - basic-prelude ==0.7.0 + - bbdb ==0.8 + - bcrypt ==0.0.11 + - bench ==1.0.7 - benchpress ==0.2.2.10 - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.4.2 + - bifunctors ==5.5 - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - binary-conduit ==1.2.5 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - - binary-orphans ==0.1.6.0 + - binary-orphans ==0.1.8.0 - binary-parser ==0.5.5 - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 + - binary-shared ==0.8.3 - binary-tagged ==0.1.4.2 - - binary-typed ==1.0 - - bindings-DSL ==1.0.23 + - bindings-DSL ==1.0.24 - bindings-GLFW ==3.1.2.3 - bindings-libzip ==1.0.1 + - bindings-uname ==0.1 - bioace ==0.0.1 - bioalign ==0.0.5 - BiobaseNewick ==0.0.0.2 @@ -269,9 +289,14 @@ default-package-overrides: - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - bits ==0.5.1 + - bitset-word8 ==0.1.1.0 + - bit-stream ==0.1.0.2 - bitx-bitcoin ==0.11.0.1 - blake2 ==0.2.0 - blank-canvas ==0.6.1 + - blas-carray ==0.0 + - blas-ffi ==0.0 + - blas-hs ==0.1.1.0 - BlastHTTP ==1.2.1 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 @@ -280,35 +305,33 @@ default-package-overrides: - blaze-markup ==0.8.0.0 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - - BlogLiterately ==0.8.4.3 - - BlogLiterately-diagrams ==0.2.0.5 - - bloodhound ==0.14.0.0 + - bloodhound ==0.15.0.0 - bloomfilter ==2.0.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 - bno055-haskell ==0.1.0 - - board-games ==0.1.0.6 - boltzmann-samplers ==0.1.0.0 - bookkeeping ==0.2.1.4 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - - bool-extras ==0.4.0 - boolsimplifier ==0.1.8 - boomerang ==1.4.5.3 + - bordacount ==0.1.0.0 - both ==0.1.1.0 - bound ==2.0.1 - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.4 - - brick ==0.18 + - brick ==0.29.1 + - brittany ==0.9.0.0 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 - bson-lens ==0.1.1 - btrfs ==0.1.2.3 - buffer-builder ==0.2.4.4 - buffer-pipe ==0.0 - - bumper ==0.6.0.3 + - butcher ==1.2.1.0 - bv ==0.4.1 - byteable ==0.1.1 - bytedump ==1.0 @@ -317,23 +340,20 @@ default-package-overrides: - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.1.0 - bytestring-conversion ==0.3.1 - - bytestring-handle ==0.1.0.5 - bytestring-lexing ==0.5.0.2 - - bytestring-progress ==1.0.7 - bytestring-strict-builder ==0.4.5 - bytestring-tree-builder ==0.2.7.1 - bytestring-trie ==0.2.4.1 + - bzlib ==0.5.0.5 - bzlib-conduit ==0.2.1.5 - - c2hs ==0.28.2 - - Cabal ==1.24.2.0 - - cabal-dependency-licenses ==0.2.0.0 - - cabal-doctest ==1.0.3 + - c2hs ==0.28.3 + - Cabal ==2.0.1.1 + - cabal-doctest ==1.0.4 - cabal-file-th ==0.2.4 - - cabal-helper ==0.7.3.0 - - cabal-rpm ==0.11.2 - - cache ==0.1.0.0 - - cacophony ==0.10.0 - - cairo ==0.13.4.1 + - cabal-rpm ==0.12 + - cabal-toolkit ==0.0.4 + - cache ==0.1.0.1 + - cairo ==0.13.4.2 - calendar-recycling ==0.0 - call-stack ==0.1.0 - carray ==0.1.6.8 @@ -342,29 +362,30 @@ default-package-overrides: - case-insensitive ==1.2.0.10 - cases ==0.1.3.2 - casing ==0.1.2.1 - - cassava ==0.4.5.1 - - cassava-conduit ==0.3.5.1 + - cassava ==0.5.1.0 + - cassava-conduit ==0.4.0.1 - cassette ==0.1.0 + - cast ==0.1.0.2 - cayley-client ==0.4.1 - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 + - cereal-time ==0.1.0.0 - cereal-vector ==0.2.0.1 - - cgi ==3001.3.0.2 - ChannelT ==0.0.0.4 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.3 - Chart ==1.8.2 - Chart-cairo ==1.8.2 - Chart-diagrams ==1.8.2 - - chart-unit ==0.4.1 + - chart-unit ==0.5.5.0 - chaselev-deque ==0.5.0.5 - - cheapskate ==0.1.0.5 + - chatwork ==0.1.2.0 + - cheapskate ==0.1.1 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - checkers ==0.4.9.5 - - chell ==0.4.0.1 - choice ==0.2.2 - chunked-data ==0.3.0 - cipher-aes ==0.2.11 @@ -374,61 +395,67 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - clang-pure ==0.2.0.2 - - clash-ghc ==0.7.2 - - clash-lib ==0.7.1 - - clash-prelude ==0.11.2 - - clash-systemverilog ==0.7.2 - - clash-verilog ==0.7.2 - - clash-vhdl ==0.7.2 - - classy-prelude ==1.2.0.1 - - classy-prelude-conduit ==1.2.0 - - classy-prelude-yesod ==1.2.0 + - cisco-spark-api ==0.1.0.0 + - clang-compilation-database ==0.1.0.0 + - classy-prelude ==1.3.1 + - classy-prelude-conduit ==1.3.1 + - classy-prelude-yesod ==1.3.1 - clay ==0.12.2 - cli ==0.1.2 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - clock ==0.7.2 - clock-extras ==0.1.0.2 - - clr-host ==0.1.0.0 - - clr-inline ==0.1.0.0 - - clr-marshal ==0.1.0.0 + - clr-host ==0.2.0.1 + - clr-inline ==0.2.0.1 + - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.1 - - clustering ==0.3.1 - cmark ==0.5.6 + - cmark-gfm ==0.1.3 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.18 + - cmdargs ==0.10.19 - code-builder ==0.1.3 + - codec ==0.2.1 - code-page ==0.1.3 - codo-notation ==0.5.2 - colorful-monoids ==0.2.1.0 - - colour ==2.3.3 + - colorize-haskell ==1.0.1 + - colour ==2.3.4 + - colour-accelerate ==0.2.0.0 + - combinatorial ==0.0 - comfort-graph ==0.0.2.1 - commutative ==0.0.1.4 - comonad ==5.0.2 - comonads-fd ==4.0 - comonad-transformers ==4.0 + - compact ==0.1.0.1 - compactmap ==0.1.4.2.1 - compensated ==0.7.2 + - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - concise ==0.1.0.0 - - concurrency ==1.1.2.1 - - concurrent-output ==1.9.2 + - concurrency ==1.2.3.0 + - concurrent-extra ==0.7.0.11 + - concurrent-output ==1.10.1 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 + - cond ==0.4.1.1 - conduit ==1.2.12.1 - - conduit-combinators ==1.1.1 + - conduit-algorithms ==0.0.6.1 + - conduit-combinators ==1.1.2 - conduit-connection ==0.1.0.3 - - conduit-extra ==1.1.17 + - conduit-extra ==1.2.3.2 - conduit-iconv ==0.1.1.2 - - conduit-parse ==0.1.2.1 + - conduit-parse ==0.1.2.2 + - conduit-throttle ==0.3.1.0 - ConfigFile ==1.1.4 - - configuration-tools ==0.2.15 + - config-ini ==0.2.1.1 + - configuration-tools ==0.3.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.8 @@ -446,6 +473,7 @@ default-package-overrides: - convertible ==1.1.1.0 - cookie ==0.4.3 - countable ==1.0 + - country ==0.1.4 - courier ==0.1.1.5 - cpphs ==1.20.8 - cprng-aes ==0.6.1 @@ -453,24 +481,26 @@ default-package-overrides: - cpuinfo ==0.1.0.1 - cql ==3.1.1 - cql-io ==0.16.0 - - criterion ==1.1.4.0 - - cron ==0.5.0 - - crypto-api ==0.13.2 + - crackNum ==1.9 + - criterion ==1.2.6.0 + - cron ==0.6.1 + - crypto-api ==0.13.3 - crypto-api-tests ==0.3 - cryptocipher ==0.6.2 - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - - crypto-enigma ==0.0.2.9 + - crypto-enigma ==0.0.2.10 - cryptohash ==0.11.9 - - cryptohash-conduit ==0.1.1 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 - cryptohash-sha1 ==0.11.100.1 - cryptohash-sha256 ==0.11.101.0 - cryptohash-sha512 ==0.11.100.1 - - cryptonite ==0.23 + - cryptonite ==0.24 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.6 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 @@ -480,13 +510,19 @@ default-package-overrides: - css-text ==0.1.2.2 - csv ==0.1.2 - csv-conduit ==0.6.7 - - ctrie ==0.1.1.0 + - ctrie ==0.2 - cubicbezier ==0.6.0.4 - cubicspline ==0.1.2 - - cue-sheet ==0.1.1 + - cublas ==0.4.0.0 + - cuda ==0.9.0.0 + - cue-sheet ==1.0.1 + - cufft ==0.8.0.0 - curl ==1.3.8 + - currencies ==0.1.1.1 + - cusolver ==0.1.0.0 + - cusparse ==0.1.0.0 - cutter ==0.0 - - darcs ==2.12.5 + - czipwith ==1.0.0.0 - data-accessor ==0.2.2.7 - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.14 @@ -501,12 +537,12 @@ default-package-overrides: - data-default-instances-containers ==0.0.1 - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - - data-diverse ==0.8.1.0 - - data-diverse-lens ==0.1.1.0 + - data-diverse ==2.0.1.0 + - data-diverse-lens ==1.0.0.1 - data-dword ==0.3.1.1 - data-endian ==0.1.1 - - data-fix ==0.0.7 - - data-has ==0.2.1.0 + - data-fix ==0.2.0 + - data-has ==0.3.0.0 - data-hash ==0.2.0.1 - data-inttrie ==0.1.2 - data-lens-light ==0.1.2.2 @@ -516,35 +552,44 @@ default-package-overrides: - data-ordlist ==0.4.7.0 - data-ref ==0.0.1.1 - data-reify ==0.6.1 - - data-serializer ==0.3 + - data-serializer ==0.3.2 + - datasets ==0.2.5 - data-textual ==0.3.0.2 + - data-tree-print ==0.1.0.0 - dataurl ==0.1.0.0 - DAV ==1.3.1 - dawg-ord ==0.5.1.0 - - dbus ==0.10.13 + - dbcleaner ==0.1.3 + - dbus ==0.10.14 - debian-build ==0.10.1.0 + - debug ==0.0.2 - Decimal ==0.4.2 - declarative ==0.5.1 - deepseq-generics ==0.2.0.0 - - dejafu ==0.7.3.0 + - dejafu ==0.9.1.2 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 + - dependent-sum-template ==0.0.0.6 + - deque ==0.2 - derive ==2.6.3 - deriving-compat ==0.3.6 - descriptive ==0.9.4 + - dhall ==1.8.2 + - dhall-bash ==1.0.6 + - dhall-json ==1.0.9 + - dhall-nix ==1.0.9 + - dhall-text ==1.0.4 - diagrams ==1.4 - diagrams-builder ==0.8.0.1 - diagrams-cairo ==1.4 - diagrams-canvas ==1.4 - diagrams-contrib ==1.4.1 - diagrams-core ==1.4.0.1 - - diagrams-gtk ==1.4 - - diagrams-html5 ==1.4 - - diagrams-lib ==1.4.1.2 + - diagrams-lib ==1.4.2 - diagrams-postscript ==1.4 - - diagrams-rasterific ==1.4 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.1.1 + - dice ==0.1 - dictionaries ==0.2.0.3 - Diff ==0.3.4 - diff3 ==0.3.0 @@ -552,16 +597,17 @@ default-package-overrides: - digits ==0.3.1 - dimensional ==1.0.1.3 - directory-tree ==0.12.1 + - direct-rocksdb ==0.0.3 - direct-sqlite ==2.3.21 - - discord-gateway ==0.2.2 - - discord-hs ==0.4.2 - - discord-rest ==0.2.2 - - discord-types ==0.2.2 - discount ==0.1.1 + - discrimination ==0.3 - disk-free-space ==0.1.0.1 - disposable ==0.2.0.4 - distance ==0.1.0.0 - distributed-closure ==0.3.4.0 + - distributed-process ==0.7.3 + - distributed-process-simplelocalnet ==0.2.4 + - distributed-process-tests ==0.4.11 - distributed-static ==0.3.8 - distribution ==1.1.1.0 - distributive ==0.5.3 @@ -571,18 +617,18 @@ default-package-overrides: - dlist ==0.8.0.3 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dmenu ==0.3.1.1 - - dmenu-pkill ==0.1.0.1 - - dmenu-pmount ==0.1.0.1 - - dmenu-search ==0.1.0.1 - - dns ==2.0.13 + - dns ==3.0.0 + - docker ==0.4.1.1 + - docker-build-cacher ==1.8.2 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 - - doctemplates ==0.1.0.2 - - doctest ==0.11.4 + - doctemplates ==0.2.1 + - doctest ==0.13.0 - doctest-discover ==0.1.0.7 + - doctest-driver-gen ==0.1.0.1 - do-list ==1.0.1 - - dotenv ==0.3.4.0 + - dom-parser ==3.0.0 + - dotenv ==0.5.2.1 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.6 @@ -590,11 +636,12 @@ default-package-overrides: - drawille ==0.1.2.0 - DRBG ==0.5.5 - drifter ==0.2.3 - - drifter-postgresql ==0.1.0 - - dsp ==0.2.3.1 + - drifter-postgresql ==0.2.1 + - dsp ==0.2.4 - dual-tree ==0.2.1 + - dublincore-xml-conduit ==0.1.0.2 - dvorak ==0.1.0.0 - - dynamic-state ==0.2.2.0 + - dynamic-state ==0.3 - dyre ==0.8.12 - Earley ==0.12.0.1 - easy-file ==0.2.1 @@ -608,29 +655,25 @@ default-package-overrides: - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - effect-handlers ==0.1.0.8 - - effin ==0.3.0.3 - - either ==4.4.1.1 + - either ==4.5 - either-unwrap ==1.1 - ekg ==0.4.0.14 + - ekg-cloudwatch ==0.0.1.6 - ekg-core ==0.1.1.3 - ekg-json ==0.1.0.6 - ekg-statsd ==0.2.2.0 - ekg-wai ==0.1.0.2 - elerea ==2.9.0 - - elm-bridge ==0.4.1 + - eliminators ==0.3 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - emailaddress ==0.2.0.0 - email-validate ==2.3.2 - enclosed-exceptions ==1.0.2 - - encoding-io ==0.0.1 - - engine-io ==1.2.17 - - engine-io-wai ==1.0.6 - - EntrezHTTP ==1.0.3 + - EntrezHTTP ==1.0.4 - entropy ==0.3.8 - enummapset ==0.5.2.1 - - enummapset-th ==0.6.1.1 - enumset ==0.0.4 - envelope ==0.2.2.0 - envparse ==0.4 @@ -641,22 +684,27 @@ default-package-overrides: - equivalence ==0.3.2 - erf ==2.0.0.0 - errors ==2.2.2 + - errors-ext ==0.4.1 + - error-util ==0.0.1.2 - ersatz ==0.4.1 - esqueleto ==2.5.3 - - etc ==0.2.0.0 - etcd ==1.0.5 - ether ==0.5.1.0 - - euphoria ==0.8.0.0 - event ==0.1.4 - - eventful-core ==0.1.3 - - eventful-dynamodb ==0.1.3 - - eventful-memory ==0.1.3 - - eventful-postgresql ==0.1.3 - - eventful-sql-common ==0.1.3 - - eventful-sqlite ==0.1.3 - - eventful-test-helpers ==0.1.3 + - eventful-core ==0.2.0 + - eventful-dynamodb ==0.2.0 + - eventful-memory ==0.2.0 + - eventful-postgresql ==0.2.0 + - eventful-sql-common ==0.2.0 + - eventful-sqlite ==0.2.0 + - eventful-test-helpers ==0.2.0 - event-list ==0.1.1.3 + - eventsource-api ==1.1.1 + - eventsource-geteventstore-store ==1.0.4 + - eventsource-store-specs ==1.0.1 + - eventsource-stub-store ==1.0.2 - eventstore ==0.15.0.2 + - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.2 - exceptional ==0.3.0.0 @@ -669,12 +717,12 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.6 - - extensible-effects ==1.11.1.0 + - extensible ==0.4.7 + - extensible-effects ==2.1.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.5.3 + - extra ==1.6.2 - extractable-singleton ==0.0.1 - - extract-dependencies ==0.2.0.1 + - extrapolate ==0.3.0 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fasta ==0.10.4.2 @@ -686,44 +734,45 @@ default-package-overrides: - fclabels ==2.0.3.2 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - - fedora-haskell-tools ==0.3 - - feed ==0.3.12.0 + - fedora-haskell-tools ==0.4 + - feed ==1.0.0.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - - fgl ==5.5.3.1 - - fgl-arbitrary ==0.2.0.3 + - fgl ==5.5.4.0 - filecache ==0.2.9 - - file-embed ==0.0.10 + - file-embed ==0.0.10.1 - filelock ==0.1.1.2 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 + - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - - fingertree ==0.1.2.1 + - fingertree ==0.1.3.1 - fingertree-psqueue ==0.3 - - finite-typelits ==0.1.2.0 + - finite-typelits ==0.1.3.0 + - fitspec ==0.4.4 - fixed ==0.2.1.1 - fixed-length ==0.2 - - fixed-vector ==0.9.0.0 - - fixed-vector-hetero ==0.3.1.2 + - fixed-vector ==1.0.0.0 + - fixed-vector-hetero ==0.4.0.0 - flac ==0.1.2 - flac-picture ==0.1.1 - flat ==0.3 - flat-mcmc ==1.5.0 - flexible-defaults ==0.0.1.2 + - FloatingHex ==0.4 - floatshow ==0.2.4 - - flock ==0.3.1.8 - - flow ==1.0.9 - - fmlist ==0.9 - - fmt ==0.3.0.0 + - flow ==1.0.10 + - fmlist ==0.9.1 + - fmt ==0.5.0.0 - fn ==0.3.0.2 - focus ==0.1.5.2 - fold-debounce ==0.2.0.6 - fold-debounce-conduit ==0.1.0.5 - - foldl ==1.2.5 - - foldl-statistics ==0.1.4.6 + - foldl ==1.3.5 - folds ==0.7.4 + - follow-file ==0.0.2 - FontyFruity ==0.5.3.3 - force-layout ==0.4.0.6 - foreign-store ==0.2 @@ -732,67 +781,87 @@ default-package-overrides: - format-numbers ==0.1.0.0 - formatting ==6.2.5 - foundation ==0.0.17 - - Frames ==0.1.9 + - FPretty ==1.1 + - Frames ==0.3.0.2 - free ==4.12.4 - freenect ==1.2.1 - - freer ==0.2.4.1 - - freer-effects ==0.3.0.1 + - freer-simple ==1.0.0.0 - freetype2 ==0.1.2 - free-vl ==0.1.4 + - friday ==0.2.3.1 - friendly-time ==0.4.1 - - frisby ==0.2.1 + - frisby ==0.2.2 - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1.1 - fsnotify-conduit ==0.1.0.0 + - fswatch ==0.1.0.2 - funcmp ==1.8 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - - fuzzy ==0.1.0.0 + - fuzzyset ==0.1.0.3 - gauge ==0.1.3 - gd ==3000.7.3 + - gdax ==0.6.0.0 - Genbank ==1.0.3 - general-games ==1.0.5 - generic-aeson ==0.2.0.9 - - generic-deriving ==1.11.2 - - generic-random ==0.5.0.0 + - generic-arbitrary ==0.1.0 + - generic-deriving ==1.12 + - generic-lens ==0.5.1.0 + - GenericPretty ==1.2.1 + - generic-random ==1.0.0.0 - generics-eot ==0.2.1.1 - generics-sop ==0.3.1.0 - generics-sop-lens ==0.1.2.1 - generic-xmlpickler ==0.1.0.5 - geniplate-mirror ==0.7.5 + - genvalidity ==0.4.0.2 + - genvalidity-aeson ==0.1.0.0 + - genvalidity-bytestring ==0.1.0.0 + - genvalidity-containers ==0.3.0.0 + - genvalidity-hspec ==0.5.0.0 + - genvalidity-hspec-aeson ==0.1.0.1 + - genvalidity-hspec-binary ==0.1.0.0 + - genvalidity-hspec-cereal ==0.1.0.0 + - genvalidity-hspec-hashable ==0.1.0.0 + - genvalidity-path ==0.2.0.2 + - genvalidity-property ==0.1.0.0 + - genvalidity-scientific ==0.1.0.0 + - genvalidity-text ==0.4.0.0 + - genvalidity-time ==0.1.0.0 + - genvalidity-unordered-containers ==0.1.0.0 + - genvalidity-uuid ==0.0.0.0 + - genvalidity-vector ==0.1.0.0 - getopt-generics ==0.13.0.1 - - ghc-events ==0.6.0 + - ghc-compact ==0.1.0.0 + - ghc-core ==0.5.6 + - ghc-events ==0.7.0 - ghc-exactprint ==0.5.5.0 - - ghc-heap-view ==0.5.10 - ghcid ==0.6.8 - ghcjs-base-stub ==0.1.0.4 - ghcjs-codemirror ==0.0.0.1 + - ghcjs-dom ==0.9.2.0 + - ghcjs-dom-jsaddle ==0.9.2.0 - ghcjs-perch ==0.3.3.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.0.3 + - ghc-prof ==1.4.0.4 - ghc-syb-utils ==0.2.3.3 - - ghc-tcplugins-extra ==0.2.1 - - ghc-typelits-extra ==0.2.3 - - ghc-typelits-knownnat ==0.3.1 - - ghc-typelits-natnormalise ==0.5.4 + - ghc-tcplugins-extra ==0.2.2 + - ghc-typelits-extra ==0.2.4 + - ghc-typelits-knownnat ==0.4 + - ghc-typelits-natnormalise ==0.5.8 + - ghost-buster ==0.1.1.0 - gi-atk ==2.0.14 - gi-cairo ==1.0.14 - - gi-gdk ==3.0.14 - - gi-gdkpixbuf ==2.0.14 - - gi-gio ==2.0.14 - - gi-glib ==2.0.14 + - gi-glib ==2.0.15 - gi-gobject ==2.0.15 - - gi-gtk ==3.0.17 - - gi-javascriptcore ==3.0.14 - - ginger ==0.5.3.0 - - gio ==0.13.3.1 - - gi-pango ==1.0.15 + - gi-javascriptcore ==4.0.14 + - ginger ==0.7.3.0 - giphy-api ==0.5.2.0 - - gi-soup ==2.4.14 - - git ==0.2.0 - - github ==0.16.0 - - github-release ==1.0.7 + - git ==0.2.1 + - github ==0.18 + - github-release ==1.1.2 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -800,25 +869,26 @@ default-package-overrides: - gitlib-libgit2 ==3.1.1 - gitlib-test ==3.1.0.3 - gitrev ==1.3.1 - - gitson ==0.5.2 - - gi-webkit ==3.0.14 - gl ==0.8.0 - - glabrous ==0.3.3 + - glabrous ==0.3.4 - glaze ==0.3.0.1 - glazier ==0.11.0.1 - glazier-pipes ==0.1.5.1 - - glazier-react ==0.6.0.0 - - glazier-react-widget ==0.6.0.0 - GLFW-b ==1.4.8.1 - glib ==0.13.5.0 - - Glob ==0.8.0 + - Glob ==0.9.1 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 + - gloss-accelerate ==2.0.0.0 + - gloss-algorithms ==1.11.1.1 + - gloss-raster ==1.11.1.1 + - gloss-raster-accelerate ==2.0.0.0 - gloss-rendering ==1.11.1.1 - GLURaw ==2.0.0.3 - GLUT ==2.7.0.12 - gluturtle ==0.0.58.1 - gnuplot ==0.5.4.2 + - goggles ==0.1.0.3 - gogol ==0.3.0 - gogol-adexchange-buyer ==0.3.0 - gogol-adexchange-seller ==0.3.0 @@ -918,12 +988,12 @@ default-package-overrides: - gogol-youtube-reporting ==0.3.0 - google-cloud ==0.0.4 - google-oauth2-jwt ==0.2.2 + - google-translate ==0.4.1 - GPipe ==2.2.3 - - GPipe-GLFW ==1.4.1.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphs ==0.7 - - graphviz ==2999.18.1.2 + - graphviz ==2999.19.0.0 - graph-wrapper ==0.2.5.1 - gravatar ==0.8.0 - graylog ==0.1.0.1 @@ -933,80 +1003,78 @@ default-package-overrides: - groundhog-mysql ==0.8 - groundhog-postgresql ==0.8.0.1 - groundhog-sqlite ==0.8 - - groundhog-th ==0.8.0.1 + - groundhog-th ==0.8.0.2 - group-by-date ==0.1.0.2 - - grouped-list ==0.2.1.3 + - grouped-list ==0.2.1.4 - groupoids ==4.0 - - groups ==0.4.0.0 - - gtk ==0.14.7 - - gtk2hs-buildtools ==0.13.3.0 - - gtk3 ==0.14.7 + - groups ==0.4.1.0 + - gtk2hs-buildtools ==0.13.3.1 + - gym-http-api ==0.1.0.0 - H ==0.9.0.1 - h2c ==1.0.0 - - hackage-db ==1.22 + - hackage-db ==2.0 - hackage-security ==0.5.2.2 - - hackernews ==1.2.0.0 - - haddock ==2.17.4 - - haddock-api ==2.17.4 + - hackernews ==1.3.0.0 - haddock-library ==1.4.3 - - haddock-test ==0.0.1 - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - - hakyll ==4.9.8.0 - - hakyll-favicon ==0.1.0 + - hakyll ==4.10.0.0 - half ==0.2.2.3 - - hamilton ==0.1.0.0 + - hamilton ==0.1.0.1 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.3.0 + - hapistrano ==0.3.5.1 - happstack-hsp ==7.3.7.3 - happstack-jmacro ==7.0.12 - - happstack-server ==7.4.6.4 + - happstack-server ==7.5.0.1 - happstack-server-tls ==7.1.6.4 - happy ==1.19.8 - harp ==0.4.3 - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - - hashmap ==1.3.2 + - hashids ==1.0.2.3 + - hashmap ==1.3.3 - hashtables ==1.2.2.1 - - haskeline ==0.7.4.0 + - haskeline ==0.7.4.2 - haskell-gi ==0.20.3 - - haskell-gi-base ==0.20.5 + - haskell-gi-base ==0.20.8 - haskell-gi-overloading ==1.0 - haskell-import-graph ==1.0.3 - haskell-lexer ==1.0.1 - - haskell-lsp ==0.1.0.0 + - haskell-lsp ==0.2.0.1 + - haskell-lsp-client ==1.0.0.1 + - haskell-names ==0.9.0 - haskell-neo4j-client ==0.3.2.4 - HaskellNet ==0.5.1 - HaskellNet-SSL ==0.3.4.0 - - haskell-packages ==0.5 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.2.0 - - haskell-src-exts ==1.18.2 + - haskell-src-exts ==1.19.1 - haskell-src-exts-simple ==1.19.0.0 - haskell-src-exts-util ==0.2.1.2 - haskell-src-meta ==0.8.0.1 - - haskell-tools-ast ==0.8.1.0 - - haskell-tools-backend-ghc ==0.8.1.0 - - haskell-tools-cli ==0.8.0.0 - - haskell-tools-daemon ==0.8.1.0 - - haskell-tools-debug ==0.8.1.0 - - haskell-tools-demo ==0.8.1.0 - - haskell-tools-prettyprint ==0.8.1.0 - - haskell-tools-refactor ==0.8.1.0 - - haskell-tools-rewrite ==0.8.1.0 - - haskintex ==0.7.0.1 - - hasmin ==0.3.3.1 - - hasql ==0.19.18.2 + - haskell-tools-ast ==1.0.0.3 + - haskell-tools-backend-ghc ==1.0.0.3 + - haskell-tools-builtin-refactorings ==1.0.0.3 + - haskell-tools-cli ==1.0.0.3 + - haskell-tools-daemon ==1.0.0.3 + - haskell-tools-debug ==1.0.0.3 + - haskell-tools-demo ==1.0.0.3 + - haskell-tools-prettyprint ==1.0.0.3 + - haskell-tools-refactor ==1.0.0.3 + - haskell-tools-rewrite ==1.0.0.3 + - haskintex ==0.8.0.0 + - hasmin ==1.0.1 + - hasql ==1.1.1 - hasql-migration ==0.1.3 + - hasql-optparse-applicative ==0.2.4 - hasql-pool ==0.4.3 - hasql-transaction ==0.5.2 - hastache ==0.6.1 - hasty-hamiltonian ==1.3.0 - HaTeX ==3.17.3.1 - - hatex-guide ==1.3.1.6 - haxl ==0.5.1.0 - haxl-amazonka ==0.1.1 - HaXml ==1.25.4 @@ -1014,95 +1082,98 @@ default-package-overrides: - hbeanstalk ==0.2.4 - Hclip ==3.0.0.4 - HCodecs ==0.5 - - hcwiid ==0.0.6.1 - - hdaemonize ==0.5.4 + - hdaemonize ==0.5.5 - HDBC ==2.4.0.2 - HDBC-mysql ==0.7.1.0 - HDBC-session ==0.1.1.1 - - hdevtools ==0.1.6.0 - - hdocs ==0.5.2.1 + - hdevtools ==0.1.6.1 - heap ==1.0.3 - heaps ==0.3.5 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 - - hedgehog ==0.5 + - hedgehog ==0.5.1 - hedgehog-quickcheck ==0.1 - hedis ==0.9.12 - - here ==1.2.11 + - here ==1.2.12 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.1 - hex ==0.1.2 - hexml ==0.3.3 + - hexml-lens ==0.2.1 - hexpat ==0.20.13 - hexstring ==0.11.1 - hformat ==0.3.1.0 - hfsevents ==0.1.6 - hid ==0.2.2 - hidapi ==0.1.4 - - hidden-char ==0.1.0.1 + - hidden-char ==0.1.0.2 - hierarchical-clustering ==0.4.6 + - higher-leveldb ==0.4.0.1 - highjson ==0.4.0.0 - highjson-swagger ==0.4.0.0 - highjson-th ==0.4.0.0 - - highlight ==1.0.0.1 - highlighting-kate ==0.6.4 - hinotify ==0.3.9 - hint ==0.7.0 - - hinterface ==0.5.0.2 + - hip ==1.5.3.0 - histogram-fill ==0.8.5.0 - hit ==0.6.3 - hjsmin ==0.2.0.2 - - hjsonpointer ==1.2.0 - - hjsonschema ==1.6.3 + - hjsonpointer ==1.3.0 + - hjsonschema ==1.7.1 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.6.1 - - hlint ==2.0.10 - - hmatrix ==0.18.0.0 + - hlint ==2.0.11 + - hmatrix ==0.18.1.0 - hmatrix-gsl ==0.18.0.1 - hmatrix-gsl-stats ==0.4.1.7 + - hmatrix-morpheus ==0.1.1.1 + - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.4.0.1 - hmpfr ==0.4.3 - - hoauth2 ==1.3.0 + - hnix ==0.3.4 + - hoauth2 ==1.5.1 - hocilib ==0.2.0 + - Hoed ==0.4.0 - holy-project ==0.2.0.1 + - hOpenPGP ==2.5.5 + - hopenpgp-tools ==0.19.5 - hopfli ==0.2.2.1 - - hosc ==0.15 + - hosc ==0.16 - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.10 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.8.0.2 - - hpack ==0.18.1 + - hpack ==0.21.2 - hpc-coveralls ==1.0.10 - - hPDB ==1.2.0.9 - - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.10 - - hpp ==0.4.1 + - hpio ==0.9.0.2 + - hpp ==0.5.1 - hpqtypes ==1.5.1.1 + - hprotoc ==2.4.6 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - - hruby ==0.3.4.4 - - hsass ==0.4.2 + - hruby ==0.3.5.1 + - hsass ==0.5.0 - hsb2hs ==0.3.1 - - hs-bibutils ==5.5 - - hscolour ==1.24.1 - - hscurses ==1.4.2.0 - - hsdev ==0.2.5.1 + - hs-bibutils ==6.2.0.1 + - hscolour ==1.24.2 - hsdns ==1.7 - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - hset ==2.2.0 - HSet ==0.0.1 - - hsexif ==0.6.1.4 + - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 - hsinstall ==1.6 - hslogger ==1.2.10 - - hslua ==0.4.1 - - hslua-aeson ==0.1.0.4 + - hslua ==0.9.5 + - hslua-aeson ==0.3.0.1 + - hslua-module-text ==0.1.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - HsOpenSSL ==0.11.4.11 @@ -1117,16 +1188,15 @@ default-package-overrides: - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.4 - - hspec-golden-aeson ==0.2.1.0 - - hspec-megaparsec ==0.3.1 + - hspec-golden-aeson ==0.4.0.0 + - hspec-megaparsec ==1.0.0 - hspec-meta ==2.4.4 - hspec-pg-transact ==0.1.0.2 - - hspec-setup ==0.2.1.0 - hspec-smallcheck ==0.4.2 - - hspec-wai ==0.8.0 - - hspec-wai-json ==0.8.0 + - hspec-wai ==0.9.0 + - hspec-wai-json ==0.9.0 - hspec-webdriver ==1.2.0 - - hsshellscript ==3.4.1 + - hsshellscript ==3.4.5 - hstatistics ==0.3 - hstatsd ==0.1 - HStringTemplate ==0.8.6 @@ -1134,45 +1204,52 @@ default-package-overrides: - hsx2hs ==0.14.1.1 - hsx-jmacro ==7.3.8 - hsyslog ==5.0.1 + - hsyslog-udp ==0.2.0 - htaglib ==1.1.1 - HTF ==0.13.2.2 - html ==1.0.1.2 - html-conduit ==1.2.1.2 - html-email-validate ==0.2.0.0 + - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - HTTP ==4000.3.8 + - HTTP ==4000.3.9 - http2 ==1.6.3 - http-api-data ==0.3.7.1 - http-client ==0.5.7.1 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.1 - http-common ==0.8.2.0 - - http-conduit ==2.2.3.2 + - http-conduit ==2.2.4 - http-date ==0.0.6.1 - - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3 - - http-media ==0.6.4 + - http-media ==0.7.1.1 - http-reverse-proxy ==0.4.5 - - http-streams ==0.8.5.3 + - http-streams ==0.8.5.5 - http-types ==0.9.1 - human-readable-duration ==0.2.0.3 - - HUnit ==1.5.0.0 + - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==0.6.0.0 + - hunit-dejafu ==0.7.1.1 - hvect ==0.4.0.0 - - hw-balancedparens ==0.1.0.2 - - hw-bits ==0.5.0.3 + - hw-balancedparens ==0.2.0.1 + - hw-bits ==0.7.0.2 + - hw-conduit ==0.2.0.3 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 - - hw-excess ==0.1.0.1 + - hw-excess ==0.2.0.0 + - hw-hedgehog ==0.1.0.1 + - hw-hspec-hedgehog ==0.1.0.0 - hw-int ==0.0.0.3 + - 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.4.0.5 - - hw-rankselect ==0.8.0.2 + - hw-prim ==0.5.0.0 + - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 + - hw-xml ==0.1.0.1 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 @@ -1189,7 +1266,6 @@ default-package-overrides: - ical ==0.0.1 - iconv ==0.4.1.3 - identicon ==0.2.2 - - idris ==1.0 - ieee754 ==0.8.0 - if ==0.1.0.0 - IfElse ==0.85 @@ -1199,31 +1275,34 @@ default-package-overrides: - ilist ==0.3.1.0 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - - imm ==1.2.0.0 - immortal ==0.2.2.1 + - importify ==1.0.1 - include-file ==0.1.0.3 - incremental-parser ==0.2.5.2 - indentation-core ==0.0.0.1 - indentation-parsec ==0.0.0.1 - - indents ==0.4.0.0 - - inflections ==0.3.0.0 + - indents ==0.4.0.1 + - inflections ==0.4.0.0 + - influxdb ==1.2.2.2 - ini ==0.3.5 - - inline-c ==0.5.6.1 - - inline-c-cpp ==0.1.0.0 - - inline-java ==0.6.5 + - inline-c ==0.6.0.5 + - inline-c-cpp ==0.2.1.0 + - inline-java ==0.7.2 - inline-r ==0.9.0.2 - insert-ordered-containers ==0.2.1.0 + - inspection-testing ==0.1.2 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2 - integration ==0.2.1 - - intero ==0.1.23 + - intern ==0.9.1.4 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 + - Interpolation ==0.3.0 - interpolation ==0.1.0.2 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - intro ==0.3.0.1 - - invariant ==0.4.3 + - invariant ==0.5 - invertible ==0.2.0.2 - io-choice ==0.0.6 - io-machine ==0.2.0.0 @@ -1231,14 +1310,16 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.4.1.0 + - io-streams ==1.5.0.1 - io-streams-haproxy ==1.0.0.2 + - ip ==1.1.1 - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 - IPv6DB ==0.2.3 + - ipython-kernel ==0.9.0.1 - irc ==0.6.1.0 - - irc-client ==0.4.4.4 + - irc-client ==1.0.0.1 - irc-conduit ==0.2.2.4 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 @@ -1246,8 +1327,8 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.4 - - isotope ==0.5.0.1 - iterable ==3.0 + - ixset ==1.0.7 - ixset-typed ==0.3.1.1 - ix-shapable ==0.1.0 - jack ==0.7.1.1 @@ -1257,153 +1338,165 @@ default-package-overrides: - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - jmacro-rpc-snap ==0.3 - - jni ==0.3.1 + - jni ==0.5.1 - jose ==0.6.0.3 - - jose-jwt ==0.7.7 + - jose-jwt ==0.7.8 + - jsaddle ==0.9.4.0 + - jsaddle-dom ==0.9.2.0 - js-flot ==0.8.3 - js-jquery ==3.2.1 - json ==0.9.1 + - json-autotype ==1.0.18 - json-builder ==0.3 - - json-rpc-generic ==0.2.1.2 + - json-rpc-generic ==0.2.1.3 - json-schema ==0.7.4.1 - json-stream ==0.4.1.5 - - JuicyPixels ==3.2.9.1 + - JuicyPixels ==3.2.9.3 - JuicyPixels-extra ==0.2.2 - JuicyPixels-scale-dct ==0.1.1.2 - - jvm ==0.2.2 - - jvm-streaming ==0.2 + - justified-containers ==0.2.0.1 + - jvm ==0.4.1 - jwt ==0.7.2 - kan-extensions ==5.0.2 + - kanji ==3.0.2 - kansas-comet ==0.4 - - katip ==0.5.1.0 + - katip ==0.5.2.0 + - katip-elasticsearch ==0.4.0.3 + - katydid ==0.1.1.0 - kawhi ==0.3.0 - kdt ==0.2.4 - - keter ==1.4.3.2 - keycode ==0.2.2 - keys ==3.11 - kmeans ==0.1.3 - knob ==0.1.1 - koofr-client ==1.0.0.3 - - kraken ==0.0.3 + - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==0.4.6 + - lackey ==0.4.7 - lame ==0.1.1 - - language-c ==0.6.1 + - language-c ==0.7.1 - language-c-quote ==0.12.1 - - language-dockerfile ==0.3.6.0 - - language-ecmascript ==0.17.2.0 + - language-docker ==1.0.0 - language-fortran ==0.5.1 - language-glsl ==0.2.1 - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - language-javascript ==0.6.0.10 - - language-lua2 ==0.1.0.5 - - language-puppet ==1.3.8.1 - - language-python ==0.5.4 - - language-thrift ==0.10.0.0 + - language-puppet ==1.3.13 + - lapack-carray ==0.0 + - lapack-ffi ==0.0 + - lapack-ffi-tools ==0.0.0.1 + - large-hashable ==0.1.0.4 - largeword ==1.2.5 - latex ==0.1.0.3 - - lattices ==1.5.0 + - lattices ==1.7 - lazyio ==0.1.0.4 + - lazysmallcheck ==0.6 - lca ==0.3 - - leancheck ==0.6.7 - - leapseconds-announced ==2017 + - leancheck ==0.7.0 + - leapseconds-announced ==2017.1.0.1 - lens ==4.15.4 + - lens-accelerate ==0.1.0.0 - lens-action ==0.2.2 - lens-aeson ==1.0.2 - lens-datetime ==0.3 - - lens-family ==1.2.1 - - lens-family-core ==1.2.1 + - lens-family ==1.2.2 + - lens-family-core ==1.2.2 - lens-family-th ==0.5.0.1 - lens-labels ==0.1.0.2 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 - - lentil ==1.0.9.0 + - lentil ==1.0.9.1 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.1 - - lhs2tex ==1.19 - libffi ==0.1 - libgit ==0.3.1 + - libgraph ==1.14 - libinfluxdb ==0.0.4 - libmpd ==0.9.0.7 - - libnotify ==0.2 - - librato ==0.2.0.1 + - liboath-hs ==0.0.1.0 - libsystemd-journal ==1.4.2 - libxml-sax ==0.7.5 - LibZip ==1.0.1 - licensor ==0.2.1 - - lifted-async ==0.9.3 + - lifted-async ==0.9.3.2 - lifted-base ==0.2.3.11 - - lift-generics ==0.1.1 - - line ==3.1.0 + - lift-generics ==0.1.2 + - line ==4.0.1 - linear ==1.20.7 - - linear-accelerate ==0.4.1 + - linear-accelerate ==0.5.0.1 - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.2.0 - List ==0.6.2 - - list-fusion-probe ==0.1.0.6 - ListLike ==4.5.1 - - list-prompt ==0.1.1.0 - listsafe ==0.1.0.1 - list-t ==1.0.0.1 - - llvm-hs ==4.2.0 - - llvm-hs-pure ==4.1.0.0 + - llvm-hs ==5.1.3 + - llvm-hs-pure ==5.1.2 - lmdb ==0.2.5 + - load-env ==0.1.2 - loch-th ==0.2.1 + - lockfree-queue ==0.2.3.1 - log ==0.9.0.1 - log-base ==0.7.4.0 - - log-domain ==0.11.2 + - log-domain ==0.12 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - logging-effect ==1.2.1 + - logging-effect-extra ==1.2.1 + - logging-effect-extra-file ==1.1.1 + - logging-effect-extra-handler ==1.1.1 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 - log-postgres ==0.7.0.2 + - log-warper ==1.8.3 - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.2 - lucid ==2.9.9 - - lucid-svg ==0.7.0.0 - - lzma-conduit ==1.1.3.3 + - lxd-client ==0.1.0.5 + - lxd-client-config ==0.1.0.1 + - lzma ==0.0.0.3 + - lzma-conduit ==1.2.0 - machines ==0.6.3 - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - - machines-process ==0.2.0.8 - magic ==1.1 - - magicbane ==0.1.3 + - magicbane ==0.1.4 - mainland-pretty ==0.6.1 - - makefile ==1.0.0.4 + - makefile ==1.1.0.0 + - mallard ==0.6.1.1 - managed ==1.0.5 - mandrill ==0.5.3.2 - markdown ==0.1.16 - - markdown-unlit ==0.4.0 + - markdown-unlit ==0.4.1 - markov-chain ==0.0.3.4 - - markup ==3.1.0 + - markup ==4.0.3 - marvin ==0.2.5 - marvin-interpolate ==1.1.2 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 - - matplotlib ==0.5.0 + - matplotlib ==0.6.0 - matrices ==0.4.5 - matrix ==0.3.5.0 - matrix-market-attoparsec ==0.1.0.8 - maximal-cliques ==0.1.1 - mbox ==0.3.4 - mbox-utility ==0.0.1 + - mbtiles ==0.6.0.0 - mcmc-types ==1.0.3 - - mediabus ==0.4.0.1 - - mediabus-rtp ==0.4.0.1 - median-stream ==0.7.0.0 - med-module ==0.1.1 - - megaparsec ==5.3.1 - - mega-sdist ==0.3.0.2 - - memory ==0.14.8 + - megaparsec ==6.3.0 + - mega-sdist ==0.3.0.6 + - memory ==0.14.11 - MemoTrie ==0.6.8 + - mercury-api ==0.1.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - messagepack-rpc ==0.5.1 @@ -1418,26 +1511,37 @@ default-package-overrides: - microlens-mtl ==0.1.11.0 - microlens-platform ==0.3.9.0 - microlens-th ==0.4.1.1 + - microsoft-translator ==0.1.1 + - microspec ==0.1.0.0 - microstache ==1.0.1.1 - midi ==0.2.2.1 - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 + - milena ==0.5.2.0 - mime-mail ==0.4.14 - - mime-mail-ses ==0.3.2.3 + - mime-mail-ses ==0.4.0.0 - mime-types ==0.1.0.7 + - minimorph ==0.1.6.1 - minio-hs ==0.3.2 + - miniutter ==0.4.6.0 - mintty ==0.1.1 - - miso ==0.4.0.0 + - misfortune ==0.1.1.2 + - miso ==0.10.0.0 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - - mixed-types-num ==0.2.0.1 + - mixed-types-num ==0.3.1.4 - mltool ==0.1.0.2 - mmap ==0.5.9 - - mmorph ==1.0.9 + - mmark ==0.0.4.0 + - mmark-ext ==0.0.1.2 + - mmorph ==1.1.0 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - model ==0.3 + - model ==0.4.4 + - modern-uri ==0.1.2.1 - modify-fasta ==0.8.2.3 + - moesocks ==1.0.0.43 + - mole ==0.0.6 - monad-control ==1.0.2.2 - monad-control-aligned ==0.0.1 - monad-coroutine ==0.9.0.3 @@ -1445,14 +1549,17 @@ default-package-overrides: - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monadic-arrays ==0.2.2 - - monad-journal ==0.7.2 + - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.25.1 + - monad-logger ==0.3.26 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - - monad-metrics ==0.1.0.2 + - monad-memo ==0.4.1 + - monad-metrics ==0.2.1.0 + - monad-mock ==0.2.0.0 + - monadoid ==0.0.2 - monad-par ==0.3.4.8 - monad-parallel ==0.7.2.2 - monad-par-extras ==0.3.3 @@ -1461,19 +1568,21 @@ default-package-overrides: - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - MonadRandom ==0.5.1 + - monad-recorder ==0.1.0 - monad-skeleton ==0.1.5 + - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 - monad-time ==0.2 - monad-unlift ==0.2.0 - - monad-unlift-ref ==0.2.0 - - mongoDB ==2.3.0 + - monad-unlift-ref ==0.2.1 + - mongoDB ==2.3.0.1 - monoidal-containers ==0.3.0.2 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.4 - monoid-transformer ==0.0.3 - - mono-traversable ==1.0.4.0 + - mono-traversable ==1.0.7.0 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.11 + - morte ==1.6.13 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1485,17 +1594,19 @@ default-package-overrides: - multiset ==0.3.3 - multistate ==0.7.1.2 - murmur-hash ==0.1.0.9 - - mushu ==0.1.1 - MusicBrainz ==0.3.1 - - mustache ==2.2.3 + - mustache ==2.3.0 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 - mwc-random ==0.13.6.0 + - mwc-random-accelerate ==0.1.0.0 - mysql ==0.1.4 - - mysql-haskell ==0.8.0.0 - - mysql-haskell-openssl ==0.8.0.0 + - mysql-haskell ==0.8.3.0 + - mysql-haskell-nem ==0.1.0.0 + - mysql-haskell-openssl ==0.8.3.0 - mysql-simple ==0.4.4 - nagios-check ==0.3.2 + - nakadi-client ==0.3.0.0 - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 - nanospec ==0.2.1 @@ -1505,10 +1616,13 @@ default-package-overrides: - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.1 + - netlib-carray ==0.0 + - netlib-ffi ==0.0 - netpbm ==1.0.2 + - nettle ==0.2.0 - netwire ==5.0.2 - netwire-input ==0.0.6 - - netwire-input-glfw ==0.0.6 + - netwire-input-glfw ==0.0.7 - network ==2.6.3.2 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 @@ -1516,16 +1630,16 @@ default-package-overrides: - network-carbon ==1.0.10 - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - - network-info ==0.2.0.8 + - network-info ==0.2.0.9 - network-ip ==0.3.0.2 - network-msgpack-rpc ==0.0.3 - network-multicast ==0.2.0 - Network-NineP ==0.4.1 - network-simple ==0.4.0.5 - - network-transport ==0.4.4.0 - - network-transport-composed ==0.2.0.1 + - network-transport ==0.5.2 + - network-transport-composed ==0.2.1 - network-transport-inmemory ==0.5.2 - - network-transport-tcp ==0.5.1 + - network-transport-tcp ==0.6.0 - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 @@ -1534,95 +1648,96 @@ default-package-overrides: - nfc ==0.1.0 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - - nix-paths ==1.0.0.1 - - nonce ==1.0.4 + - nix-paths ==1.0.1 + - NoHoed ==0.1.1 + - nonce ==1.0.5 - nondeterminism ==1.4 - non-empty ==0.3 - non-empty-sequence ==0.2.0.2 - non-negative ==0.1.1.2 + - normaldistribution ==1.1.0.3 + - normalization-insensitive ==2.0.1 - NoTrace ==0.3.0.2 - - nsis ==0.3.1 + - nsis ==0.3.2 + - n-tuple ==0.0.1.1 - numbers ==3000.2.0.1 - numeric-extras ==0.1 - numeric-prelude ==0.4.2 - - numeric-quest ==0.2.0.1 - - numhask ==0.0.9 - - numhask-range ==0.0.4 + - numhask ==0.1.4.0 + - numhask-range ==0.1.3.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.1 - - nvim-hs ==0.2.4 + - nvim-hs ==0.2.5 - nvim-hs-contrib ==0.2.0 - nvim-hs-ghcid ==0.2.0 - - oanda-rest-api ==0.4.1 - - objective ==1.1.1 + - nvvm ==0.8.0.2 + - objective ==1.1.2 - ObjectName ==1.1.0.1 - - octane ==0.20.2 - - Octree ==0.5.4.3 + - ochintin-daicho ==0.1.0.1 - oeis ==0.3.9 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - once ==0.2 - - one-liner ==0.9.1 + - one-liner ==0.9.2 - OneTuple ==0.2.1 - online ==0.2.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.4.0 - - opaleye-trans ==0.3.7 + - opaleye ==0.6.0.0 + - opaleye-trans ==0.4.2 - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.1 - OpenGL ==3.0.2.0 - - OpenGLRaw ==3.2.5.0 + - OpenGLRaw ==3.2.7.0 - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.3 - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - opml-conduit ==0.6.0.3 + - opml-conduit ==0.6.0.4 - optional-args ==1.0.1 - options ==1.2.1.1 - - optparse-applicative ==0.13.2.0 - - optparse-generic ==1.2.2 - - optparse-helper ==0.2.1.1 - - optparse-simple ==0.0.4 + - optparse-applicative ==0.14.0.0 + - optparse-generic ==1.2.3 + - optparse-simple ==0.1.0 - optparse-text ==0.1.1.0 - - osdkeys ==0.0 - - overloaded-records ==0.4.2.0 - package-description-remote ==0.2.0.0 - - packdeps ==0.4.3 - - packunused ==0.1.2 + - packdeps ==0.4.4 - pager ==0.1.1.0 - pagerduty ==0.0.8 - pagination ==0.2.1 - palette ==0.1.0.5 - - pandoc ==1.19.2.4 - - pandoc-citeproc ==0.10.5.1 - - pandoc-types ==1.17.0.5 + - pandoc ==2.0.6 + - pandoc-citeproc ==0.12.2.5 + - pandoc-types ==1.17.3 - pango ==0.13.4.0 - - papillon ==0.1.0.4 + - papillon ==0.1.0.5 - parallel ==3.2.1.1 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - parsec ==3.1.11 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==0.1.0 - - parsers ==0.12.7 + - parser-combinators ==0.4.0 + - parsers ==0.12.8 - partial-handler ==1.0.2 - partial-isomorphisms ==0.2.2.1 - partial-order ==0.1.2.1 - - patat ==0.5.2.2 - - path ==0.5.13 + - partial-semigroup ==0.3.0.2 + - path ==0.6.1 - path-extra ==0.0.6 - - path-io ==1.2.2 + - path-io ==1.3.3 - path-pieces ==0.2.1 + - path-text-utf8 ==0.0.1.0 - pathtype ==0.8 - pathwalk ==0.3.1.2 - patience ==0.1.1 - pattern-arrows ==0.0.2 + - pcf-font ==0.2.2.0 + - pcf-font-embed ==0.1.1.0 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.0.4 - pcre-utils ==0.1.8.1.1 @@ -1630,18 +1745,18 @@ default-package-overrides: - pdf-toolbox-content ==0.0.5.1 - pdf-toolbox-core ==0.0.4.1 - pdf-toolbox-document ==0.0.7.1 + - pell ==0.1.1.0 - pem ==0.2.2 - - perf ==0.1.2 - - persistable-record ==0.5.1.1 + - perf ==0.3.0 + - persistable-record ==0.6.0.0 - persistable-types-HDBC-pg ==0.0.1.5 - persistent ==2.7.1 - persistent-mongoDB ==2.6.0 - persistent-mysql ==2.6.2.1 - - persistent-mysql-haskell ==0.3.0.0 - - persistent-postgresql ==2.6.2 - - persistent-redis ==2.5.2 + - persistent-mysql-haskell ==0.3.6 + - persistent-postgresql ==2.6.2.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.3 + - persistent-sqlite ==2.6.4 - persistent-template ==2.5.3 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 @@ -1652,57 +1767,53 @@ default-package-overrides: - pid1 ==0.1.2.0 - pinboard ==0.9.12.6 - pinch ==0.3.2.0 - - pinchot ==0.24.0.0 - - pipes ==4.3.6 + - pipes ==4.3.7 + - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.6 - - pipes-cacophony ==0.5.0 - - pipes-category ==0.2.0.1 + - pipes-category ==0.3.0.0 - pipes-concurrency ==2.0.8 + - pipes-csv ==1.4.3 - pipes-extras ==1.0.12 - - pipes-fluid ==0.5.0.3 + - pipes-fastx ==0.3.0.0 + - pipes-fluid ==0.6.0.0 - pipes-group ==1.0.8 - - pipes-misc ==0.3.0.0 + - pipes-misc ==0.4.0.1 - pipes-mongodb ==0.1.0.0 + - pipes-network ==0.6.4.1 - pipes-parse ==3.0.8 - - pipes-random ==1.0.0.3 - - pipes-safe ==2.2.5 + - pipes-random ==1.0.0.4 + - pipes-safe ==2.2.6 - pipes-text ==0.0.2.5 - pipes-wai ==3.2.0 - pixelated-avatar-generator ==0.1.3 - pkcs10 ==0.2.0.0 - placeholders ==0.1 - plan-b ==0.2.1 - - plot ==0.2.3.8 - - plot-gtk ==0.2.0.4 - - plot-gtk3 ==0.1.0.2 - - plot-gtk-ui ==0.3.0.2 - - plot-light ==0.2.7 + - plot ==0.2.3.9 - pointed ==5 - pointedlist ==0.6.1 - pointful ==1.0.9 - pointless-fun ==1.1.0.6 - - point-octree ==0.5.5.3 - poll ==0.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 - pooled-io ==0.0.2.1 - - posix-paths ==0.2.1.1 - - posix-realtime ==0.0.0.4 + - PortMidi ==0.1.6.1 + - posix-paths ==0.2.1.3 - postgresql-binary ==0.12.1 - postgresql-libpq ==0.9.3.1 - - postgresql-schema ==0.1.13 + - postgresql-query ==3.3.0 + - postgresql-schema ==0.1.14 - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.11.0 - - postgresql-simple-opts ==0.2.0.2 - - postgresql-simple-queue ==0.5.1.1 + - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 - postgresql-typed ==0.5.2 - post-mess-age ==0.2.1.0 - pqueue ==1.3.2.3 - - prednote ==0.36.0.4 - pred-set ==0.0.1 - pred-trie ==0.5.1.2 - prefix-units ==0.2.0 @@ -1719,62 +1830,72 @@ 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 - - pretty-show ==1.6.13 + - pretty-show ==1.6.15 - pretty-simple ==2.0.1.0 - pretty-types ==0.2.3.1 + - prim-array ==0.2.1 - primes ==0.2.1.0 - primitive ==0.6.2.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - process-extras ==0.7.2 + - product-isomorphic ==0.0.3.1 - product-profunctors ==0.8.0.3 - profiterole ==0.1 - - profiteur ==0.4.3.0 + - profiteur ==0.4.4.0 - profunctor-extras ==4.0 - profunctors ==5.2.1 - projectroot ==0.2.0.1 - project-template ==0.2.0 - - prometheus-client ==0.2.0 - - prometheus-metrics-ghc ==0.2.0 + - prometheus-client ==0.3.0 + - prometheus-metrics-ghc ==0.3.0 + - promises ==0.3 - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.5 - - protocol-buffers ==2.4.5 - - protocol-buffers-descriptor ==2.4.5 - - proto-lens ==0.2.1.0 + - protocol-buffers ==2.4.6 + - protocol-buffers-descriptor ==2.4.6 + - proto-lens ==0.2.2.0 - proto-lens-arbitrary ==0.1.1.1 - - proto-lens-combinators ==0.1.0.7 - - proto-lens-descriptors ==0.2.1.0 + - proto-lens-combinators ==0.1.0.8 + - proto-lens-descriptors ==0.2.2.0 - proto-lens-optparse ==0.1.0.4 - - proto-lens-protobuf-types ==0.2.1.0 - - proto-lens-protoc ==0.2.1.0 - - protolude ==0.1.10 + - proto-lens-protobuf-types ==0.2.2.0 + - proto-lens-protoc ==0.2.2.3 + - protolude ==0.2 - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - psqueues ==0.2.4.0 - - publicsuffix ==0.20170508 + - pthread ==0.2.0 + - publicsuffix ==0.20170802 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.11.1.1 - - pusher-http-haskell ==1.2.0.1 + - purescript-bridge ==0.11.1.2 + - pusher-http-haskell ==1.5.1.0 - pwstore-fast ==2.4.4 + - qchas ==1.0.1.0 + - qm-interpolated-string ==0.2.1.0 - QuasiText ==0.1.2.6 - - questioner ==0.1.1.0 - quickbench ==1.0 - - QuickCheck ==2.9.2 + - QuickCheck ==2.10.1 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.3.0 + - quickcheck-classes ==0.3.1 - quickcheck-combinators ==0.0.2 - - quickcheck-instances ==0.3.12 + - quickcheck-instances ==0.3.16 - quickcheck-io ==0.2.0 + - quickcheck-properties ==0.1 - quickcheck-simple ==0.1.0.2 - quickcheck-special ==0.1.0.6 + - quickcheck-state-machine ==0.3.0 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - - raaz ==0.1.1 + - quickcheck-with-counterexamples ==1.0 + - raaz ==0.2.0 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 + - rakuten ==0.1.0.4 - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 @@ -1783,13 +1904,14 @@ default-package-overrides: - random-tree ==0.6.0.5 - range ==0.1.2.0 - range-set-list ==0.1.2.0 - - rank1dynamic ==0.3.3.0 + - rank1dynamic ==0.4.0 - rank-product ==0.2.0.1 - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.3 - - ratel ==0.3.7 - - ratel-wai ==0.2.0 - - rattletrap ==2.5.0 + - ratel ==0.3.8 + - ratel-wai ==0.3.2 + - ratio-int ==0.1.2 + - rattletrap ==3.1.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -1797,17 +1919,15 @@ default-package-overrides: - rdtsc ==1.3.0.1 - reactive-banana ==1.1.0.1 - readable ==0.3.1 - - ReadArgs ==1.2.3 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - readline ==1.0.3.0 - - rebase ==1.0.8.1 + - rebase ==1.1.1 - recursion-schemes ==5.0.2 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.2 - refact ==0.3.0.2 - - references ==0.3.3.0 + - references ==0.3.3.1 - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - reflection ==2.1.2 @@ -1817,7 +1937,7 @@ default-package-overrides: - reform-happstack ==0.2.5.2 - reform-hsp ==0.2.7.1 - RefSerialize ==0.4.0 - - regex ==1.0.1.3 + - ref-tf ==0.4.0.1 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1829,42 +1949,43 @@ default-package-overrides: - regex-posix ==0.95.2 - regex-tdfa ==1.2.2 - regex-tdfa-text ==1.0.0.3 - - regex-with-pcre ==1.0.1.3 - reinterpret-cast ==0.1.0 - - relational-query ==0.9.5.0 - - relational-query-HDBC ==0.6.4.1 - - relational-record ==0.1.8.0 - - relational-schemas ==0.1.4.1 + - relational-query ==0.11.0.0 + - relational-query-HDBC ==0.6.6.1 + - relational-record ==0.2.1.2 + - relational-schemas ==0.1.6.1 + - rematch ==0.2.0.0 - renderable ==0.2.0.1 - - RepLib ==0.5.4 - - repline ==0.1.6.0 - - req ==0.2.0 - - req-conduit ==0.1.0 - - rerebase ==1.0.3 + - repa ==3.4.1.3 + - repa-algorithms ==3.4.1.2 + - repa-io ==3.4.1.1 + - repline ==0.1.7.0 + - req ==1.0.0 + - req-conduit ==1.0.0 - reroute ==0.4.1.0 - - resolve-trivial-conflicts ==0.3.2.4 - resource-pool ==0.2.3.2 - - resourcet ==1.1.9 + - resourcet ==1.1.10 - rest-client ==0.5.1.1 - rest-core ==0.39 - rest-gen ==0.20.0.1 - rest-happstack ==0.3.1.1 - - rest-snap ==0.2.0.1 + - rest-snap ==0.3.0.0 - rest-stringmap ==0.2.0.6 - rest-types ==1.14.1.1 - rest-wai ==0.2.0.1 - result ==0.2.6.0 - - rethinkdb ==2.2.0.10 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.4.3 + - retry ==0.7.5.1 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - - rng-utils ==0.2.1 - - rose-trees ==0.0.4.3 + - riak ==1.1.2.3 + - riak-protobuf ==0.23.0.0 + - RNAlien ==1.3.7 + - rng-utils ==0.3.0 + - roles ==0.2.0.0 + - rose-trees ==0.0.4.4 - rot13 ==0.2.0.1 - - rotating-log ==0.4.2 - RSA ==2.3.0 - - rss-conduit ==0.3.1.2 - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 @@ -1880,24 +2001,26 @@ default-package-overrides: - sandi ==0.4.1 - sandman ==0.2.0.1 - say ==0.1.0.0 + - sbp ==2.3.2 + - sbv ==7.4 + - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 - - schematic ==0.1.6.0 + - schematic ==0.4.2.0 - scientific ==0.3.5.2 - scotty ==0.11.0 - - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 - - SDL ==0.6.5.1 - - sdl2 ==2.2.0 + - sdl2 ==2.3.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==0.1 - - sdl2-ttf ==1.0.0 - - search-algorithms ==0.2.0 + - sdl2-ttf ==2.0.2 + - search-algorithms ==0.3.0 - securemem ==0.1.9 - SegmentTree ==0.3 - - selda ==0.1.11.1 + - selda ==0.1.11.2 - selda-postgresql ==0.1.7.0 - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 @@ -1906,71 +2029,79 @@ default-package-overrides: - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 - - sensu-run ==0.2.0 + - sensu-run ==0.4.0.3 - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 - serf ==0.1.1.0 - servant ==0.11 - servant-auth-cookie ==0.5.0.5 - servant-blaze ==0.7.1 - - servant-cassava ==0.9 + - servant-cassava ==0.10 - servant-checked-exceptions ==0.4.1.0 - servant-client ==0.11 - servant-docs ==0.11 - servant-elm ==0.4.0.1 + - servant-exceptions ==0.1.0 - servant-foreign ==0.10.1 + - servant-generic ==0.1.0.1 - servant-js ==0.9.3.1 - servant-JuicyPixels ==0.3.0.3 + - servant-kotlin ==0.1.0.2 - servant-lucid ==0.7.1 - servant-mock ==0.8.3 - - servant-purescript ==0.8.0.1 - - servant-ruby ==0.2.1.0 + - servant-pandoc ==0.4.1.4 + - servant-purescript ==0.9.0.2 + - servant-rawm ==0.2.0.2 + - servant-ruby ==0.5.0.0 - servant-server ==0.11.0.1 - servant-static-th ==0.1.0.6 - - servant-subscriber ==0.6.0.0 + - servant-subscriber ==0.6.0.1 - servant-swagger ==1.1.4 - servant-swagger-ui ==0.2.4.3.4.0 + - servant-websockets ==1.0.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 + - serversession-backend-persistent ==1.0.4 + - serversession-backend-redis ==1.0.2 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - servius ==1.2.0.3 + - ses-html ==0.4.0.0 - set-cover ==0.0.8 - setenv ==0.1.1.3 - setlocale ==1.0.0.5 - set-monad ==0.2.0.0 - sets ==0.0.5.2 - SHA ==1.6.4.2 - - shake ==0.15.11 - - shake-language-c ==0.10.1 - - shakespeare ==2.0.14 + - shake ==0.16 + - shake-language-c ==0.11.0 + - shakespeare ==2.0.14.1 - shell-conduit ==4.6.1 - - shelly ==1.6.8.3 + - shell-escape ==0.2.0 + - shelly ==1.7.0 - shikensu ==0.3.7 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - show-prettyprint ==0.2 - - sibe ==0.2.0.5 - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 - - simple-download ==0.0.2 - simple-log ==0.9.3 - simple-reflect ==0.3.2 - - simple-sendfile ==0.2.25 + - simple-sendfile ==0.2.26 - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - singleton-bool ==0.1.2.0 - - singletons ==2.2 + - singleton-nats ==0.4.0.3 + - singletons ==2.3.1 - siphash ==1.0.3 - skein ==1.0.9.4 - skeletons ==0.4.0 - - skylighting ==0.1.1.5 + - skylighting ==0.5.0.1 + - slack-web ==0.2.0.1 - slave-thread ==1.0.2 - slug ==0.1.7 - - smallcaps ==0.6.0.4 - - smallcheck ==1.1.2 - - smallcheck-series ==0.6 + - smallcheck ==1.1.3.1 - smoothie ==0.4.2.7 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 @@ -1983,19 +2114,16 @@ default-package-overrides: - soap-tls ==0.1.1.2 - socket ==0.8.0.1 - socket-activation ==0.1.0.2 - - socks ==0.5.5 - - solga ==0.1.0.2 - - solga-swagger ==0.1.0.2 + - socks ==0.5.6 - sort ==1.0.0.0 - sorted-list ==0.2.0.0 - - sound-collage ==0.2.0.1 - sourcemap ==0.1.6 - sox ==0.2.2.7 - soxlib ==0.0.3 - - sparkle ==0.5.0.1 - sparse-linear-algebra ==0.2.9.8 - spdx ==0.2.2.0 - special-values ==0.1.0.0 + - speculate ==0.3.2 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 @@ -2003,32 +2131,27 @@ default-package-overrides: - splice ==0.6.1.1 - split ==0.2.3.2 - splitmix ==0 - - split-record ==0.1.1.3 - Spock ==0.12.0.0 - Spock-api ==0.12.0.0 - Spock-api-server ==0.12.0.0 - Spock-core ==0.12.0.0 - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - - spool ==0.1 - - spreadsheet ==0.1.3.6 + - spreadsheet ==0.1.3.7 - sqlite-simple ==0.4.14.0 - sqlite-simple-errors ==0.6.0.0 - sql-words ==0.1.5.1 + - squeal-postgresql ==0.1.1.4 - srcloc ==0.5.1.1 - - stache ==0.2.2 - - stackage-curator ==0.14.5 - - stackage-query ==0.1.2 - - stackage-types ==1.2.0 - - stack-run-auto ==0.1.1.4 + - stache ==1.2.1 + - stackage-curator ==0.15.1.0 - stack-type ==0.1.0.0 + - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.0.4 - stateWriter ==0.2.9 - - static-canvas ==0.2.0.3 - - statistics ==0.13.3.0 - - stemmer ==0.5.2 + - statistics ==0.14.0.2 - stm ==2.4.4.1 - stm-chans ==3.0.0.4 - stm-conduit ==3.0.0 @@ -2045,21 +2168,21 @@ default-package-overrides: - storable-record ==0.0.3.1 - storable-tuple ==0.0.3.3 - storablevector ==0.2.12.1 - - storablevector-carray ==0.0 - store ==0.4.3.2 - store-core ==0.4.1 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.6.0 - - streaming ==0.1.4.5 - - streaming-binary ==0.3.0.1 - - streaming-bytestring ==0.1.4.6 - - streaming-commons ==0.1.17 - - streaming-utils ==0.1.4.7 - - streaming-wai ==0.1.1 + - stratosphere ==0.14.0 + - Stream ==0.4.7.2 + - streaming ==0.2.0.0 + - streaming-bytestring ==0.1.5 + - streaming-commons ==0.1.18 + - streamly ==0.1.0 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.5.0 + - strict-concurrency ==0.2.4.2 + - strict-types ==0.1.2 - stringable ==0.1.3 - stringbuilder ==0.5.0 - string-class ==0.1.6.5 @@ -2068,23 +2191,28 @@ default-package-overrides: - string-conversions ==0.4.0.1 - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - - strive ==3.0.4 + - string-transform ==0.1.0 + - stripe-core ==2.2.3 + - stripe-haskell ==2.2.3 + - stripe-http-streams ==2.2.3 + - stripe-tests ==2.2.3 + - strive ==4.0.3 + - structured-haskell-mode ==1.1.0 - stylish-haskell ==0.8.1.0 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 - - superrecord ==0.3.0.0 - svg-builder ==0.1.0.2 - SVGFonts ==1.6.0.3 - - svg-tree ==0.6.2 + - svg-tree ==0.6.2.1 - swagger ==0.3.0 - - swagger2 ==2.1.6 + - swagger2 ==2.2 + - swagger-petstore ==0.0.1.6 + - swish ==0.9.1.10 - syb ==0.7 + - syb-with-class ==0.6.1.8 - symbol ==0.2.4 - symengine ==0.1.2.0 - - synthesizer-core ==0.8.1.1 - - synthesizer-dimensional ==0.8.0.2 - - synthesizer-midi ==0.6.0.4 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - system-fileio ==0.3.16.3 @@ -2095,8 +2223,7 @@ default-package-overrides: - tagged ==0.8.5 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.2 - - tagshare ==0.0 - - tagsoup ==0.14.1 + - tagsoup ==0.14.2 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 - tar-conduit ==0.1.1 @@ -2104,52 +2231,45 @@ default-package-overrides: - tasty ==0.11.3 - tasty-ant-xml ==1.1.1 - tasty-auto ==0.2.0.0 - - tasty-dejafu ==0.6.0.0 - - tasty-discover ==3.0.2 + - tasty-dejafu ==0.7.1.1 + - tasty-discover ==4.1.3 - tasty-expected-failure ==0.11.0.4 - tasty-fail-fast ==0.0.3 - - tasty-golden ==2.3.1.1 + - tasty-golden ==2.3.1.2 + - tasty-hedgehog ==0.1.0.1 - tasty-hspec ==1.1.3.2 - tasty-html ==0.4.1.1 - tasty-hunit ==0.9.2 - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - - tasty-quickcheck ==0.8.4 - - tasty-rerun ==1.1.7 - - tasty-silver ==3.1.10 + - tasty-quickcheck ==0.9.1 + - tasty-rerun ==1.1.8 + - tasty-silver ==3.1.11 - tasty-smallcheck ==0.8.1 - tasty-stats ==0.2.0.3 - tasty-tap ==0.0.4 - tasty-th ==0.1.7 - - Taxonomy ==1.0.2 + - Taxonomy ==1.0.3 - TCache ==0.12.1 - tce-conf ==1.3 - - tcp-streams ==0.6.0.0 - - tcp-streams-openssl ==0.6.0.0 + - tcp-streams ==1.0.1.0 + - tcp-streams-openssl ==1.0.1.0 - tdigest ==0.1 - - tdigest-Chart ==0 - - teardown ==0.1.0.1 + - teardown ==0.3.0.0 - template ==0.2.0.10 - temporary ==1.2.1.1 - temporary-rc ==1.2.0.3 - - tensorflow ==0.1.0.2 - - tensorflow-core-ops ==0.1.0.0 - - tensorflow-opgen ==0.1.0.0 - - tensorflow-ops ==0.1.0.0 - - tensorflow-proto ==0.1.0.0 - tensorflow-test ==0.1.0.0 - termcolor ==0.2.0.0 - terminal-progress-bar ==0.1.1.1 - terminal-size ==0.3.2.1 - - terminfo ==0.4.1.0 - test-fixture ==0.5.1.0 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - test-framework-quickcheck2 ==0.3.0.4 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - - testing-feat ==0.4.0.3 - - texmath ==0.9.4.4 + - texmath ==0.10.1 - text ==1.2.2.2 - text-all ==0.4.1.1 - text-binary ==0.2.1.1 @@ -2158,47 +2278,56 @@ default-package-overrides: - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-latin1 ==0.3 - - text-ldap ==0.1.1.8 + - text-ldap ==0.1.1.10 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.2.3 - text-printer ==0.5 - text-region ==0.3.0.0 - - text-show ==3.6 - - text-show-instances ==3.6 + - text-short ==0.1.1 + - text-show ==3.7.1 + - text-show-instances ==3.6.2 - text-zipper ==0.10.1 - tfp ==1.0.0.2 - tf-random ==0.5 - th-abstraction ==0.2.6.0 - - th-data-compat ==0.0.2.4 - - th-desugar ==1.6 - - these ==0.7.3 - - th-expand-syns ==0.4.3.0 + - th-data-compat ==0.0.2.5 + - th-desugar ==1.7 + - these ==0.7.4 + - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - th-lift ==0.7.7 - th-lift-instances ==0.1.11 - th-orphans ==0.13.4 - - thread-local-storage ==0.1.1 + - thread-hierarchy ==0.3.0.0 + - thread-local-storage ==0.1.2 - threads ==0.5.1.5 - - threepenny-editors ==0.4.1 + - threads-extras ==0.1.0.2 + - threepenny-editors ==0.5.6 - threepenny-gui ==0.8.2.0 - threepenny-gui-flexbox ==0.4.2 - th-reify-compat ==0.0.1.3 - 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-to-exp ==0.0.1.1 - thumbnail-plus ==1.0.5 - th-utilities ==0.2.0.1 - thyme ==0.3.5.5 - - tidal ==0.9.4 + - tibetan-utils ==0.1.1.4 + - tidal ==0.9.6 + - tidal-midi ==0.9.5.2 + - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==1.0.0.0 - timelens ==0.2.0.2 - - time-lens ==0.4.0.1 + - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.3 - - timemap ==0.0.4 + - time-locale-vietnamese ==1.0.0.0 + - timemap ==0.0.6 - time-parsers ==0.1.2.0 - timerep ==2.0.0.2 - timespan ==0.3.0.0 @@ -2207,50 +2336,52 @@ default-package-overrides: - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - titlecase ==1.0.1 - - tldr ==0.2.2 - - tls ==1.3.11 - - tls-debug ==0.4.4 - - tls-session-manager ==0.0.0.1 + - tldr ==0.2.4 + - tls ==1.4.0 + - tls-debug ==0.4.5 + - tls-session-manager ==0.0.0.2 + - tmapchan ==0.0.3 + - tmapmvar ==0.0.3 - tmp-postgres ==0.1.1.1 - token-bucket ==0.1.0.1 - torrent ==10000.1.1 - tostring ==0.2.1.1 - - tracy ==0.1.4.0 - transformers-base ==0.4.4 + - transformers-bifunctors ==0.1 - transformers-compat ==0.5.1.4 - transformers-lift ==0.2.0.1 - transient ==0.5.9.2 - transient-universe ==0.4.6.1 - traverse-with-class ==1.0.0.0 + - tree-diff ==0.0.0.1 - tree-fun ==0.8.1.0 - tries ==0.0.4.2 - - trifecta ==1.6.2.1 + - trifecta ==1.7.1.1 - triplesec ==0.1.2.0 - true-name ==0.1.0.3 - tsv2csv ==0.1.0.2 - ttrie ==0.1.2.1 - - tttool ==1.7.0.3 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-th ==0.2.5 - - turtle ==1.3.6 + - turtle ==1.4.5 - turtle-options ==0.1.0.4 - - twitter-conduit ==0.2.2.2 - - twitter-feed ==0.2.0.11 + - twitter-conduit ==0.2.3 - twitter-types ==0.7.2.2 - twitter-types-lens ==0.7.2 - type-aligned ==0.9.6 - type-assertions ==0.1.0.0 - type-combinators ==0.2.4.3 + - type-combinators-singletons ==0.1.0.0 - TypeCompose ==0.9.12 - - typed-process ==0.1.1 + - typed-process ==0.2.1.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 - - type-list ==0.5.0.0 - typelits-witnesses ==0.2.3.0 + - type-of-html ==1.3.2.0 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 @@ -2258,9 +2389,10 @@ default-package-overrides: - tzdata ==0.1.20170320.0 - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - - unbound ==0.5.1 + - unagi-chan ==0.4.1.0 - unbounded-delays ==0.1.1.0 - unbound-generics ==0.3.1 + - unboxed-ref ==0.4.0.0 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - unfoldable ==0.9.4 @@ -2273,33 +2405,35 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - unique ==0 - Unique ==0.4.7.1 + - unique ==0 - unit-constraint ==0.0.0 - - units ==2.4 - - units-defs ==2.0.1.1 - - units-parser ==0.1.1 + - units-parser ==0.1.1.2 - 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.0.0 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.4.3.1 + - unix-compat ==0.5.0.1 - unix-time ==0.3.7 - - unliftio ==0.1.1.0 - - unliftio-core ==0.1.0.0 + - unliftio ==0.2.2.0 + - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.8.0 + - unordered-intmap ==0.1.0.0 - unsafe ==0.0 - - uri-bytestring ==0.2.3.3 + - uri-bytestring ==0.3.1.0 - uri-bytestring-aeson ==0.1.0.4 - uri-encode ==1.5.0.5 - - uri-templater ==0.2.2.0 + - uri-templater ==0.3.1.0 - url ==2.1.3 - - urlpath ==5.0.0.1 + - urlpath ==7.0.1 + - userid ==0.1.3.1 - users ==0.5.0.0 + - users-persistent ==0.5.0.2 - users-postgresql-simple ==0.5.0.2 - users-test ==0.5.0.1 - utf8-light ==0.4.2 @@ -2307,12 +2441,21 @@ default-package-overrides: - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 - - uu-interleaved ==0.2.0.0 - - uu-parsinglib ==2.9.1.1 - vado ==0.0.9 - validate-input ==0.4.0.0 - - validation ==0.5.5 + - validation ==0.6.2 - validationt ==0.2.0.0 + - validity ==0.4.0.2 + - validity-aeson ==0.1.0.0 + - validity-bytestring ==0.2.0.0 + - validity-containers ==0.2.0.0 + - validity-path ==0.2.0.2 + - validity-scientific ==0.1.0.0 + - validity-text ==0.2.0.0 + - validity-time ==0.1.0.0 + - validity-unordered-containers ==0.1.0.0 + - validity-uuid ==0.0.0.0 + - validity-vector ==0.1.0.0 - varying ==0.7.0.3 - vault ==0.3.0.7 - vcswrapper ==0.1.6 @@ -2320,87 +2463,84 @@ default-package-overrides: - vector-algorithms ==0.7.0.1 - vector-binary-instances ==0.2.3.5 - vector-buffer ==0.4.1 + - vector-builder ==0.3.4.1 + - vector-fftw ==0.1.3.8 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-sized ==0.5.1.0 - - vector-space ==0.10.4 + - vector-sized ==0.6.1.0 + - vector-space ==0.12 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - vectortiles ==1.2.0.5 + - vectortiles ==1.2.0.6 - verbosity ==0.2.3.0 - - versions ==3.1.1 + - versions ==3.3.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.11 - - vinyl ==0.5.3 - - vinyl-utils ==0.3.0.0 + - viewprof ==0.0.0.12 + - vinyl ==0.7.0 + - vivid ==0.3.0.2 + - vivid-osc ==0.3.0.0 + - vivid-supercollider ==0.3.0.0 - void ==0.7.2 - - vty ==5.16 + - vty ==5.19.1 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.3 - - wai-cors ==0.2.5 + - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.20.0 + - wai-extra ==3.0.21.0 - wai-handler-launch ==3.0.2.3 - - wai-logger ==2.3.0 + - wai-logger ==2.3.1 - wai-middleware-auth ==0.1.2.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-consul ==0.1.0.2 - - wai-middleware-content-type ==0.5.1 - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - - wai-middleware-rollbar ==0.4.0 + - wai-middleware-prometheus ==0.3.0 + - wai-middleware-rollbar ==0.8.1 - wai-middleware-static ==0.8.1 - - wai-middleware-throttle ==0.2.1.0 - - wai-middleware-verbs ==0.3.2 - - wai-predicates ==0.9.0 - - wai-route ==0.3.1.1 - - wai-routes ==0.10.0 + - wai-middleware-throttle ==0.2.2.0 + - wai-predicates ==0.10.0 + - wai-route ==0.3.1.2 - wai-routing ==0.13.0 - wai-session ==0.3.2 - - wai-session-postgresql ==0.2.1.1 + - wai-session-postgresql ==0.2.1.2 - wai-slack-middleware ==0.2.0 - - waitra ==0.0.4.0 - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - warp ==3.2.13 - warp-tls ==3.2.4 - wave ==0.1.5 - - wavefront-obj ==0.1.0.1 + - wavefront ==0.7.1.1 - webdriver ==0.8.5 - webdriver-angular ==0.1.11 - - webkitgtk3 ==0.14.2.1 - - webkitgtk3-javascriptcore ==0.14.2.1 - webpage ==0.0.5 - web-plugins ==0.2.9 - - web-routes ==0.27.12 + - web-routes ==0.27.13 - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.11 - web-routes-hsp ==0.24.6.1 - web-routes-th ==0.22.6.2 - web-routes-wai ==0.24.3 - webrtc-vad ==0.1.0.3 - - websockets ==0.10.0.0 - - websockets-rpc ==0.4.0 - - websockets-simple ==0.0.2 - - websockets-snap ==0.10.2.3 - - weeder ==0.1.7 - - weigh ==0.0.5 + - websockets ==0.12.3.0 + - websockets-rpc ==0.6.0 + - websockets-simple ==0.0.6.3 + - websockets-snap ==0.10.2.4 + - weeder ==0.1.11 + - weigh ==0.0.7 + - wide-word ==0.1.0.5 - wikicfp-scraper ==0.1.0.9 - - wild-bind ==0.1.0.3 - - wild-bind-indicator ==0.1.0.1 - - wild-bind-task-x11 ==0.1.0.1 + - wild-bind ==0.1.1.0 - wild-bind-x11 ==0.1.0.7 - - Win32 ==2.3.1.1 - - Win32-extras ==0.2.0.1 + - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 - withdependencies ==0.2.4.1 - - witherable ==0.1.3.4 + - witherable ==0.2 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.2 @@ -2413,15 +2553,18 @@ default-package-overrides: - word24 ==2.0.1 - word8 ==0.1.3 - word-trie ==0.3.0 + - word-wrap ==0.4.1 - Workflow ==0.8.3 - wrap ==0.0.0 - - wreq ==0.5.0.1 + - wrecker ==1.2.3.0 + - wreq ==0.5.2.0 + - wreq-stringless ==0.5.2.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.4 - writer-cps-transformers ==0.1.1.3 - - wuss ==1.1.5 + - wuss ==1.1.6 - X11 ==1.8 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2430,22 +2573,24 @@ default-package-overrides: - x509-system ==1.6.6 - x509-validation ==1.6.9 - Xauth ==0.1 - - xdcc ==1.1.4 - xdg-basedir ==0.2.2 - - xeno ==0.2 + - xeno ==0.3.2 - xenstore ==0.1.1 - xhtml ==3000.2.2 + - xls ==0.1.0 - xlsx ==0.6.0 - xlsx-tabular ==0.2.2 - xml ==1.3.14 - xml-basic ==0.1.2 - - xml-conduit ==1.5.1 - - xml-conduit-parse ==0.3.1.1 + - xml-conduit ==1.7.0.1 + - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.1 - xml-hamlet ==0.4.1.1 + - xmlhtml ==0.2.5.2 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 + - xml-isogen ==0.2.1 - xml-lens ==0.1.6.3 - xml-picklers ==0.3.6 - xml-to-json ==2.0.1 @@ -2456,20 +2601,21 @@ default-package-overrides: - xmonad-extras ==0.13.2 - xss-sanitize ==0.3.5.7 - xturtle ==0.2.0.0 - - yackage ==0.8.1 - - yahoo-finance-api ==0.2.0.2 - - yaml ==0.8.25 - - Yampa ==0.10.6.2 + - xxhash ==0.0.2 + - xxhash-ffi ==0.2.0.0 + - yaml ==0.8.25.1 + - Yampa ==0.10.7 - YampaSynth ==0.2 + - yeshql ==3.0.1.3 - yesod ==1.4.5 - - yesod-auth ==1.4.19 - - yesod-auth-account ==1.4.3 + - yesod-alerts ==0.1.1.0 + - yesod-auth ==1.4.21 - yesod-auth-basic ==0.1.0.2 - yesod-auth-fb ==1.8.1 - yesod-auth-hashdb ==1.6.2 - - yesod-bin ==1.5.2.6 - - yesod-core ==1.4.37 - - yesod-default ==1.2.0 + - yesod-bin ==1.5.3 + - yesod-core ==1.4.37.2 + - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.4.1 - yesod-fb ==0.4.0 - yesod-form ==1.4.16 @@ -2477,38 +2623,37 @@ default-package-overrides: - yesod-form-richtext ==0.1.0.2 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 - - yesod-job-queue ==0.3.0.4 - - yesod-markdown ==0.11.4 - yesod-newsfeed ==1.6 - - yesod-persistent ==1.4.2 - - yesod-recaptcha2 ==0.1.0.1 + - yesod-persistent ==1.4.3 + - yesod-recaptcha2 ==0.2.3 - yesod-sitemap ==1.4.0.1 - yesod-static ==1.5.3.1 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.8 + - yesod-test ==1.5.9.1 - yesod-websockets ==0.2.6 - yes-precure5-command ==5.5.3 - - yi-core ==0.14.1 - - yi-frontend-vty ==0.14.1 - - yi-fuzzy-open ==0.14.1 - - yi-ireader ==0.14.1 - - yi-keymap-cua ==0.14.1 - - yi-keymap-emacs ==0.14.1 - - yi-keymap-vim ==0.14.1 - - yi-language ==0.14.1 - - yi-misc-modes ==0.14.1 - - yi-mode-haskell ==0.14.1 - - yi-mode-javascript ==0.14.1 - - yi-rope ==0.9 - - yi-snippet ==0.14.1 + - yi-core ==0.17.1 + - yi-frontend-vty ==0.17.1 + - yi-fuzzy-open ==0.17.1 + - yi-ireader ==0.17.1 + - yi-keymap-cua ==0.17.1 + - yi-keymap-emacs ==0.17.1 + - yi-keymap-vim ==0.17.1 + - yi-language ==0.17.1 + - yi-misc-modes ==0.17.1 + - yi-mode-haskell ==0.17.1 + - yi-mode-javascript ==0.17.1 + - yi-rope ==0.10 + - yi-snippet ==0.17.1 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 - - yoga ==0.0.0.1 + - yoga ==0.0.0.2 - youtube ==0.2.1.1 - zero ==0.1.4 - - zeromq4-haskell ==0.6.7 - - zip ==0.1.11 + - zeromq4-haskell ==0.7.0 + - zim-parser ==0.2.1.0 + - zip ==0.2.0 - zip-archive ==0.3.1.1 - zippers ==0.2.4 - ziptastic-client ==0.3.0.3 @@ -2516,7 +2661,7 @@ default-package-overrides: - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - - zm ==0.2.4 + - zm ==0.3.2 - zot ==0.0.3 - ztail ==1.2 @@ -2529,6 +2674,7 @@ extra-packages: - Cabal == 1.18.* # required for cabal-install et al on old GHC versions - Cabal == 1.20.* # required for cabal-install et al on old GHC versions - Cabal == 1.24.* # required for jailbreak-cabal etc. + - colour < 2.3.4 # newer versions don't support GHC 7.10.x - containers < 0.5 # required to build alex with GHC 6.12.3 - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 @@ -2537,10 +2683,16 @@ extra-packages: - haddock < 2.17 # required on GHC 7.10.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x + - 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.4 # required for haddock-api-2.18.x - 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.18.* # required by hoogle-5.0.4 + - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode + - hoogle == 5.0.14 # required by hie-hoogle + - hpack == 0.20.* # required by stack-1.6.1 + - inline-c < 0.6 # required on GHC 8.0.x + - inline-c-cpp < 0.2 # required on GHC 8.0.x - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. - 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 @@ -2600,7 +2752,6 @@ package-maintainers: - path-pieces - persistent - persistent-postgresql - - persistent-redis - persistent-sqlite - persistent-template - shakespeare @@ -2609,6 +2760,9 @@ package-maintainers: - lambdabot alunduil: - collection-json + - network-arbitrary + - network-uri-json + - siren-json dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -2682,6 +2836,7 @@ dont-distribute-packages: yices-painless: [ i686-linux, x86_64-linux, x86_64-darwin ] # these packages don't evaluate because they have broken dependencies + comark: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] dialog: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2694,7 +2849,10 @@ dont-distribute-packages: gi-webkit2webextension: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] + hplayground: [ i686-linux, x86_64-linux, x86_64-darwin ] imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2710,18 +2868,22 @@ dont-distribute-packages: nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ] nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ] nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + passman-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] spike: [ i686-linux, x86_64-linux, x86_64-darwin ] tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] # soft restrictions because of build errors @@ -2729,9 +2891,10 @@ dont-distribute-packages: 4Blocks: [ 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: [ "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 ] + abnf: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2745,14 +2908,11 @@ dont-distribute-packages: AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-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 ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] acid-state-dist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2763,6 +2923,7 @@ dont-distribute-packages: acme-hq9plus: [ 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 ] acme-now: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2802,20 +2963,21 @@ dont-distribute-packages: 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-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-prefix: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-quick: [ 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 ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-value-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-yak: [ 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 ] @@ -2827,13 +2989,15 @@ dont-distribute-packages: 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 ] - aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] + airtable-api: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] + alerta: [ i686-linux, x86_64-linux, x86_64-darwin ] + alex-prelude: [ 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-classes: [ 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 ] AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2848,38 +3012,19 @@ dont-distribute-packages: alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa: [ 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 ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] - ALUT: [ "x86_64-darwin" ] amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-athena: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-batch: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-clouddirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-cloudhsmv2: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-codestar: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-cur: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-dynamodb-dax: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-glue: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-greengrass: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-lex-models: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-lex-runtime: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-marketplace-entitlement: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-mechanicalturk: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-migrationhub: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-mobile: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-organizations: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-pricing: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-resourcegroupstagging: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-waf-regional: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-workdocs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-s3-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] amby: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + amqp-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2890,10 +3035,10 @@ dont-distribute-packages: angel: [ i686-linux, x86_64-linux, x86_64-darwin ] angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] - animate: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] annah: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] 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 ] @@ -2929,14 +3074,17 @@ dont-distribute-packages: applicative-fail: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] + apply-refact: [ 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 ] + approximate: [ 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 ] - arbtt: [ "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 ] archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] + archnews: [ i686-linux, x86_64-linux, x86_64-darwin ] arff: [ i686-linux, x86_64-linux, x86_64-darwin ] arghwxhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] argon2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2946,15 +3094,14 @@ 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 ] 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 ] 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 ] @@ -2966,30 +3113,33 @@ dont-distribute-packages: asil: [ i686-linux, x86_64-linux, x86_64-darwin ] asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] + assert: [ i686-linux, x86_64-linux, x86_64-darwin ] assimp: [ 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-dejafu: [ "x86_64-darwin" ] async-manager: [ 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 ] atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + atmos-dimensional-tf: [ 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 ] + atomic-modify: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] + atp-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + ats-format: [ i686-linux, x86_64-linux, x86_64-darwin ] attic-schedule: [ 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-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-csv: [ 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 ] attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3022,6 +3172,7 @@ 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-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 ] aws-general: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3029,6 +3180,7 @@ dont-distribute-packages: aws-kinesis-reshard: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-kinesis: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-mfa-credentials: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3036,13 +3188,11 @@ dont-distribute-packages: aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] - axiom: [ "x86_64-darwin" ] azubi: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] - b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - babylon: [ "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 ] backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3057,6 +3207,7 @@ dont-distribute-packages: bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] bamse: [ i686-linux, x86_64-linux, x86_64-darwin ] Bang: [ i686-linux, x86_64-linux, x86_64-darwin ] + bank-holiday-usa: [ i686-linux, x86_64-linux, x86_64-darwin ] banwords: [ i686-linux, x86_64-linux, x86_64-darwin ] barchart: [ i686-linux, x86_64-linux, x86_64-darwin ] barcodes-code128: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3067,8 +3218,8 @@ dont-distribute-packages: barrier-monad: [ 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 ] - base32-bytestring: [ "x86_64-darwin" ] base64-conduit: [ 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 ] batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3080,7 +3231,6 @@ dont-distribute-packages: beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] - bearriver: [ i686-linux, x86_64-linux, x86_64-darwin ] beautifHOL: [ i686-linux, x86_64-linux, x86_64-darwin ] bed-and-breakfast: [ i686-linux, x86_64-linux, x86_64-darwin ] beeminder-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3101,6 +3251,7 @@ dont-distribute-packages: 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 ] + 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 ] billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3108,14 +3259,18 @@ 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-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-parsers: [ 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-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 ] - binding-wx: [ "x86_64-darwin" ] + binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3126,11 +3281,10 @@ dont-distribute-packages: bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-fann: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-friso: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-gpgme: [ "x86_64-darwin" ] bindings-gsl: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-hamlib: [ "x86_64-darwin" ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3138,20 +3292,16 @@ dont-distribute-packages: 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-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-mmap: [ "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-parport: [ "x86_64-darwin" ] - bindings-portaudio: [ "x86_64-darwin" ] - bindings-posix: [ "x86_64-darwin" ] - bindings-ppdev: [ "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 ] + bio-sequence: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3163,36 +3313,38 @@ dont-distribute-packages: BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] - biohazard: [ 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 ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ 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 ] 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 ] Bitly: [ i686-linux, x86_64-linux, x86_64-darwin ] bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] bits-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - bits-extras: [ "x86_64-darwin" ] bitset: [ i686-linux, x86_64-linux, x86_64-darwin ] bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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: [ 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 ] - black-jewel: [ 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-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 ] blatex: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-builder-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - blaze-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-truncate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3206,16 +3358,19 @@ dont-distribute-packages: blockhash: [ i686-linux, x86_64-linux, x86_64-darwin ] Blogdown: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - bloxorz: [ "x86_64-darwin" ] blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] blunt: [ i686-linux, x86_64-linux, x86_64-darwin ] - BNFC-meta: [ 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 ] + bogocopy: [ 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 ] bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3223,81 +3378,91 @@ dont-distribute-packages: bond: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + bookkeeping-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] - boolean-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - boolean-normal-forms: [ 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 ] bot: [ 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 ] - brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + brain-bleep: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] + breve: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - bsd-sysctl: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - btrfs: [ "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 ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] bugzilla: [ i686-linux, x86_64-linux, x86_64-darwin ] buildable: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + 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 ] burst-detection: [ 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 ] - butcher: [ i686-linux, x86_64-linux, x86_64-darwin ] + buster: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytearray-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-arbitrary: [ 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-plain: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-progress: [ 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-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-tree-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - c-mosquitto: [ "x86_64-darwin" ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-bounds: [ 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-dependency-licenses: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-lenses: [ 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 ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-src: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal2ebuild: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3323,7 +3488,9 @@ dont-distribute-packages: camfort: [ i686-linux, x86_64-linux, x86_64-darwin ] campfire: [ i686-linux, x86_64-linux, x86_64-darwin ] canonical-filepath: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] cao: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3331,10 +3498,11 @@ dont-distribute-packages: Capabilities: [ 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 ] - caramia: [ "x86_64-darwin" ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] + carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] carte: [ i686-linux, x86_64-linux, x86_64-darwin ] Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] + casa-abbreviations-and-acronyms: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3384,6 +3552,7 @@ dont-distribute-packages: cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] cef3-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] cef3-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + cef: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] celtchar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3400,7 +3569,9 @@ 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 ] @@ -3410,14 +3581,12 @@ dont-distribute-packages: chart-unit: [ 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 ] chevalier-common: [ 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 ] @@ -3428,9 +3597,10 @@ dont-distribute-packages: chp-spec: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] ChristmasTree: [ i686-linux, x86_64-linux, x86_64-darwin ] chronograph: [ i686-linux, x86_64-linux, x86_64-darwin ] - chronos: [ 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 ] @@ -3448,12 +3618,18 @@ 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 ] CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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-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 ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3483,6 +3659,7 @@ dont-distribute-packages: 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 ] @@ -3492,11 +3669,8 @@ 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-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] clr-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] - clr-typed: [ 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 ] clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3513,7 +3687,6 @@ dont-distribute-packages: cmph: [ 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 ] - cndict: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ 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 ] @@ -3521,6 +3694,7 @@ dont-distribute-packages: 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 ] @@ -3532,23 +3706,21 @@ dont-distribute-packages: 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 ] - colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] - comark: [ i686-linux, x86_64-linux, x86_64-darwin ] combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] + comic: [ i686-linux, x86_64-linux, x86_64-darwin ] commander: [ i686-linux, x86_64-linux, x86_64-darwin ] Commando: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] @@ -3559,7 +3731,8 @@ dont-distribute-packages: compact-mutable: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] - compact: [ i686-linux, x86_64-linux, x86_64-darwin ] + Compactable: [ 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 ] compdata-dags: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-param: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3567,8 +3740,10 @@ dont-distribute-packages: 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 ] - compose-ltr: [ 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 ] + composite-opaleye: [ i686-linux, x86_64-linux, x86_64-darwin ] composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] compressed: [ i686-linux, x86_64-linux, x86_64-darwin ] compression: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3581,28 +3756,33 @@ dont-distribute-packages: concrete-haskell-autogen: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] + condor: [ i686-linux, x86_64-linux, x86_64-darwin ] condorcet: [ i686-linux, x86_64-linux, x86_64-darwin ] + conductive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] + conductive-song: [ 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 ] conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] conf: [ i686-linux, x86_64-linux, x86_64-darwin ] conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-ini: [ i686-linux, x86_64-linux, x86_64-darwin ] + config-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] configifier: [ i686-linux, x86_64-linux, x86_64-darwin ] Configurable: [ 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 ] conkin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3612,7 +3792,10 @@ dont-distribute-packages: console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ 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 ] + constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ 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 ] @@ -3620,12 +3803,14 @@ dont-distribute-packages: container: [ i686-linux, x86_64-linux, x86_64-darwin ] containers-benchmark: [ 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-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] ContextAlgebra: [ 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-dotdotdot: [ i686-linux, x86_64-linux, x86_64-darwin ] control-event: [ 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 ] @@ -3639,6 +3824,7 @@ dont-distribute-packages: convert: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3660,7 +3846,7 @@ dont-distribute-packages: couchdb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - counter: [ i686-linux, x86_64-linux, x86_64-darwin ] + countable-inflections: [ 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 ] @@ -3689,6 +3875,7 @@ 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 ] @@ -3696,6 +3883,7 @@ dont-distribute-packages: crf-chain1: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-tiers: [ i686-linux, x86_64-linux, x86_64-darwin ] + critbit: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-to-html: [ i686-linux, x86_64-linux, x86_64-darwin ] criu-rpc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3705,35 +3893,30 @@ dont-distribute-packages: cron-compat: [ 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 ] + crypt-sha512: [ 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 ] cryptoconditions: [ i686-linux, x86_64-linux, x86_64-darwin ] + cryptohash-sha512: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression-opcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-sampler: [ 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 ] cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] + csv-to-qif: [ 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 ] - cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] + cube: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3744,12 +3927,11 @@ dont-distribute-packages: 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 ] - damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ 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 ] @@ -3762,6 +3944,7 @@ dont-distribute-packages: darcs-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs: [ i686-linux, x86_64-linux, x86_64-darwin ] darcsden: [ i686-linux, x86_64-linux, x86_64-darwin ] DarcsHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] darcswatch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3779,10 +3962,14 @@ dont-distribute-packages: data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] data-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-emoticons: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-extend-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] data-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-foldapp: [ 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 ] @@ -3791,6 +3978,7 @@ dont-distribute-packages: 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-list-zigzag: [ i686-linux, x86_64-linux, x86_64-darwin ] data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3800,8 +3988,8 @@ dont-distribute-packages: 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 ] - data-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3817,8 +4005,10 @@ dont-distribute-packages: dbcleaner: [ 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 ] dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbmigrations-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3826,8 +4016,10 @@ dont-distribute-packages: DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] dcpu16: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddate: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-code: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3847,7 +4039,6 @@ dont-distribute-packages: debug-me: [ 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 ] decoder-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dedukti: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3863,27 +4054,24 @@ dont-distribute-packages: 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 ] - deiko-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - dejafu: [ "x86_64-darwin" ] deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] deka: [ i686-linux, x86_64-linux, x86_64-darwin ] delicious: [ 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 ] delta: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] dependent-state: [ 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 ] - dequeue: [ 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 ] derive-gadt: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-IG: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-storable: [ 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 ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3894,38 +4082,48 @@ dont-distribute-packages: 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-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-builder: [ 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-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-rasterific: [ 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 ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] + difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-happstack: [ 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-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors: [ 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 ] DimensionalHash: [ i686-linux, x86_64-linux, x86_64-darwin ] - dimensions: [ 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 ] dingo-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3940,39 +4138,42 @@ dont-distribute-packages: directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + discord-gateway: [ 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 ] discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] Dish: [ i686-linux, x86_64-linux, x86_64-darwin ] + disjoint-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] - diskhash: [ "x86_64-darwin" ] + diskhash: [ 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-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ 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 ] distribution-plot: [ 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 ] + 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 ] + dmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] DMuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] DnaProteinAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] dnscache: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3981,7 +4182,6 @@ 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: [ 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 ] @@ -3993,10 +4193,10 @@ dont-distribute-packages: domain-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] + dotenv: [ i686-linux, x86_64-linux, x86_64-darwin ] dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - dow: [ "x86_64-darwin" ] + doublify-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] - download: [ i686-linux, x86_64-linux, x86_64-darwin ] dozenal: [ i686-linux, x86_64-linux, x86_64-darwin ] dozens: [ i686-linux, x86_64-linux, x86_64-darwin ] DP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4020,6 +4220,7 @@ dont-distribute-packages: dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] + DSA: [ i686-linux, x86_64-linux, x86_64-darwin ] dsh-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] DSH: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4035,9 +4236,7 @@ dont-distribute-packages: dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtw: [ 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 ] 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 ] @@ -4060,17 +4259,18 @@ dont-distribute-packages: dywapitchtrack: [ 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 ] + 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: [ 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 ] + ecstasy: [ 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 ] edenmodules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4089,19 +4289,23 @@ dont-distribute-packages: 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 ] + either-list-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ 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 ] ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-prometheus-adapter: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-push: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] - elerea-examples: [ "x86_64-darwin" ] - elerea-sdl: [ "x86_64-darwin" ] elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] - eliminators: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] + elm-bridge: [ 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 ] @@ -4111,10 +4315,15 @@ dont-distribute-packages: embroidery: [ 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: [ 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 ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4123,11 +4332,11 @@ dont-distribute-packages: EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ] env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + envy: [ 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: [ "x86_64-darwin" ] + epic: [ i686-linux, x86_64-linux, x86_64-darwin ] epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] - epub-tools: [ "x86_64-darwin" ] 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 ] @@ -4140,7 +4349,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 ] - error-util: [ 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 ] ert: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4152,16 +4361,17 @@ dont-distribute-packages: estreps: [ i686-linux, x86_64-linux, x86_64-darwin ] Etage-Graph: [ i686-linux, x86_64-linux, x86_64-darwin ] Etage: [ i686-linux, x86_64-linux, x86_64-darwin ] - EtaMOO: [ "x86_64-darwin" ] + etc: [ 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 ] Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - ethereum-analyzer-deps: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-client-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + ety: [ i686-linux, x86_64-linux, x86_64-darwin ] + euphoria: [ i686-linux, x86_64-linux, x86_64-darwin ] eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4175,10 +4385,16 @@ dont-distribute-packages: every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + exact-cover: [ 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 ] exception-hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] execs: [ i686-linux, x86_64-linux, x86_64-darwin ] + executor: [ i686-linux, x86_64-linux, x86_64-darwin ] exference: [ i686-linux, x86_64-linux, x86_64-darwin ] exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4186,7 +4402,9 @@ dont-distribute-packages: 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 ] + exinst: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] + exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4197,8 +4415,6 @@ 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 ] @@ -4206,9 +4422,9 @@ dont-distribute-packages: extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-effects: [ 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 ] extralife: [ i686-linux, x86_64-linux, x86_64-darwin ] - extrapolate: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4216,14 +4432,19 @@ dont-distribute-packages: fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno: [ i686-linux, x86_64-linux, x86_64-darwin ] + failure-detector: [ i686-linux, x86_64-linux, x86_64-darwin ] FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] fake-type: [ 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-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-tagsoup: [ 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 ] + FastPush: [ i686-linux, x86_64-linux, x86_64-darwin ] FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4241,6 +4462,7 @@ dont-distribute-packages: fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] + fcache: [ i686-linux, x86_64-linux, x86_64-darwin ] fcd: [ i686-linux, x86_64-linux, x86_64-darwin ] fckeditor: [ i686-linux, x86_64-linux, x86_64-darwin ] fclabels-monadlib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4249,6 +4471,7 @@ dont-distribute-packages: feature-flipper-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] fedora-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed-collect: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-crawl: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4273,31 +4496,34 @@ dont-distribute-packages: file-collection: [ i686-linux, x86_64-linux, x86_64-darwin ] file-command-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] - filecache: [ "x86_64-darwin" ] filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-crypto: [ 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 ] + filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] Files: [ i686-linux, x86_64-linux, x86_64-darwin ] + filestore: [ 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 ] filtrable: [ 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-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + finite-field: [ i686-linux, x86_64-linux, x86_64-darwin ] FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + firefly-example: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] - fitspec: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4305,18 +4531,17 @@ 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 ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixplate: [ "x86_64-darwin" ] + fixie: [ i686-linux, x86_64-linux, x86_64-darwin ] + fizzbuzz-as-a-service: [ i686-linux, x86_64-linux, x86_64-darwin ] + fizzbuzz: [ i686-linux, x86_64-linux, x86_64-darwin ] flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flac: [ i686-linux, x86_64-linux, x86_64-darwin ] - flaccuraterip: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -4325,6 +4550,7 @@ dont-distribute-packages: Flippi: [ i686-linux, x86_64-linux, x86_64-darwin ] flite: [ i686-linux, x86_64-linux, x86_64-darwin ] floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + flock: [ i686-linux, x86_64-linux, x86_64-darwin ] flow-er: [ i686-linux, x86_64-linux, x86_64-darwin ] flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4366,11 +4592,11 @@ dont-distribute-packages: formura: [ 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 ] + 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 ] - foundation-edge: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] fptest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4381,7 +4607,6 @@ dont-distribute-packages: Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] fraxl: [ 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 ] @@ -4390,9 +4615,9 @@ 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-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 ] 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 ] @@ -4400,22 +4625,21 @@ dont-distribute-packages: fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ 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-gtk3: [ "x86_64-darwin" ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] - fsnotify-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - fswatch: [ 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-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] FTPLine: [ 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 ] @@ -4424,6 +4648,7 @@ dont-distribute-packages: 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-infix: [ i686-linux, x86_64-linux, x86_64-darwin ] functor-utils: [ 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 ] @@ -4435,11 +4660,11 @@ dont-distribute-packages: 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 ] - fuzzytime: [ "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 ] @@ -4447,17 +4672,19 @@ dont-distribute-packages: 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 ] 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 ] 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 ] - GeBoP: [ "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 ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] - gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ] gen-passwd: [ i686-linux, x86_64-linux, x86_64-darwin ] gencheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4469,10 +4696,11 @@ dont-distribute-packages: generators: [ 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-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-xml: [ 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 ] @@ -4488,7 +4716,21 @@ 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: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4500,25 +4742,24 @@ dont-distribute-packages: GeomPredicates-SSE: [ 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 ] - ghc-compact: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-exactprint: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-make: [ 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-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-syb: [ 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 ] ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4531,25 +4772,35 @@ dont-distribute-packages: ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-cairo: [ "x86_64-darwin" ] - gi-gdk: [ "x86_64-darwin" ] + gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstpbutils: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gsttag: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gtk-hs: [ "x86_64-darwin" ] - gi-gtk: [ "x86_64-darwin" ] + gi-gstvideo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gtk-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gtksource: [ "x86_64-darwin" ] + gi-gtksource: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pangocairo: [ "x86_64-darwin" ] + gi-ostree: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-pangocairo: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-secret: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-soup: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-vte: [ 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 ] + ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ] gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] - gist: [ i686-linux, x86_64-linux, x86_64-darwin ] GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] + gist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4563,11 +4814,13 @@ dont-distribute-packages: git-sanity: [ i686-linux, x86_64-linux, x86_64-darwin ] git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitHUD: [ 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 ] + gitlib-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-libgit2: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4575,14 +4828,15 @@ dont-distribute-packages: glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] glapp: [ 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 ] GLFW-task: [ i686-linux, x86_64-linux, x86_64-darwin ] - GLFW: [ "x86_64-darwin" ] - GLHUI: [ "x86_64-darwin" ] gli: [ 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 ] + glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] + glider-nlp: [ 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 ] @@ -4590,12 +4844,14 @@ dont-distribute-packages: global: [ i686-linux, x86_64-linux, x86_64-darwin ] glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] - GlomeVec: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] + glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4603,7 +4859,6 @@ dont-distribute-packages: 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 ] @@ -4612,51 +4867,58 @@ dont-distribute-packages: 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-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-games: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-oauth2-for-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-maps-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] + GoogleCodeJam: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] googleplus: [ i686-linux, x86_64-linux, x86_64-darwin ] googlepolyline: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleSB: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] + gopher-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-actor: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-async: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] GotoT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gotta-go-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] gpah: [ i686-linux, x86_64-linux, x86_64-darwin ] - gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe-GLFW: [ "x86_64-darwin" ] + GPipe-GLFW: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe: [ "x86_64-darwin" ] + GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] gps: [ i686-linux, x86_64-linux, x86_64-darwin ] gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] - grakn: [ i686-linux, x86_64-linux, x86_64-darwin ] + Grafos: [ i686-linux, x86_64-linux, x86_64-darwin ] grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] grammatical-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-ui-gtk: [ "x86_64-darwin" ] graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-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 ] @@ -4665,7 +4927,7 @@ dont-distribute-packages: graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphite: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphmod: [ i686-linux, x86_64-linux, x86_64-darwin ] graphql-api: [ 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 ] @@ -4678,14 +4940,15 @@ 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 ] grm: [ 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 ] - group-by-date: [ "x86_64-darwin" ] group-with: [ 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 ] @@ -4696,15 +4959,12 @@ dont-distribute-packages: gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - gstreamer: [ "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-largeTreeStore: [ "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-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-traymanager: [ "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 ] @@ -4715,32 +4975,29 @@ dont-distribute-packages: 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: [ "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 ] guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] guid: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] gyah-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] h2c: [ i686-linux, x86_64-linux, x86_64-darwin ] - H: [ "x86_64-darwin" ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] habit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hablog: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -4752,24 +5009,30 @@ 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 ] hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-sparks: [ 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 ] 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 ] haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddock-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4777,10 +5040,12 @@ dont-distribute-packages: haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] haiji: [ i686-linux, x86_64-linux, x86_64-darwin ] + hail: [ i686-linux, x86_64-linux, x86_64-darwin ] hailgun-send: [ i686-linux, x86_64-linux, x86_64-darwin ] hairy: [ i686-linux, x86_64-linux, x86_64-darwin ] hakaru: [ i686-linux, x86_64-linux, x86_64-darwin ] hakismet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakka: [ i686-linux, x86_64-linux, x86_64-darwin ] hako: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-agda: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-blaze-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4789,6 +5054,8 @@ dont-distribute-packages: hakyll-contrib-hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-filestore: [ 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 ] @@ -4800,11 +5067,11 @@ dont-distribute-packages: 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 ] - hamid: [ "x86_64-darwin" ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamtsolo: [ 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 ] handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4826,10 +5093,12 @@ dont-distribute-packages: HAppS-Util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -4837,10 +5106,12 @@ 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-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 ] happstack-server-tls-cryptonite: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-static-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-yui: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4849,13 +5120,14 @@ dont-distribute-packages: happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] 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-Base: [ 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 ] haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4863,7 +5135,6 @@ dont-distribute-packages: has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascar: [ 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 ] @@ -4874,6 +5145,7 @@ dont-distribute-packages: hash: [ i686-linux, x86_64-linux, x86_64-darwin ] hashable-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hashable-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4887,6 +5159,7 @@ dont-distribute-packages: haskdeep: [ 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 ] @@ -4894,18 +5167,20 @@ dont-distribute-packages: 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-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-docs: [ 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-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-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-lsp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-mpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-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 ] @@ -4923,7 +5198,9 @@ dont-distribute-packages: haskell-tools-ast-trf: [ 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-experimental-refactorings: [ 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-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 ] @@ -4979,28 +5256,37 @@ 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 ] + haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskus-system-build: [ 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 ] 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 ] + hasql-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-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 ] haste-app: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-perch: [ 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 ] + 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 ] @@ -5052,23 +5338,29 @@ dont-distribute-packages: hdis86: [ i686-linux, x86_64-linux, x86_64-darwin ] hdiscount: [ i686-linux, x86_64-linux, x86_64-darwin ] hdm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdocs: [ i686-linux, x86_64-linux, x86_64-darwin ] hdph-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] hdph: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + heap: [ 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 ] 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 ] 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 ] helium: [ i686-linux, x86_64-linux, x86_64-darwin ] helix: [ i686-linux, x86_64-linux, x86_64-darwin ] hell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5086,6 +5378,7 @@ 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 ] @@ -5100,12 +5393,13 @@ dont-distribute-packages: heukarya: [ 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 ] hexif: [ 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 ] heyefi: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5153,7 +5447,7 @@ dont-distribute-packages: hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgrev: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgrep: [ 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 ] @@ -5161,7 +5455,6 @@ dont-distribute-packages: hi: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hid: [ "x86_64-darwin" ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5169,24 +5462,22 @@ dont-distribute-packages: 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 ] - higher-leveldb: [ "x86_64-darwin" ] higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] + highlight-versions: [ i686-linux, x86_64-linux, x86_64-darwin ] + highlight: [ 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 ] hindley-milner: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinotify-bytestring: [ "x86_64-darwin" ] 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 ] + 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 ] - hip: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - Hipmunk-Utils: [ "x86_64-darwin" ] - Hipmunk: [ "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 ] @@ -5212,10 +5503,7 @@ 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-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5223,8 +5511,8 @@ dont-distribute-packages: hlibsass: [ 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 ] 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 ] @@ -5237,13 +5525,12 @@ dont-distribute-packages: 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-special: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - hmidi: [ "x86_64-darwin" ] + hmep: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5255,18 +5542,16 @@ 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 ] hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] hob: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] - hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] hocilib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -5282,10 +5567,10 @@ dont-distribute-packages: Holumbus-Storage: [ 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 ] + homoiconic: [ i686-linux, x86_64-linux, x86_64-darwin ] homplexity: [ i686-linux, x86_64-linux, x86_64-darwin ] HongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] honi: [ i686-linux, x86_64-linux, x86_64-darwin ] - honk: [ "x86_64-darwin" ] hoobuddy: [ i686-linux, x86_64-linux, x86_64-darwin ] hood-off: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5305,7 +5590,6 @@ dont-distribute-packages: hoq: [ 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 ] @@ -5314,18 +5598,19 @@ dont-distribute-packages: hp2any-core: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] hpapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaste: [ i686-linux, x86_64-linux, x86_64-darwin ] hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpath: [ "x86_64-darwin" ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] - hplayground: [ 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 ] @@ -5333,20 +5618,17 @@ dont-distribute-packages: 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 ] - hprotoc: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] hps: [ i686-linux, x86_64-linux, x86_64-darwin ] hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ] hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ 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 ] + 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 ] @@ -5386,25 +5668,26 @@ dont-distribute-packages: hsass: [ i686-linux, x86_64-linux, x86_64-darwin ] hsay: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsbc: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + hsc3-sf-hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-sf: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5412,11 +5695,11 @@ 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 ] + 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 ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsemail-ns: [ i686-linux, x86_64-linux, x86_64-darwin ] hsenv: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfacter: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfcsh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5428,18 +5711,16 @@ dont-distribute-packages: hsgsom: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHaruPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsI2C: [ "x86_64-darwin" ] hSimpleDB: [ 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 ] hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hslinks: [ i686-linux, x86_64-linux, x86_64-darwin ] HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslua-module-text: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5461,15 +5742,19 @@ dont-distribute-packages: hspec-jenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-pg-transact: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] hsprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-manic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5480,8 +5765,6 @@ dont-distribute-packages: hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] hsreadability: [ i686-linux, x86_64-linux, x86_64-darwin ] hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsshellscript: [ "x86_64-darwin" ] - hssourceinfo: [ "x86_64-darwin" ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5495,20 +5778,19 @@ dont-distribute-packages: hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] hsudoku: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] htar: [ 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 ] - html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] + htlset: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] hts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5521,8 +5803,11 @@ dont-distribute-packages: http-conduit-browser: [ 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-kinder: [ 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-response-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] http2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5533,21 +5818,23 @@ dont-distribute-packages: htzaar: [ 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 ] - huckleberry: [ "x86_64-darwin" ] HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] huff: [ i686-linux, x86_64-linux, x86_64-darwin ] + huffman: [ i686-linux, x86_64-linux, x86_64-darwin ] hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] HulkImport: [ i686-linux, x86_64-linux, x86_64-darwin ] + human-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] + human-text: [ i686-linux, x86_64-linux, x86_64-darwin ] hums: [ i686-linux, x86_64-linux, x86_64-darwin ] hunch: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunit-dejafu: [ "x86_64-darwin" ] HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] hunp: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] husky: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5556,26 +5843,24 @@ dont-distribute-packages: huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-kafka-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-prim-bits: [ 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 ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ 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: [ "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 ] 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 ] hyakko: [ i686-linux, x86_64-linux, x86_64-darwin ] hybrid: [ i686-linux, x86_64-linux, x86_64-darwin ] hydra-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5589,14 +5874,15 @@ 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 ] 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 ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyperloglog: [ 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 ] @@ -5604,15 +5890,20 @@ dont-distribute-packages: 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 ] IcoGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] - iconv-typed: [ "x86_64-darwin" ] + icon-fonts: [ 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 ] ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + ideas: [ i686-linux, x86_64-linux, x86_64-darwin ] idempotent: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] + idna: [ 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 ] @@ -5620,6 +5911,7 @@ dont-distribute-packages: IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] ig: [ i686-linux, x86_64-linux, x86_64-darwin ] ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] + ige: [ i686-linux, x86_64-linux, x86_64-darwin ] igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] igrf: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5628,6 +5920,7 @@ dont-distribute-packages: ihaskell-charts: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-display: [ i686-linux, x86_64-linux, x86_64-darwin ] + ihaskell-gnuplot: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-hatex: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5653,6 +5946,7 @@ dont-distribute-packages: implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit: [ i686-linux, x86_64-linux, x86_64-darwin ] + importify: [ i686-linux, x86_64-linux, x86_64-darwin ] imports: [ i686-linux, x86_64-linux, x86_64-darwin ] impossible: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5674,7 +5968,6 @@ dont-distribute-packages: inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-r: [ "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 ] @@ -5683,16 +5976,16 @@ dont-distribute-packages: instant-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + instapaper-sender: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ 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 ] interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] - intricacy: [ "x86_64-darwin" ] intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5703,6 +5996,7 @@ dont-distribute-packages: 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 ] @@ -5713,21 +6007,25 @@ dont-distribute-packages: iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-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: [ i686-linux, x86_64-linux, x86_64-darwin ] + ircbot: [ 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: [ "x86_64-darwin" ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] iso8583-bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] + isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] + itemfield: [ i686-linux, x86_64-linux, x86_64-darwin ] iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5744,13 +6042,12 @@ dont-distribute-packages: 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 ] + ixshader: [ i686-linux, x86_64-linux, x86_64-darwin ] iyql: [ i686-linux, x86_64-linux, x86_64-darwin ] j2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - jack: [ "x86_64-darwin" ] - jack: [ i686-linux, x86_64-linux, x86_64-darwin ] - jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] jail: [ i686-linux, x86_64-linux, x86_64-darwin ] jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5762,14 +6059,14 @@ dont-distribute-packages: java-bridge: [ 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 ] - javasf: [ 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 ] jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] - jenkinsPlugins2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] + jenga: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5783,12 +6080,13 @@ 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-assertions: [ 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-autotype: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-bytes-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-encoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] json-feed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5797,14 +6095,20 @@ dont-distribute-packages: json-pointer-hasql: [ 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-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 ] + jsonextfilter: [ i686-linux, x86_64-linux, x86_64-darwin ] JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] + JSONParser: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonrpc-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsons-to-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonsql: [ i686-linux, x86_64-linux, x86_64-darwin ] jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5817,6 +6121,7 @@ dont-distribute-packages: JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] JuPyTer-notebook: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5826,10 +6131,9 @@ dont-distribute-packages: kafka-device-vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device: [ i686-linux, x86_64-linux, x86_64-darwin ] kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] + kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] - kanji: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5840,9 +6144,9 @@ 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 ] 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 ] @@ -5859,6 +6163,7 @@ dont-distribute-packages: 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 ] keyed: [ i686-linux, x86_64-linux, x86_64-darwin ] keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5874,6 +6179,8 @@ dont-distribute-packages: kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] kit: [ i686-linux, x86_64-linux, x86_64-darwin ] kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ] + kmeans-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + kmp-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] knead-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] knead: [ i686-linux, x86_64-linux, x86_64-darwin ] knots: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5887,7 +6194,6 @@ dont-distribute-packages: KSP: [ i686-linux, x86_64-linux, x86_64-darwin ] ktx: [ i686-linux, x86_64-linux, x86_64-darwin ] kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - kyotocabinet: [ "x86_64-darwin" ] KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] l-bfgs-b: [ i686-linux, x86_64-linux, x86_64-darwin ] L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5933,21 +6239,23 @@ dont-distribute-packages: language-boogie: [ i686-linux, x86_64-linux, x86_64-darwin ] language-c-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] language-c-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-c-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] language-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-dockerfile: [ 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-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 ] language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ "x86_64-darwin" ] + language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5955,6 +6263,10 @@ dont-distribute-packages: language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-thrift: [ 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 ] 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 ] @@ -5968,6 +6280,9 @@ dont-distribute-packages: layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazy-hash-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazy-hash: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazy-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ] lazyset: [ i686-linux, x86_64-linux, x86_64-darwin ] lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5978,7 +6293,6 @@ dont-distribute-packages: 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 ] - leancheck: [ "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 ] @@ -5989,6 +6303,7 @@ 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-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-properties: [ 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 ] @@ -5997,11 +6312,12 @@ dont-distribute-packages: lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] lenz-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + lenz: [ i686-linux, x86_64-linux, x86_64-darwin ] Level0: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - leveldb-haskell: [ "x86_64-darwin" ] levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] + lfst: [ i686-linux, x86_64-linux, x86_64-darwin ] lgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] lha: [ i686-linux, x86_64-linux, x86_64-darwin ] lhae: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6014,29 +6330,26 @@ dont-distribute-packages: libcspm: [ i686-linux, x86_64-linux, x86_64-darwin ] libexpect: [ i686-linux, x86_64-linux, x86_64-darwin ] libGenI: [ i686-linux, x86_64-linux, x86_64-darwin ] - libgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] liblastfm: [ i686-linux, x86_64-linux, x86_64-darwin ] liblawless: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] libmolude: [ i686-linux, x86_64-linux, x86_64-darwin ] + libmpd: [ 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 ] - libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] - libvirt-hs: [ "x86_64-darwin" ] - libvirt-hs: [ 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 ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] LibZip: [ 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 ] lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6052,9 +6365,10 @@ dont-distribute-packages: linear-circuit: [ 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 ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6063,12 +6377,7 @@ dont-distribute-packages: 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 ] - linux-evdev: [ "x86_64-darwin" ] - linux-file-extents: [ "x86_64-darwin" ] - linux-inotify: [ "x86_64-darwin" ] linux-kmod: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-mount: [ "x86_64-darwin" ] - linux-namespaces: [ "x86_64-darwin" ] linux-perf: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-ptrace: [ i686-linux, x86_64-linux, x86_64-darwin ] linx-gateway: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6078,13 +6387,16 @@ dont-distribute-packages: liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-prompt: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-remote-forwards: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] list-zip-def: [ 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 ] lit: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6101,24 +6413,25 @@ dont-distribute-packages: llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-hs: [ "x86_64-darwin" ] + llvm-hs-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - lmdb-high-level: [ "x86_64-darwin" ] - lmdb-simple: [ "x86_64-darwin" ] - lmdb: [ "x86_64-darwin" ] + lmdb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - loc: [ "x86_64-darwin" ] + load-balancing: [ i686-linux, x86_64-linux, x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] + lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-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 ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6129,6 +6442,7 @@ dont-distribute-packages: LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] + logict-state: [ i686-linux, x86_64-linux, x86_64-darwin ] logplex-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6159,8 +6473,10 @@ dont-distribute-packages: lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ 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 ] + luautils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lucid-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] lui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6173,26 +6489,30 @@ dont-distribute-packages: lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] - lxd-client-config: [ i686-linux, x86_64-linux, x86_64-darwin ] lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] lz4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma: [ 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 ] 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 ] 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 ] + 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 ] mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] maid: [ i686-linux, x86_64-linux, x86_64-darwin ] + mailbox-count: [ i686-linux, x86_64-linux, x86_64-darwin ] mailchimp-subscribe: [ i686-linux, x86_64-linux, x86_64-darwin ] mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6200,8 +6520,10 @@ dont-distribute-packages: 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 ] + make-monofoldable-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] make-package: [ i686-linux, x86_64-linux, x86_64-darwin ] makedo: [ i686-linux, x86_64-linux, x86_64-darwin ] + makefile: [ i686-linux, x86_64-linux, x86_64-darwin ] mallard: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6219,17 +6541,17 @@ dont-distribute-packages: manatee: [ 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 ] + map-exts: [ 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 ] markdown2svg: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] master-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6243,7 +6565,6 @@ dont-distribute-packages: 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: [ "x86_64-darwin" ] maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6251,9 +6572,11 @@ 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 ] + mcm: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmc-samplers: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmc-synthesis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6268,9 +6591,12 @@ dont-distribute-packages: mecab: [ i686-linux, x86_64-linux, x86_64-darwin ] mech: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + mechs: [ 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 ] @@ -6278,12 +6604,15 @@ dont-distribute-packages: mellon-gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-web: [ i686-linux, x86_64-linux, x86_64-darwin ] melody: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] memis: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + memorable-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] mercury-api: [ i686-linux, x86_64-linux, x86_64-darwin ] merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ] merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6294,7 +6623,6 @@ dont-distribute-packages: MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ] metaplug: [ 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 ] Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6311,15 +6639,11 @@ dont-distribute-packages: 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-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-util: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi: [ 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 ] - mime-string: [ i686-linux, x86_64-linux, x86_64-darwin ] + mikmod: [ 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 ] @@ -6340,14 +6664,11 @@ dont-distribute-packages: mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] - mmark-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] - mmark: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - modern-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6357,10 +6678,11 @@ dont-distribute-packages: modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-classes: [ 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 ] @@ -6376,13 +6698,13 @@ dont-distribute-packages: monad-ran: [ 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-task: [ 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-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 ] MonadCatchIO-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6406,11 +6728,9 @@ dont-distribute-packages: money: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] - monky: [ "x86_64-darwin" ] mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ 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 ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6419,7 +6739,6 @@ dont-distribute-packages: moonshine: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] @@ -6435,6 +6754,9 @@ dont-distribute-packages: 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 ] ms: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6447,6 +6769,7 @@ dont-distribute-packages: MTGBuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -6460,23 +6783,25 @@ dont-distribute-packages: 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 ] + 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 ] 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 ] multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - multirec: [ i686-linux, x86_64-linux, x86_64-darwin ] multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] murder: [ i686-linux, x86_64-linux, x86_64-darwin ] murmur: [ i686-linux, x86_64-linux, x86_64-darwin ] murmurhash3: [ i686-linux, x86_64-linux, x86_64-darwin ] + mushu: [ i686-linux, x86_64-linux, x86_64-darwin ] music-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] music-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] music-pitch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6484,6 +6809,7 @@ dont-distribute-packages: music-score: [ i686-linux, x86_64-linux, x86_64-darwin ] music-sibelius: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6491,18 +6817,23 @@ dont-distribute-packages: 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 ] + mvar-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nnvm: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + myanimelist-export: [ i686-linux, x86_64-linux, x86_64-darwin ] + mybitcoin-sci: [ 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 ] @@ -6510,6 +6841,7 @@ dont-distribute-packages: mzv: [ 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 ] + namecoin-update: [ 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 ] @@ -6527,7 +6859,6 @@ dont-distribute-packages: narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] native: [ i686-linux, x86_64-linux, x86_64-darwin ] - nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] naver-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] NearContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6539,6 +6870,7 @@ dont-distribute-packages: neko-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Neks: [ i686-linux, x86_64-linux, x86_64-darwin ] nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ] + nemesis: [ i686-linux, x86_64-linux, x86_64-darwin ] nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6546,10 +6878,11 @@ dont-distribute-packages: nested-routes: [ 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 ] + 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 ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] - netlink: [ "x86_64-darwin" ] + netrc: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] netstring-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6561,18 +6894,15 @@ dont-distribute-packages: netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-bitcoin: [ 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-dns: [ 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-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-netpacket: [ 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 ] network-service: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6581,10 +6911,11 @@ 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-zeromq: [ 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 ] + networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] neural-network-blashs: [ i686-linux, x86_64-linux, x86_64-darwin ] neural-network-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] neural: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6599,12 +6930,15 @@ dont-distribute-packages: NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] niagra: [ i686-linux, x86_64-linux, x86_64-darwin ] nibblestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + nice-html: [ i686-linux, x86_64-linux, x86_64-darwin ] nicovideo-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] nikepub: [ i686-linux, x86_64-linux, x86_64-darwin ] nimber: [ i686-linux, x86_64-linux, x86_64-darwin ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-paths: [ "x86_64-darwin" ] + nix-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] + nix-diff: [ 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 ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] nlopt-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6614,6 +6948,7 @@ dont-distribute-packages: 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 ] @@ -6621,7 +6956,9 @@ 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 ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] + nonfree: [ 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 ] @@ -6630,6 +6967,7 @@ dont-distribute-packages: 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 ] + notzero: [ 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 ] ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6642,6 +6980,7 @@ dont-distribute-packages: NumberTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ 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 ] numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6652,6 +6991,7 @@ dont-distribute-packages: 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 ] + oanda-rest-api: [ 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 ] @@ -6660,6 +7000,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 ] + 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 ] octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6676,14 +7017,15 @@ dont-distribute-packages: old-version: [ i686-linux, x86_64-linux, x86_64-darwin ] olwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ 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 ] + 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 ] oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] online: [ i686-linux, x86_64-linux, x86_64-darwin ] + onpartitions: [ i686-linux, x86_64-linux, x86_64-darwin ] OnRmt: [ i686-linux, x86_64-linux, x86_64-darwin ] onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6691,8 +7033,7 @@ dont-distribute-packages: open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAL: [ "x86_64-darwin" ] - opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAFP-Utils: [ 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 ] @@ -6716,12 +7057,13 @@ dont-distribute-packages: OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] - opml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] opn: [ 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 ] optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + optparse-helper: [ 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 ] @@ -6745,21 +7087,28 @@ dont-distribute-packages: 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 ] + 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-o-tron: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ 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 ] packman: [ i686-linux, x86_64-linux, x86_64-darwin ] + packunused: [ i686-linux, x86_64-linux, x86_64-darwin ] pacman-memcache: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ 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 ] + pagure-hook-receiver: [ i686-linux, x86_64-linux, x86_64-darwin ] Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ 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-emphasize-code: [ 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-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6768,20 +7117,26 @@ dont-distribute-packages: pang-a-lambda: [ 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 ] + papa-prelude-core: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-prelude-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-prelude-semigroupoids: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] 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 ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] - parameterized: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco: [ i686-linux, x86_64-linux, x86_64-darwin ] parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] - parport: [ "x86_64-darwin" ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6793,13 +7148,14 @@ dont-distribute-packages: parsestar: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] + partial-order: [ 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 ] 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 ] Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6816,7 +7172,7 @@ dont-distribute-packages: PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] pcre-light-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdfname: [ i686-linux, x86_64-linux, x86_64-darwin ] + pdf-slave: [ i686-linux, x86_64-linux, x86_64-darwin ] pdfsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6834,8 +7190,9 @@ dont-distribute-packages: perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ] perf: [ i686-linux, x86_64-linux, x86_64-darwin ] - perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] + perfect-hash-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] + perfecthash: [ 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 ] permute: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6846,7 +7203,9 @@ dont-distribute-packages: 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-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-relational-record: [ 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 ] @@ -6863,7 +7222,8 @@ 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 ] - phoityne: [ "x86_64-darwin" ] + phaser: [ 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 ] @@ -6877,8 +7237,9 @@ dont-distribute-packages: pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] picologic: [ 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 ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] - piki: [ i686-linux, x86_64-linux, x86_64-darwin ] + pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ 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 ] @@ -6904,14 +7265,20 @@ dont-distribute-packages: pipes-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-shell: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] + Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] pixelated-avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] + pkcs10: [ i686-linux, x86_64-linux, x86_64-darwin ] + pkcs7: [ i686-linux, x86_64-linux, x86_64-darwin ] pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ] plailude: [ i686-linux, x86_64-linux, x86_64-darwin ] + plan-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] planar-graph: [ 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 ] @@ -6919,13 +7286,14 @@ dont-distribute-packages: 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-gtk3: [ "x86_64-darwin" ] - Plot-ho-matic: [ "x86_64-darwin" ] + plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-light: [ i686-linux, x86_64-linux, x86_64-darwin ] + ploton: [ 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 ] plumbers: [ 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 ] @@ -6934,6 +7302,7 @@ 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 ] + pointfree: [ 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 ] @@ -6944,52 +7313,57 @@ dont-distribute-packages: polimorf: [ i686-linux, x86_64-linux, x86_64-darwin ] Pollutocracy: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] - portaudio: [ "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 ] - positron: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-pty: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-realtime: [ "x86_64-darwin" ] - posix-timer: [ "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-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-binary: [ 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 ] + postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-simple-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - powermate: [ "x86_64-darwin" ] + potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerqueue-levelmem: [ "x86_64-darwin" ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6999,6 +7373,7 @@ dont-distribute-packages: precis: [ i686-linux, x86_64-linux, x86_64-darwin ] pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + prednote: [ i686-linux, x86_64-linux, x86_64-darwin ] prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-generalize: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7006,41 +7381,48 @@ dont-distribute-packages: preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - prettyprinter-convert-ansi-wl-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ 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 ] print-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] + printcess: [ i686-linux, x86_64-linux, x86_64-darwin ] Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] + private-hackage-uploader: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] + probable: [ i686-linux, x86_64-linux, x86_64-darwin ] proc: [ i686-linux, x86_64-linux, x86_64-darwin ] process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] process-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] process-listlike: [ i686-linux, x86_64-linux, x86_64-darwin ] process-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + 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 ] progression: [ i686-linux, x86_64-linux, x86_64-darwin ] progressive: [ i686-linux, x86_64-linux, x86_64-darwin ] proj4-hs-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] project-m36: [ i686-linux, x86_64-linux, x86_64-darwin ] + projectile: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] + prometheus-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] promise: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7048,41 +7430,46 @@ dont-distribute-packages: property-list: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] prosper: [ i686-linux, x86_64-linux, x86_64-darwin ] - proteaaudio: [ "x86_64-darwin" ] proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] proton-haskell: [ 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 ] psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ] ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] + publicsuffixlist: [ 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 ] puffytools: [ i686-linux, x86_64-linux, x86_64-darwin ] + pugixml: [ i686-linux, x86_64-linux, x86_64-darwin ] + pugs-compat: [ 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 ] - pulseaudio: [ "x86_64-darwin" ] punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-cdb: [ 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 ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - pursuit-client: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-apn: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] + pushbullet-types: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -7097,8 +7484,8 @@ dont-distribute-packages: qed: [ i686-linux, x86_64-linux, x86_64-darwin ] qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] qif: [ i686-linux, x86_64-linux, x86_64-darwin ] + QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] - qm-interpolated-string: [ 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 ] @@ -7116,6 +7503,7 @@ dont-distribute-packages: Quelea: [ i686-linux, x86_64-linux, x86_64-darwin ] quenya-verb: [ 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 ] @@ -7133,20 +7521,25 @@ dont-distribute-packages: quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] Quickson: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickspec: [ i686-linux, x86_64-linux, x86_64-darwin ] quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] + quipper-core: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-groups: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] quoridor-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] qux: [ i686-linux, x86_64-linux, x86_64-darwin ] R-pandoc: [ 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 ] rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raft: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7156,7 +7549,6 @@ dont-distribute-packages: 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 ] - rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ 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 ] @@ -7174,6 +7566,7 @@ dont-distribute-packages: rangemin: [ 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 ] rasa-example-config: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-bufs: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-cmd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7188,7 +7581,6 @@ 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 ] - 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 ] @@ -7202,17 +7594,13 @@ dont-distribute-packages: react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-gi-gtk: [ "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: [ "x86_64-darwin" ] + reactive-banana-wx: [ 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: [ "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 ] @@ -7236,10 +7624,10 @@ dont-distribute-packages: redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] - reenact: [ "x86_64-darwin" ] + reenact: [ 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: [ 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 ] @@ -7251,9 +7639,12 @@ dont-distribute-packages: reflex-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + reformat: [ i686-linux, x86_64-linux, x86_64-darwin ] refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7262,7 +7653,9 @@ 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 ] 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 ] @@ -7278,11 +7671,12 @@ dont-distribute-packages: regular-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] regular: [ i686-linux, x86_64-linux, x86_64-darwin ] reheat: [ i686-linux, x86_64-linux, x86_64-darwin ] + rehoo: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] - relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] remark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7295,14 +7689,12 @@ dont-distribute-packages: 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-algorithms: [ 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 ] repa-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-io: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-linear-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-scalar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7310,18 +7702,23 @@ dont-distribute-packages: repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] repl: [ i686-linux, x86_64-linux, x86_64-darwin ] + RepLib: [ i686-linux, x86_64-linux, x86_64-darwin ] replicant: [ i686-linux, x86_64-linux, x86_64-darwin ] repo-based-blog: [ i686-linux, x86_64-linux, x86_64-darwin ] repr: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - req: [ i686-linux, x86_64-linux, x86_64-darwin ] reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ] + reroute: [ i686-linux, x86_64-linux, x86_64-darwin ] + reserve: [ 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 ] resource-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-pool-catchio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7337,6 +7734,7 @@ dont-distribute-packages: 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 ] + rethinkdb: [ i686-linux, x86_64-linux, x86_64-darwin ] retryer: [ i686-linux, x86_64-linux, x86_64-darwin ] reverse-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7344,23 +7742,25 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ 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 ] - riak: [ 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 ] + riemann: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] rivet-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet-simple-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet: [ i686-linux, x86_64-linux, x86_64-darwin ] RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] + rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ] rlglue: [ i686-linux, x86_64-linux, x86_64-darwin ] rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7372,22 +7772,26 @@ dont-distribute-packages: RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAwolf: [ i686-linux, x86_64-linux, x86_64-darwin ] rncryptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + rob: [ 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 ] - rocksdb-haskell: [ 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 ] roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + rosa: [ 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 ] roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] + rosmsg: [ i686-linux, x86_64-linux, x86_64-darwin ] + rospkg: [ i686-linux, x86_64-linux, x86_64-darwin ] rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] + rotating-log: [ 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-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7401,20 +7805,22 @@ dont-distribute-packages: rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] - rset: [ 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 ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtnetlink: [ "x86_64-darwin" ] + rss: [ i686-linux, x86_64-linux, x86_64-darwin ] + RtMidi: [ 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 ] - rubberband: [ 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 ] ruin: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] + runmany: [ i686-linux, x86_64-linux, x86_64-darwin ] runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7425,6 +7831,7 @@ dont-distribute-packages: safe-length: [ 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 ] @@ -7436,7 +7843,6 @@ dont-distribute-packages: sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - saltine: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7457,16 +7863,15 @@ dont-distribute-packages: satchmo-minisat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] - sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] 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 ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-texmath: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7474,7 +7879,6 @@ dont-distribute-packages: 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 ] - SciFlow: [ 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 ] @@ -7484,8 +7888,9 @@ dont-distribute-packages: scotty-binding-play: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-blaze: [ 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-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-resource: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-session: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-view: [ i686-linux, x86_64-linux, x86_64-darwin ] scp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7493,21 +7898,17 @@ dont-distribute-packages: scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ] + scroll: [ 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 ] scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] - SDL-gfx: [ "x86_64-darwin" ] - SDL-image: [ "x86_64-darwin" ] - SDL-mixer: [ "x86_64-darwin" ] - SDL-mpeg: [ "x86_64-darwin" ] - SDL-ttf: [ "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-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-mixer: [ 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 ] - search: [ 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 ] @@ -7516,7 +7917,6 @@ dont-distribute-packages: secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] - select: [ "x86_64-darwin" ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7533,62 +7933,65 @@ dont-distribute-packages: sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] + separated: [ 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 ] seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] + serialize-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-client: [ 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-server: [ 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-client-core: [ 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-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-match: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-mock: [ 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 ] + servant-pushbullet-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ 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 ] + servant-zeppelin-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-zeppelin: [ i686-linux, x86_64-linux, x86_64-darwin ] server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] services: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] - ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] + sessiontypes-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - sfml-audio: [ "x86_64-darwin" ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] sfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7607,6 +8010,8 @@ dont-distribute-packages: 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 ] shakers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7615,24 +8020,28 @@ dont-distribute-packages: shapely-data: [ 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: [ "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-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] + shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] + shelly-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + shelly: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] + shopify: [ i686-linux, x86_64-linux, x86_64-darwin ] shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] ShortestPathProblems: [ i686-linux, x86_64-linux, x86_64-darwin ] showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] Shu-thing: [ i686-linux, x86_64-linux, x86_64-darwin ] - si-clock: [ "x86_64-darwin" ] + shuffle: [ i686-linux, x86_64-linux, x86_64-darwin ] + sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ 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 ] @@ -7643,6 +8052,7 @@ dont-distribute-packages: simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-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 ] @@ -7654,7 +8064,11 @@ dont-distribute-packages: simple-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-postgresql-orm: [ 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-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleargs: [ 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 ] @@ -7663,32 +8077,36 @@ dont-distribute-packages: 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 ] - simplessh: [ i686-linux, x86_64-linux, x86_64-darwin ] simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - SimpleTableGenerator: [ 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 ] + 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 ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] - sitemap: [ i686-linux, x86_64-linux, x86_64-darwin ] + sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ 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 ] sjsp: [ i686-linux, x86_64-linux, x86_64-darwin ] skeleton: [ 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 ] + 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 ] slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] + sloane: [ 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 ] 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 ] smallcheck-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + smallcheck-series: [ i686-linux, x86_64-linux, x86_64-darwin ] smallpt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] smallstring: [ i686-linux, x86_64-linux, x86_64-darwin ] smartcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7697,14 +8115,18 @@ dont-distribute-packages: smartword: [ i686-linux, x86_64-linux, x86_64-darwin ] sme: [ i686-linux, x86_64-linux, x86_64-darwin ] smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] + smiles: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] + smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] snake: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-auth-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7716,6 +8138,7 @@ dont-distribute-packages: snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-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 ] @@ -7764,24 +8187,28 @@ dont-distribute-packages: snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] sneakyterm: [ i686-linux, x86_64-linux, x86_64-darwin ] - sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] + snipcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] snm: [ i686-linux, x86_64-linux, x86_64-darwin ] snmp: [ i686-linux, x86_64-linux, x86_64-darwin ] snorkels: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ 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-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ 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 ] 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 ] + 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 ] sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] Sonnex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7794,9 +8221,9 @@ dont-distribute-packages: SourceGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] sousit: [ i686-linux, x86_64-linux, x86_64-darwin ] soyuz: [ i686-linux, x86_64-linux, x86_64-darwin ] + SpaceInvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] SpacePrivateers: [ i686-linux, x86_64-linux, x86_64-darwin ] - spaceprobe: [ i686-linux, x86_64-linux, x86_64-darwin ] spake2: [ i686-linux, x86_64-linux, x86_64-darwin ] spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7806,11 +8233,11 @@ dont-distribute-packages: spata: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ 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 ] - speculate: [ "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 ] + sphinx: [ i686-linux, x86_64-linux, x86_64-darwin ] + sphinxesc: [ i686-linux, x86_64-linux, x86_64-darwin ] spice: [ i686-linux, x86_64-linux, x86_64-darwin ] SpinCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] spir-v: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7818,8 +8245,16 @@ dont-distribute-packages: spline3: [ i686-linux, x86_64-linux, x86_64-darwin ] splines: [ i686-linux, x86_64-linux, x86_64-darwin ] splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + splot: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-api-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-api-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock: [ i686-linux, x86_64-linux, x86_64-darwin ] spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7835,22 +8270,34 @@ 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 ] + ssh-tunnel: [ i686-linux, x86_64-linux, x86_64-darwin ] ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] sshd-lint: [ i686-linux, x86_64-linux, x86_64-darwin ] sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] + SSTG: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + stable-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-bump: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack2nix: [ 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 ] 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-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-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 ] stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7860,27 +8307,35 @@ dont-distribute-packages: 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 ] + state-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] state: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] + static-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] static-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + 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 ] - step-function: [ 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 ] - STLinkUSB: [ 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-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-promise: [ 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 ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7890,7 +8345,6 @@ dont-distribute-packages: Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] StrappedTemplates: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratosphere: [ i686-linux, x86_64-linux, x86_64-darwin ] stratum-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-http: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7901,64 +8355,71 @@ dont-distribute-packages: stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ 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-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-postgresql-simple: [ 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-concurrency: [ 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 ] strictly: [ 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 ] - stripe-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + stringprep: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] - structs: [ 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 ] structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] + stt: [ i686-linux, x86_64-linux, x86_64-darwin ] + stunclient: [ 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 ] 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 ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] + submark: [ 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 ] - 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 ] + 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 ] - supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] + superrecord: [ 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 ] - SVD2HS: [ 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 ] + svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] svgutils: [ 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-test: [ 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 ] SWMMoutGetMB: [ 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 ] + syfco: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-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 ] sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7975,19 +8436,16 @@ dont-distribute-packages: syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] syntaxnet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - sysinfo: [ "x86_64-darwin" ] + sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-inotify: [ "x86_64-darwin" ] + system-command: [ i686-linux, x86_64-linux, x86_64-darwin ] system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] system-locale: [ i686-linux, x86_64-linux, x86_64-darwin ] system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-time-monotonic: [ "x86_64-darwin" ] systemstats: [ i686-linux, x86_64-linux, x86_64-darwin ] t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] t3-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7996,28 +8454,32 @@ dont-distribute-packages: 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 ] - tables: [ 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 ] tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] + Tablify: [ i686-linux, x86_64-linux, x86_64-darwin ] tablize: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] - taffybar: [ "x86_64-darwin" ] + taffybar: [ i686-linux, x86_64-linux, x86_64-darwin ] tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagged-exception-core: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-timers: [ i686-linux, x86_64-linux, x86_64-darwin ] - taggy-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - taggy: [ 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 ] Tahin: [ i686-linux, x86_64-linux, x86_64-darwin ] - tai: [ "x86_64-darwin" ] - tailfile-hinotify: [ "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 ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] + tal: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-term: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8028,7 +8490,6 @@ dont-distribute-packages: task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-dejafu: [ "x86_64-darwin" ] tasty-groundhog-converters: [ 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 ] @@ -8044,8 +8505,11 @@ dont-distribute-packages: tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] + teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8053,8 +8517,10 @@ dont-distribute-packages: teleshell: [ i686-linux, x86_64-linux, x86_64-darwin ] tellbot: [ i686-linux, x86_64-linux, x86_64-darwin ] template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] @@ -8077,18 +8543,17 @@ dont-distribute-packages: 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 ] - tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-skip: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-framework-th-prime: [ i686-linux, x86_64-linux, x86_64-darwin ] test-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] testbench: [ i686-linux, x86_64-linux, x86_64-darwin ] - testCom: [ i686-linux, x86_64-linux, x86_64-darwin ] + TestExplode: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -8096,40 +8561,45 @@ dont-distribute-packages: 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 ] + texrunner: [ 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-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-icu-translit: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-icu: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-regex-replace: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-render: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-short: [ 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-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-zipper-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + text1: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] textocat-api: [ i686-linux, x86_64-linux, x86_64-darwin ] textual: [ i686-linux, x86_64-linux, x86_64-darwin ] tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tftp: [ i686-linux, x86_64-linux, x86_64-darwin ] tga: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] th-build: [ i686-linux, x86_64-linux, x86_64-darwin ] th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-dict-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] th-fold: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] th-sccs: [ 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 ] + 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 ] @@ -8138,7 +8608,7 @@ dont-distribute-packages: 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 ] - threadscope: [ "x86_64-darwin" ] + threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ 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 ] @@ -8148,7 +8618,6 @@ dont-distribute-packages: tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8157,11 +8626,13 @@ dont-distribute-packages: tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-exts: [ "x86_64-darwin" ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] time-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-series-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8181,24 +8652,24 @@ dont-distribute-packages: Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] - tldr: [ i686-linux, x86_64-linux, x86_64-darwin ] tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - tmp-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] tn: [ i686-linux, x86_64-linux, x86_64-darwin ] to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ] + todo: [ i686-linux, x86_64-linux, x86_64-darwin ] todos: [ i686-linux, x86_64-linux, x86_64-darwin ] tofromxml: [ i686-linux, x86_64-linux, x86_64-darwin ] toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] tokenify: [ 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: [ 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 ] + Top: [ i686-linux, x86_64-linux, x86_64-darwin ] topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] torch: [ i686-linux, x86_64-linux, x86_64-darwin ] touched: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8206,11 +8677,14 @@ dont-distribute-packages: toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] + 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 ] transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8222,18 +8696,18 @@ dont-distribute-packages: transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient-universe: [ "x86_64-darwin" ] 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 ] trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] - tree-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] Treiber: [ i686-linux, x86_64-linux, x86_64-darwin ] tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8242,9 +8716,11 @@ dont-distribute-packages: triangulation: [ 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 ] trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] triplesec: [ i686-linux, x86_64-linux, x86_64-darwin ] tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ] + trivia: [ i686-linux, x86_64-linux, x86_64-darwin ] tropical: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8252,8 +8728,9 @@ dont-distribute-packages: 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 ] - tuntap-simple: [ "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 ] @@ -8262,7 +8739,6 @@ dont-distribute-packages: tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] - turing-music: [ "x86_64-darwin" ] turingMachine: [ 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 ] @@ -8282,6 +8758,7 @@ dont-distribute-packages: twine: [ i686-linux, x86_64-linux, x86_64-darwin ] twisty: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8292,11 +8769,14 @@ dont-distribute-packages: type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-combinators-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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-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-of-html: [ 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-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 ] @@ -8308,19 +8788,17 @@ dont-distribute-packages: TypeClass: [ 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-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ 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 ] typelevel: [ 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 ] 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 ] - tz: [ "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 ] @@ -8330,14 +8808,25 @@ dont-distribute-packages: udbus: [ i686-linux, x86_64-linux, x86_64-darwin ] udp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] + uhc-util: [ i686-linux, x86_64-linux, x86_64-darwin ] uhexdump: [ i686-linux, x86_64-linux, x86_64-darwin ] + uhttpc: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + 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 ] @@ -8347,17 +8836,22 @@ dont-distribute-packages: unique-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] uniqueid: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ 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 ] - Unixutils-shadow: [ "x86_64-darwin" ] unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + unordered-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] unroll-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] unsafely: [ i686-linux, x86_64-linux, x86_64-darwin ] unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] unsequential: [ i686-linux, x86_64-linux, x86_64-darwin ] + unused: [ i686-linux, x86_64-linux, x86_64-darwin ] + uom-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] up: [ i686-linux, x86_64-linux, x86_64-darwin ] update-nix-fetchgit: [ i686-linux, x86_64-linux, x86_64-darwin ] uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8367,12 +8861,15 @@ dont-distribute-packages: 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-template: [ 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 ] urlcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] + urlpath: [ i686-linux, x86_64-linux, x86_64-darwin ] URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] urn-random: [ i686-linux, x86_64-linux, x86_64-darwin ] urn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8386,9 +8883,15 @@ dont-distribute-packages: utc: [ i686-linux, x86_64-linux, x86_64-darwin ] utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ 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-options: [ i686-linux, x86_64-linux, x86_64-darwin ] + uuagc-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + uuagc-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + uuagc: [ i686-linux, x86_64-linux, x86_64-darwin ] uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8401,25 +8904,22 @@ dont-distribute-packages: valid-names: [ i686-linux, x86_64-linux, x86_64-darwin ] validated-literals: [ 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 ] 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 ] vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcache-trie: [ "x86_64-darwin" ] - vcache: [ "x86_64-darwin" ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcsgui: [ "x86_64-darwin" ] + vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-bytes-instances: [ 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 ] @@ -8429,8 +8929,10 @@ dont-distribute-packages: 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-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 ] @@ -8440,17 +8942,19 @@ dont-distribute-packages: 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-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 ] 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 ] - vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] + visualize-cbn: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ 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 ] @@ -8466,7 +8970,10 @@ dont-distribute-packages: 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-digestive-functors: [ 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 ] @@ -8478,7 +8985,6 @@ dont-distribute-packages: wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8487,20 +8993,20 @@ 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-json-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-verbs: [ 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-secure-cookies: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-routes: [ 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 ] + waitra: [ i686-linux, x86_64-linux, x86_64-darwin ] waldo: [ i686-linux, x86_64-linux, x86_64-darwin ] warc: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8509,6 +9015,7 @@ dont-distribute-packages: WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wavefront-obj: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8536,8 +9043,8 @@ dont-distribute-packages: webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] 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: [ "x86_64-darwin" ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8556,16 +9063,15 @@ dont-distribute-packages: whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] why3: [ i686-linux, x86_64-linux, x86_64-darwin ] - wide-word: [ 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-task-x11: [ "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 ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] - Wired: [ "x86_64-darwin" ] + wire-streams: [ 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 ] wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8576,13 +9082,13 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ 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 ] 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-windows: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8591,7 +9097,6 @@ dont-distribute-packages: 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 ] - wreq-stringless: [ 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 ] @@ -8604,11 +9109,12 @@ 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: [ "x86_64-darwin" ] - wxAsteroids: [ "x86_64-darwin" ] - wxc: [ "x86_64-darwin" ] - wxcore: [ "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 ] WxGeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8620,13 +9126,12 @@ dont-distribute-packages: X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] - x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] - xbattbar: [ "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 ] - xdot: [ "x86_64-darwin" ] + xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] + xdot: [ i686-linux, x86_64-linux, x86_64-darwin ] Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] xhaskell-library: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8635,19 +9140,15 @@ dont-distribute-packages: xhb: [ 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: [ "x86_64-darwin" ] + xkbcommon: [ i686-linux, x86_64-linux, x86_64-darwin ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] - xleb: [ i686-linux, x86_64-linux, x86_64-darwin ] - xls: [ "x86_64-darwin" ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-conduit-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-conduit-parse: [ 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-isogen: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8658,17 +9159,20 @@ dont-distribute-packages: xml-tydom-conduit: [ 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 ] - xmlhtml: [ 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 ] 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 ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmobar: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-utils: [ "x86_64-darwin" ] + xmonad-extras: [ 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 ] @@ -8681,11 +9185,13 @@ dont-distribute-packages: xpathdsv: [ i686-linux, x86_64-linux, x86_64-darwin ] xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] + xsd: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] - xtc: [ "x86_64-darwin" ] + xtc: [ 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 ] Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] + yackage: [ i686-linux, x86_64-linux, x86_64-darwin ] YACPong: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-finance-api: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-finance-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8697,23 +9203,24 @@ dont-distribute-packages: yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ] yamlkeysdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] - YamlReference: [ "x86_64-darwin" ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa2048: [ 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 ] + yarn-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] + yarn2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] yarr-image-io: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] yeller: [ i686-linux, x86_64-linux, x86_64-darwin ] - yeshql: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-articles: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-account: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8722,24 +9229,25 @@ dont-distribute-packages: yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-native: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-oauth: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-zendesk: [ 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 ] yesod-crud-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-crud: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-job-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ 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 ] @@ -8749,6 +9257,7 @@ dont-distribute-packages: yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-raml-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8766,23 +9275,24 @@ dont-distribute-packages: YFrob: [ 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-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-frontend-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + yoga: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] yql: [ i686-linux, x86_64-linux, x86_64-darwin ] - yst: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-launch: [ 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 ] + yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + z3-encoding: [ 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 ] @@ -8806,10 +9316,9 @@ dont-distribute-packages: zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ] - zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] ziptastic-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - ziptastic-core: [ "x86_64-darwin" ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] + zm: [ i686-linux, x86_64-linux, x86_64-darwin ] ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8820,8 +9329,7 @@ dont-distribute-packages: zoom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-refs: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] - zot: [ "x86_64-darwin" ] + Zora: [ 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 ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] - zxcvbn-c: [ "x86_64-darwin" ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8146674a9435..2320d6a8752a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super { # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { @@ -258,7 +258,7 @@ self: super: builtins.intersectAttrs super { } ); - llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_4; }; + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_5; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -463,9 +463,6 @@ self: super: builtins.intersectAttrs super { # This propagates this to everything depending on haskell-gi-base haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection; - # Requires gi-javascriptcore API version 4 - gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_14; }; - # requires valid, writeable $HOME hatex-guide = overrideCabal super.hatex-guide (drv: { preConfigure = '' @@ -501,10 +498,11 @@ self: super: builtins.intersectAttrs super { # Without this override, the builds lacks pkg-config. opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); - # Written against the 6.X series of megaparsec - htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; }; - # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; + colour = dontCheck super.colour; + LDAP = dontCheck (overrideCabal super.LDAP (drv: { + librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; + })); } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 1658ce793936..4db418a7775b 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -2,7 +2,7 @@ , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) -, initialPackages ? import ./hackage-packages.nix +, initialPackages ? import ./initial-packages.nix , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix }: diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3e82003be43c..bf195696f947 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,7 +1,14 @@ -{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo +{ stdenv, buildPackages, ghc +, jailbreak-cabal, hscolour, cpphs, nodejs +, buildPlatform, hostPlatform }: -let isCross = (ghc.cross or null) != null; in + +let + isCross = buildPlatform != hostPlatform; + inherit (buildPackages) + fetchurl removeReferencesTo + pkgconfig coreutils gnugrep gnused glibcLocales; +in { pname , dontStrip ? (ghc.isGhcjs or false) @@ -20,8 +27,8 @@ let isCross = (ghc.cross or null) != null; in , enableLibraryProfiling ? false , enableExecutableProfiling ? false # TODO enable shared libs for cross-compiling -, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) -, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) +, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? true @@ -53,7 +60,7 @@ let isCross = (ghc.cross or null) != null; in , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" +, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock } @ args: @@ -102,11 +109,12 @@ let enableParallelBuilding = (versionOlder "7.8" ghc.version && !hasActiveLibrary) || versionOlder "8.0.1" ghc.version; crossCabalFlags = [ - "--with-ghc=${ghc.cross.config}-ghc" - "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" - "--with-gcc=${ghc.cc}" - "--with-ld=${ghc.ld}" - "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" + "--with-ghc=${ghc.targetPrefix}ghc" + "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" + "--with-gcc=${stdenv.cc.targetPrefix}cc" + "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" + "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" # not cross one + "--with-strip=${stdenv.cc.bintools.targetPrefix}strip" ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); crossCabalFlagsString = @@ -122,7 +130,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !stdenv.isArm && !stdenv.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") @@ -135,7 +143,7 @@ let ] ++ optionals isGhcjs [ "--ghcjs" ] ++ optionals isCross ([ - "--configure-option=--host=${ghc.cross.config}" + "--configure-option=--host=${hostPlatform.config}" ] ++ crossCabalFlags); setupCompileFlags = [ @@ -171,8 +179,7 @@ let setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= toUpper ghcCommand'; in @@ -222,8 +229,8 @@ stdenv.mkDerivation ({ setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" - # nativePkgs defined in stdenv/setup.hs - for p in "''${nativePkgs[@]}"; do + # host.*Pkgs defined in stdenv/setup.hs + for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ continue @@ -243,7 +250,7 @@ stdenv.mkDerivation ({ # libraries) from all the dependencies. local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir - for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'); do + for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'|sort -u); do ln -s "$d/"*.dylib $dynamicLinksDir done # Edit the local package DB to reference the links directory. @@ -269,6 +276,8 @@ stdenv.mkDerivation ({ runHook postCompileBuildDriver ''; + inherit configureFlags; + configurePhase = '' runHook preConfigure @@ -276,7 +285,7 @@ stdenv.mkDerivation ({ echo configureFlags: $configureFlags ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" - if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then + 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 @@ -317,8 +326,14 @@ stdenv.mkDerivation ({ local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile - local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) - mv $packageConfFile $packageConfDir/$pkgId.conf + if [ -d "$packageConfFile" ]; then + mv "$packageConfFile"/* "$packageConfDir" + rmdir "$packageConfFile" + fi + for packageConfFile in "$packageConfDir"/*; do + local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) + mv $packageConfFile $packageConfDir/$pkgId.conf + done ''} ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do @@ -350,6 +365,8 @@ stdenv.mkDerivation ({ inherit pname version; + compiler = ghc; + isHaskellLibrary = hasActiveLibrary; # TODO: ask why the split outputs are configurable at all? @@ -362,7 +379,8 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; - nativeBuildInputs = [ ghcEnv systemBuildInputs ]; + buildInputs = systemBuildInputs; + nativeBuildInputs = [ ghcEnv ]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' @@ -393,7 +411,6 @@ stdenv.mkDerivation ({ // optionalAttrs (postCompileBuildDriver != "") { inherit postCompileBuildDriver; } // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } @@ -412,5 +429,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } -// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } +// optionalAttrs (buildPlatform.isLinux){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d8b9b42e2cd3..7cc141655666 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -520,7 +520,6 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freealut;}; "AMI" = callPackage @@ -754,6 +753,8 @@ self: { pname = "Agda"; version = "2.5.3"; sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"; + revision = "3"; + editedCabalFile = "1hd1viy4wj7fyskjmmf5hqziyvk5qxjr0zcnbp5zdyacng0yyafi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -873,22 +874,23 @@ self: { "Allure" = callPackage ({ mkDerivation, async, base, containers, enummapset-th, filepath - , LambdaHack, random, template-haskell, text, zlib + , LambdaHack, optparse-applicative, random, template-haskell, text + , zlib }: mkDerivation { pname = "Allure"; - version = "0.6.2.0"; - sha256 = "1va5xpyw2plq1f82q2zk64xyrdvkprjzv5p6zycircgc2ficz5a1"; + version = "0.7.1.0"; + sha256 = "0lsyp2rgn5g5d7q4wv13m9p5ayh0aqlzp3b11swhf7br77gg17ym"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - async base containers enummapset-th filepath LambdaHack random - template-haskell text zlib + async base containers enummapset-th filepath LambdaHack + optparse-applicative random template-haskell text zlib ]; testHaskellDepends = [ - base containers enummapset-th filepath LambdaHack random - template-haskell text zlib + base containers enummapset-th filepath LambdaHack + optparse-applicative random template-haskell text zlib ]; homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; @@ -938,7 +940,6 @@ self: { testHaskellDepends = [ base mtl multirec parsec ]; description = "Constructing, analyzing and destructing annotated trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ansi2Html" = callPackage @@ -1222,7 +1223,6 @@ self: { ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Baggins" = callPackage @@ -1376,6 +1376,7 @@ self: { homepage = "http://www.prg.nii.ac.jp/project/bigul/"; description = "The Bidirectional Generic Update Language"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BigPixel" = callPackage @@ -1745,6 +1746,7 @@ self: { transformers vector ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BitSyntax" = callPackage @@ -1839,6 +1841,7 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage @@ -1859,6 +1862,7 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Blogdown" = callPackage @@ -2283,7 +2287,6 @@ self: { ]; description = "Firing rules semantic of CSPM"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-Frontend" = callPackage @@ -2492,15 +2495,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_0_1_0" = callPackage + "Cabal_2_0_1_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, pretty, process, QuickCheck, tagged , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix }: mkDerivation { pname = "Cabal"; - version = "2.0.1.0"; - sha256 = "15jc66l38z3vi1rf3ak4i4hc9vckm5x59qfhqqlbf46nlnc10ii9"; + version = "2.0.1.1"; + sha256 = "06rx6jxikqrdf7k6pmam5cvhwnagq6njmb9qm5777nrz278ccaw0"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -3070,6 +3073,7 @@ self: { libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Concurrent-Cache" = callPackage @@ -3081,6 +3085,7 @@ self: { libraryHaskellDepends = [ base ]; description = "A Cached variable for IO functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ConcurrentUtils" = callPackage @@ -3748,6 +3753,7 @@ self: { ]; description = "Implementation of DSA, based on the description of FIPS 186-4"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DSH" = callPackage @@ -4002,6 +4008,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Decimal_0_5_1" = callPackage + ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Decimal"; + version = "0.5.1"; + sha256 = "0k7kh05mr2f54w1lpgq1nln0h8k6s6h99dyp5jzsb9cfbb3aap2p"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/PaulJohnson/Haskell-Decimal"; + description = "Decimal numbers with variable precision"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DecisionTree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -4702,6 +4727,23 @@ self: { license = "unknown"; }) {}; + "EdisonCore_1_3_2_1" = callPackage + ({ mkDerivation, array, base, containers, EdisonAPI, mtl + , QuickCheck + }: + mkDerivation { + pname = "EdisonCore"; + version = "1.3.2.1"; + sha256 = "0fgj5iwiv3v2gdgx7kjcr15dcs4x1kvmjspp3p99wyhh0x6h3ikk"; + libraryHaskellDepends = [ + array base containers EdisonAPI mtl QuickCheck + ]; + homepage = "http://rwd.rdockins.name/edison/home/"; + description = "A library of efficient, purely-functional data structures (Core Implementations)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "EditTimeReport" = callPackage ({ mkDerivation, array, base, containers, csv, directory, editline , filepath, haskell98, html, pretty, xhtml @@ -4807,6 +4849,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A type class for empty containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Encode" = callPackage @@ -4825,23 +4868,6 @@ self: { }) {}; "EntrezHTTP" = callPackage - ({ mkDerivation, base, biocore, bytestring, conduit, HTTP - , http-conduit, hxt, mtl, network, Taxonomy, text, transformers - }: - mkDerivation { - pname = "EntrezHTTP"; - version = "1.0.3"; - sha256 = "16x8z6s17wgf53wmp8lib9nr7a2jsa1n95714q4gqs2vif646p1r"; - libraryHaskellDepends = [ - base biocore bytestring conduit HTTP http-conduit hxt mtl network - Taxonomy text transformers - ]; - homepage = "https://github.com/eggzilla/EntrezHTTP"; - description = "Libary to interface with the NCBI Entrez REST service"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "EntrezHTTP_1_0_4" = callPackage ({ mkDerivation, base, biocore, bytestring, conduit, HTTP , http-conduit, hxt, mtl, network, Taxonomy, text, transformers }: @@ -4856,7 +4882,6 @@ self: { homepage = "https://github.com/eggzilla/EntrezHTTP"; description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EnumContainers" = callPackage @@ -4972,7 +4997,6 @@ self: { homepage = "http://verement.github.io/etamoo"; description = "A new implementation of the LambdaMOO server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) pcre;}; "Etage" = callPackage @@ -5273,6 +5297,7 @@ self: { homepage = "https://github.com/wyager/FastPush/"; description = "A monad and monad transformer for pushing things onto a stack very fast"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FastxPipe" = callPackage @@ -5462,6 +5487,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Fin" = callPackage + ({ mkDerivation, base, clist, natural-induction, peano }: + mkDerivation { + pname = "Fin"; + version = "0.2.0.0"; + sha256 = "0w4gmfhpav73rkia3q7g6m4lncz1smhfa0rl2sr0602sc0694spr"; + libraryHaskellDepends = [ base clist natural-induction peano ]; + description = "Finite totally-ordered sets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Finance-Quote-Yahoo" = callPackage ({ mkDerivation, base, bytestring, http-conduit, network , old-locale, time @@ -5805,43 +5842,20 @@ self: { "Frames" = callPackage ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml - , pipes, pretty, primitive, readable, regex-applicative - , template-haskell, temporary, text, transformers - , unordered-containers, vector, vinyl + , HUnit, pipes, pipes-bytestring, pipes-group, pipes-parse + , pipes-safe, pipes-text, pretty, primitive, readable + , regex-applicative, template-haskell, temporary, text + , transformers, unordered-containers, vector, vinyl }: mkDerivation { pname = "Frames"; - version = "0.1.9"; - sha256 = "09bbxdqfgshhax0lrkpzii9zg3rymqmkgk0xr9b73zzkr1jfmshq"; + version = "0.3.0.2"; + sha256 = "1a0dq3dfiqj5nmqk5ivn07ds7k51rf24k5kcbk19m8nwy4hvi896"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text - transformers vector vinyl - ]; - testHaskellDepends = [ - base directory hspec htoml pretty regex-applicative - template-haskell temporary text unordered-containers - ]; - benchmarkHaskellDepends = [ base criterion pipes transformers ]; - description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Frames_0_2_1_1" = callPackage - ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml - , HUnit, pipes, pretty, primitive, readable, regex-applicative - , template-haskell, temporary, text, transformers - , unordered-containers, vector, vinyl - }: - mkDerivation { - pname = "Frames"; - version = "0.2.1.1"; - sha256 = "19sgkra9i5mn8nbys1h17vhl2j1yhd43hhg4bjr35nz9hj1cjfjs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text + base ghc-prim pipes pipes-bytestring pipes-group pipes-parse + pipes-safe pipes-text primitive readable template-haskell text transformers vector vinyl ]; testHaskellDepends = [ @@ -5851,7 +5865,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; }) {}; "Frank" = callPackage @@ -5972,7 +5985,6 @@ self: { homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage @@ -6028,8 +6040,8 @@ self: { ({ mkDerivation, base, GLFW, monad-task, OpenGL, transformers }: mkDerivation { pname = "GLFW-task"; - version = "0.2.0"; - sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p"; + version = "0.3.0"; + sha256 = "1il8npm7ygg0j8byczlxadlnnf6xxy5hn307k75drbhn4z8swcqg"; libraryHaskellDepends = [ base GLFW monad-task OpenGL transformers ]; @@ -6049,7 +6061,6 @@ self: { librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLM" = callPackage @@ -6135,8 +6146,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.2"; - sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r"; + version = "0.9.3"; + sha256 = "045wdcxm8ink7q86f6c4p47i1vmjyndk8xahabb0zic4yf3mdr76"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -6179,7 +6190,7 @@ self: { homepage = "https://github.com/tobbebex/GPipe-Core#readme"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-Collada" = callPackage @@ -6226,7 +6237,7 @@ self: { homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-TextureLoad" = callPackage @@ -6328,7 +6339,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -6592,29 +6603,6 @@ self: { }) {}; "Glob" = 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.8.0"; - sha256 = "15p8nbi19mhl3iisngbawmdpvk8paaqq4248fqgan63q1sz13w1q"; - 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 - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Glob_0_9_1" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -6635,7 +6623,6 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -6662,7 +6649,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (self.llvmPackages) llvm;}; "GlomeView" = callPackage @@ -6710,6 +6696,7 @@ self: { homepage = "http://johannesgerer.com/GoogleCodeJam"; description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleDirections" = callPackage @@ -6795,6 +6782,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Grafos Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GrammarProducts" = callPackage @@ -6897,6 +6885,7 @@ self: { ]; description = "Graph-Theoretic Analysis library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Grempa" = callPackage @@ -7074,7 +7063,6 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "HARM" = callPackage @@ -8225,6 +8213,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Phone number parser and validator - This is now DEPRECATED!"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HPi" = callPackage @@ -8510,13 +8499,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "HSlippyMap"; - version = "2.2"; - sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559"; - revision = "2"; - editedCabalFile = "0iw3s7snb255jxj555vyfl3ckgqxf6xivbzl4z9ypy18a5glpzri"; + version = "3.0"; + sha256 = "1kqyahisqzilndargvyh0gqln3471ll1jkpnayirfi9am1by4f93"; libraryHaskellDepends = [ base ]; - homepage = "https://github.com/41px/HSlippyMap"; - description = "OpenStreetMap (OSM) Slippy Map"; + homepage = "https://github.com/apeyroux/HSlippyMap"; + description = "OpenStreetMap Slippy Map"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -8621,7 +8608,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Haskell Bindings for libsvm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HTF" = callPackage @@ -8665,8 +8651,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.8"; - sha256 = "1w6d17xn58f55xw84rql48ad8npzw93k7b46ibx8x4xsl6q5jfk0"; + version = "4000.3.9"; + sha256 = "1zv38sjr1kv6vm35a8w5659ap9jpxpq5b9zjgablils8ca52p5h5"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -8733,19 +8719,6 @@ self: { }) {}; "HUnit" = callPackage - ({ mkDerivation, base, call-stack, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.5.0.0"; - sha256 = "186ykl7vxlfgkd2k8k1rq7yzcryzjpqwmn4ci1nn9h6irqbivib5"; - libraryHaskellDepends = [ base call-stack deepseq ]; - testHaskellDepends = [ base call-stack deepseq filepath ]; - homepage = "https://github.com/hspec/HUnit#readme"; - description = "A unit testing framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HUnit_1_6_0_0" = callPackage ({ mkDerivation, base, call-stack, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -8756,7 +8729,6 @@ self: { homepage = "https://github.com/hspec/HUnit#readme"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HUnit-Diff" = callPackage @@ -9135,6 +9107,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HappyTree" = callPackage + ({ mkDerivation, base, constraints, generics-sop, safe, singletons + }: + mkDerivation { + pname = "HappyTree"; + version = "0.2018.1.8"; + sha256 = "01mc5qh786aw2vbpj5h8kzarhwi5h73bd65m51x7xiyabwfmln0b"; + libraryHaskellDepends = [ + base constraints generics-sop safe singletons + ]; + testHaskellDepends = [ + base constraints generics-sop safe singletons + ]; + homepage = "https://github.com/MarisaKirisame/HappyTree#readme"; + description = "Type Safe and End to End Decision Tree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HarmTrace" = callPackage ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff , directory, filepath, ghc-prim, HarmTrace-Base, instant-generics @@ -9178,7 +9168,6 @@ self: { homepage = "https://bitbucket.org/bash/harmtrace-base"; description = "Parsing and unambiguously representing musical chords"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HasCacBDD" = callPackage @@ -9614,7 +9603,6 @@ self: { homepage = "https://github.com/meteficha/Hipmunk"; description = "A Haskell binding for Chipmunk"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Hipmunk-Utils" = callPackage @@ -9628,7 +9616,6 @@ self: { homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme"; description = "Useful functions for Hipmunk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "HipmunkPlayground" = callPackage @@ -9715,7 +9702,6 @@ self: { homepage = "https://wiki.haskell.org/Hoed"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HoleyMonoid" = callPackage @@ -9933,7 +9919,6 @@ self: { ]; description = "High level bindings to htslib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsHaruPDF" = callPackage @@ -10556,6 +10541,7 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JSONb" = callPackage @@ -10732,8 +10718,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.9.1"; - sha256 = "1g31zgsg7gq5ac9r5aizghvrg7jwn1a0qs4qwnfillqn4wkw6y5b"; + version = "3.2.9.3"; + sha256 = "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -11188,41 +11174,59 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "LambdaDesigner" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-trie + , containers, hosc, lens, lens-aeson, matrix, text, transformers + , vector + }: + mkDerivation { + pname = "LambdaDesigner"; + version = "0.1.0.0"; + sha256 = "1lgplxb546f7bdrwnmivb8zwix4rqhkrhv83ni90hzf4nx5fpjcy"; + libraryHaskellDepends = [ + aeson base bytestring bytestring-trie containers hosc lens + lens-aeson matrix text transformers vector + ]; + homepage = "https://github.com/ulyssesp/LambdaDesigner#readme"; + description = "A type-safe EDSL for TouchDesigner written in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "LambdaHack" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary , bytestring, containers, deepseq, directory, enummapset-th - , filepath, ghc-prim, hashable, hsini, keys, miniutter, pretty-show - , random, sdl2, sdl2-ttf, stm, template-haskell, text, time - , transformers, unordered-containers, vector - , vector-binary-instances, zlib + , filepath, ghc-prim, hashable, hsini, keys, miniutter + , optparse-applicative, pretty-show, random, sdl2, sdl2-ttf, stm + , template-haskell, text, time, transformers, unordered-containers + , vector, vector-binary-instances, zlib }: mkDerivation { pname = "LambdaHack"; - version = "0.6.2.0"; - sha256 = "15fa4kwaa7dzdrppjzkpm8dhazsb5cw372ksfl3smsfxiz8z4af9"; + version = "0.7.1.0"; + sha256 = "1k68vjlfcjnyikissv9bmqfg04zhba1318pvhjc9yb1lb2v745d7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ assert-failure async base base-compat binary bytestring containers deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter pretty-show random sdl2 sdl2-ttf stm text time - transformers unordered-containers vector vector-binary-instances - zlib + keys miniutter optparse-applicative pretty-show random sdl2 + sdl2-ttf stm text time transformers unordered-containers vector + vector-binary-instances zlib ]; executableHaskellDepends = [ assert-failure async base base-compat binary bytestring containers deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter pretty-show random stm template-haskell text time - transformers unordered-containers vector vector-binary-instances - zlib + keys miniutter optparse-applicative pretty-show random stm + template-haskell text time transformers unordered-containers vector + vector-binary-instances zlib ]; testHaskellDepends = [ assert-failure async base base-compat binary bytestring containers deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter pretty-show random stm template-haskell text time - transformers unordered-containers vector vector-binary-instances - zlib + keys miniutter optparse-applicative pretty-show random stm + template-haskell text time transformers unordered-containers vector + vector-binary-instances zlib ]; homepage = "https://lambdahack.github.io"; description = "A game engine library for roguelike dungeon crawlers"; @@ -11589,6 +11593,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListT" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck + , transformers, util + }: + mkDerivation { + pname = "ListT"; + version = "0.1.2.0"; + sha256 = "0ygj695w1xrv0kkpnm55gfjnks7xdbw6vrlqx1a5as4s36hq11zr"; + libraryHaskellDepends = [ base transformers util ]; + testHaskellDepends = [ + base smallcheck tasty tasty-smallcheck transformers util + ]; + description = "List transformer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ListTree" = callPackage ({ mkDerivation, base, directory, filepath, List, transformers }: mkDerivation { @@ -11856,11 +11876,12 @@ self: { ({ mkDerivation, base, bytestring, hidapi, mtl }: mkDerivation { pname = "MBot"; - version = "0.2.2.0"; - sha256 = "1iyb1zynjlnq9qwn7g85d7qwyffpgrdjsimambv9sqkajwf86wdx"; + version = "0.2.4.0"; + sha256 = "1jzjf1p1ld9xdxqb9jf32nyhzmp29mirpinz24s8blwpscia5v56"; 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 @@ -11976,6 +11997,7 @@ self: { homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html"; description = "Automatic inductive functional programmer by systematic search"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MailchimpSimple" = callPackage @@ -13474,21 +13496,6 @@ self: { }) {}; "Octree" = callPackage - ({ mkDerivation, AC-Vector, base, markdown-unlit, QuickCheck }: - mkDerivation { - pname = "Octree"; - version = "0.5.4.3"; - sha256 = "0rdlf8cqpfz43j9xddc5pqp829nyirndkc2rc7h8f8ycpdzsmn2g"; - revision = "1"; - editedCabalFile = "1ysmpp7knrkxh68q6nq012877mn51sgzjrpls7d80pkg4pgkf42a"; - libraryHaskellDepends = [ AC-Vector base QuickCheck ]; - testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ]; - homepage = "https://github.com/mgajda/octree"; - description = "Simple unbalanced Octree for storing data about 3D points"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Octree_0_5_4_4" = callPackage ({ mkDerivation, AC-Vector, base, QuickCheck }: mkDerivation { pname = "Octree"; @@ -13499,7 +13506,6 @@ self: { homepage = "https://github.com/mgajda/octree"; description = "Simple unbalanced Octree for storing data about 3D points"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OddWord" = callPackage @@ -13625,6 +13631,7 @@ self: { ]; description = "Assorted utilities to work with AFP data streams"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenAL" = callPackage @@ -13645,7 +13652,6 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "OpenCL" = callPackage @@ -13727,8 +13733,8 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.2.5.0"; - sha256 = "1drxviqsx25isrxdq5f5gr5hrpfpbqcs7pj632qibmvpaqp4s3xg"; + version = "3.2.7.0"; + sha256 = "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -13738,24 +13744,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; - "OpenGLRaw_3_2_6_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.2.6.0"; - sha256 = "1fsrlc0wy27dvb1551zwgwyf1sdxd37kn1ddv33rxbli988wha60"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesa;}; - "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -13909,6 +13897,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Ordinary" = callPackage + ({ mkDerivation, base, safe, threepenny-gui }: + mkDerivation { + pname = "Ordinary"; + version = "0.2018.1.8"; + sha256 = "0n4mk28cdcj71qxifh1prib2a83fjk4dzw6h5dm8a81z6ijribb1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe threepenny-gui ]; + executableHaskellDepends = [ base safe threepenny-gui ]; + testHaskellDepends = [ base safe threepenny-gui ]; + homepage = "https://github.com/MarisaKirisame/Ordinary#readme"; + description = "A Programming Language in Construction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "PArrows" = callPackage ({ mkDerivation, base, containers, ghc-prim, mtl }: mkDerivation { @@ -14350,6 +14354,7 @@ self: { homepage = "https://github.com/MedeaMelana/Piso"; description = "Partial isomorphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlayHangmanGame" = callPackage @@ -14406,7 +14411,6 @@ self: { executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "PlslTools" = callPackage @@ -14542,7 +14546,6 @@ self: { homepage = "https://github.com/choener/PrimitiveArray-Pretty"; description = "Pretty-printing for primitive arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Printf-TH" = callPackage @@ -14738,6 +14741,7 @@ self: { homepage = "https://github.com/alexandersgreen/qio-haskell"; description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QLearn" = callPackage @@ -14848,25 +14852,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, random, template-haskell - , test-framework, tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.9.2"; - sha256 = "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m"; - libraryHaskellDepends = [ - base containers random template-haskell tf-random transformers - ]; - testHaskellDepends = [ - base containers template-haskell test-framework - ]; - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_10_1" = callPackage ({ mkDerivation, base, containers, deepseq, random , template-haskell, tf-random, transformers }: @@ -14882,7 +14867,6 @@ self: { homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -15496,6 +15480,7 @@ self: { homepage = "https://github.com/sweirich/replib"; description = "Generic programming library with representation types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReplicateEffects" = callPackage @@ -15613,6 +15598,7 @@ self: { libraryHaskellDepends = [ base ]; homepage = "https://github.com/riottracker/RtMidi"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "RxHaskell" = callPackage @@ -15661,17 +15647,14 @@ self: { homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System"; 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 ({ mkDerivation, base, SDL }: mkDerivation { pname = "SDL"; - version = "0.6.5.1"; - sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"; - revision = "1"; - editedCabalFile = "0gj76j31i8rnlnvkf6hr8ljc6qmqqqcndy0bgrcppji78zg3ygi3"; + version = "0.6.6.0"; + sha256 = "0wpddhq5vwm2m1q8ja1p6draz4f40p1snmdshxwqnyyj3nchqz0z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ SDL ]; @@ -15690,7 +15673,6 @@ self: { librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_gfx;}; "SDL-image" = callPackage @@ -15706,7 +15688,6 @@ self: { librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_image;}; "SDL-mixer" = callPackage @@ -15722,7 +15703,6 @@ self: { librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_mixer;}; "SDL-mpeg" = callPackage @@ -15736,7 +15716,6 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -15750,7 +15729,6 @@ self: { librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_ttf;}; "SDL2-ttf" = callPackage @@ -15949,6 +15927,7 @@ self: { homepage = "https://github.com/AntonXue/SSTG#readme"; description = "STG Symbolic Execution"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STL" = callPackage @@ -15961,6 +15940,7 @@ self: { homepage = "http://github.com/bergey/STL"; description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STLinkUSB" = callPackage @@ -15976,7 +15956,6 @@ self: { ]; description = "STLink USB interface in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STM32-Zombie" = callPackage @@ -16033,7 +16012,6 @@ self: { ]; description = "translate a SVD of a Microcontroller to Haskell tables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVG2Q" = callPackage @@ -16211,7 +16189,6 @@ self: { ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ScratchFs" = callPackage @@ -16356,8 +16333,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.4.6"; - sha256 = "1g5ihsma3zgb7q89n2j4772f504nnhfn065xdz6bqgrnjhkrpsqi"; + version = "0.4.7"; + sha256 = "0z0dlx4s0j5v627cvns5qdq1r6kcka5nif8g62hdria29lk5aj8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16612,7 +16589,6 @@ self: { testHaskellDepends = [ base Cabal ]; description = "Simple table generator"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Sit" = callPackage @@ -16837,6 +16813,7 @@ self: { homepage = "http://www.haskell.org/yampa/"; description = "Video game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SpacePrivateers" = callPackage @@ -16915,6 +16892,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-api" = callPackage @@ -16929,6 +16907,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-api-ghcjs" = callPackage @@ -16958,6 +16937,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-auth" = callPackage @@ -16999,6 +16979,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-digestive" = callPackage @@ -17016,6 +16997,7 @@ self: { homepage = "https://github.com/agrafix/Spock-digestive"; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-lucid" = callPackage @@ -17028,6 +17010,7 @@ self: { homepage = "http://github.com/aelve/Spock-lucid"; description = "Lucid support for Spock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-worker" = callPackage @@ -17046,6 +17029,7 @@ self: { homepage = "http://github.com/agrafix/Spock-worker"; description = "Background workers for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SpreadsheetML" = callPackage @@ -17509,6 +17493,7 @@ self: { homepage = "http://www.storytotell.org/code/tablify"; description = "Tool to render CSV into tables of various formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Tahin" = callPackage @@ -17573,21 +17558,6 @@ self: { }) {}; "Taxonomy" = callPackage - ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl - , graphviz, parsec, text, vector - }: - mkDerivation { - pname = "Taxonomy"; - version = "1.0.2"; - sha256 = "076j2jj45insbj9v98iygm7ighk210xja3dm8ar9jnjmrpar8gil"; - libraryHaskellDepends = [ - aeson base bytestring either-unwrap fgl graphviz parsec text vector - ]; - description = "Libary for parsing, processing and vizualization of taxonomy data"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "Taxonomy_1_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl , graphviz, parsec, text, vector }: @@ -17600,7 +17570,6 @@ self: { ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TaxonomyTools" = callPackage @@ -17706,6 +17675,7 @@ self: { homepage = "https://github.com/testexplode/testexplode"; description = "Generates testcases from program-snippets"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Theora" = callPackage @@ -18121,7 +18091,6 @@ self: { homepage = "https://github.com/avieth/TypeNat"; description = "Some Nat-indexed types for GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TypingTester" = callPackage @@ -18201,6 +18170,7 @@ self: { homepage = "http://github.com/solidsnack/URLb"; description = "DEPRECATED A simple, liberal URL parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "UTFTConverter" = callPackage @@ -18271,7 +18241,6 @@ self: { homepage = "http://src.seereason.com/haskell-unixutils-shadow"; description = "A simple interface to shadow passwords (aka, shadow.h)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Updater" = callPackage @@ -18833,33 +18802,14 @@ self: { }) {}; "Win32" = callPackage - ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 - , shfolder, user32, winmm - }: - mkDerivation { - pname = "Win32"; - version = "2.3.1.1"; - sha256 = "1255qx2a2ff95x9f5qg5k9cgy7s5j19vh9gybfa9xfqkkv5gcmsw"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ - advapi32 gdi32 shell32 shfolder user32 winmm - ]; - homepage = "https://github.com/haskell/win32"; - description = "A binding to part of the Win32 library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; - }) {advapi32 = null; gdi32 = null; shell32 = null; - shfolder = null; user32 = null; winmm = null;}; - - "Win32_2_6_1_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 - , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm + , msimg32, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.6.1.0"; - sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; - libraryHaskellDepends = [ base bytestring filepath unbuildable ]; + version = "2.5.4.1"; + sha256 = "0r1xzm0w3kg8rqq24j17405ic6yix53r9sq9wpl4zl2sajg3w66c"; + libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm ]; @@ -18871,6 +18821,26 @@ self: { shell32 = null; shfolder = null; shlwapi = null; user32 = null; winmm = null;}; + "Win32_2_6_2_0" = callPackage + ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 + , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm + }: + mkDerivation { + pname = "Win32"; + version = "2.6.2.0"; + sha256 = "0rfp3yivwycp988rp01zgx61m7csrr7v449ksjrym1bb06ksxgjr"; + libraryHaskellDepends = [ base bytestring filepath unbuildable ]; + librarySystemDepends = [ + advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm + ]; + homepage = "https://github.com/haskell/win32"; + description = "A binding to Windows Win32 API"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.none; + }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; + shell32 = null; shfolder = null; shlwapi = null; user32 = null; + winmm = null;}; + "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: mkDerivation { @@ -19029,7 +18999,6 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/wired/"; description = "Wire-aware hardware description"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "WordAlignment" = callPackage @@ -19281,6 +19250,7 @@ self: { homepage = "xy30.com"; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "XMMS" = callPackage @@ -19491,15 +19461,14 @@ self: { homepage = "http://www.ben-kiki.org/oren/YamlReference"; description = "YAML reference implementation"; license = "LGPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Yampa" = callPackage ({ mkDerivation, base, deepseq, random }: mkDerivation { pname = "Yampa"; - version = "0.10.6.2"; - sha256 = "1d18m2id6dsdkpldmqsjxxi6mpqv8hg87mzpay99l8h937nyhj3g"; + version = "0.10.7"; + sha256 = "1ifijcqk6il68h8yr62mvqh8fqc1ss15slfp73vwd92jkv5kvc8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random ]; @@ -19681,6 +19650,7 @@ self: { homepage = "http://github.com/bgwines/zora"; description = "Graphing library wrapper + assorted useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Zwaluw" = callPackage @@ -19769,7 +19739,7 @@ self: { ]; description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {abc = null;}; "abcnotation" = callPackage @@ -19825,6 +19795,7 @@ self: { homepage = "https://github.com/Xandaros/abnf.git"; description = "Parse ABNF and generate parsers for the specified document"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "abstract-deque" = callPackage @@ -19930,28 +19901,6 @@ self: { }) {}; "accelerate" = callPackage - ({ mkDerivation, base, base-orphans, containers, deepseq, directory - , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables - , mtl, pretty, template-haskell, time, transformers, unique, unix - , unordered-containers - }: - mkDerivation { - pname = "accelerate"; - version = "1.0.0.0"; - sha256 = "04pix2hazqafyb3zr8ikn1acrc77f9r9061fygpblbl5fxmk9g96"; - revision = "1"; - editedCabalFile = "1n6mhckkry2ga6w5yhc9s37saf055jfs2ixi1g0np5cca6027h10"; - libraryHaskellDepends = [ - base base-orphans containers deepseq directory exceptions fclabels - filepath ghc-prim hashable hashtables mtl pretty template-haskell - time transformers unique unix unordered-containers - ]; - homepage = "https://github.com/AccelerateHS/accelerate/"; - description = "An embedded language for accelerated array processing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "accelerate_1_1_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-orphans, containers , deepseq, directory, exceptions, fclabels, filepath, ghc-prim , hashable, hashtables, mtl, template-haskell, time, transformers @@ -19969,7 +19918,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-arithmetic" = callPackage @@ -19989,7 +19937,6 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/"; description = "Linear algebra and interpolation using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-bignum" = callPackage @@ -20108,18 +20055,18 @@ self: { }) {}; "accelerate-cufft" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, accelerate-fourier - , accelerate-utility, base, cuda, cufft + ({ mkDerivation, accelerate, accelerate-fourier + , accelerate-llvm-ptx, accelerate-utility, base, cuda, cufft }: mkDerivation { pname = "accelerate-cufft"; - version = "0.0.1"; - sha256 = "0w7j5d2ncabz2ca4q53i07jybwsc116l38q71z2jl842lrlc1vc2"; + version = "1.0"; + sha256 = "1rz5i80scvbz36awh4wgh5vp2vkv8drj3gmwvx02j80cjjqibcij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - accelerate accelerate-cuda accelerate-fourier accelerate-utility - base cuda cufft + accelerate accelerate-fourier accelerate-llvm-ptx + accelerate-utility base cuda cufft ]; homepage = "http://hub.darcs.net/thielema/accelerate-cufft/"; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; @@ -20204,7 +20151,6 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-fftw/"; description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier" = callPackage @@ -20340,6 +20286,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-llvm-ptx_1_1_0_1" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , containers, cuda, deepseq, directory, dlist, fclabels, file-embed + , filepath, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty + , process, template-haskell, time, unordered-containers + }: + mkDerivation { + pname = "accelerate-llvm-ptx"; + version = "1.1.0.1"; + sha256 = "0j1j4y0gx219ib8hyklydv0l610j53zg6qan4n7477rs58ninv5j"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring containers cuda deepseq + directory dlist fclabels file-embed filepath hashable llvm-hs + llvm-hs-pure mtl nvvm pretty process template-haskell time + unordered-containers + ]; + description = "Accelerate backend for NVIDIA GPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-random" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -20385,7 +20352,6 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-utility/"; description = "Utility functions for the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accentuateus" = callPackage @@ -20750,6 +20716,7 @@ self: { homepage = "https://github.com/marcosdumay/acme-kitchen-sink"; description = "A place for dumping that does-not-feel-right code while you improve it"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-left-pad" = callPackage @@ -20834,6 +20801,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-mutable-package" = callPackage + ({ mkDerivation, base, Cabal }: + mkDerivation { + pname = "acme-mutable-package"; + version = "0"; + sha256 = "16da6pkkdr2g77dn3n4v9x6mwi6yz3xlpisvpn0id2xz0bayipmr"; + revision = "3"; + editedCabalFile = "094kr4ib0hldgccr5bvy9azpfvkf5dmq3hq6xk5hyha6djjkx2gc"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base ]; + description = "A mutable package"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-now" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -21416,13 +21397,13 @@ self: { "aern2-real" = callPackage ({ mkDerivation, aern2-mp, aeson, base, bytestring, containers - , convertible, elm-bridge, hspec, lens, mixed-types-num, QuickCheck - , random, stm, transformers + , convertible, hspec, lens, mixed-types-num, QuickCheck, random + , stm, transformers }: mkDerivation { pname = "aern2-real"; - version = "0.1.0.2"; - sha256 = "1bm0w1wvyga97ahg9p31w3lj7rhq8q0bz2my0g0n7vrlm98jv8v0"; + version = "0.1.1.0"; + sha256 = "1sq2s20vwhm0avdzqg2vb5ck6rj7aw16kcfkdyhda0dl6s2l5q15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21430,7 +21411,7 @@ self: { mixed-types-num QuickCheck stm transformers ]; executableHaskellDepends = [ - aern2-mp base elm-bridge mixed-types-num QuickCheck random + aern2-mp base mixed-types-num QuickCheck random ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/michalkonecny/aern2"; @@ -21469,40 +21450,6 @@ self: { }) {}; "aeson" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, integer-logarithms, QuickCheck - , quickcheck-instances, scientific, tagged, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, time-locale-compat, unordered-containers, uuid-types - , vector - }: - mkDerivation { - pname = "aeson"; - version = "1.1.2.0"; - sha256 = "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"; - revision = "1"; - editedCabalFile = "06acsik1qcn5r1z1y3n7iw5h8x0h3hdcjii0bq9nf9ncvc71h1d4"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text time - time-locale-compat unordered-containers uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck - quickcheck-instances scientific tagged template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 text - time time-locale-compat unordered-containers uuid-types vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_2_3_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable @@ -21533,7 +21480,6 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -21626,35 +21572,6 @@ self: { }) {}; "aeson-compat" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans - , bytestring, containers, exceptions, hashable, nats, QuickCheck - , quickcheck-instances, scientific, semigroups, tagged, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson-compat"; - version = "0.3.6"; - sha256 = "0hnifh46g218ih666gha3r0hp8bahcl9aj1rr4jqyw2gykcnb8vs"; - revision = "6"; - editedCabalFile = "1hvq2pp7k2wqlzd192l7dz1dhld7m3slhv84hnmh4jz8g618xzsc"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring containers exceptions - hashable nats scientific semigroups tagged text time - time-locale-compat unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat base-orphans bytestring - containers exceptions hashable nats QuickCheck quickcheck-instances - scientific semigroups tagged tasty tasty-hunit tasty-quickcheck - text time time-locale-compat unordered-containers vector - ]; - homepage = "https://github.com/phadej/aeson-compat#readme"; - description = "Compatibility layer for aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-compat_0_3_7_1" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions , hashable, QuickCheck, quickcheck-instances, scientific, tagged @@ -21679,7 +21596,6 @@ self: { homepage = "https://github.com/phadej/aeson-compat#readme"; description = "Compatibility layer for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-diff" = callPackage @@ -21711,34 +21627,6 @@ self: { }) {}; "aeson-extra" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , bytestring, containers, exceptions, hashable, parsec - , quickcheck-instances, recursion-schemes, scientific, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, these - , time, time-parsers, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-extra"; - version = "0.4.0.0"; - sha256 = "1555mc2vq74i8ydxrvc9ci9kiajml3i7ha4i4f9c0s4bbzvfvv3q"; - revision = "3"; - editedCabalFile = "11wps0p4wrm68zzck6km0yxj988xnkcbaww1vlyd02jv3vzyb16z"; - libraryHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat bytestring - containers exceptions hashable parsec recursion-schemes scientific - template-haskell text time time-parsers unordered-containers vector - ]; - testHaskellDepends = [ - base containers quickcheck-instances tasty tasty-hunit - tasty-quickcheck these time time-parsers unordered-containers - vector - ]; - homepage = "https://github.com/phadej/aeson-extra#readme"; - description = "Extra goodies for aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-extra_0_4_1_0" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec , attoparsec-iso8601, base, base-compat, bytestring, containers , deepseq, exceptions, hashable, parsec, quickcheck-instances @@ -21841,36 +21729,14 @@ self: { ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-generic-compat"; - version = "0.0.1.0"; - sha256 = "1bfkj0hmnpw6f5iql86iky3ivj4hv7f8a317gv7g8l0k6m6mx86l"; + version = "0.0.1.1"; + sha256 = "1davhg48x4k9nsizpafjlicwryi05ijfh902bn35x76pay7alims"; libraryHaskellDepends = [ aeson base ]; description = "Compatible generic class names of Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; "aeson-injector" = callPackage - ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens - , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2 - , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers - , vector - }: - mkDerivation { - pname = "aeson-injector"; - version = "1.0.10.0"; - sha256 = "169zdhc3j2lv9hgv6c2s7jxvwb68xkgimkyqp8c7vwr812asqabk"; - libraryHaskellDepends = [ - aeson base bifunctors deepseq lens servant-docs swagger2 text - unordered-containers - ]; - testHaskellDepends = [ - aeson base HUnit lens QuickCheck quickcheck-text scientific - swagger2 tasty tasty-hunit tasty-quickcheck text vector - ]; - description = "Injecting fields into aeson values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-injector_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, deepseq , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific , servant-docs, swagger2, tasty, tasty-hunit, tasty-quickcheck @@ -21890,7 +21756,6 @@ self: { ]; description = "Injecting fields into aeson values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-iproute" = callPackage @@ -21986,6 +21851,7 @@ self: { homepage = "https://github.com/j1r1k/aeson-prefix#readme"; description = "Hiearchical prefixing for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-pretty_0_7_2" = callPackage @@ -22243,35 +22109,33 @@ self: { homepage = "https://github.com/sannsyn/aeson-value-parser"; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-yak" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-yak"; - version = "0.1.1.1"; - sha256 = "0q52h6py1fc24f7r51pc3gpziakp7h557wy3r06qfa6rx00yvsk8"; + version = "0.1.1.3"; + sha256 = "0x5a5z0bmiljl9rfapyq6srffp6v3g25qvy0x692a5as66y5ahxg"; libraryHaskellDepends = [ aeson base ]; homepage = "https://github.com/tejon/aeson-yak"; description = "Handle JSON that may or may not be a list, or exist"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "affection" = callPackage - ({ mkDerivation, babl, base, clock, containers, gegl, glib - , monad-loops, monad-parallel, mtl, sdl2, text + ({ mkDerivation, base, bytestring, clock, containers, glib, linear + , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid }: mkDerivation { pname = "affection"; - version = "0.0.0.6"; - sha256 = "0fc071zl68acm01ik4v1admy0hs4jp787kpadw9ddavwykmr6jdz"; + version = "0.0.0.7"; + sha256 = "0qnlh1ny4cysxzh45vsh1d49gk4kc2kzpdjrqnn3mh66wz2fc177"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - babl base clock containers gegl glib monad-loops monad-parallel mtl - sdl2 text + base bytestring clock containers glib linear monad-loops + monad-parallel mtl OpenGL sdl2 stm text uuid ]; homepage = "https://github.com/nek0/affection#readme"; description = "A simple Game Engine using SDL"; @@ -22361,6 +22225,7 @@ self: { homepage = "https://github.com/UU-ComputerScience/ag-pictgen"; description = "Attribute Grammar picture generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agda-server" = callPackage @@ -22455,8 +22320,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "agum"; - version = "2.6"; - sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim"; + version = "2.7"; + sha256 = "1x1yd2wxff2am7g50nvwmk4slw6p31zl61mlm8rdgcjbds4a2qrk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -22602,8 +22467,8 @@ self: { }: mkDerivation { pname = "airship"; - version = "0.6.0"; - sha256 = "1mhz0mqq57xsxi4m9r7aznrn7d4vxl4b2jalv7gm3kfzqpjjpjp4"; + version = "0.9.2"; + sha256 = "02r607yqvr5w6i6hba0ifbc02fshxijd4g46ygird9lsarcr2svp"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring bytestring-trie case-insensitive containers cryptohash directory @@ -22621,37 +22486,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "airship_0_9_1" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, bytestring-trie, case-insensitive, containers - , cryptohash, directory, either, filepath, http-date, http-media - , http-types, lifted-base, microlens, mime-types, mmorph - , monad-control, mtl, network, old-locale, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unix, unordered-containers, wai, wai-extra - }: - mkDerivation { - pname = "airship"; - version = "0.9.1"; - sha256 = "09kjgb3zv03n0h1brw61xccrs37219pdphah3cwa397vhlncmlgq"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - bytestring-trie case-insensitive containers cryptohash directory - either filepath http-date http-media http-types lifted-base - microlens mime-types mmorph monad-control mtl network old-locale - random text time transformers transformers-base unix - unordered-containers wai wai-extra - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - transformers wai - ]; - homepage = "https://github.com/helium/airship/"; - description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "airtable-api" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, lens, text , time, unordered-containers, wreq @@ -22668,6 +22502,7 @@ self: { homepage = "https://github.com/ooblahman/airtable-api"; description = "Requesting and introspecting Tables within an Airtable project"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika" = callPackage @@ -22718,7 +22553,6 @@ self: { homepage = "http://www.aivikasoft.com"; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment" = callPackage @@ -22796,8 +22630,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.4"; - sha256 = "0yrpbq0ppck1z9d7whzfknia16sac6jpr80mi8bw6g65hjcg3z1g"; + version = "0.5"; + sha256 = "1szf6xaq7lk3l473rm8pls5s23nk08dwdzf875hx96i0m7kxmp6p"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -22933,24 +22767,6 @@ self: { }) {}; "alerta" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, containers - , data-default, http-api-data, http-client, servant, servant-client - , servant-server, text, time - }: - mkDerivation { - pname = "alerta"; - version = "0.1.0.5"; - sha256 = "1fmdn30nmz0gqa3kqyc675msmwvrdvbissfbgax19xma3yppafal"; - libraryHaskellDepends = [ - aeson aeson-pretty base containers data-default http-api-data - http-client servant servant-client servant-server text time - ]; - homepage = "https://github.com/mjhopkins/alerta-client"; - description = "Bindings to the alerta REST API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alerta_0_1_0_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, containers , data-default, http-api-data, http-client, servant, servant-client , servant-client-core, servant-server, text, time @@ -23030,6 +22846,7 @@ self: { homepage = "https://www.asayers.com/"; description = "Collection of useful functions for writing console applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-tools" = callPackage @@ -23110,8 +22927,8 @@ self: { }: mkDerivation { pname = "algebra"; - version = "4.3"; - sha256 = "1h61lvy9fkkzm2gpr78b09bid0yi1fd7xa4mx90jy2sd16gq6k1r"; + version = "4.3.1"; + sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void @@ -23186,7 +23003,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/algebraic-classes"; description = "Conversions between algebraic classes and F-algebras"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algebraic-graphs" = callPackage @@ -23220,6 +23036,7 @@ self: { homepage = "https://github.com/konn/algebraic-prelude#readme"; description = "Algebraically structured Prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algo-s" = callPackage @@ -23598,6 +23415,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Extra utilities for alternatives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alternative-io" = callPackage @@ -23634,8 +23452,8 @@ self: { ({ mkDerivation, base, mmorph, transformers }: mkDerivation { pname = "alternators"; - version = "0.1.1.1"; - sha256 = "03ivs1iwqgyf5slhyv0alkvik3jn49dqbhqs1vi4h9gwdc9d8l4n"; + version = "0.1.2.0"; + sha256 = "19i2yhi6nsd2nl7sisbj6wrii5nw1z7xj7zk0fjmivyclnj03r5g"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/louispan/alternators#readme"; description = "Handy functions when using transformers"; @@ -23733,27 +23551,6 @@ self: { }) {}; "amazonka" = callPackage - ({ mkDerivation, amazonka-core, base, bytestring, conduit - , conduit-extra, directory, exceptions, http-conduit, ini, mmorph - , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text - , time, transformers, transformers-base, transformers-compat - }: - mkDerivation { - pname = "amazonka"; - version = "1.4.5"; - sha256 = "0p48ra5hns9kpnsgr40imj0zgnd311ww2kk4lz4nnjpa1ppvgrw6"; - libraryHaskellDepends = [ - amazonka-core base bytestring conduit conduit-extra directory - exceptions http-conduit ini mmorph monad-control mtl resourcet - retry text time transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Comprehensive Amazon Web Services SDK"; - license = "unknown"; - }) {}; - - "amazonka_1_5_0" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, directory, exceptions, http-conduit, ini, mmorph , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text @@ -23772,28 +23569,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-apigateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-apigateway"; - version = "1.4.5"; - sha256 = "0jhf9lihkipb4hsskrzwczif4zr7v70gsijrvvq3snxp69w4zkfc"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon API Gateway SDK"; - license = "unknown"; - }) {}; - - "amazonka-apigateway_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23809,28 +23587,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon API Gateway SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-application-autoscaling" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-application-autoscaling"; - version = "1.4.5"; - sha256 = "0kn2xsgmqgdmq4wf0j2x02kkaykbis2ipa6slph7jhpbx0dybd76"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Application Auto Scaling SDK"; - license = "unknown"; - }) {}; - - "amazonka-application-autoscaling_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23846,28 +23605,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-appstream" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-appstream"; - version = "1.4.5"; - sha256 = "0z2ih9vnyf81hlwa3ybyzmv2cziqbx677idyk3m91pxgw9hdl5bz"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon AppStream SDK"; - license = "unknown"; - }) {}; - - "amazonka-appstream_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23883,7 +23623,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon AppStream SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-athena" = callPackage @@ -23902,28 +23641,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Athena SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-autoscaling" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-autoscaling"; - version = "1.4.5"; - sha256 = "1nkbkqrxrifpwh6471k80rgj7rlpl1cai6gfilidr3pqgygvz1zq"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Auto Scaling SDK"; - license = "unknown"; - }) {}; - - "amazonka-autoscaling_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23939,7 +23659,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-batch" = callPackage @@ -23958,28 +23677,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Batch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-budgets" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-budgets"; - version = "1.4.5"; - sha256 = "12qxxbkv97x85clw733rskdygvpfz1b10j8q9ag5ps71axh3ndm1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Budgets SDK"; - license = "unknown"; - }) {}; - - "amazonka-budgets_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23995,28 +23695,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Budgets SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-certificatemanager" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-certificatemanager"; - version = "1.4.5"; - sha256 = "1c1j0rnf7fz6m969zj475hqwc0784fwlpfcp640j9ss4004w344r"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Certificate Manager SDK"; - license = "unknown"; - }) {}; - - "amazonka-certificatemanager_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24032,7 +23713,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Certificate Manager SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-clouddirectory" = callPackage @@ -24051,28 +23731,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudDirectory SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudformation"; - version = "1.4.5"; - sha256 = "1xmpvmicn3kr9q4s3h5hdv4q83yrjh8hkb2ifym6nf3fwhg4ghps"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFormation SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudformation_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24088,28 +23749,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudfront"; - version = "1.4.5"; - sha256 = "1ldalnim14ry62q9w95psz2i2b0hsd3rnkf9b9gs81xnbagg928f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFront SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudfront_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24125,28 +23767,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudhsm"; - version = "1.4.5"; - sha256 = "0dx8fwy8kl1vafnncjjwxhiw5d72gyj50rv57vhagpyk6waaj501"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudHSM SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudhsm_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24162,7 +23785,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsmv2" = callPackage @@ -24181,28 +23803,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM V2 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch"; - version = "1.4.5"; - sha256 = "0nrjpangzwrllr4rrpc72ha2cj98dsrnslvgjqwf90hndrcjpi32"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24218,28 +23821,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch-domains"; - version = "1.4.5"; - sha256 = "12h2x8pj5ka4ay79v01aa1cafnh8nr0m1frpjnlk1knnv6bh62g0"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch Domain SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch-domains_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24255,28 +23839,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudtrail"; - version = "1.4.5"; - sha256 = "0xn2rkxcqkrlkafnmriykxadjzs0lgx8pa2mcfjyj0k4lv8hps25"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudTrail SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudtrail_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24292,28 +23857,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch"; - version = "1.4.5"; - sha256 = "0092ihps4z99mmp6mwz5sxa8q0bp8qkcihkz9i6mpva9v7wbbrh0"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24329,28 +23875,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-events" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch-events"; - version = "1.4.5"; - sha256 = "0zgwr6yw1vd8ckab9zdjf3m21ckl7is9mggy40l4w43ckq8vi8mi"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch Events SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch-events_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24366,28 +23893,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Events SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-logs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch-logs"; - version = "1.4.5"; - sha256 = "0clhg49d9x68z8mcjrz3w3ag3dw96rmday0bfimj3vpnwcygpkqh"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch Logs SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch-logs_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24403,28 +23911,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codebuild" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codebuild"; - version = "1.4.5"; - sha256 = "1l7xga491f6zw0gnz8rz4cfmcci05vxfizxhscdihw915ch6whi4"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeBuild SDK"; - license = "unknown"; - }) {}; - - "amazonka-codebuild_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24440,28 +23929,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeBuild SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codecommit" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codecommit"; - version = "1.4.5"; - sha256 = "0qw0cqdcx1gb2w8g2q94kgxs0n9jng36fx7yrza809prxlnfv3zw"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeCommit SDK"; - license = "unknown"; - }) {}; - - "amazonka-codecommit_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24477,28 +23947,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codedeploy"; - version = "1.4.5"; - sha256 = "1dvif2grws2mm7m0vzdhbdjygbzdd53nvzxiylbc211m1lp25w5i"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeDeploy SDK"; - license = "unknown"; - }) {}; - - "amazonka-codedeploy_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24514,28 +23965,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codepipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codepipeline"; - version = "1.4.5"; - sha256 = "1v268rjryqcx4mzxp6vppjqjbi39x36qh2c3pb5rdjddy7wah236"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodePipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-codepipeline_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24551,7 +23983,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codestar" = callPackage @@ -24570,28 +24001,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeStar SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-identity"; - version = "1.4.5"; - sha256 = "01hdyp65arhjn4bdlbgfbyfafmqx0gw4p4158mlhl30v9rlpkb1c"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Identity SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-identity_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24607,28 +24019,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-idp" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-idp"; - version = "1.4.5"; - sha256 = "06362bbqqndnk26xwkhszmrlgl6qd2nj5g1217ixzv27id4p7wmw"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Identity Provider SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-idp_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24644,28 +24037,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity Provider SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-sync"; - version = "1.4.5"; - sha256 = "1psf6jk61i2632wfpk9gclkrbv0g21ddjn2gj1i0333rchqm4c8k"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Sync SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-sync_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24681,28 +24055,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-config"; - version = "1.4.5"; - sha256 = "095ygx63drvif2magxnshv1zrhbsc1zzbajld7p8bcggysgmnp3p"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Config SDK"; - license = "unknown"; - }) {}; - - "amazonka-config_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24718,40 +24073,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, cryptonite, deepseq - , exceptions, hashable, http-conduit, http-types, lens, memory, mtl - , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups - , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, transformers, transformers-compat - , unordered-containers, xml-conduit, xml-types - }: - mkDerivation { - pname = "amazonka-core"; - version = "1.4.5"; - sha256 = "0zzfrn4m7ixs7dxw2n7d6ajfb9h8bnbk8pw1hw8w48nprv8f24yv"; - libraryHaskellDepends = [ - aeson attoparsec base bifunctors bytestring case-insensitive - conduit conduit-extra cryptonite deepseq exceptions hashable - http-conduit http-types lens memory mtl resourcet scientific - semigroups tagged text time transformers transformers-compat - unordered-containers xml-conduit xml-types - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive http-types QuickCheck - quickcheck-unicode tasty tasty-hunit tasty-quickcheck - template-haskell text time - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Core data types and functionality for Amazonka libraries"; - license = "unknown"; - }) {}; - - "amazonka-core_1_5_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, cryptonite , data-ordlist, deepseq, exceptions, hashable, http-conduit @@ -24779,7 +24103,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Core data types and functionality for Amazonka libraries"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cur" = callPackage @@ -24798,28 +24121,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cost and Usage Report Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-datapipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-datapipeline"; - version = "1.4.5"; - sha256 = "1dawy8zzzcgmwl82byv4avv6126jd7zk53yix1bbyly5lfli5215"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Data Pipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-datapipeline_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24835,28 +24139,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-devicefarm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-devicefarm"; - version = "1.4.5"; - sha256 = "00l88pd9sixyr53vfy67fg2z2zy3d9s5njpapa302dizr5s2jiza"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Device Farm SDK"; - license = "unknown"; - }) {}; - - "amazonka-devicefarm_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24872,28 +24157,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-directconnect"; - version = "1.4.5"; - sha256 = "1afyndqyvg2rysmzpblhhn3ci3g34mdgzq14zh3hdmj26da9w4sj"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Direct Connect SDK"; - license = "unknown"; - }) {}; - - "amazonka-directconnect_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24909,28 +24175,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-discovery" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-discovery"; - version = "1.4.5"; - sha256 = "1f5dpk6ppky1dinz9gaxvqfzlas2fjvggiizwv64nwysis9q2myz"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Application Discovery Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-discovery_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24946,28 +24193,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Discovery Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dms"; - version = "1.4.5"; - sha256 = "1z3ia6qzy2qqhrdccyv208a2jx4jrsz9i6y17rwb8v34bjvhjhik"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Database Migration Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-dms_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24983,28 +24211,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Database Migration Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ds" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ds"; - version = "1.4.5"; - sha256 = "1pa4d73kx1x8al24qf939l2g7yl2jkv8k1q8pjlkacbra93z64g7"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Directory Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ds_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25020,28 +24229,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb"; - version = "1.4.5"; - sha256 = "0qnppij7qs3zmj52p9aai1hxqaz2jqaa80a0l7rv5xra05d3vckl"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25057,7 +24247,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -25076,28 +24265,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Accelerator (DAX) SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb-streams" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb-streams"; - version = "1.4.5"; - sha256 = "1vgyw5sl31v388yl51jzkfacf5k5cic97h7lnsq65kgvcgbl18w3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB Streams SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb-streams_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25113,29 +24283,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ec2"; - version = "1.4.5"; - sha256 = "166l1i8nc98wn081mifwiyk7pr9n5mxc9axmk6vnjvbvjj7r7974"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Compute Cloud SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "amazonka-ec2_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25151,28 +24301,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecr" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ecr"; - version = "1.4.5"; - sha256 = "0339zm44b6g0mlv2bd0xvnkd7gw182vh2cw0yj3jlh12xaa11yn3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon EC2 Container Registry SDK"; - license = "unknown"; - }) {}; - - "amazonka-ecr_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25188,28 +24319,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Registry SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ecs"; - version = "1.4.5"; - sha256 = "0564w843rkxx5sjxcd86bz0cc4ip6ikh0w3vrhx15sgf90j5jwms"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon EC2 Container Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ecs_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25225,28 +24337,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-efs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-efs"; - version = "1.4.5"; - sha256 = "0l1cnn636j819f8nnzhs7pb8lj74ahxqfmxsjbd9794wvi0a3yz8"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic File System SDK"; - license = "unknown"; - }) {}; - - "amazonka-efs_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25262,28 +24355,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticache" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticache"; - version = "1.4.5"; - sha256 = "1fs5prhw55phdw04bpx4nqkmrdxkhjxvyarkp4x47c59y1x2snbg"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon ElastiCache SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticache_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25299,28 +24373,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticbeanstalk"; - version = "1.4.5"; - sha256 = "1y2rvy1gnxq76girapsfnaw5cbkhpqnfsazqgxasnldrjcdjkb73"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Beanstalk SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticbeanstalk_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25336,28 +24391,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticsearch"; - version = "1.4.5"; - sha256 = "00sk4nwkdr1m23zy47gy3zfcss8m4rxzfj3h6nsjgpkg4yzziidx"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elasticsearch Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticsearch_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25373,28 +24409,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elasticsearch Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elastictranscoder"; - version = "1.4.5"; - sha256 = "0fqj5j71n836xpkx15jmjg3fmqs64snclx55rwlkzs5sfann0rrh"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Transcoder SDK"; - license = "unknown"; - }) {}; - - "amazonka-elastictranscoder_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25410,28 +24427,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elb"; - version = "1.4.5"; - sha256 = "0qpb239fzpnnap2yi9a1dlqa8pj1ixkgckrinjfgz2697zwnxjp6"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Load Balancing SDK"; - license = "unknown"; - }) {}; - - "amazonka-elb_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25447,28 +24445,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elbv2" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elbv2"; - version = "1.4.5"; - sha256 = "0iyqbpkjv6d8v8j3f07vx41p1jsa8s6z0irxmp183gl55x4qsk7s"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Load Balancing SDK"; - license = "unknown"; - }) {}; - - "amazonka-elbv2_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25484,28 +24463,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-emr"; - version = "1.4.5"; - sha256 = "1dr4x7h2vah52zvdldzkqn6y9sb5iinwnn59amz5wlrd8fzg169c"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic MapReduce SDK"; - license = "unknown"; - }) {}; - - "amazonka-emr_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25521,28 +24481,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-gamelift" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-gamelift"; - version = "1.4.5"; - sha256 = "0ll1vh41dvw7pkif3l8fxg2apypgimwpacnvq5cgdwsihrslfn70"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon GameLift SDK"; - license = "unknown"; - }) {}; - - "amazonka-gamelift_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25558,28 +24499,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon GameLift SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-glacier"; - version = "1.4.5"; - sha256 = "1qsjmlsqb1lqj8yvp5pcv790a82r8mfmwa54jq3lffzs06l7v8cw"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Glacier SDK"; - license = "unknown"; - }) {}; - - "amazonka-glacier_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25595,7 +24517,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glue" = callPackage @@ -25614,7 +24535,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glue SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-greengrass" = callPackage @@ -25633,28 +24553,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Greengrass SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-health" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-health"; - version = "1.4.5"; - sha256 = "0q9f3rn6gakknq01py5im66hqxa2p7byqjrcm5jwja9kh4ryy7gc"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Health APIs and Notifications SDK"; - license = "unknown"; - }) {}; - - "amazonka-health_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25670,28 +24571,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Health APIs and Notifications SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iam" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iam"; - version = "1.4.5"; - sha256 = "1jk8j1r9m0czd7i55x2ndpc1s5j55yi9xb43jsd4bkmxzs0n0z63"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Identity and Access Management SDK"; - license = "unknown"; - }) {}; - - "amazonka-iam_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25707,28 +24589,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-importexport" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-importexport"; - version = "1.4.5"; - sha256 = "1v65b4wvs0lvllg6jnhafz6w8b72az1iqm482qf5725gy7xk3c94"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Import/Export SDK"; - license = "unknown"; - }) {}; - - "amazonka-importexport_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25744,28 +24607,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-inspector" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-inspector"; - version = "1.4.5"; - sha256 = "12m7kafjxl3yin65jz2plnvhsllqssvsziddl8v32p5xbx9zj244"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Inspector SDK"; - license = "unknown"; - }) {}; - - "amazonka-inspector_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25781,28 +24625,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Inspector SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot"; - version = "1.4.5"; - sha256 = "14v2sv9z38pddhkcsn8qvxk0i3gm5a96qqrc5gbbqyy67xsbpj5s"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25818,28 +24643,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot-dataplane" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot-dataplane"; - version = "1.4.5"; - sha256 = "0qnrskv59zh6w5y5y980f83rvkfvjcvrc01n2vxzwd7m0lnw4g9v"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT Data Plane SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot-dataplane_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25855,28 +24661,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT Data Plane SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis"; - version = "1.4.5"; - sha256 = "0kd23qphxg8cpj84z08cx71y73df0nvnwmry5l4fijdrykm1wrk9"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25892,28 +24679,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-analytics" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis-analytics"; - version = "1.4.5"; - sha256 = "12lhwmivpwr8mw8xw1kn3njxaha7m50izzgi4kicmcjiv7c7x49n"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis Analytics SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis-analytics_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25929,28 +24697,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-firehose" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis-firehose"; - version = "1.4.5"; - sha256 = "00z19k934xpxkig41q70ph3l5mm09ql909z3k2fvjyagwlbcrp7w"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis Firehose SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis-firehose_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25966,28 +24715,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Firehose SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kms"; - version = "1.4.5"; - sha256 = "1xphd0f7s29lq2076zf5lxbdhhqbd1syjnmmg07ldvb3lx5n2y45"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Key Management Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-kms_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26003,28 +24733,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lambda" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-lambda"; - version = "1.4.5"; - sha256 = "08ng97wnlhbdir46bf9q18f1y02dkfd9nq3qha25qzbqzx0al45j"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Lambda SDK"; - license = "unknown"; - }) {}; - - "amazonka-lambda_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26040,7 +24751,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lex-models" = callPackage @@ -26059,7 +24769,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lex Model Building Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lex-runtime" = callPackage @@ -26078,28 +24787,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lex Runtime Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lightsail" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-lightsail"; - version = "1.4.5"; - sha256 = "1079qfbw1la3lf4avlq4w28s56r6dwhy798ih2cxv3hfsyja814j"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Lightsail SDK"; - license = "unknown"; - }) {}; - - "amazonka-lightsail_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26115,28 +24805,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lightsail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-analytics" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-marketplace-analytics"; - version = "1.4.5"; - sha256 = "0a5b17qx820q6n61g7gsnl8il0lq3v02vp34ik0alf3s3ssjim23"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Marketplace Commerce Analytics SDK"; - license = "unknown"; - }) {}; - - "amazonka-marketplace-analytics_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26152,7 +24823,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Commerce Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-entitlement" = callPackage @@ -26171,28 +24841,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Entitlement Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-metering" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-marketplace-metering"; - version = "1.4.5"; - sha256 = "1piwisfq5cdknpzw1vzi13ymsjwyij14zjhgxi04q096ibj4y53n"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Marketplace Metering SDK"; - license = "unknown"; - }) {}; - - "amazonka-marketplace-metering_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26208,7 +24859,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Metering SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-mechanicalturk" = callPackage @@ -26227,7 +24877,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Mechanical Turk SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-migrationhub" = callPackage @@ -26246,28 +24895,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Migration Hub SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ml" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ml"; - version = "1.4.5"; - sha256 = "0ra8ak4ymxg6cv3g3zw2pkhwbccjw6r8jjir9z8kgimx5820v6sp"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Machine Learning SDK"; - license = "unknown"; - }) {}; - - "amazonka-ml_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26283,7 +24913,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-mobile" = callPackage @@ -26302,28 +24931,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Mobile SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-opsworks"; - version = "1.4.5"; - sha256 = "0d4d5zy3lq6mcy9iyqqh73kramxj3z7fb0mkhsfja3fgpp404669"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon OpsWorks SDK"; - license = "unknown"; - }) {}; - - "amazonka-opsworks_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26339,28 +24949,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks-cm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-opsworks-cm"; - version = "1.4.5"; - sha256 = "1lr9kpn6v6rqlss40w41vbriflsb0a2a5zyx27y3sy5k1cmp54ap"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon OpsWorks for Chef Automate SDK"; - license = "unknown"; - }) {}; - - "amazonka-opsworks-cm_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26376,7 +24967,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks for Chef Automate SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-organizations" = callPackage @@ -26395,28 +24985,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Organizations SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-pinpoint" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-pinpoint"; - version = "1.4.5"; - sha256 = "1pdwq6d8z5g7cj3csi43181c98ly2d5g40bfxxb5ygj5n01p29li"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Pinpoint SDK"; - license = "unknown"; - }) {}; - - "amazonka-pinpoint_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26432,28 +25003,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Pinpoint SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-polly" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-polly"; - version = "1.4.5"; - sha256 = "1infnfp5m348mrlxr6kdv1ggw7vc1h8ah5if33sdm64sghsf5mdm"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Polly SDK"; - license = "unknown"; - }) {}; - - "amazonka-polly_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26469,7 +25021,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Polly SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-pricing" = callPackage @@ -26488,28 +25039,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Price List Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-rds"; - version = "1.4.5"; - sha256 = "02x3q846i7i9yvr94pf05xim5h3vsvinq10p4kndin76hhxy0xw3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Relational Database Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-rds_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26525,28 +25057,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-redshift" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-redshift"; - version = "1.4.5"; - sha256 = "0jm8zxjyrcnfnj8dng51ccw1xfrfb941dxsy8g9jhszza45xdv5p"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Redshift SDK"; - license = "unknown"; - }) {}; - - "amazonka-redshift_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26562,28 +25075,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rekognition" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-rekognition"; - version = "1.4.5"; - sha256 = "1gi5g839rhgixj0gsf1cwzzisqdrixrj4jv4hi27qjxag73axhx6"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Rekognition SDK"; - license = "unknown"; - }) {}; - - "amazonka-rekognition_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26599,7 +25093,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Rekognition SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-resourcegroupstagging" = callPackage @@ -26618,28 +25111,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Resource Groups Tagging API SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53"; - version = "1.4.5"; - sha256 = "0pa2v2pd8nx5qxdqq4g6ayafgxi4hafil20ijg4sp57mv0k9ix38"; - libraryHaskellDepends = [ amazonka-core base text ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26655,28 +25129,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53-domains"; - version = "1.4.5"; - sha256 = "0ggxsixfrmbdlvxqjjizzd0c947x7ramp9zvl7gz86f0l2845dqz"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 Domains SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53-domains_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26692,28 +25147,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-s3"; - version = "1.4.5"; - sha256 = "1bg45wxcvizdi7j5jggvblxwhd3f7sfy1j0jaq2ajfxcdsb7wabq"; - libraryHaskellDepends = [ amazonka-core base lens text ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Storage Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-s3_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26729,7 +25165,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3-streaming" = callPackage @@ -26756,27 +25191,10 @@ self: { homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme"; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sdb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sdb"; - version = "1.4.5"; - sha256 = "1cn6pvr5fbqgb79l3sa0zmvwnb2mrlcdnmk4lyp0ws44h5gniv7x"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon SimpleDB SDK"; - license = "unknown"; - }) {}; - - "amazonka-sdb_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26792,28 +25210,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-servicecatalog" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-servicecatalog"; - version = "1.4.5"; - sha256 = "1rynfj7vk6rri042lbs0wlgn56j16w82v3xvqqddanss2mm11q55"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Service Catalog SDK"; - license = "unknown"; - }) {}; - - "amazonka-servicecatalog_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26829,28 +25228,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Service Catalog SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ses"; - version = "1.4.5"; - sha256 = "0a8k5vj4ls6hzn845x8vdr9gg4lhdydkx8b7viwxg8nb9mi263x3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Email Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ses_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26866,28 +25246,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-shield" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-shield"; - version = "1.4.5"; - sha256 = "1p1g4kbwj3pbwl0cr80m3ggd8k6wys9hyv8k6cynba7wc72w4blc"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Shield SDK"; - license = "unknown"; - }) {}; - - "amazonka-shield_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26903,28 +25264,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Shield SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sms"; - version = "1.4.5"; - sha256 = "0y6sn3bnv73sfad12ylsncwm92h6sy9d6j3za4l9knsq5kqgnvsa"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Server Migration Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sms_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26940,28 +25282,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Server Migration Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-snowball" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-snowball"; - version = "1.4.5"; - sha256 = "07hyhgnl5m86wk3biwak0j173b3m6n10xs6sd4956x08h1rjqzz2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Import/Export Snowball SDK"; - license = "unknown"; - }) {}; - - "amazonka-snowball_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -26977,28 +25300,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export Snowball SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sns"; - version = "1.4.5"; - sha256 = "10c6i07iapavigdk863bxk0vja4pldcan7agv19rgjsmd8zc4xg8"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Notification Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sns_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27014,28 +25318,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sqs"; - version = "1.4.5"; - sha256 = "1pajmh7mizzjjysrkdvfswx70lcf0x9s4r2arw0968myplkqz8wh"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Queue Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sqs_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27051,28 +25336,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ssm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ssm"; - version = "1.4.5"; - sha256 = "0lnza1qsnl9wswf2f8na852vi51bhgiyddldww23kxam5yk6rlgv"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Systems Manager (SSM) SDK"; - license = "unknown"; - }) {}; - - "amazonka-ssm_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27088,28 +25354,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Manager (SSM) SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-stepfunctions" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-stepfunctions"; - version = "1.4.5"; - sha256 = "062jy1pfmng6az8api5xh66qcjdz8c5d1nskx8756gpzpb2pj0wr"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Step Functions SDK"; - license = "unknown"; - }) {}; - - "amazonka-stepfunctions_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27125,28 +25372,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Step Functions SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-storagegateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-storagegateway"; - version = "1.4.5"; - sha256 = "1sqsy968rp6an5g7n9y17wv73kybmv6vnrycnsmyy4br9vbr5pwc"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Storage Gateway SDK"; - license = "unknown"; - }) {}; - - "amazonka-storagegateway_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27162,28 +25390,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sts"; - version = "1.4.5"; - sha256 = "1mg3dprk8r94kmzbyqcffvnj7dnrnabdiyg7lm90zhy048hsyfxq"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Security Token Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sts_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27199,28 +25408,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-support"; - version = "1.4.5"; - sha256 = "0awfvf8rff3q442jk0r26bkgri7hv2hxyrninpbjcckrz8fq8pqk"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Support SDK"; - license = "unknown"; - }) {}; - - "amazonka-support_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27236,28 +25426,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-swf"; - version = "1.4.5"; - sha256 = "0a4r4zbq4r5x89zwk6ys3xr8as5qp5v2xhcsh7l69f3vrdlc35s3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Workflow Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-swf_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27273,32 +25444,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-test" = callPackage - ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, groom, http-client - , http-types, process, resourcet, tasty, tasty-hunit - , template-haskell, temporary, text, time, unordered-containers - , yaml - }: - mkDerivation { - pname = "amazonka-test"; - version = "1.4.5"; - sha256 = "0fjynyb85px3mbf85jf1xvs7n21622w60lasshgjy42brp5p524q"; - libraryHaskellDepends = [ - aeson amazonka-core base bifunctors bytestring case-insensitive - conduit conduit-extra groom http-client http-types process - resourcet tasty tasty-hunit template-haskell temporary text time - unordered-containers yaml - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Common functionality for Amazonka library test-suites"; - license = "unknown"; - }) {}; - - "amazonka-test_1_5_0" = callPackage ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, groom, http-client , http-types, process, resourcet, tasty, tasty-hunit @@ -27318,28 +25466,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Common functionality for Amazonka library test-suites"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-waf" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-waf"; - version = "1.4.5"; - sha256 = "0mgirx31c7gffbgp99z9gfa6ps8n45rrqlrmn4kmc0bbf893vipx"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WAF SDK"; - license = "unknown"; - }) {}; - - "amazonka-waf_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27355,7 +25484,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WAF SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-waf-regional" = callPackage @@ -27374,7 +25502,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WAF Regional SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-workdocs" = callPackage @@ -27393,28 +25520,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkDocs SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-workspaces" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-workspaces"; - version = "1.4.5"; - sha256 = "1px7nyybmd50mfm2iivkqi294g9sgsgp3a41676g8qdacw15yv1m"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WorkSpaces SDK"; - license = "unknown"; - }) {}; - - "amazonka-workspaces_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27430,28 +25538,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-xray" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-xray"; - version = "1.4.5"; - sha256 = "0l72rvpgwsly3xlqc6drj79q9n2kr2wwc3lm2z836d1layc3hcz1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon X-Ray SDK"; - license = "unknown"; - }) {}; - - "amazonka-xray_1_5_0" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -27467,7 +25556,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon X-Ray SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amby" = callPackage @@ -27530,34 +25618,6 @@ self: { }) {}; "amqp" = callPackage - ({ mkDerivation, base, binary, bytestring, clock, connection - , containers, data-binary-ieee754, hspec, hspec-expectations - , monad-control, network, network-uri, split, stm, text, vector - , xml - }: - mkDerivation { - pname = "amqp"; - version = "0.15.1"; - sha256 = "17pgwa810w8f3kqhxp850hwkr9yqi0sydy4sc6wxxfi4pwy5xvld"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 monad-control network network-uri split stm - text vector - ]; - executableHaskellDepends = [ base containers xml ]; - testHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 hspec hspec-expectations network network-uri - split stm text vector - ]; - homepage = "https://github.com/hreinhardt/amqp"; - description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "amqp_0_18_1" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -27583,7 +25643,6 @@ self: { homepage = "https://github.com/hreinhardt/amqp"; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-conduit" = callPackage @@ -27647,6 +25706,7 @@ self: { ]; description = "High level functions for working with message queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amrun" = callPackage @@ -27926,7 +25986,6 @@ self: { homepage = "https://github.com/jxv/animate#readme"; description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "animate-example" = callPackage @@ -27946,6 +26005,7 @@ self: { homepage = "https://github.com/jxv/animate#readme"; description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anki-tools" = callPackage @@ -28028,6 +26088,7 @@ self: { homepage = "http://www.github.com/massysett/anonymous-sums"; description = "Anonymous sum types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anonymous-sums-tests" = callPackage @@ -28043,6 +26104,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ansi-escape-codes" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ansi-escape-codes"; + version = "0.3.0.0"; + sha256 = "1aj7p937c48laz5kkhil45lgkjiivcidky6vxxp3q5yvkymsijvb"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/joegesualdo/ansi-escape-codes"; + description = "Haskell package to generate ANSI escape codes for styling strings in the terminal"; + license = stdenv.lib.licenses.mit; + }) {}; + "ansi-pretty" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bytestring , containers, generics-sop, nats, scientific, semigroups, tagged @@ -28064,7 +26137,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal" = callPackage + "ansi-terminal_0_6_3_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ansi-terminal"; @@ -28077,9 +26150,10 @@ self: { homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ansi-terminal_0_7_1_1" = callPackage + "ansi-terminal" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; @@ -28092,25 +26166,25 @@ self: { homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "ansi-terminal_0_8" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.8"; + sha256 = "1gg2xy800vzj2xixx8ifis1z027v34xj1a3792v0y8b7kmypgwlb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/feuerbach/ansi-terminal"; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansi-wl-pprint" = callPackage - ({ mkDerivation, ansi-terminal, base }: - mkDerivation { - pname = "ansi-wl-pprint"; - version = "0.6.7.3"; - sha256 = "025pyphsjf0dnbrmj5nscbi6gzyigwgp3ifxb3psn7kji6mfr29p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base ]; - executableHaskellDepends = [ ansi-terminal base ]; - homepage = "http://github.com/ekmett/ansi-wl-pprint"; - description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-wl-pprint_0_6_8_1" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; @@ -28125,15 +26199,14 @@ self: { homepage = "http://github.com/ekmett/ansi-wl-pprint"; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.4"; - sha256 = "0gyim5a4b0gc4z45hsbxwl3gn3xcad3068xwcgwh8gc4ikannki9"; + version = "0.3.0.5"; + sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -28395,8 +26468,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.6"; - sha256 = "0alf0sxsnsr1a2g7wv08jm1vh3s2kbvkn0s4a0h9ya2rjyz7dp7f"; + version = "0.2.4.7"; + sha256 = "0hqx0q52688zd7hdy6bcmbhycscy1laxggy8fvswglbfdm9m9n8s"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -29124,6 +27197,7 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apportionment" = callPackage @@ -29191,6 +27265,7 @@ self: { homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "approximate-equality" = callPackage @@ -29264,34 +27339,34 @@ self: { }) {arbb_dev = null;}; "arbtt" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 + ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring + , bytestring-progress, conduit, conduit-extra, containers, deepseq + , directory, exceptions, filepath, mtl, parsec, pcre-light + , process-extras, strict, tasty, tasty-golden, tasty-hunit + , terminal-progress-bar, time, transformers, unix, utf8-string, X11 }: mkDerivation { pname = "arbtt"; - version = "0.9.0.13"; - sha256 = "0ga0jq47s83w36ipmz1wdcrg6ir5z2klppx6kcxpmkikf8f85gl9"; + version = "0.10"; + sha256 = "0klxsxyq4yij11c9z11jgrarmz1fya2rpx0zax7kqpvc26xbc24n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 + aeson array attoparsec base binary bytestring bytestring-progress + conduit conduit-extra containers deepseq directory exceptions + filepath mtl parsec pcre-light strict terminal-progress-bar time + transformers unix utf8-string X11 ]; - executableSystemDepends = [ libXScrnSaver ]; testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec + base binary bytestring containers deepseq directory mtl parsec pcre-light process-extras tasty tasty-golden tasty-hunit time transformers unix utf8-string ]; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libXScrnSaver;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "arcgrid" = callPackage ({ mkDerivation, base, parsec, parsec-numeric }: @@ -29423,6 +27498,7 @@ self: { homepage = "http://archhaskell.wordpress.com/"; description = "Convert Arch Linux package updates in RSS to pretty markdown"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arena" = callPackage @@ -29682,37 +27758,8 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.5.0.0"; - sha256 = "0gja9x6y2nprlg5d2wjycjvxgc7bb4p6y8d4fg3dxxzzwgqgrrab"; - configureFlags = [ "-f-llvm" ]; - libraryHaskellDepends = [ - array base containers exact-pi ghc-prim integer-gmp - integer-logarithms mtl random - ]; - testHaskellDepends = [ - base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion integer-logarithms random - ]; - homepage = "https://github.com/cartazio/arithmoi"; - description = "Efficient basic number-theoretic functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "arithmoi_0_6_0_0" = callPackage - ({ mkDerivation, array, base, containers, criterion, exact-pi - , ghc-prim, integer-gmp, integer-logarithms, mtl, QuickCheck - , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, transformers - }: - mkDerivation { - pname = "arithmoi"; - version = "0.6.0.0"; - sha256 = "14kcv5n9rm48f9vac333cbazy4hlpb0wqgb4fbv97ivxnjs7g22m"; - revision = "1"; - editedCabalFile = "0408asx3296s0rwpzjmsllfjavdnh9h2rnmbvz908xs7qc5njixd"; + version = "0.6.0.1"; + sha256 = "0dhr55r5vi10d9wqr054fy8rxp7h9z0kfpwvckaly0j90d6gvkqm"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp @@ -29849,7 +27896,6 @@ 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 @@ -29931,23 +27977,6 @@ self: { }) {}; "arrowp-qq" = callPackage - ({ mkDerivation, array, base, containers, haskell-src - , template-haskell, transformers - }: - mkDerivation { - pname = "arrowp-qq"; - version = "0.1.1"; - sha256 = "1khs7xcc234i4xk6gwjakrzmn8gymaradar9inqikb6wkrs61r53"; - libraryHaskellDepends = [ - array base containers haskell-src template-haskell transformers - ]; - homepage = "http://www.haskell.org/arrows/"; - description = "quasiquoter translating arrow notation into Haskell 98"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "arrowp-qq_0_2_1_1" = callPackage ({ mkDerivation, arrows, base, containers, data-default , haskell-src-exts, haskell-src-exts-util, haskell-src-meta, NoHoed , template-haskell, transformers, uniplate @@ -29967,7 +27996,6 @@ self: { homepage = "https://github.com/pepeiborra/arrowp"; description = "A preprocessor and quasiquoter for translating arrow notation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arrows" = callPackage @@ -30383,6 +28411,7 @@ self: { homepage = "https://github.com/liyang/assert"; description = "Helpers for Control.Exception.assert"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "assert-failure" = callPackage @@ -30585,7 +28614,6 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Run MonadConc operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "async-extra" = callPackage @@ -30755,6 +28783,7 @@ self: { homepage = "https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk/atermlib"; description = "serialisation for Haskell values with sharing support"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aterm-utils" = callPackage @@ -30869,6 +28898,7 @@ self: { libraryHaskellDepends = [ atmos base dimensional-tf ]; description = "dimensional-tf wrapper on atmos package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atndapi" = callPackage @@ -30925,33 +28955,6 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators - , data-default, hlint, lens-simple, mono-traversable, parsers - , quickcheck-instances, resourcet, safe-exceptions, tasty - , tasty-hunit, tasty-quickcheck, text, time, timerep - , uri-bytestring, xml-conduit, xml-types - }: - mkDerivation { - pname = "atom-conduit"; - version = "0.4.0.3"; - sha256 = "0pl5p9zj33fjjgrxkyj2y45r3qyl5p8z9g17zg19gvqzszsk3vr1"; - libraryHaskellDepends = [ - base blaze-builder conduit conduit-combinators lens-simple - mono-traversable parsers safe-exceptions text time timerep - uri-bytestring xml-conduit xml-types - ]; - testHaskellDepends = [ - base conduit data-default hlint lens-simple mono-traversable - parsers quickcheck-instances resourcet safe-exceptions tasty - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "atom-conduit_0_5_0_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators , data-default, hlint, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty @@ -30975,7 +28978,6 @@ self: { ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atom-msp430" = callPackage @@ -31001,14 +29003,15 @@ self: { homepage = "https://github.com/chris-martin/haskell-libraries"; description = "A typeclass for mutable references that have an atomic modify operation"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atomic-primops" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; - version = "0.8.1"; - sha256 = "0zqbx0sfgl0hi8bqavvwjxsczayxrhwjqxymaawrvn44xr9g35c1"; + version = "0.8.1.1"; + sha256 = "0wi18i3k5mjmyd13n1kly7021084rjm4wfpcf70zzzss1z37kxch"; libraryHaskellDepends = [ base ghc-prim primitive ]; homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "A safe approach to CAS and other atomic ops in Haskell"; @@ -31110,6 +29113,7 @@ self: { homepage = "https://github.com/seereason/atp-haskell"; description = "Translation from Ocaml to Haskell of John Harrison's ATP code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atrans" = callPackage @@ -31124,6 +29128,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ats-format" = callPackage + ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base + , Cabal, composition-prelude, criterion, deepseq, directory + , file-embed, happy, hspec, hspec-dirstream, htoml-megaparsec, lens + , megaparsec, optparse-applicative, process, recursion-schemes + , system-filepath, text, unordered-containers + }: + mkDerivation { + pname = "ats-format"; + version = "0.1.0.20"; + sha256 = "116awkzdld7z1vw77pm1v4ldk2iapzarzh4vg02awxwlaj20mpk4"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory lens process ]; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base composition-prelude deepseq + directory file-embed htoml-megaparsec lens megaparsec + optparse-applicative process recursion-schemes text + unordered-containers + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hspec hspec-dirstream system-filepath + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://hub.darcs.net/vmchale/ats-format#readme"; + description = "A source-code formatter for ATS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attempt" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -31179,36 +29216,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "attoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , tasty, tasty-quickcheck, text, transformers, unordered-containers - , vector + "attomail" = callPackage + ({ mkDerivation, base, bytestring, ConfigFile, directory, doctest + , email-validate, Glob, hsemail-ns, MissingH, mtl, network + , optparse-applicative, parsec, QuickCheck, random, text, time + , transformers, unix, unix-time }: mkDerivation { - pname = "attoparsec"; - version = "0.13.1.0"; - sha256 = "0r1zrrkbqv8w4pb459fj5izd1h85p9nrsp3gyzj7qiayjpa79p2j"; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers + pname = "attomail"; + version = "0.1.0.2"; + sha256 = "0yryvw8qcp0vgal4dn48xi7x42wl9b1bwfbh0chnvbi5rwnwspyr"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring ConfigFile directory email-validate hsemail-ns + MissingH mtl network optparse-applicative parsec random text time + transformers unix unix-time ]; - testHaskellDepends = [ - array base bytestring deepseq QuickCheck quickcheck-unicode - scientific tasty tasty-quickcheck text transformers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text - transformers unordered-containers vector - ]; - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; + testHaskellDepends = [ base doctest Glob QuickCheck ]; + description = "Minimal mail delivery agent (MDA) for local mail with maildir support"; + license = stdenv.lib.licenses.bsd2; }) {}; - "attoparsec_0_13_2_0" = callPackage + "attoparsec" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, criterion, deepseq, directory, filepath, ghc-prim , http-types, parsec, QuickCheck, quickcheck-unicode, scientific @@ -31235,7 +29265,6 @@ self: { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-arff" = callPackage @@ -31295,6 +29324,7 @@ self: { homepage = "https://github.com/robinbb/attoparsec-csv"; description = "A parser for CSV files that uses Attoparsec"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-data" = callPackage @@ -31312,7 +29342,6 @@ self: { homepage = "https://github.com/nikita-volkov/attoparsec-data"; description = "Parsers for the standard Haskell data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-enumerator" = callPackage @@ -31442,28 +29471,6 @@ self: { }) {}; "attoparsec-time" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, Cabal - , cabal-doctest, directory, doctest, filepath, scientific, text - , time - }: - mkDerivation { - pname = "attoparsec-time"; - version = "0.1.4"; - sha256 = "0b4h530j01wkx8405b0yf0cz5k7mjglzr72lvv8rr7idd7m4k5iw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec base base-prelude scientific text time - ]; - testHaskellDepends = [ - base base-prelude directory doctest filepath - ]; - homepage = "https://github.com/nikita-volkov/attoparsec-time"; - description = "Attoparsec parsers of time"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "attoparsec-time_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bytestring, Cabal , cabal-doctest, directory, doctest, filepath, scientific, text , time @@ -31482,7 +29489,6 @@ self: { homepage = "https://github.com/nikita-volkov/attoparsec-time"; description = "Attoparsec parsers of time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-trans" = callPackage @@ -31670,18 +29676,18 @@ self: { "authenticate" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, http-conduit, http-types - , monad-control, network-uri, resourcet, tagstream-conduit, text - , transformers, unordered-containers, xml-conduit + , network-uri, resourcet, tagstream-conduit, text, transformers + , unordered-containers, xml-conduit }: mkDerivation { pname = "authenticate"; - version = "1.3.3.2"; - sha256 = "0c3fcl1i32112jz7w2ss0p1x5xpcvsnnk0vbzi3shvk43rwzfpx6"; + version = "1.3.4"; + sha256 = "1f1gjggfq114h3nrlzg2svm0j5ghp6n9zlgb3fnq2pgpzpdndm9z"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive - conduit containers http-conduit http-types monad-control - network-uri resourcet tagstream-conduit text transformers - unordered-containers xml-conduit + conduit containers http-conduit http-types network-uri resourcet + tagstream-conduit text transformers unordered-containers + xml-conduit ]; homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; @@ -31800,8 +29806,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.2"; - sha256 = "1n7pzpxz3bb4l20hy53qdda4r1gwf6j47py08n9w568j7hygrklx"; + version = "1.1.3"; + sha256 = "0rkgb2vfznn6a28h40c26if43mzcavwd81myi27zbg8811g9bv6m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -31999,26 +30005,6 @@ self: { }) {}; "avers-api" = callPackage - ({ mkDerivation, aeson, avers, base, bytestring, cookie - , http-api-data, servant, text, time, vector - }: - mkDerivation { - pname = "avers-api"; - version = "0.0.18.0"; - sha256 = "1i85g3zf3bli3jqh8vrhf8b51agx8bzx99zgk3r6nqr04k9jmfmi"; - revision = "1"; - editedCabalFile = "0znsxj4igjrgs1xg8x8s9vg88830cvrqb880v9gchn1wp34lfihv"; - libraryHaskellDepends = [ - aeson avers base bytestring cookie http-api-data servant text time - vector - ]; - homepage = "http://github.com/wereHamster/avers-api"; - description = "Types describing the core and extended Avers APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "avers-api_0_1_0" = callPackage ({ mkDerivation, aeson, avers, base, bytestring, cookie , http-api-data, servant, text, time, vector }: @@ -32057,30 +30043,6 @@ self: { }) {}; "avers-server" = callPackage - ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring - , bytestring, bytestring-conversion, containers, cookie, cryptonite - , either, http-types, memory, mtl, resource-pool - , rethinkdb-client-driver, servant, servant-server, stm, text, time - , transformers, wai, wai-websockets, websockets - }: - mkDerivation { - pname = "avers-server"; - version = "0.0.19.0"; - sha256 = "0qvfswp9ph96iy809q2jqg45j9msanpcvmh04dc12h86mlcwldg7"; - libraryHaskellDepends = [ - aeson avers avers-api base base64-bytestring bytestring - bytestring-conversion containers cookie cryptonite either - http-types memory mtl resource-pool rethinkdb-client-driver servant - servant-server stm text time transformers wai wai-websockets - websockets - ]; - homepage = "http://github.com/wereHamster/avers-server"; - description = "Server implementation of the Avers API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "avers-server_0_1_0" = callPackage ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring , bytestring, bytestring-conversion, containers, cookie, cryptonite , http-types, memory, mtl, resource-pool, rethinkdb-client-driver @@ -32268,29 +30230,27 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring , case-insensitive, cereal, conduit, conduit-combinators - , conduit-extra, containers, cryptohash, data-default, directory + , conduit-extra, containers, cryptonite, data-default, directory , errors, filepath, http-client, http-client-tls, http-conduit - , http-types, lifted-base, monad-control, mtl, network, old-locale - , QuickCheck, quickcheck-instances, resourcet, safe, scientific - , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, transformers-base, unordered-containers + , http-types, lifted-base, memory, monad-control, mtl, network + , old-locale, QuickCheck, quickcheck-instances, resourcet, safe + , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, transformers-base, unordered-containers , utf8-string, vector, xml-conduit }: mkDerivation { pname = "aws"; - version = "0.16"; - sha256 = "1710jajfla76igqrb2hv455gqhr4wap8225z1bffvjgk4w1cddc4"; - revision = "1"; - editedCabalFile = "0q4nbmi6s2zzp9jc4hwvdml101xskgindv0scyjjzcvl2cfa0zk9"; + version = "0.18"; + sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit + conduit-extra containers cryptonite data-default directory 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 ]; testHaskellDepends = [ aeson base bytestring conduit-combinators errors http-client @@ -32303,44 +30263,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aws_0_17_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-combinators - , conduit-extra, containers, cryptohash, data-default, directory - , errors, filepath, http-client, http-client-tls, http-conduit - , http-types, lifted-base, monad-control, mtl, network, old-locale - , QuickCheck, quickcheck-instances, resourcet, safe, scientific - , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, transformers-base, unordered-containers - , utf8-string, vector, xml-conduit - }: - mkDerivation { - pname = "aws"; - version = "0.17.1"; - sha256 = "1q4qh58vj8447a4fl88n3nkpdc4yv293qsh02w6zvszd6ch61yh7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base 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-combinators errors http-client - http-client-tls http-types lifted-base monad-control mtl QuickCheck - quickcheck-instances resourcet tagged tasty tasty-hunit - tasty-quickcheck text time transformers transformers-base - ]; - homepage = "http://github.com/aristidb/aws"; - description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -32472,6 +30394,7 @@ self: { homepage = "http://github.com/bitnomial/aws-ec2-knownhosts"; description = "Capture and manage AWS EC2 known_host pubkeys"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-elastic-transcoder" = callPackage @@ -32658,6 +30581,7 @@ self: { homepage = "https://github.com/TaktInc/aws-mfa-credentials"; description = "Keep your AWS credentials file up to date with MFA-carrying credentials"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-performance-tests" = callPackage @@ -32863,7 +30787,6 @@ self: { homepage = "https://github.com/transient-haskell/axiom"; description = "Web EDSL for running in browsers and server nodes using transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "axiomatic-classes" = callPackage @@ -33015,7 +30938,6 @@ self: { homepage = "http://github.com/bgamari/b-tree"; description = "Immutable disk-based B* trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "b9" = callPackage @@ -33079,7 +31001,7 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backdropper" = callPackage @@ -33411,6 +31333,7 @@ self: { homepage = "https://github.com/tippenein/BankHoliday"; description = "A library for determining US bank holidays"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bank-holidays-england" = callPackage @@ -33559,12 +31482,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_10_0_0" = callPackage + "base_4_10_1_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.10.0.0"; - sha256 = "06sgjlf3v3yyp0rdyi3f7qlp5iqw7kg0zrwml9lmccdy93pahclv"; + version = "4.10.1.0"; + sha256 = "0hnzhqdf2bxz9slia67sym6s0hi5szh8596kcckighchs9jzl9wx"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -33625,19 +31548,6 @@ self: { }) {}; "base-noprelude" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-noprelude"; - version = "4.9.1.0"; - sha256 = "15gq6naaqh3zcbcaib7fi0k4qs1w3ppd34rky6a1d8r62grisq8i"; - libraryHaskellDepends = [ base ]; - doHaddock = false; - homepage = "https://github.com/hvr/base-noprelude"; - description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base-noprelude_4_10_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; @@ -33648,7 +31558,6 @@ self: { homepage = "https://github.com/hvr/base-noprelude"; description = "\"base\" package sans \"Prelude\" module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-orphans" = callPackage @@ -33714,7 +31623,6 @@ self: { homepage = "https://github.com/pxqr/base32-bytestring"; description = "Fast base32 and base32hex codec for ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "base32string" = callPackage @@ -33921,18 +31829,17 @@ self: { "basic-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "basic-prelude"; - version = "0.6.1.1"; - sha256 = "1irfz57w4966y1vxkgh6bqxdlw3jijwz1pmq3qz9748linnpicgp"; + version = "0.7.0"; + sha256 = "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h"; libraryHaskellDepends = [ - base bytestring containers filepath hashable lifted-base ReadArgs - safe text transformers unordered-containers vector + base bytestring containers filepath hashable text transformers + unordered-containers vector ]; - homepage = "https://github.com/snoyberg/basic-prelude"; + homepage = "https://github.com/snoyberg/basic-prelude#readme"; description = "An enhanced core prelude; a common foundation for alternate preludes"; license = stdenv.lib.licenses.mit; }) {}; @@ -33948,6 +31855,7 @@ self: { ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "baskell" = callPackage @@ -34101,14 +32009,15 @@ self: { }) {}; "bbdb" = callPackage - ({ mkDerivation, base, mtl, parsec }: + ({ mkDerivation, base, hspec, parsec }: mkDerivation { pname = "bbdb"; - version = "0.5"; - sha256 = "13pf760i1iwgfnbh33cgmrri2i87rqlnszcnsq8gwn16h23cr883"; - libraryHaskellDepends = [ base mtl parsec ]; - homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html"; - description = "Ability to read, write, and examine BBDB files"; + version = "0.8"; + sha256 = "0p1aphzp55h4zlh3h8xnm6mxvsxyrab98ms8f07iqvp4p267kryw"; + libraryHaskellDepends = [ base parsec ]; + testHaskellDepends = [ base hspec parsec ]; + homepage = "https://github.com/henrylaxen/bbdb"; + description = "Ability to read, write, and modify BBDB files"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -34131,8 +32040,8 @@ self: { ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { pname = "bcrypt"; - version = "0.0.10"; - sha256 = "1dhfxpz0nbm39xi28khnvqvriwh1rpycc66p9k5hpggjipzzk604"; + version = "0.0.11"; + sha256 = "1vzwf9g6mvn4v1cn1m0axjyi2l0glnvv8c49v1j51dm7xn41fcz4"; libraryHaskellDepends = [ base bytestring data-default entropy memory ]; @@ -34140,6 +32049,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bdcs" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , codec-rpm, cond, conduit, conduit-combinators, conduit-extra + , containers, content-store, cpio-conduit, cryptonite, directory + , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree + , gitrev, hspec, http-conduit, HUnit, memory, monad-control + , monad-logger, monad-loops, mtl, network-uri, ostree, parsec + , parsec-numbers, persistent, persistent-sqlite + , persistent-template, process, regex-pcre, resourcet, split, tar + , tar-conduit, temporary, text, time, unix, unordered-containers + , xml-conduit + }: + mkDerivation { + pname = "bdcs"; + version = "0.1.0"; + sha256 = "1z9wfyay1l6d1l86izh31nldg0yidqyzvj3l11k4wrqr5yn07hfs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + aeson base bytestring codec-rpm cond conduit conduit-combinators + conduit-extra containers content-store cpio-conduit cryptonite + directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree + gitrev http-conduit memory monad-control monad-logger mtl + network-uri parsec parsec-numbers persistent persistent-sqlite + persistent-template process regex-pcre resourcet split tar + tar-conduit temporary text time unix unordered-containers + xml-conduit + ]; + libraryPkgconfigDepends = [ ostree ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cond conduit content-store + directory filepath monad-loops mtl network-uri persistent-sqlite + process regex-pcre text time + ]; + testHaskellDepends = [ + aeson base bytestring codec-rpm cond conduit conduit-combinators + containers directory esqueleto filepath gi-gio gi-glib hspec HUnit + monad-logger mtl parsec parsec-numbers persistent persistent-sqlite + persistent-template resourcet text time unix + ]; + homepage = "https://github.com/weldr/bdcs"; + description = "Tools for managing a content store of software packages"; + license = "LGPL"; + }) {inherit (pkgs) ostree;}; + "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process , test-framework, test-framework-hunit, transformers @@ -34253,16 +32209,17 @@ self: { }) {}; "bearriver" = callPackage - ({ mkDerivation, base, dunai, mtl, transformers }: + ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }: mkDerivation { pname = "bearriver"; - version = "0.10.4"; - sha256 = "0arykaxbl9wsvlws8lhnaw64xcrhqjq470f0rlpzjljqibi7n4f1"; - libraryHaskellDepends = [ base dunai mtl transformers ]; + version = "0.10.4.2"; + sha256 = "1y8ha8kllp0s6v89q8kyzhmlchrldf9rahdk3sx9qygwbq36fg09"; + libraryHaskellDepends = [ + base dunai MonadRandom mtl transformers + ]; homepage = "keera.co.uk"; description = "A replacement of Yampa based on Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beautifHOL" = callPackage @@ -34349,17 +32306,17 @@ self: { }) {}; "bench" = callPackage - ({ mkDerivation, base, criterion, optparse-applicative, silently - , text, turtle + ({ mkDerivation, base, criterion, optparse-applicative, process + , silently, text, turtle }: mkDerivation { pname = "bench"; - version = "1.0.6"; - sha256 = "0ss5liap1f71i7igpszdpb6himl30gibydlknx9ka44dsrh7dhq9"; + version = "1.0.7"; + sha256 = "1mn9lsix5ng9a6k0c26mw6fbqx4gap2c3cqzm30ariisdkh2bdaf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base criterion optparse-applicative silently text turtle + base criterion optparse-applicative process silently text turtle ]; homepage = "http://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; @@ -34730,16 +32687,16 @@ self: { "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , QuickCheck, semigroups, tagged, template-haskell, transformers - , transformers-compat + , QuickCheck, semigroups, tagged, template-haskell, th-abstraction + , transformers, transformers-compat }: mkDerivation { pname = "bifunctors"; - version = "5.4.2"; - sha256 = "13fwvw1102ik96pgi85i34kisz1h237vgw88ywsgifsah9kh4qiq"; + version = "5.5"; + sha256 = "0a5y85p1dhcvkagpdci6ah5kczc2jpwsj7ywkd9cg0nqcyzq3icj"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged - template-haskell transformers transformers-compat + template-haskell th-abstraction transformers transformers-compat ]; testHaskellDepends = [ base hspec QuickCheck template-haskell transformers @@ -35084,6 +33041,7 @@ self: { homepage = "https://github.com/A1-Triard/binary-ext"; description = "An alternate with typed errors for Data.Binary.Get monad from 'binary' library."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-file" = callPackage @@ -35173,33 +33131,6 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, aeson, base, binary, case-insensitive, hashable - , QuickCheck, quickcheck-instances, scientific, tagged, tasty - , tasty-quickcheck, text, text-binary, time, unordered-containers - , vector, vector-binary-instances - }: - mkDerivation { - pname = "binary-orphans"; - version = "0.1.6.0"; - sha256 = "19c4avasgjzy81dg0ih4j769kqg0sn40jh6yxwjv5zh0bxzdrqg0"; - revision = "1"; - editedCabalFile = "1knb7lxgvhkai7p2qgb2zmqnrfm08liga6y794p9l5b5j0kcy55i"; - libraryHaskellDepends = [ - aeson base binary case-insensitive hashable scientific tagged text - text-binary time unordered-containers vector - vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary case-insensitive hashable QuickCheck - quickcheck-instances scientific tagged tasty tasty-quickcheck text - time unordered-containers vector - ]; - homepage = "https://github.com/phadej/binary-orphans#readme"; - description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-orphans_0_1_8_0" = callPackage ({ mkDerivation, aeson, base, binary, case-insensitive, hashable , QuickCheck, quickcheck-instances, scientific, tagged, tasty , tasty-quickcheck, text, text-binary, time, unordered-containers @@ -35222,7 +33153,6 @@ self: { homepage = "https://github.com/phadej/binary-orphans#readme"; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -35245,6 +33175,7 @@ self: { homepage = "https://github.com/nikita-volkov/binary-parser"; description = "A highly-efficient but limited parser API specialised for bytestrings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parsers" = callPackage @@ -35277,6 +33208,7 @@ self: { homepage = "https://github.com/winterland1989/binary-parsers"; description = "Extends binary with parsec/attoparsec style parsing combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-protocol" = callPackage @@ -35467,6 +33399,7 @@ self: { homepage = "https://github.com/quchen/binary-typed"; description = "Type-safe binary serialization"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binarydefer" = callPackage @@ -35543,7 +33476,7 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings" = callPackage @@ -35561,8 +33494,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "bindings-DSL"; - version = "1.0.23"; - sha256 = "1rqhkk8hn1xjl3705dvakxx93q89vp0fw22v2cbrlapbir27cv7b"; + version = "1.0.24"; + sha256 = "03n8z5qxrrq4l6h2f3xyav45f5v2gr112g4l4r4jw8yfvr8qyk93"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jwiegley/bindings-dsl/wiki"; description = "FFI domain specific language, on top of hsc2hs"; @@ -35795,6 +33728,7 @@ self: { homepage = "http://github.com/bgamari/bindings-fluidsynth"; description = "Haskell FFI bindings for fluidsynth software synthesizer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fluidsynth;}; "bindings-friso" = callPackage @@ -35845,7 +33779,6 @@ self: { homepage = "https://github.com/jwiegley/bindings-dsl"; description = "Project bindings-* raw interface to gpgme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gpgme;}; "bindings-gsl" = callPackage @@ -35890,7 +33823,6 @@ self: { homepage = "https://github.com/relrod/hamlib-haskell"; description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage @@ -36045,13 +33977,12 @@ self: { ({ mkDerivation, base, bindings-DSL, ioctl }: mkDerivation { pname = "bindings-linux-videodev2"; - version = "0.1"; - sha256 = "1pqi8ks441m1s1md6nhjr7zhal5fv6s71xq4881zijd539qhq9dq"; + version = "0.1.0.1"; + sha256 = "0k8h0i8qfmx6fg5d7mbh57brp8h896j9070bss9jmds4bhizhpw9"; libraryHaskellDepends = [ base bindings-DSL ioctl ]; - homepage = "https://gitorious.org/hsv4l2"; + homepage = "https://code.mathr.co.uk/bindings-linux-videodev2"; description = "bindings to Video For Linux Two (v4l2) kernel interfaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings-lxc" = callPackage @@ -36066,6 +33997,7 @@ 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 @@ -36077,7 +34009,6 @@ self: { libraryHaskellDepends = [ bindings-posix ]; description = "(deprecated) see bindings-posix instead"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-monetdb-mapi" = callPackage @@ -36133,7 +34064,6 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "parport bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-portaudio" = callPackage @@ -36146,7 +34076,6 @@ self: { libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "bindings-posix" = callPackage @@ -36158,7 +34087,6 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to posix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-potrace" = callPackage @@ -36183,7 +34111,6 @@ self: { libraryHaskellDepends = [ base bindings-DSL ioctl ]; description = "PPDev bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-saga-cmd" = callPackage @@ -36432,6 +34359,7 @@ self: { homepage = "https://github.com/biocad/bio-sequence"; description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bioace" = callPackage @@ -36515,7 +34443,6 @@ self: { homepage = "http://github.com/udo-stenzel/biohazard"; description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bioinformatics-toolkit" = callPackage @@ -36652,6 +34579,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bisect-binary" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hashable + , haskeline, integer-logarithms, optparse-applicative, process + , terminal-size, time, yaml + }: + mkDerivation { + pname = "bisect-binary"; + version = "0.1.0.1"; + sha256 = "000dydglclgk65ryb2n2zdrwp1rnzv7phmh2vi8s1gpp67b5l5ad"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath hashable haskeline + integer-logarithms optparse-applicative process terminal-size time + yaml + ]; + homepage = "http://github.com/nomeata/bisect-binary"; + description = "Determine relevant parts of binary data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bit-array" = callPackage ({ mkDerivation, base, directory, doctest, filepath, numeric-qq }: mkDerivation { @@ -36686,7 +34635,6 @@ self: { homepage = "https://github.com/Bodigrim/bit-stream#readme"; description = "Lazy, infinite, compact stream of Bool with O(1) indexing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bit-vector" = callPackage @@ -36811,6 +34759,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Partial implementation of the Bitcoin protocol (as of 2013)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitcoin-payment-channel" = callPackage @@ -37091,7 +35040,6 @@ self: { librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gcc_s = null;}; "bitset" = callPackage @@ -37222,6 +35170,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bittrex" = callPackage + ({ mkDerivation, aeson, base, bytestring, flow, http-client-tls + , lens, lens-aeson, scientific, SHA, split, text, time, turtle + , wreq + }: + mkDerivation { + pname = "bittrex"; + version = "0.6.0.0"; + sha256 = "02h8r753dkkkgpzxhycdmjpccdqfsc5gnmw6qi9kpl1165jrd2fd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring flow http-client-tls lens lens-aeson + scientific SHA split text time wreq + ]; + executableHaskellDepends = [ base text turtle ]; + homepage = "https://github.com/dmjio/bittrex"; + description = "Bindings for the Bittrex API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bitvec" = callPackage ({ mkDerivation, base, HUnit, primitive, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, vector @@ -37238,6 +35207,7 @@ self: { homepage = "https://github.com/mokus0/bitvec"; description = "Unboxed vectors of bits / dense IntSets"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitwise" = callPackage @@ -37280,16 +35250,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin_0_12_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, directory + , doctest, exceptions, hspec, http-client, http-client-tls + , http-types, microlens, microlens-th, network, QuickCheck, safe + , scientific, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.12.0.0"; + sha256 = "0wf86pkpm5vlcv5cci2sn6by0ajmq44b3azxc41zivqdpf5kkwii"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions http-client + http-client-tls http-types microlens microlens-th network + QuickCheck scientific split text time + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest hspec http-client + http-types microlens safe text time + ]; + homepage = "https://github.com/tebello-thejane/bitx.hs"; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bizzlelude" = callPackage ({ mkDerivation, base, containers, directory, text }: mkDerivation { pname = "bizzlelude"; - version = "1.0.3"; - sha256 = "135wbjk79j0ayipkpv761ybnsq1001mvbcry3pl8fg1s8zbdaqfh"; + version = "1.0.4"; + sha256 = "0vaw51cn9lmnd6pxb8kjf9k6lxzxwzv0nmgr7j1h8b6qbchf2i3q"; libraryHaskellDepends = [ base containers directory text ]; homepage = "http://github.com/TheBizzle"; description = "A lousy Prelude replacement by a lousy dude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bizzlelude-js" = callPackage @@ -37387,7 +35383,6 @@ self: { homepage = "http://git.kaction.name/black-jewel"; description = "The pirate bay client"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blacktip" = callPackage @@ -37504,6 +35499,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blas-carray" = callPackage + ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi + , storable-complex, transformers + }: + mkDerivation { + pname = "blas-carray"; + version = "0.0"; + sha256 = "131kz5rdgz4l5xhwpfacix0wiwqf9a0ngdvmgp7iznf7znrf8hk6"; + libraryHaskellDepends = [ + base blas-ffi carray netlib-carray netlib-ffi storable-complex + transformers + ]; + homepage = "http://hub.darcs.net/thielema/blas-carray/"; + description = "Auto-generated interface to Fortran BLAS via CArrays"; + 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"; + sha256 = "173djbrps396c9v5fl706k70qwy5jqcxay9j67draidw5qwhqcs2"; + libraryHaskellDepends = [ base netlib-ffi ]; + libraryPkgconfigDepends = [ blas ]; + homepage = "http://hub.darcs.net/thielema/blas-ffi/"; + description = "Auto-generated interface to Fortran BLAS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) blas;}; + "blas-hs" = callPackage ({ mkDerivation, base, blas, storable-complex, vector }: mkDerivation { @@ -37642,7 +35669,6 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using blaze-html with colonnade"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-from-html" = callPackage @@ -37772,6 +35798,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_1_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.1.0"; + sha256 = "1isb328dh642nxfj7izlmw3amygh94jn1pdycga7wla1v993psx6"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -37875,8 +35920,8 @@ self: { }: mkDerivation { pname = "ble"; - version = "0.4.1"; - sha256 = "1ascfscxg24crc2bv1vsgdp72gg3lql2pabg66zhv8vcvqcrlcah"; + version = "0.4.2"; + sha256 = "0vpmz66qg4kqkg6rqwpnp21d36yzywxvlcxxfbqrpv2kdy8pm3pb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -38036,35 +36081,6 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, errors, exceptions, generics-sop, hashable - , hspec, http-client, http-types, mtl, mtl-compat, network-uri - , QuickCheck, quickcheck-properties, scientific, semigroups - , temporary, text, time, transformers, unix-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "bloodhound"; - version = "0.14.0.0"; - sha256 = "1vpfsly1y6iryl2swaaid8jpfni886fanh3mp893fxgyzbn7n6rf"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers data-default-class - exceptions hashable http-client http-types mtl mtl-compat - network-uri scientific semigroups text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers errors exceptions generics-sop - hspec http-client http-types mtl network-uri QuickCheck - quickcheck-properties semigroups temporary text time unix-compat - unordered-containers vector - ]; - homepage = "https://github.com/bitemyapp/bloodhound"; - description = "ElasticSearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bloodhound_0_15_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, errors, exceptions, generics-sop, hashable , hspec, http-client, http-types, mtl, mtl-compat, network-uri @@ -38091,7 +36107,6 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -38115,6 +36130,7 @@ self: { homepage = "http://github.com/MichaelXavier/bloodhound-amazonka-auth#readme"; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloomfilter" = callPackage @@ -38191,7 +36207,6 @@ self: { executableHaskellDepends = [ base GLFW OpenGL ]; description = "OpenGL Logic Game"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber" = callPackage @@ -38363,6 +36378,7 @@ self: { homepage = "http://code.haskell.org/~thielema/games/"; description = "Three games for inclusion in a web server"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bogocopy" = callPackage @@ -38384,6 +36400,7 @@ self: { homepage = "https://github.com/phlummox/bogocopy"; description = "Copy a directory tree, making zero-size sparse copies of big files"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bogre-banana" = callPackage @@ -38539,8 +36556,8 @@ self: { }: mkDerivation { pname = "bookkeeper"; - version = "0.2.4"; - sha256 = "17qzgq5wrl00gby3xlxan547cf3r66iz7h71v57rii5q6mxk2x8g"; + version = "0.2.5"; + sha256 = "1mj3qj97zq5zf7xvg8f62bw8jacij41435rpgcfczjisgylm1nc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38603,6 +36620,7 @@ self: { homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bool-extras" = callPackage @@ -38654,7 +36672,6 @@ self: { homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boolean-normal-forms" = callPackage @@ -38671,7 +36688,6 @@ self: { ]; description = "Boolean normal form: NNF, DNF & CNF"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boolexpr" = callPackage @@ -38937,8 +36953,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "1"; - editedCabalFile = "0hqs7k5xyfpfcrfms342jj81gzrgxkrkvrl68061nkmsc5xrm4ix"; + revision = "2"; + editedCabalFile = "1ls2p35png3wjbldvgknkpsg1xsgxzgkb1mmvzjpbbgxhfhk8x68"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -39080,7 +37096,6 @@ self: { homepage = "http://github.com/githubuser/braid#readme"; description = "Types and functions to work with braids and Khovanov homology"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brain-bleep" = callPackage @@ -39094,6 +37109,7 @@ self: { executableHaskellDepends = [ array base containers parsec ]; description = "primitive imperative language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brainfuck" = callPackage @@ -39154,7 +37170,6 @@ self: { homepage = "https://github.com/vmchale/brainheck#readme"; description = "Brainh*ck interpreter in haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "break" = callPackage @@ -39205,6 +37220,7 @@ self: { homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brians-brain" = callPackage @@ -39223,30 +37239,6 @@ self: { }) {}; "brick" = callPackage - ({ mkDerivation, base, containers, contravariant, data-clist - , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm - , template-haskell, text, text-zipper, transformers, vector, vty - }: - mkDerivation { - pname = "brick"; - version = "0.18"; - sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers contravariant data-clist deepseq dlist microlens - microlens-mtl microlens-th stm template-haskell text text-zipper - transformers vector vty - ]; - executableHaskellDepends = [ - base microlens microlens-th text text-zipper vector vty - ]; - homepage = "https://github.com/jtdaugherty/brick/"; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "brick_0_29" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -39254,8 +37246,33 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.29"; - sha256 = "05zwp8rrb9iyfcp36pczxr8l035wsi5nnmc4dwv1d5vn7rcbiipw"; + version = "0.29.1"; + sha256 = "1jslqfsqgrg379x4zi44f5xxn2jh0syqd4zbnfg07y3zgy5i399z"; + 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 + ]; + executableHaskellDepends = [ + base microlens microlens-th text text-zipper vector vty word-wrap + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "brick_0_32_1" = callPackage + ({ mkDerivation, 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 + }: + mkDerivation { + pname = "brick"; + version = "0.32.1"; + sha256 = "09lyl9zz8hl6p7w5d34kpwsac66w3pqr4f6k97yb9chpcpfiqmb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39287,6 +37304,7 @@ self: { homepage = "https://github.com/chris-martin/bricks#readme"; description = "Bricks is a lazy functional language based on Nix"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brillig" = callPackage @@ -39312,35 +37330,35 @@ self: { "brittany" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs - , containers, czipwith, data-tree-print, deepseq, directory, either - , extra, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths - , hspec, monad-memo, mtl, multistate, neat-interpolation, parsec - , pretty, safe, semigroups, strict, syb, text, transformers - , uniplate, unsafe, yaml + , containers, czipwith, data-tree-print, deepseq, directory, extra + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec + , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty + , safe, semigroups, strict, syb, text, transformers, uniplate + , unsafe, yaml }: mkDerivation { pname = "brittany"; - version = "0.8.0.3"; - sha256 = "0a468lq4gnhax4kfrwi2ligc4mjbrs0jqxgh1f4j86ql53k4mpg9"; + version = "0.9.0.0"; + sha256 = "0fi87p8ybibwhsmbh35xhipfkdg3kdwqb6n3y5ynql7603kssgc1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra ghc ghc-boot-th + data-tree-print deepseq directory extra ghc ghc-boot-th ghc-exactprint ghc-paths monad-memo mtl multistate neat-interpolation pretty safe semigroups strict syb text transformers uniplate unsafe yaml ]; executableHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra filepath ghc - ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl - multistate neat-interpolation pretty safe semigroups strict syb - text transformers uniplate unsafe yaml + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml ]; testHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra ghc ghc-boot-th + data-tree-print deepseq directory extra filepath ghc ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl multistate neat-interpolation parsec pretty safe semigroups strict syb text transformers uniplate unsafe yaml @@ -39417,7 +37435,6 @@ self: { homepage = "https://github.com:p-alik/bsd-sysctl"; description = "Access to the BSD sysctl(3) interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bson" = callPackage @@ -39585,7 +37602,6 @@ self: { homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "buchhaltung" = callPackage @@ -39646,6 +37662,7 @@ self: { homepage = "https://github.com/nikita-volkov/buffer"; description = "Simple mutable low-level buffer for IO"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer-builder" = callPackage @@ -39887,6 +37904,24 @@ self: { homepage = "http://github.com/silkapp/bumper"; description = "Automatically bump package versions, also transitively"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bunz" = callPackage + ({ mkDerivation, base, cmdargs, doctest, hspec, text, unix }: + mkDerivation { + pname = "bunz"; + version = "0.0.7"; + sha256 = "124vas0i5hdx7wmcdmydxal6c3iqy89fypparf9hzpkbb7gwrpwz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base cmdargs text unix ]; + testHaskellDepends = [ base doctest hspec ]; + homepage = "https://github.com/sendyhalim/bunz"; + description = "CLI tool to beautify JSON string"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "burnt-explorer" = callPackage @@ -40020,7 +38055,6 @@ self: { homepage = "https://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {system-glib = pkgs.glib;}; "butcher" = callPackage @@ -40043,7 +38077,6 @@ self: { homepage = "https://github.com/lspitzner/butcher/"; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "butterflies" = callPackage @@ -40137,7 +38170,6 @@ self: { homepage = "https://github.com/nikita-volkov/bytearray-parsing"; description = "Parsing of bytearray-based data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytedump" = callPackage @@ -40239,6 +38271,7 @@ self: { homepage = "https://github.com/tsuraan/bytestring-arbitrary"; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-builder" = callPackage @@ -40336,24 +38369,6 @@ self: { }) {}; "bytestring-handle" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "bytestring-handle"; - version = "0.1.0.5"; - sha256 = "10xv4m1k1wxnbabb02slp08fxcmv8m4nsbncbgj24a53bgrjdi52"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; - description = "ByteString-backed Handles"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bytestring-handle_0_1_0_6" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 }: @@ -40369,7 +38384,6 @@ self: { homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-lexing" = callPackage @@ -40424,14 +38438,15 @@ self: { homepage = "https://github.com/hvr/bytestring-plain"; description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-progress" = callPackage ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.7"; - sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p"; + version = "1.0.8"; + sha256 = "0zqb9aanlwq2ddcn7n8xar73fjb04xvfym7k5pjah2cs1lh3cv8l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time @@ -40439,6 +38454,7 @@ self: { homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-read" = callPackage @@ -40531,6 +38547,7 @@ self: { homepage = "https://github.com/nikita-volkov/bytestring-strict-builder"; description = "An efficient strict bytestring builder"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-time" = callPackage @@ -40548,6 +38565,7 @@ self: { homepage = "https://github.com/klangner/bytestring-time"; description = "Library for Time parsing from ByteString"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-tree-builder" = callPackage @@ -40572,6 +38590,7 @@ self: { homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -40645,8 +38664,8 @@ self: { ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }: mkDerivation { pname = "byteunits"; - version = "0.3.0.2"; - sha256 = "1nfr56zxzvh0lf2qqmjb2jiaslmsr4a73bflvh9y5zqp1aivchgq"; + version = "0.4.0.1"; + sha256 = "012n5gry1a3x4qwqbndgzrq0f90hvgkal48c8s9dylh1n6pi871l"; libraryHaskellDepends = [ base safe ]; testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; @@ -40733,7 +38752,6 @@ self: { homepage = "https://github.com/tolysz/c-mosquitto#readme"; description = "Simpe mosquito MQTT binding able to work with the Amazons IoT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) mosquitto;}; "c-storable-deriving" = callPackage @@ -40808,31 +38826,6 @@ self: { }) {}; "c2hs" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , dlist, filepath, HUnit, language-c, pretty, process, shelly - , test-framework, test-framework-hunit, text, transformers - }: - mkDerivation { - pname = "c2hs"; - version = "0.28.2"; - sha256 = "17hgj8s08lh7mjddbsahdgssk80wpkhc4qspfc34k7zyr9w185zl"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - array base bytestring containers directory dlist filepath - language-c pretty process - ]; - testHaskellDepends = [ - base filepath HUnit shelly test-framework test-framework-hunit text - transformers - ]; - homepage = "https://github.com/haskell/c2hs"; - description = "C->Haskell FFI tool that gives some cross-language type safety"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "c2hs_0_28_3" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , dlist, filepath, HUnit, language-c, pretty, process, shelly , test-framework, test-framework-hunit, text, transformers @@ -40855,7 +38848,6 @@ self: { homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c2hs-extra" = callPackage @@ -40872,19 +38864,26 @@ self: { }) {}; "c2hsc" = callPackage - ({ mkDerivation, base, cmdargs, containers, directory, filepath - , HStringTemplate, language-c, mtl, pretty, split, transformers + ({ mkDerivation, base, cmdargs, containers, data-default, directory + , filepath, here, hspec, HStringTemplate, language-c, logging + , monad-logger, mtl, pretty, split, temporary, text, transformers }: mkDerivation { pname = "c2hsc"; - version = "0.6.5"; - sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd"; - isLibrary = false; + version = "0.7.1"; + sha256 = "02z6bfnhsngl5l4shnyw81alhsw9vhl1lbvy04azlg54fgm9sg9x"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - base cmdargs containers directory filepath HStringTemplate - language-c mtl pretty split transformers + libraryHaskellDepends = [ + base containers data-default directory filepath HStringTemplate + language-c logging mtl pretty split temporary text transformers ]; + executableHaskellDepends = [ + base cmdargs containers data-default directory filepath + HStringTemplate language-c logging pretty split temporary text + transformers + ]; + testHaskellDepends = [ base here hspec logging monad-logger text ]; homepage = "https://github.com/jwiegley/c2hsc"; description = "Convert C API header files to .hsc and .hsc.helper.c files"; license = stdenv.lib.licenses.bsd3; @@ -40950,19 +38949,21 @@ self: { }) {}; "cabal-bounds" = callPackage - ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory - , either, filepath, Glob, lens, process, strict, tasty - , tasty-golden, transformers, unordered-containers + ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-lenses + , cmdargs, directory, either, filepath, Glob, lens, lens-aeson + , process, strict, tasty, tasty-golden, text, transformers + , unordered-containers }: mkDerivation { pname = "cabal-bounds"; - version = "1.2.0"; - sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj"; + version = "1.5.0"; + sha256 = "0qkrrbv8b0ij4hrqzlzzkn2rislz77kbvqb67mh0pnlfrn77kwy7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal cabal-lenses cmdargs directory either filepath lens - strict transformers unordered-containers + aeson base bytestring Cabal cabal-lenses cmdargs directory either + filepath lens lens-aeson strict text transformers + unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -40970,6 +38971,7 @@ self: { ]; description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-cargs" = callPackage @@ -40979,8 +38981,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.8.1"; - sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3"; + version = "0.9.0"; + sha256 = "0w371991841m4d9r73nr86j4jnr0jilj9jnvkmgh9a055vyi573s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40992,6 +38994,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 @@ -41077,6 +39080,7 @@ self: { homepage = "http://github.com/jaspervdj/cabal-dependency-licenses"; description = "Compose a list of a project's transitive dependencies with their licenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dev" = callPackage @@ -41120,8 +39124,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.3"; - sha256 = "1qyqxmw5z1418jda3q5j04pknqirfrfrqigibbxi4n31ajwlfisc"; + version = "1.0.4"; + sha256 = "03sawamkp95jycq9sah72iw525pdndb3x4h489zf4s3ir9avds3d"; libraryHaskellDepends = [ base Cabal directory filepath ]; homepage = "https://github.com/phadej/cabal-doctest"; description = "A Setup.hs helper for doctests running"; @@ -41226,6 +39230,7 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-info" = callPackage @@ -41247,6 +39252,7 @@ self: { homepage = "https://github.com/barrucadu/cabal-info"; description = "Read information from cabal files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-install" = callPackage @@ -41259,10 +39265,10 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "2.0.0.0"; - sha256 = "0b9b0sx2nxas894ns1sjyirhvra8y8ixfcsya9pxkw0q5yn0ndsz"; - revision = "1"; - editedCabalFile = "047bf57sxaajaa0wi7v3bg6kq19ngfpw5n4cc46zlbqqjbvvq1d5"; + version = "2.0.0.1"; + sha256 = "16ax1lx89jdgf9pqka423h2bf8dblkra48n4y3icg8fs79py74gr"; + revision = "3"; + editedCabalFile = "148rq7hcbl8rq7pkywn1hk3l7lv442flf6b0wamfixxzxk74fwlj"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; @@ -41358,14 +39364,15 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.4.9"; - sha256 = "0f4250cssh42xvrr6npnv71303pxkhv3k26bh6j2ifwz489nmfsr"; + version = "0.7.0"; + sha256 = "07xyn4sy2snj8a5983p6g6w9pwklzmd3w9wzj02ig4pdnz7682ls"; libraryHaskellDepends = [ base Cabal either lens strict system-fileio system-filepath text transformers unordered-containers ]; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-macosx" = callPackage @@ -41415,6 +39422,7 @@ self: { homepage = "http://www.yesodweb.com/"; description = "build multiple packages at once"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-mon" = callPackage @@ -41455,28 +39463,22 @@ self: { }) {}; "cabal-plan" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , bytestring, containers, directory, filepath, mtl - , optparse-applicative, text + ({ mkDerivation, aeson, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, directory, filepath + , text, vector }: mkDerivation { pname = "cabal-plan"; - version = "0.2.0.0"; - sha256 = "1hxsrk6avv69gqajx94n2nzlivhy3ywwmlx6c0w2nnaz854j1ya0"; + version = "0.3.0.0"; + sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring containers directory - filepath text + aeson base base-compat base-orphans base16-bytestring bytestring + containers directory filepath text vector ]; - executableHaskellDepends = [ - ansi-terminal base bytestring containers mtl optparse-applicative - text - ]; - homepage = "https://github.com/hvr/cabal-plan"; description = "Library and utiltity for processing cabal's plan.json file"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-progdeps" = callPackage @@ -41512,24 +39514,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, old-locale - , process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.11.2"; - sha256 = "18k9dbjz97d6nhnjjr0xqs7z49qcisia3l9h0rg58s5xqkjvzq89"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal directory filepath old-locale process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_12" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , http-client, http-client-tls, http-conduit, process, time, unix }: @@ -41546,7 +39530,6 @@ self: { homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -41634,6 +39617,7 @@ self: { homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-test" = callPackage @@ -41699,15 +39683,14 @@ self: { }: mkDerivation { pname = "cabal-toolkit"; - version = "0.0.3"; - sha256 = "1l0ak8jch6hvmk5phibadzphwac60f00l1rkq03irifqs17c9a1f"; + version = "0.0.4"; + sha256 = "04afwsbbqsw9lj7flbnrfwy3qbv1c9nkwm65ylspy2nzf9v06ljj"; libraryHaskellDepends = [ base binary bytestring Cabal containers ghc template-haskell ]; homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; description = "Helper functions for writing custom Setup.hs scripts."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -41788,6 +39771,7 @@ self: { homepage = "yet"; description = "make gentoo's .ebuild file from .cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal2ghci" = callPackage @@ -41819,8 +39803,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.7"; - sha256 = "1ypzldvifqm4nv9bwzvm5pfsxxn4mp19z50fpkxk84fhb5pb6nbd"; + version = "2.7.2"; + sha256 = "1376a97pmhpxf78lhl4b6glraajjwhk99cvvrz4p7nmdc1qq9zhy"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -42027,8 +40011,8 @@ self: { }: mkDerivation { pname = "cache"; - version = "0.1.0.0"; - sha256 = "1l7vn3fnspbnm3qrrxai7ldcy63wkppa4amspxhpqaajch5f97hl"; + version = "0.1.0.1"; + sha256 = "0bv7s9lffhggh0z5ad03ryqzq6bcqga1zg4c6f57i7hh9q8161qd"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; @@ -42143,25 +40127,6 @@ self: { }) {}; "cairo" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo - , gtk2hs-buildtools, mtl, text, utf8-string - }: - mkDerivation { - pname = "cairo"; - version = "0.13.4.1"; - sha256 = "04ig1v3nyiqycrh2xipmw0mynnsnf6pyr2qgk57dravaisf89s02"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring mtl text utf8-string - ]; - libraryPkgconfigDepends = [ cairo ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) cairo;}; - - "cairo_0_13_4_2" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo , gtk2hs-buildtools, mtl, text, utf8-string }: @@ -42178,7 +40143,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage @@ -42584,6 +40548,7 @@ self: { homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-listen-http" = callPackage @@ -42614,6 +40579,7 @@ self: { homepage = "https://github.com/SumAll/haskell-canteven-log"; description = "A canteven way of setting up logging for your program"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-parsedate" = callPackage @@ -42711,6 +40677,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "capataz" = callPackage + ({ mkDerivation, async, base, bytestring, data-default, pretty-show + , protolude, safe-exceptions, stm, tasty, tasty-hunit, tasty-rerun + , tasty-smallcheck, teardown, text, time, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "capataz"; + version = "0.0.0.1"; + sha256 = "0bfwciidmp0ijgaq7zbyqw35m702xs9lm382072jwws8y353n29s"; + libraryHaskellDepends = [ + async base bytestring data-default protolude safe-exceptions stm + teardown text time unordered-containers uuid vector + ]; + testHaskellDepends = [ + async base bytestring data-default pretty-show protolude + safe-exceptions stm tasty tasty-hunit tasty-rerun tasty-smallcheck + teardown text time unordered-containers uuid vector + ]; + homepage = "https://github.com/roman/Haskell-capataz#readme"; + description = "OTP-like supervision trees in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "capped-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -42785,7 +40775,6 @@ self: { homepage = "https://github.com/Noeda/caramia/"; description = "High-level OpenGL bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "carbonara" = callPackage @@ -42841,6 +40830,7 @@ self: { homepage = "https://github.com/master-q/carettah"; description = "A presentation tool written with Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carray" = callPackage @@ -42924,6 +40914,7 @@ self: { homepage = "https://github.com/tonymorris/casa-abbreviations-and-acronyms"; description = "CASA Abbreviations and Acronyms"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casadi-bindings" = callPackage @@ -43386,49 +41377,20 @@ self: { }) {}; "cassava" = callPackage - ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, HUnit, lazy-csv - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unordered-containers, vector - }: - mkDerivation { - pname = "cassava"; - version = "0.4.5.1"; - sha256 = "17wxrwq977nyi225zlg3wj32f0ypyvikznhw59k0hxb4vkljlqkw"; - revision = "1"; - editedCabalFile = "05035bnvyqs36sp2bqd1wdjp5x4zs1pnrw6c8hq5nwjwdajjqkf0"; - libraryHaskellDepends = [ - array attoparsec base blaze-builder bytestring containers deepseq - hashable text unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - array attoparsec base blaze-builder bytestring containers criterion - deepseq hashable lazy-csv text unordered-containers vector - ]; - homepage = "https://github.com/hvr/cassava"; - description = "A CSV parsing and encoding library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava_0_5_1_0" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring - , bytestring-builder, containers, deepseq, hashable, HUnit, Only - , QuickCheck, quickcheck-instances, scientific, test-framework - , test-framework-hunit, test-framework-quickcheck2, text + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, text-short , unordered-containers, vector }: mkDerivation { pname = "cassava"; version = "0.5.1.0"; sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n"; + configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ - array attoparsec base bytestring bytestring-builder containers - deepseq hashable Only scientific text unordered-containers vector + array attoparsec base bytestring containers deepseq hashable Only + scientific text text-short unordered-containers vector ]; testHaskellDepends = [ attoparsec base bytestring hashable HUnit QuickCheck @@ -43438,32 +41400,9 @@ self: { homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-conduit" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, cassava - , conduit, conduit-extra, containers, criterion, mtl, QuickCheck - , text - }: - mkDerivation { - pname = "cassava-conduit"; - version = "0.3.5.1"; - sha256 = "1mbmk923hccnlxcg93dlnz80akhqv73kki80v10js8dcvcr3x1a5"; - libraryHaskellDepends = [ - array base bifunctors bytestring cassava conduit conduit-extra - containers mtl text - ]; - testHaskellDepends = [ - base bytestring cassava conduit conduit-extra QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/domdere/cassava-conduit"; - description = "Conduit interface for cassava package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava-conduit_0_4_0_1" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, criterion, mtl, QuickCheck , text @@ -43483,7 +41422,6 @@ self: { homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-embed" = callPackage @@ -43694,10 +41632,8 @@ self: { ({ mkDerivation, alg, base }: mkDerivation { pname = "category"; - version = "0.1.1.0"; - sha256 = "1jfwcxbyd12ykfff2113i39d47bp0d5ikj2sj69mxz137d2lqhlq"; - revision = "1"; - editedCabalFile = "0rv05qfjx61lh2cf1dir3k3w1sjxlcbdypi2bjd35dj19vxg5hvl"; + version = "0.2.0.1"; + sha256 = "0v5b15lgbdjrqpln532kw2d4isl5lf633jbld3clcp7c71vb7l07"; libraryHaskellDepends = [ alg base ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; @@ -43987,6 +41923,7 @@ self: { homepage = "http://github.com/picussecurity/haskell-cef.git"; description = "CEF log format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cef3-raw" = callPackage @@ -44061,8 +41998,8 @@ self: { }: mkDerivation { pname = "celtchar"; - version = "0.1.2.0"; - sha256 = "1p53fyv15vvch6zjv2mgycj9wpcxkxpfbwkmbi7dpjgi65wyaz97"; + version = "0.1.3.0"; + sha256 = "1f67vi6kjjhnnr4kxnzgkva1qvcadx9968cmac3iix2g56xs26wn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44448,6 +42385,7 @@ self: { homepage = "https://github.com/cheecheeo/haskell-cgi"; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-undecidable" = callPackage @@ -44459,6 +42397,7 @@ 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 @@ -44485,8 +42424,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.6.17"; - sha256 = "18si8gmgkfzky9rd53llz489j2wgzaw2b7hgr1djlc9yvp5h7482"; + version = "6.6.22"; + sha256 = "0nh8smbhwkqygxdv61yd82n26q6d4sdh4zzixcq5pczzacfzp8j9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44690,56 +42629,28 @@ self: { }) {}; "chart-unit" = callPackage - ({ mkDerivation, ad, base, colour, diagrams-lib - , diagrams-rasterific, diagrams-svg, foldl, formatting, JuicyPixels - , lens, linear, mwc-probability, mwc-random, numhask, numhask-range - , primitive, protolude, reflection, tasty, tasty-hspec, tdigest - , text - }: - mkDerivation { - pname = "chart-unit"; - version = "0.4.1"; - sha256 = "0ry6j00rmkbv9z98d7i6zmj5sxh4ram4nyaw39k2kgaxkgfa1iag"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base colour diagrams-lib diagrams-svg foldl formatting lens linear - numhask numhask-range text - ]; - executableHaskellDepends = [ - ad base diagrams-lib diagrams-rasterific foldl JuicyPixels - mwc-probability mwc-random numhask primitive protolude reflection - tdigest text - ]; - testHaskellDepends = [ base numhask tasty tasty-hspec ]; - homepage = "https://github.com/tonyday567/chart-unit"; - description = "Native haskell charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "chart-unit_0_5_4" = callPackage ({ mkDerivation, base, colour, containers, data-default , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear , mwc-probability, mwc-random, numhask, numhask-range, palette - , primitive, protolude, SVGFonts, tasty, tasty-hspec, tdigest, text + , primitive, protolude, scientific, SVGFonts, tasty, tasty-hspec + , tdigest, text }: mkDerivation { pname = "chart-unit"; - version = "0.5.4"; - sha256 = "1zyfh713sr8bhyn6v2la52xzyq7frg0igwxhfl8ym8l7nhxrrby7"; + version = "0.5.5.0"; + sha256 = "0hskfcg17h22fyprr9y264g6jz4lq1a7akqvdyji4fln61mqn07r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour data-default diagrams-lib diagrams-svg foldl formatting - lens linear numhask numhask-range palette SVGFonts text + lens linear numhask numhask-range palette scientific SVGFonts text ]; executableHaskellDepends = [ base containers diagrams-lib diagrams-svg foldl formatting lens mwc-probability mwc-random numhask primitive protolude tdigest text ]; testHaskellDepends = [ base numhask tasty tasty-hspec text ]; - homepage = "https://github.com/tonyday567/chart-unit"; + homepage = "https://github.com/tonyday567/chart-unit#readme"; description = "Native haskell charts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44850,59 +42761,34 @@ self: { "chatwork" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection , data-default-class, hspec, http-api-data, http-client - , http-client-tls, http-types, req, servant-server, text, warp + , http-client-tls, http-types, req, retry, servant-server, text + , warp }: mkDerivation { pname = "chatwork"; - version = "0.1.1.5"; - sha256 = "1r3sayix8lid0hxx8xl424q4zcff89c5gdln7zs17jg3rb9a9x57"; + version = "0.1.2.0"; + sha256 = "1qgb5b8y99rh243x1mz0n12lv59l73vnhczxzq8s2h5lzcay3bps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req text + http-api-data http-client http-client-tls http-types req retry text ]; executableHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req text + http-api-data http-client http-client-tls http-types req retry text ]; testHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class hspec http-api-data http-client http-client-tls http-types req - servant-server text warp + retry servant-server text warp ]; homepage = "https://github.com/matsubara0507/chatwork#readme"; description = "The ChatWork API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, containers - , data-default, http-types, mtl, syb, text, uniplate, wai - , wai-extra, xss-sanitize - }: - mkDerivation { - pname = "cheapskate"; - version = "0.1.0.5"; - sha256 = "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"; - revision = "1"; - editedCabalFile = "1m88nnrdd2bzvpnaypzi38xa1criwyj5j6c6pzqjkkivmhk3bw99"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html containers data-default mtl syb text uniplate - xss-sanitize - ]; - executableHaskellDepends = [ - aeson base blaze-html bytestring http-types text wai wai-extra - ]; - homepage = "http://github.com/jgm/cheapskate"; - description = "Experimental markdown processor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cheapskate_0_1_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize }: @@ -44922,7 +42808,6 @@ self: { homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate-highlight" = callPackage @@ -45084,8 +42969,8 @@ self: { }: mkDerivation { pname = "chell"; - version = "0.4.0.1"; - sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz"; + version = "0.4.0.2"; + sha256 = "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9"; libraryHaskellDepends = [ ansi-terminal base bytestring options patience random template-haskell text transformers @@ -45112,13 +42997,12 @@ self: { ({ mkDerivation, base, chell, QuickCheck, random }: mkDerivation { pname = "chell-quickcheck"; - version = "0.2.5"; - sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs"; + version = "0.2.5.1"; + sha256 = "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a"; libraryHaskellDepends = [ base chell QuickCheck random ]; homepage = "https://john-millikin.com/software/chell/"; description = "QuickCheck support for the Chell testing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chesshs" = callPackage @@ -45329,6 +43213,94 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "chr-core" = callPackage + ({ mkDerivation, base, chr-data, chr-pretty, containers, hashable + , logict-state, mtl, pqueue, unordered-containers + }: + mkDerivation { + pname = "chr-core"; + version = "0.1.0.1"; + sha256 = "07lc9h9k3zy1ylw5b5xv6kls7sj7ppr18gacvzfqz3ppys54kkja"; + libraryHaskellDepends = [ + base chr-data chr-pretty containers hashable logict-state mtl + pqueue unordered-containers + ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Constraint Handling Rules"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "chr-data" = callPackage + ({ mkDerivation, array, base, chr-pretty, containers, fclabels + , hashable, microlens, microlens-mtl, microlens-th, mtl + , template-haskell, unordered-containers, vector + }: + mkDerivation { + pname = "chr-data"; + version = "0.1.0.0"; + sha256 = "0igcqrqbxy3l26b3girh6qpmls5z2jcgzywxid2qq348jan88bgh"; + revision = "1"; + editedCabalFile = "1wzhcwzaskbl28plgs0z26jh3mj99mf2rbkn75n75yr6gf8fqs44"; + libraryHaskellDepends = [ + array base chr-pretty containers fclabels hashable microlens + microlens-mtl microlens-th mtl template-haskell + unordered-containers vector + ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Datatypes required for chr library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "chr-lang" = callPackage + ({ mkDerivation, base, chr-core, chr-data, chr-parse, chr-pretty + , containers, fgl, hashable, mtl, time, unordered-containers + }: + mkDerivation { + pname = "chr-lang"; + version = "0.1.0.1"; + sha256 = "0dd4xlk2klnqn6xyfh3b7gcy17z8x1lvyps5f5mypk9ijmrckhdy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base chr-core chr-data chr-parse chr-pretty containers fgl hashable + mtl time unordered-containers + ]; + executableHaskellDepends = [ base chr-data ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "AST + surface language around chr"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "chr-parse" = callPackage + ({ mkDerivation, base, containers, uulib }: + mkDerivation { + pname = "chr-parse"; + version = "0.1.0.0"; + sha256 = "00jlfpanzkawiz0fh5gc4czda9ip5r203pnjwllcqhmy9w04ip9k"; + revision = "1"; + editedCabalFile = "0h3qyn306sxqsvxmz9hfba169nkc3hx7ygkxr5j2sz033fvi31jc"; + libraryHaskellDepends = [ base containers uulib ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Parsing for chr library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "chr-pretty" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "chr-pretty"; + version = "0.1.0.0"; + sha256 = "0flm7phvi5x84m8vbkvhd3xq3dwnj1vxwi27fw78ikbzx91q376n"; + revision = "1"; + editedCabalFile = "15v5bv7azi7qw33rg849wggpy07ingd8fp24dm0azwgwsqd05mb9"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Pretty printing for chr library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chronograph" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, thyme, vector-space }: mkDerivation { @@ -45357,18 +43329,18 @@ self: { }) {}; "chronos" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable - , HUnit, primitive, QuickCheck, test-framework + ({ mkDerivation, aeson, attoparsec, base, bytestring, clock + , hashable, HUnit, primitive, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text, torsor , vector }: mkDerivation { pname = "chronos"; - version = "1.0"; - sha256 = "135fb54lac1rqb7ql0810f22a41whmswckhjbmb1xysryv0gv05k"; + version = "1.0.1"; + sha256 = "1vbjjnsp61km96adlk6ywhhfakmcac680aliavbh18rc00vfi3cj"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text torsor - vector + aeson attoparsec base bytestring clock hashable primitive text + torsor vector ]; testHaskellDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -45377,7 +43349,6 @@ self: { homepage = "https://github.com/andrewthad/chronos#readme"; description = "A performant time library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chu2" = callPackage @@ -46059,7 +44030,6 @@ self: { homepage = "https://github.com/lambdageek/clang-compilation-database"; description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clang-pure" = callPackage @@ -46170,6 +44140,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-lib" = callPackage @@ -46196,6 +44167,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-multisignal" = callPackage @@ -46211,6 +44183,7 @@ self: { ]; homepage = "https://github.com/ra1u/clash-multisignal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude" = callPackage @@ -46239,6 +44212,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -46270,6 +44244,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-verilog" = callPackage @@ -46288,6 +44263,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-vhdl" = callPackage @@ -46306,6 +44282,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classify" = callPackage @@ -46364,8 +44341,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.2.0.1"; - sha256 = "0d7s3z4vbp2pq696m0yc1ccd51d3qvz7f50ya7xijfx7771y0zm4"; + version = "1.3.1"; + sha256 = "0rk1h0kipmpk94ny2i389l6kjv7j4a55vabpm938rxv5clja2wyd"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -46378,43 +44355,11 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck transformers unordered-containers ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude_1_3_0" = callPackage - ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim - , hashable, hspec, lifted-async, lifted-base, monad-unlift - , mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, safe-exceptions, say - , semigroups, stm, stm-chans, text, time, time-locale-compat - , transformers, transformers-base, unordered-containers, vector - , vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "1.3.0"; - sha256 = "048h2pcp0i2xzd92f6w48hhk5zpic040prmddcf4jp725l1ziid5"; - libraryHaskellDepends = [ - async base basic-prelude bifunctors bytestring chunked-data - containers deepseq dlist exceptions ghc-prim hashable lifted-async - lifted-base monad-unlift mono-traversable - mono-traversable-instances mtl mutable-containers primitive - safe-exceptions say semigroups stm stm-chans text time - time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -46422,8 +44367,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "1.2.0"; - sha256 = "0zzc6095205qf58qnnagfnb90svlc0m4hw2q79kd4x6d8b80s294"; + version = "1.3.1"; + sha256 = "0n76c6bg45zcvy1jid3lrn6cr4iz3la7dd1ym7nffvqvgrfp0r2j"; libraryHaskellDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet transformers void @@ -46431,33 +44376,11 @@ self: { testHaskellDepends = [ base bytestring conduit hspec QuickCheck transformers ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "classy-prelude together with conduit functions"; license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-conduit_1_3_0" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; - version = "1.3.0"; - sha256 = "09ibih4k72j0k9bv8yhs7lwdg1ic3gbwqfml0wnvmykpqcl2ff0g"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "classy-prelude together with conduit functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -46465,46 +44388,26 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "1.2.0"; - sha256 = "1m9z02fdk7dgz4z12x49jjprsjzsbdgywawaqqyq02yynm5fikq1"; + version = "1.3.1"; + sha256 = "1yzkwp4gbl1jqv8r95kvbiqgf2sr9wy5ddkqdz3413y0rvwccr9x"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed yesod-static ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-yesod_1_3_0" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "1.3.0"; - sha256 = "1hnb0kfjly8l08v1krmcxgk6pc1xh1lg85mbkbz34pkhjx0rf7s6"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classyplate" = callPackage ({ mkDerivation, base, criterion, parallel, template-haskell , uniplate }: mkDerivation { pname = "classyplate"; - version = "0.3.0.1"; - sha256 = "11a3fwa83v81bqi91yiqyghr8b682gqrsi8w219cy7lhikc9wzwz"; + version = "0.3.0.2"; + sha256 = "0dpllaahq81bn7h0vb0h8s1lf6w0knd2dgqyycimrxfc0aqh1md8"; libraryHaskellDepends = [ base template-haskell ]; benchmarkHaskellDepends = [ base criterion parallel uniplate ]; description = "Fuseable type-class based generics"; @@ -47070,17 +44973,16 @@ self: { }) {}; "clist" = callPackage - ({ mkDerivation, base, base-unicode-symbols, peano }: + ({ mkDerivation, base, natural-induction, peano }: mkDerivation { pname = "clist"; - version = "0.1.0.0"; - sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd"; - revision = "1"; - editedCabalFile = "00lxh1v7dcylvm62a2bgzncfcla0b4l1nkhx8q1m3201fzwba22m"; - libraryHaskellDepends = [ base base-unicode-symbols peano ]; + version = "0.3.0.0"; + sha256 = "1wicpkc1rxyjnmnlsdh975d58fwfmfqwhkd50v044g4763i36bdr"; + libraryHaskellDepends = [ base natural-induction peano ]; homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clit" = callPackage @@ -47207,6 +45109,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "closed" = callPackage + ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec + , markdown-unlit, QuickCheck, vector + }: + mkDerivation { + pname = "closed"; + version = "0.1.0"; + sha256 = "0x87s852xfsyxnwj88kw38wmpzrj52hd7r87xx73r4ffv0lp6kh4"; + libraryHaskellDepends = [ + aeson base cassava deepseq hashable QuickCheck + ]; + testHaskellDepends = [ + aeson base cassava deepseq hashable hspec markdown-unlit QuickCheck + vector + ]; + homepage = "https://github.com/frontrowed/closed#readme"; + description = "Integers bounded by a closed interval"; + license = stdenv.lib.licenses.mit; + }) {}; + "closure" = callPackage ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { @@ -47305,7 +45227,6 @@ self: { homepage = "https://github.com/CloudI/cloudi_api_haskell"; description = "Haskell CloudI API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloudyfs" = callPackage @@ -47344,31 +45265,9 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-bindings"; description = "Glue between clr-host and clr-typed"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clr-host" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, file-embed - , filepath, glib, mono, transformers - }: - mkDerivation { - pname = "clr-host"; - version = "0.1.0.0"; - sha256 = "1pci1za3vsz77bib5vpwy8ayj89271nbkmg2rpgdkl4aclq3wzaw"; - revision = "1"; - editedCabalFile = "05g7njrwd3wih0ypp4x32mgfpr81f8pir58c7g7hqmnn839k2c89"; - setupHaskellDepends = [ - base Cabal directory filepath transformers - ]; - libraryHaskellDepends = [ base bytestring file-embed ]; - librarySystemDepends = [ glib mono ]; - testHaskellDepends = [ base ]; - homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; - description = "Hosting the Common Language Runtime"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; - - "clr-host_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory , file-embed, filepath, glib, mono, text, transformers }: @@ -47387,34 +45286,9 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "clr-inline" = callPackage - ({ mkDerivation, base, bytestring, Cabal, clr-host, clr-marshal - , containers, criterion, directory, extra, filepath, here, hspec - , lens, process, template-haskell, temporary, text, transformers - }: - mkDerivation { - pname = "clr-inline"; - version = "0.1.0.0"; - sha256 = "0f9ksnc072li1mpnj024pric8hr526rdnag3x1p30x3xffp92i5l"; - revision = "1"; - editedCabalFile = "104d1k1midcmxpzr9r8ng55d04b2zsrl9xqf1b58z4yd5zlfjsfk"; - libraryHaskellDepends = [ - base bytestring Cabal clr-host clr-marshal containers directory - extra filepath here lens process template-haskell temporary text - transformers - ]; - testHaskellDepends = [ base hspec text ]; - benchmarkHaskellDepends = [ base criterion text ]; - homepage = "https://gitlab.com/tim-m89/clr-haskell"; - description = "Quasiquoters for inline C# and F#"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clr-inline_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive , clr-host, clr-marshal, containers, criterion, directory, extra , filepath, here, hspec, lens, parsec, pipes, process, split @@ -47446,18 +45320,6 @@ self: { }) {}; "clr-marshal" = callPackage - ({ mkDerivation, base, clr-host, text }: - mkDerivation { - pname = "clr-marshal"; - version = "0.1.0.0"; - sha256 = "17cphaxqz4m29iid409zqrfypawxs4khmh643vi2s7m704hcf3jk"; - libraryHaskellDepends = [ base clr-host text ]; - homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal"; - description = "Marshaling for the clr"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "clr-marshal_0_2_0_0" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "clr-marshal"; @@ -47467,7 +45329,6 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal"; description = "Marshaling for the clr"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clr-typed" = callPackage @@ -47481,7 +45342,6 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-typed"; description = "A strongly typed Haskell interface to the CLR type system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clr-win-linker" = callPackage @@ -47794,8 +45654,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.18"; - sha256 = "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh"; + version = "0.10.19"; + sha256 = "1m1a2zl5ijjkjfrl5zqdqbbdf883y81zlq8qaiy2pww52cai3snf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47913,8 +45773,8 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "cmu"; - version = "1.10"; - sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy"; + version = "1.11"; + sha256 = "1zldm0j4cxhc3zwxz2zn35mbnrqpjagh3v90akvnjz95jy60z171"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers ]; @@ -47979,13 +45839,30 @@ self: { ({ mkDerivation, array, base, bytestring, file-embed, text }: mkDerivation { pname = "cndict"; - version = "0.9.0"; - sha256 = "0v0drr7zxh2ndq91vhpsi4ykna993fnkfmxana7g1q4c2vn8b5sc"; + version = "0.10.0"; + sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m"; libraryHaskellDepends = [ array base bytestring file-embed text ]; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "coalpit" = callPackage + ({ mkDerivation, base, generic-random, megaparsec, network-uri + , scientific, tasty, tasty-quickcheck, tasty-travis, time + }: + mkDerivation { + pname = "coalpit"; + version = "0.1.1.0"; + sha256 = "0adays54vg3pyrc3hsdmir0cj7h4r4vvm3a4zakia82gd8bz99iq"; + libraryHaskellDepends = [ + base megaparsec network-uri scientific time + ]; + testHaskellDepends = [ + base generic-random tasty tasty-quickcheck tasty-travis + ]; + description = "Command-line options and DSV parsing and printing"; + license = stdenv.lib.licenses.bsd3; }) {}; "code-builder" = callPackage @@ -48196,6 +46073,7 @@ self: { homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codo-notation" = callPackage @@ -48444,21 +46322,23 @@ self: { }) {}; "collection-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, network-uri - , network-uri-json, QuickCheck, quickcheck-instances - , test-invariant, text + ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover + , network-arbitrary, network-uri, network-uri-json, QuickCheck + , quickcheck-instances, test-invariant, text }: mkDerivation { pname = "collection-json"; - version = "1.1.0.2"; - sha256 = "033hwm20w1432nh3gvphkkyl9i4rjm74l3szplpsq0a9rp097la0"; + version = "1.1.2.0"; + sha256 = "1i95s4pyijy8rpjlisadvqz152kchxkg00dzbs7q9kw739qw0qwi"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; testHaskellDepends = [ - aeson base bytestring hspec network-uri network-uri-json QuickCheck - quickcheck-instances test-invariant text + aeson base bytestring hspec network-arbitrary network-uri + network-uri-json QuickCheck quickcheck-instances test-invariant + text ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/alunduil/collection-json.hs"; description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; @@ -48537,7 +46417,6 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "color-counter" = callPackage @@ -48662,7 +46541,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "colour" = callPackage + "colour_2_3_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "colour"; @@ -48673,6 +46552,25 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "colour" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.4"; + sha256 = "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + homepage = "http://www.haskell.org/haskellwiki/Colour"; + description = "A model for human colour/color perception"; + license = stdenv.lib.licenses.mit; }) {}; "colour-accelerate" = callPackage @@ -48685,7 +46583,6 @@ self: { homepage = "https://github.com/tmcdonell/colour-accelerate"; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colour-space" = callPackage @@ -48703,7 +46600,6 @@ self: { homepage = "https://github.com/leftaroundabout/colour-space"; description = "Instances of the manifold-classes for colour types"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "coltrane" = callPackage @@ -48893,6 +46789,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "combinatorial" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, transformers + , utility-ht + }: + mkDerivation { + pname = "combinatorial"; + version = "0.0"; + sha256 = "0v0djq8kiiam8fd0057skny3dkqn3y138nf5cqbyqp52wzs2lvs6"; + libraryHaskellDepends = [ + array base containers transformers utility-ht + ]; + testHaskellDepends = [ base QuickCheck utility-ht ]; + homepage = "http://hub.darcs.net/thielema/combinatorial/"; + description = "Count, enumerate, rank and unrank combinatorial objects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "combinatorial-problems" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , containers, parsec, random @@ -48968,6 +46881,7 @@ self: { homepage = "https://oss.xkcd.com/"; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comma" = callPackage @@ -49048,6 +46962,7 @@ self: { ]; description = "Library for working with commoditized amounts and price histories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "commsec" = callPackage @@ -49194,7 +47109,6 @@ self: { homepage = "https://github.com/ezyang/compact"; description = "Non-GC'd, contiguous storage for immutable data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compact-map" = callPackage @@ -49285,6 +47199,7 @@ self: { libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compactmap" = callPackage @@ -49549,7 +47464,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "More intuitive, left-to-right function composition"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compose-trans" = callPackage @@ -49590,6 +47504,7 @@ self: { homepage = "https://github.com/ConferHealth/composite#readme"; description = "JSON for Vinyl/Frames records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-aeson-refined" = callPackage @@ -49606,6 +47521,7 @@ self: { homepage = "https://github.com/ConferHealth/composite#readme"; description = "composite-aeson support for Refined from the refined package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-base" = callPackage @@ -49667,6 +47583,7 @@ self: { homepage = "https://github.com/ConferHealth/composite#readme"; description = "Opaleye SQL for Frames records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composition" = callPackage @@ -49694,8 +47611,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "0.1.1.0"; - sha256 = "12lx5cy1bh6girs1cf88pbazwadwhnadvg5b6b8v4kx2h3yqbsa1"; + version = "0.1.1.4"; + sha256 = "1jnynldi9clzz9in9cjpl17z5yh18wcdal875aphdxd72bhb2yk7"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -49736,10 +47653,8 @@ self: { }: mkDerivation { pname = "compressed"; - version = "3.10"; - sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw"; - revision = "1"; - editedCabalFile = "1fv1ix8bsqbsrzp44i7nz0wp1dwi3l2wdvqvp46a8vbakp5nif8a"; + version = "3.11"; + sha256 = "0gfxmfyzgpa176igsby50jpfhpfvd078d7nyvwwg2cjx8hpvyyyp"; libraryHaskellDepends = [ base comonad containers fingertree hashable keys pointed reducers semigroupoids semigroups unordered-containers @@ -49800,30 +47715,37 @@ self: { "computational-algebra" = callPackage ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base - , constraints, containers, control-monad-loop, convertible - , criterion, deepseq, dlist, entropy, equational-reasoning - , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit - , hybrid-vectors, lazysmallcheck, lens, matrix, monad-loops - , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes - , process, QuickCheck, quickcheck-instances, random, reflection - , semigroups, singletons, sized, smallcheck, tagged - , template-haskell, test-framework, test-framework-hunit, text - , transformers, type-natural, unamb, unordered-containers, vector + , constraint, constraints, containers, control-monad-loop + , convertible, criterion, deepseq, dlist, entropy + , equational-reasoning, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghc-typelits-presburger, hashable + , heaps, hmatrix, hspec, HUnit, hybrid-vectors, integer-logarithms + , lazysmallcheck, lens, ListLike, matrix, monad-loops, MonadRandom + , mono-traversable, monomorphic, mtl, parallel, primes, process + , QuickCheck, quickcheck-instances, random, reflection, semigroups + , singletons, sized, smallcheck, tagged, template-haskell + , test-framework, test-framework-hunit, text, transformers + , type-natural, unamb, unordered-containers, vector + , vector-algorithms }: mkDerivation { pname = "computational-algebra"; - version = "0.5.0.0"; - sha256 = "0jfsgzjzg5ci2pr5rsdamz062yjykwkl85z9h81i5vzwgiak3rpw"; + version = "0.5.1.0"; + sha256 = "1ivhfw60gv1gxv6fl8z2n3a468dkvrwff8kg1brypaixzwp589gx"; + revision = "1"; + editedCabalFile = "1yhxqqrfqdr9dgzxz7rqk2kisg571dplhhyhd0490jbmd4z40ly6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebra algebraic-prelude arithmoi base constraints containers control-monad-loop convertible deepseq dlist entropy - equational-reasoning ghc-typelits-knownnat hashable heaps hmatrix - hybrid-vectors lens matrix monad-loops MonadRandom mono-traversable - monomorphic mtl parallel primes reflection semigroups singletons - sized tagged template-haskell text type-natural unamb - unordered-containers vector + equational-reasoning ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger hashable heaps + hmatrix hybrid-vectors integer-logarithms lens ListLike matrix + monad-loops MonadRandom mono-traversable monomorphic mtl parallel + primes reflection semigroups singletons sized tagged + template-haskell text type-natural unamb unordered-containers + vector vector-algorithms ]; executableHaskellDepends = [ algebra algebraic-prelude base constraints convertible criterion @@ -49839,13 +47761,13 @@ self: { test-framework-hunit text transformers type-natural vector ]; benchmarkHaskellDepends = [ - algebra base constraints containers criterion deepseq + algebra base constraint constraints containers criterion deepseq equational-reasoning hspec HUnit lens matrix MonadRandom monomorphic parallel process QuickCheck quickcheck-instances random reflection singletons sized smallcheck tagged test-framework test-framework-hunit transformers type-natural vector ]; - homepage = "https://github.com/konn/computational-algebra"; + homepage = "https://konn.github.com/computational-algebra"; description = "Well-kinded computational algebra library, currently supporting Groebner basis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50006,36 +47928,43 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib - , concrete-haskell-autogen, containers, directory, filepath - , hashable, megaparsec, monad-extras, mtl, network + ({ mkDerivation, base, binary, bytestring, bzlib, bzlib-conduit + , concrete-haskell-autogen, conduit, conduit-combinators + , conduit-extra, containers, cryptohash-conduit, deepseq, directory + , filepath, hashable, lens, megaparsec, monad-extras, mtl, network , optparse-generic, path, path-io, process, QuickCheck, scientific - , stm, tar, text, thrift, time, unordered-containers, uuid, vector - , zip, zlib + , stm, tar, tar-conduit, text, thrift, time, unordered-containers + , uuid, vector, zip, zip-conduit, zlib }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.15"; - sha256 = "1g6nqr82gr5937irjs2h6ybp024k6gzpmpx1lsri8yw70kxgryjl"; + version = "0.1.0.16"; + sha256 = "1bjdbvsi7saqrlxybrzi35x47a08b01nlghvz9r6l04dkikjy2xc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; executableHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; testHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; @@ -50106,8 +48035,8 @@ self: { }: mkDerivation { pname = "concurrency"; - version = "1.1.2.1"; - sha256 = "0gadbm9z9qbm208md5f811hz9f2ljw0z9dyldpgklqvic1n8w5xi"; + version = "1.2.3.0"; + sha256 = "1abrl3qab0gq1a2v4wjvmfzfmyainbj2qwf67h46pcrnd7va0ddq"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -50117,14 +48046,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_3_0" = callPackage + "concurrency_1_3_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.3.0"; - sha256 = "1abrl3qab0gq1a2v4wjvmfzfmyainbj2qwf67h46pcrnd7va0ddq"; + version = "1.3.0.0"; + sha256 = "1z75m5wgvdp4lx6v18ap60pdqgdhf1132qlamm07m4dlpkd5il98"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -50165,6 +48094,7 @@ self: { homepage = "https://github.com/nikita-volkov/concurrent-buffer"; description = "Concurrent expanding buffer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-dns-cache" = callPackage @@ -50189,6 +48119,7 @@ self: { testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-extra" = callPackage @@ -50228,25 +48159,10 @@ self: { benchmarkHaskellDepends = [ base machines time ]; description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.9.2"; - sha256 = "1wyrna3j4zg0qiyx8w5kfk6j3k33acrv2677g11f3njwvcx45hiv"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_10_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -50260,7 +48176,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -50341,14 +48256,13 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-utilities"; - version = "0.2.0.0"; - sha256 = "12limyhs55ccjxls1dw4cch9ffdn6nrvybaykcyis733w0qvh26i"; - revision = "1"; - editedCabalFile = "0sjgrya7v24lmcfhh2x72b6iyzklcsw0fbbsasb4dl31lf118w9b"; + version = "0.2.0.1"; + sha256 = "168prywiw4fhh2syzj452pyqj8byy4sb929mgkv5srgwkzqr6g0f"; libraryHaskellDepends = [ base ]; homepage = "-"; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrentoutput" = callPackage @@ -50420,6 +48334,7 @@ self: { homepage = "http://www.renickbell.net/doku.php?id=conductive-base"; description = "a library for live coding and real-time musical applications"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conductive-clock" = callPackage @@ -50462,6 +48377,7 @@ self: { homepage = "http://www.renickbell.net/doku.php?id=conductive-song"; description = "a library of functions which are useful for composing music"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit" = callPackage @@ -50491,6 +48407,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_2_13" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, exceptions + , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl + , mwc-random, primitive, QuickCheck, resourcet, safe, split + , transformers, transformers-base, transformers-compat, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.2.13"; + sha256 = "1b0i6zbmp9j0km150nghmq77rz3iahkib3dd2m9hihabc6n1p793"; + libraryHaskellDepends = [ + base exceptions lifted-base mmorph monad-control mtl primitive + resourcet transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck resourcet safe + split transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hspec kan-extensions mwc-random + transformers vector + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq @@ -50515,7 +48459,6 @@ self: { ]; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -50595,8 +48538,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.1.1"; - sha256 = "0609miq03lq9visfb2dqqsxghmvgzm24pq39mqby1jnnah6yh8m0"; + version = "1.1.2"; + sha256 = "0f31iphdi31m7cfd2szq06x3xdag1kkv2vbxh6bm2ax37k9sw2w4"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -50608,7 +48551,7 @@ self: { conduit containers directory filepath hspec mono-traversable mtl mwc-random QuickCheck safe silently text transformers vector ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; }) {}; @@ -50639,16 +48582,17 @@ self: { , bytestring-builder, conduit, criterion, directory, exceptions , filepath, hspec, monad-control, network, primitive, process , QuickCheck, resourcet, stm, streaming-commons, text, transformers - , transformers-base + , transformers-base, typed-process, unliftio-core }: mkDerivation { pname = "conduit-extra"; - version = "1.1.17"; - sha256 = "01haq94kf4jsqrhs6j2kkvxrw4iqhvhnd9rcrqpkdbp1dil493kn"; + version = "1.2.3.2"; + sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process resourcet stm streaming-commons text transformers transformers-base + typed-process unliftio-core ]; testHaskellDepends = [ async attoparsec base blaze-builder bytestring bytestring-builder @@ -50664,37 +48608,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "conduit-extra_1_2_0" = callPackage - ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring - , bytestring-builder, conduit, criterion, directory, exceptions - , filepath, hspec, monad-control, network, primitive, process - , QuickCheck, resourcet, stm, streaming-commons, text, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit-extra"; - version = "1.2.0"; - sha256 = "0f13r6ypch3px7qfh6a2qj2y5yhdzwy53v0f6bxyc9xl0hxf49yq"; - libraryHaskellDepends = [ - async attoparsec base blaze-builder bytestring conduit directory - exceptions filepath monad-control network primitive process - resourcet stm streaming-commons text transformers transformers-base - ]; - testHaskellDepends = [ - async attoparsec base blaze-builder bytestring bytestring-builder - conduit directory exceptions hspec process QuickCheck resourcet stm - streaming-commons text transformers transformers-base - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring bytestring-builder conduit criterion - transformers - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -50781,29 +48694,6 @@ self: { }) {}; "conduit-parse" = callPackage - ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint - , mtl, parsers, resourcet, safe, safe-exceptions, tasty - , tasty-hunit, text, transformers - }: - mkDerivation { - pname = "conduit-parse"; - version = "0.1.2.1"; - sha256 = "0yc3mkg3fic5bpjsffghidk51sx5dhzvyc1h94ppic9mym985fwd"; - libraryHaskellDepends = [ - base conduit conduit-combinators dlist mtl parsers safe - safe-exceptions text transformers - ]; - testHaskellDepends = [ - base conduit hlint mtl parsers resourcet safe-exceptions tasty - tasty-hunit - ]; - homepage = "https://github.com/k0ral/conduit-parse"; - description = "Parsing framework based on conduit"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "conduit-parse_0_1_2_2" = callPackage ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint , mtl, parsers, resourcet, safe, safe-exceptions, tasty , tasty-hunit, text, transformers @@ -50823,7 +48713,6 @@ self: { homepage = "https://github.com/k0ral/conduit-parse"; description = "Parsing framework based on conduit"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-resumablesink" = callPackage @@ -50841,7 +48730,6 @@ self: { homepage = "http://github.com/A1kmm/conduit-resumablesink"; description = "Allows conduit to resume sinks to feed multiple sources into it"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-throttle" = callPackage @@ -50852,8 +48740,8 @@ self: { }: mkDerivation { pname = "conduit-throttle"; - version = "0.3.0.0"; - sha256 = "1kwrryplhck8q6hn6lx6j741d9hllzf84ykmqwiq0h34fjdd0a4r"; + version = "0.3.1.0"; + sha256 = "0ad3balm1r5jm4jvf26pr1kaiqnzvjznjh5kidk2bknxylbddmld"; libraryHaskellDepends = [ async base conduit conduit-combinators conduit-extra monad-control resourcet stm stm-chans throttle-io-stream unliftio unliftio-core @@ -50962,7 +48850,6 @@ self: { homepage = "https://github.com/aisamanra/config-ini"; description = "A library for simple INI-based configuration files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-manager" = callPackage @@ -50998,6 +48885,7 @@ self: { homepage = "https://github.com/protoben/config-parser"; description = "Parse config files using parsec and generate parse errors on unhandled keys"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-schema" = callPackage @@ -51102,39 +48990,6 @@ self: { }) {}; "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, text, tls - , transformers, unordered-containers, wai, warp, warp-tls, x509 - , x509-system, x509-validation, yaml - }: - mkDerivation { - pname = "configuration-tools"; - version = "0.2.15"; - sha256 = "07hjfqsyj49piplf5xm5szbhy34bm47mxcmjriwaxn5djflafcc2"; - 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 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 - ]; - homepage = "https://github.com/alephcloud/hs-configuration-tools"; - description = "Tools for specifying and parsing configurations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "configuration-tools_0_3_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base-unicode-symbols, base64-bytestring, bytestring, Cabal , case-insensitive, connection, data-default, deepseq, directory @@ -51165,7 +49020,6 @@ self: { homepage = "https://github.com/alephcloud/hs-configuration-tools"; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configurator" = callPackage @@ -51231,6 +49085,7 @@ self: { homepage = "http://github.com/lpsmith/configurator-ng"; description = "The next generation of configuration management"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "confsolve" = callPackage @@ -51505,13 +49360,12 @@ self: { ({ mkDerivation, base, category }: mkDerivation { pname = "constraint"; - version = "0.1.0.0"; - sha256 = "0m3hkvilgwmdj3w7x42ypyakbf4p2bnd0rfcwi7kpwqw79rrbvsc"; - revision = "1"; - editedCabalFile = "0zy2nyp81dhcqp4n3mqws47ydijhgnxx36av31g6qsdgim9symf9"; + version = "0.1.1.0"; + sha256 = "15kkkbqy6vjhbjl1jdqrsazrhv5k2l2vqymdjjdn3l07cfnf9lzj"; libraryHaskellDepends = [ base category ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraint-classes" = callPackage @@ -51535,6 +49389,7 @@ self: { libraryHaskellDepends = [ base indextype ]; description = "Some conviencience type functions for manipulating constraints"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraints" = callPackage @@ -51566,6 +49421,7 @@ self: { homepage = "http://andersk.mit.edu/haskell/constructible/"; description = "Exact computation with constructible real numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructive-algebra" = callPackage @@ -51778,6 +49634,7 @@ self: { homepage = "https://github.com/weldr/content-store"; description = "Store and retrieve data from an on-disk store"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "context-free-grammar" = callPackage @@ -51837,12 +49694,12 @@ self: { }) {}; "continued-fraction" = callPackage - ({ mkDerivation, base, criterion, free, hspec, recursion-schemes }: + ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.3"; - sha256 = "08zvphhxm5w79zrrj1qsixdq4i5flwz0ci47mmkh671dp99qjriq"; - libraryHaskellDepends = [ base free recursion-schemes ]; + version = "0.1.0.6"; + sha256 = "04vv2qnpz2pfkizrx8layf3z9kfjkika15ha5kpm0av52d405fiz"; + libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://hub.darcs.net/vmchale/continued-fraction#readme"; @@ -51956,6 +49813,7 @@ self: { homepage = "https://github.com/erisco/control-dotdotdot"; description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-event" = callPackage @@ -52394,6 +50252,7 @@ self: { homepage = "https://github.com/NICTA/coordinate"; description = "A representation of latitude and longitude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot" = callPackage @@ -52827,6 +50686,7 @@ self: { homepage = "https://github.com/tippenein/countable-inflections"; description = "Countable Text Inflections"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "counter" = callPackage @@ -52839,7 +50699,6 @@ self: { homepage = "https://github.com/wei2912/counter"; description = "An object frequency counter"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "country" = callPackage @@ -53078,8 +50937,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.4.0"; - sha256 = "01imn0nnb567m1l48bjaa6nqp0555bw5lp40d9bqz56dalh4lnlk"; + version = "3.4.1"; + sha256 = "1sd6h0xw76iwvgl7i4c9wy6q5fmq75inq5vh79rzf3bhmahb1529"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -53589,21 +51448,25 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, tasty - , tasty-discover, tasty-quickcheck + ({ mkDerivation, base, binary, bytestring, containers, mtl + , network-info, QuickCheck, quickcheck-instances, safe, stm, tasty + , tasty-discover, tasty-quickcheck, time }: mkDerivation { pname = "crdt"; - version = "4.0"; - sha256 = "16lsyvcnz8qjy5lakf4dxzz9b4rcgz8bk6wzf3cmxn51kpxyc0rn"; - libraryHaskellDepends = [ base containers mtl ]; + version = "6.1"; + sha256 = "0mh71svz7d0xpsh0da292sfzyhbd8cja3r0xyddb947k3kd08q3g"; + libraryHaskellDepends = [ + base binary bytestring containers mtl network-info safe stm time + ]; testHaskellDepends = [ - base containers mtl QuickCheck tasty tasty-discover - tasty-quickcheck + base containers QuickCheck quickcheck-instances tasty + tasty-discover tasty-quickcheck ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "creatur" = callPackage @@ -53639,8 +51502,8 @@ self: { }: mkDerivation { pname = "credential-store"; - version = "0.1.1"; - sha256 = "1qim9hqyak3c7giqjrkvdvlpgwlbgnyz418q6pndwvyrhzm7n21m"; + version = "0.1.2"; + sha256 = "114jdbpiyx8xnjxnpz05nqpnb5s29y1iv330b0i491vik8hvrbad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53804,39 +51667,10 @@ self: { homepage = "https://github.com/bos/critbit"; description = "Crit-bit maps and sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring - , cassava, code-page, containers, deepseq, directory, filepath - , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random - , optparse-applicative, parsec, QuickCheck, statistics, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.1.4.0"; - sha256 = "0xps7jm8g1bg7a2y4b6mj5nhg3b595k5ysprf4711lwyfpy478jk"; - revision = "1"; - editedCabalFile = "0hgy2rbrb0dg1sjdvqk2zivdq075fih4zlf51ffdmqzgcdj3i9b1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base binary bytestring cassava code-page - containers deepseq directory filepath Glob hastache js-flot - js-jquery mtl mwc-random optparse-applicative parsec statistics - text time transformers transformers-compat vector vector-algorithms - ]; - testHaskellDepends = [ - aeson base bytestring HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - homepage = "http://www.serpentine.com/criterion"; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_2_4_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary , bytestring, cassava, code-page, containers, deepseq, directory , exceptions, filepath, Glob, HUnit, js-flot, js-jquery @@ -53847,8 +51681,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.2.4.0"; - sha256 = "01zf2sa3pva8d7176a2q94ail6ha47b58sg2hijls35qnmi3dcw6"; + version = "1.2.6.0"; + sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -53867,7 +51701,6 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-plus" = callPackage @@ -54000,30 +51833,6 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, criterion, data-default-class - , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers-compat - }: - mkDerivation { - pname = "cron"; - version = "0.5.0"; - sha256 = "1drmhnb0lx24k2s0g9g0jhs810iwwyacld3hx584n1ffshbwzzzb"; - libraryHaskellDepends = [ - attoparsec base data-default-class mtl mtl-compat old-locale - semigroups text time - ]; - testHaskellDepends = [ - attoparsec base generics-sop quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck text time transformers-compat - ]; - benchmarkHaskellDepends = [ attoparsec base criterion text time ]; - homepage = "http://github.com/michaelxavier/cron"; - description = "Cron datatypes and Attoparsec parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cron_0_6_1" = callPackage ({ mkDerivation, attoparsec, base, criterion, data-default-class , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time @@ -54045,7 +51854,6 @@ self: { homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -54122,6 +51930,7 @@ self: { homepage = "https://github.com/phadej/crypt-sha512"; description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-api" = callPackage @@ -54130,8 +51939,10 @@ self: { }: mkDerivation { pname = "crypto-api"; - version = "0.13.2"; - sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak"; + version = "0.13.3"; + sha256 = "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"; + revision = "1"; + editedCabalFile = "1z6n1sa5pn3iqvqjrd8hv4bc2pxzsrhm5sh0l8z7g9lbqp6w0wp5"; libraryHaskellDepends = [ base bytestring cereal entropy tagged transformers ]; @@ -54263,10 +52074,8 @@ self: { }: mkDerivation { pname = "crypto-enigma"; - version = "0.0.2.9"; - sha256 = "18nc5gqsy4dsm22van6iz96lqq45f7jqik4fljczgp6n1knyig9z"; - revision = "1"; - editedCabalFile = "1hbcnj3w5z7cmlrmfih7mv27n75bpcpbiq66wsfgrrvaiycrb58n"; + version = "0.0.2.10"; + sha256 = "1c7baw7k9shllfxp1yg5czr9m0392pnpqiblaz8v17rc71d402p6"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -54293,7 +52102,6 @@ self: { homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash"; description = "Multihash library on top of cryptonite crypto library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-numbers" = callPackage @@ -54675,6 +52483,7 @@ self: { homepage = "https://github.com/hvr/cryptohash-sha512"; description = "Fast, pure and practical SHA-512 implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptoids" = callPackage @@ -54744,29 +52553,6 @@ self: { }) {}; "cryptonite" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, foundation - , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit - , tasty-kat, tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.23"; - sha256 = "1680dxgmnjgj083jhsw3rlljwaw0zqi5099m59x6kwqkxhn1qjpf"; - libraryHaskellDepends = [ - base bytestring deepseq foundation ghc-prim integer-gmp memory - ]; - testHaskellDepends = [ - base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion memory random - ]; - homepage = "https://github.com/haskell-crypto/cryptonite"; - description = "Cryptography Primitives sink"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cryptonite_0_24" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, foundation , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck @@ -54787,7 +52573,6 @@ self: { homepage = "https://github.com/haskell-crypto/cryptonite"; description = "Cryptography Primitives sink"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptonite-conduit" = callPackage @@ -54890,7 +52675,6 @@ self: { homepage = "https://github.com/anton-k/csound-catalog"; description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -54911,7 +52695,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression"; description = "library to make electronic music"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -54929,7 +52712,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression-dynamic"; description = "dynamic core for csound-expression library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-opcodes" = callPackage @@ -54945,7 +52727,6 @@ self: { ]; description = "opcodes for the library csound-expression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-typed" = callPackage @@ -54967,7 +52748,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression-typed"; description = "typed core for the library csound-expression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-sampler" = callPackage @@ -54980,7 +52760,6 @@ self: { homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csp" = callPackage @@ -55179,6 +52958,7 @@ self: { homepage = "https://github.com/mrVanDalo/csv-to-qif/"; description = "A small program that will read csv files and create qif files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ctemplate" = callPackage @@ -55224,30 +53004,6 @@ self: { }) {}; "ctrie" = callPackage - ({ mkDerivation, async, atomic-primops, base, containers, criterion - , deepseq, hashable, primitive, QuickCheck, random, random-shuffle - , stm, test-framework, test-framework-quickcheck2, transformers - , unordered-containers - }: - mkDerivation { - pname = "ctrie"; - version = "0.1.1.0"; - sha256 = "1f2vz91fs8fin9ykcjjp60mmm0hw886mqmmhbs4ai02rdi7v6d44"; - libraryHaskellDepends = [ atomic-primops base hashable primitive ]; - testHaskellDepends = [ - base containers hashable QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - async base containers criterion deepseq hashable random - random-shuffle stm transformers unordered-containers - ]; - homepage = "https://github.com/mcschroeder/ctrie"; - description = "Non-blocking concurrent map"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ctrie_0_2" = callPackage ({ mkDerivation, async, atomic-primops, base, containers, criterion , deepseq, hashable, primitive, QuickCheck, random, random-shuffle , stm, test-framework, test-framework-quickcheck2, transformers @@ -55269,7 +53025,6 @@ self: { homepage = "https://github.com/mcschroeder/ctrie"; description = "Non-blocking concurrent map"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cube" = callPackage @@ -55290,6 +53045,7 @@ self: { ]; description = "Cubic DSL for 3D printing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubical" = callPackage @@ -55327,7 +53083,6 @@ self: { 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 @@ -55415,30 +53170,8 @@ self: { }: mkDerivation { pname = "cue-sheet"; - version = "0.1.1"; - sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class exceptions megaparsec - mtl QuickCheck text - ]; - testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec QuickCheck text - ]; - homepage = "https://github.com/mrkkrp/cue-sheet"; - description = "Support for construction, rendering, and parsing of CUE sheets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cue-sheet_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck - , text - }: - mkDerivation { - pname = "cue-sheet"; - version = "1.0.0"; - sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1"; + version = "1.0.1"; + sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec @@ -55451,7 +53184,6 @@ self: { homepage = "https://github.com/mrkkrp/cue-sheet"; description = "Support for construction, rendering, and parsing of CUE sheets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cufft" = callPackage @@ -55791,14 +53523,22 @@ self: { }) {}; "cyclotomic" = callPackage - ({ mkDerivation, arithmoi, base, containers }: + ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-smallcheck + }: mkDerivation { pname = "cyclotomic"; - version = "0.4.4.1"; - sha256 = "05rbigjqd6cp5g0kivz816vfnvvyn8jbfcds35kk46h8nwwsch2r"; + version = "0.5.0.0"; + sha256 = "1r8hsc2x59g5xwch417iaxd8cldm0bg00wvhjb48cb7d53lx3zf8"; libraryHaskellDepends = [ arithmoi base containers ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-smallcheck + ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cypher" = callPackage @@ -55846,8 +53586,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.7"; - sha256 = "00bd001hxh68cwrv2597qg8rpcdz0n96nn31qkqgyhbc4lni72af"; + version = "0.1.8"; + sha256 = "1s9md4865mzal0n69mmfbrd2xifhs8j40dl3vjympifw4li25l8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55864,7 +53604,6 @@ self: { ]; description = "Permissively licensed D-Bus client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "d3d11binding" = callPackage @@ -55977,7 +53716,6 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; description = "Parsing dAmn messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "danibot" = callPackage @@ -56069,6 +53807,8 @@ self: { pname = "darcs"; version = "2.12.5"; sha256 = "0lrm0sal5pl453mkqn8b9fc9l7lwinc140iqihya9g17bk408nrm"; + revision = "1"; + editedCabalFile = "0if3ww0xhi8k5c8a9yb687gjjdp2k4q2896qn7vgwwzg360slx8n"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -56095,6 +53835,7 @@ self: { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -56984,8 +54725,8 @@ self: { }: mkDerivation { pname = "data-diverse"; - version = "0.8.1.0"; - sha256 = "1lav14j4p01wym8s7j3haliiaj16lyglw5bbp7gn2xk3xg7z1k3p"; + version = "2.0.1.0"; + sha256 = "0997mn0amfl4k70rvrxjw24dzyr6sv42nr1d24whyy114lsiv05b"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -56996,50 +54737,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_1_2_0_3" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim - , hspec, tagged - }: - mkDerivation { - pname = "data-diverse"; - version = "1.2.0.3"; - sha256 = "0mc9xzh0hja8zvgwnfa65hdwirqzggbw1k07fspgzs699wj9dh6r"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim tagged - ]; - testHaskellDepends = [ base hspec tagged ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/louispan/data-diverse#readme"; - description = "Extensible records and polymorphic variants"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-diverse-lens" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens + , profunctors, tagged + }: mkDerivation { pname = "data-diverse-lens"; - version = "0.1.1.0"; - sha256 = "0arwpab3a88jdpcg1pnj96dfdhfnnzf5za3l8cfwzbsjrc5ddl44"; - libraryHaskellDepends = [ base data-diverse lens tagged ]; - testHaskellDepends = [ base data-diverse hspec lens tagged ]; + version = "1.0.0.1"; + sha256 = "0ivrm1n2pbsj6hskgz56igna13d8zfj2n0iiqvmpba81kzwlg0x7"; + libraryHaskellDepends = [ + base data-diverse generic-lens lens profunctors tagged + ]; + testHaskellDepends = [ + base data-diverse generic-lens hspec lens tagged + ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_5_1_0" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, profunctors - , tagged + "data-diverse-lens_2_1_0_0" = callPackage + ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens + , profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "0.5.1.0"; - sha256 = "0c1hrz9b8a01vphfqmlfgx3mh6ci8hd5wwr8iwpkv6z7ps7sp9kd"; + version = "2.1.0.0"; + sha256 = "1i71f67agjaflb1cz8v6qpfy1qfwwmw8fjq8zl6kqd28z4k0mms7"; libraryHaskellDepends = [ - base data-diverse lens profunctors tagged + base data-diverse generic-lens lens profunctors tagged + ]; + testHaskellDepends = [ + base data-diverse generic-lens hspec lens tagged ]; - testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; license = stdenv.lib.licenses.bsd3; @@ -57130,6 +54860,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Combinator emoticons: data-aviary in the flavor of emoticons"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-endian" = callPackage @@ -57157,6 +54888,7 @@ self: { homepage = "http://github.com/ylilarry/data-extend-generic"; description = "Extend Haskell data or newtype like in OOP languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-extra" = callPackage @@ -57240,18 +54972,6 @@ self: { }) {}; "data-fix" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-fix"; - version = "0.0.7"; - sha256 = "04k9cmb197majyw6xna8zfkhgfyxfdiz2sgb0jy5jyfpiz3cr60h"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/anton-k/data-fix"; - description = "Fixpoint data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-fix_0_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; @@ -57261,7 +54981,6 @@ self: { homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fix-cse" = callPackage @@ -57310,6 +55029,7 @@ self: { homepage = "https://github.com/erisco/data-foldapp"; description = "Fold function applications. Framework for variadic functions."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-forest" = callPackage @@ -57323,6 +55043,7 @@ self: { homepage = "https://github.com/chris-martin/data-forest"; description = "A simple multi-way tree data structure"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fresh" = callPackage @@ -57361,19 +55082,6 @@ self: { }) {}; "data-has" = callPackage - ({ mkDerivation, base, criterion, transformers }: - mkDerivation { - pname = "data-has"; - version = "0.2.1.0"; - sha256 = "147qf3hrgl1rdakifw6jasyflv31dnznp0hsj50np4kla63xjgf1"; - libraryHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ base criterion transformers ]; - homepage = "https://github.com/winterland1989/data-has"; - description = "Simple extensible product"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-has_0_3_0_0" = callPackage ({ mkDerivation, base, criterion, transformers }: mkDerivation { pname = "data-has"; @@ -57384,7 +55092,6 @@ self: { homepage = "https://github.com/winterland1989/data-has"; description = "Simple extensible product"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-hash" = callPackage @@ -57512,8 +55219,8 @@ self: { }: mkDerivation { pname = "data-lens"; - version = "2.11.1"; - sha256 = "0ciwqxm79a8zdfi7wymy9hhan6362hlhd6n8sz79pyjlsyvhpgpv"; + version = "2.11.2"; + sha256 = "123rxp37qjg0rkwz0521s5181qcm4v9gk94ny2j86vw7311kd0ax"; libraryHaskellDepends = [ base comonad containers semigroupoids transformers ]; @@ -57599,6 +55306,7 @@ self: { homepage = "https://github.com/erisco/data-list-zigzag"; description = "A list but with a balanced enumeration of Cartesian product"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-map-multikey" = callPackage @@ -57654,6 +55362,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-msgpack_0_0_11" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack"; + version = "0.0.11"; + sha256 = "11dq5s1s6zcjfa7n464amwiz4sfrkqa7bb5x1rfqiivxc6bgq119"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 data-msgpack-types text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers data-msgpack-types hashable hspec + QuickCheck text unordered-containers vector void + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + homepage = "http://msgpack.org/"; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-msgpack-types" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , QuickCheck, text, unordered-containers, vector, void @@ -57932,14 +55668,14 @@ self: { "data-serializer" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, data-endian - , parsers, semigroups, tasty, tasty-quickcheck + , parsers, semigroups, split, tasty, tasty-quickcheck }: mkDerivation { pname = "data-serializer"; - version = "0.3"; - sha256 = "0bjya0x10y55vaa86da89d5svwcckv8h10dzcyiv14q2rxxgmgn8"; + version = "0.3.2"; + sha256 = "055a4kqwg6cqx9a58i7m59jp70s4mmm2q73wa78jzp87lnh2646l"; libraryHaskellDepends = [ - base binary bytestring cereal data-endian parsers semigroups + base binary bytestring cereal data-endian parsers semigroups split ]; testHaskellDepends = [ base binary bytestring cereal tasty tasty-quickcheck @@ -58215,19 +55951,28 @@ self: { "datadog" = callPackage ({ mkDerivation, aeson, auto-update, base, buffer-builder - , bytestring, lens, lifted-base, monad-control, network, old-locale - , text, time, transformers-base + , 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 }: mkDerivation { pname = "datadog"; - version = "0.1.0.1"; - sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663"; + version = "0.2.0.0"; + sha256 = "0zk4dkd6q2rv0fbylp2fprizahfx2imczhrj08n0qd5h3mnck3c9"; libraryHaskellDepends = [ - aeson auto-update base buffer-builder bytestring lens lifted-base - monad-control network old-locale text time transformers-base + 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 + ]; + testHaskellDepends = [ + 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 ]; homepage = "https://github.com/iand675/datadog"; - description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; + description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -58390,8 +56135,8 @@ self: { ({ mkDerivation, base, dates, hspec, QuickCheck, time }: mkDerivation { pname = "date-conversions"; - version = "0.1.0.0"; - sha256 = "0348mi754n9611hzs62v17f3qba4vyls9x82capjasy8f2mw1cqn"; + version = "0.2.0.0"; + sha256 = "1bx8r66wfghrfbmcyddsi6z5b66kc9skrq0hnk2mvz4gx2cl0gdq"; libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; homepage = "https://github.com/thoughtbot/date-conversions#readme"; @@ -58572,6 +56317,7 @@ self: { homepage = "https://github.com/relrod/dbm"; description = "A *simple* database migration tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations" = callPackage @@ -58653,28 +56399,30 @@ self: { testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ]; description = "The dbmigrations tool built for SQLite databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck - , containers, criterion, deepseq, directory, filepath, libxml-sax - , network, parsec, process, QuickCheck, random, text, transformers - , unix, vector, xml-types + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, directory, extra, filepath, libxml-sax, network, parsec + , process, QuickCheck, random, resourcet, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unix, vector, xml-types }: mkDerivation { pname = "dbus"; - version = "0.10.13"; - sha256 = "1jksgv3c2bhi9d3kshllx6j1znyqmx189j6yml7j9gm0m3xsx55a"; + version = "0.10.14"; + sha256 = "13x1b3qzgsrksaqmrrlpvn5ivq4s4yzhwa8nl833pcvybzzxjb9n"; libraryHaskellDepends = [ - base bytestring cereal containers libxml-sax network parsec random - text transformers unix vector xml-types + base bytestring cereal containers deepseq libxml-sax network parsec + random text transformers unix vector xml-types ]; testHaskellDepends = [ - base bytestring cereal chell chell-quickcheck containers directory - filepath libxml-sax network parsec process QuickCheck random text - transformers unix vector xml-types + 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 ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ base criterion ]; doCheck = false; homepage = "https://github.com/rblaze/haskell-dbus#readme"; description = "A client library for the D-Bus IPC system"; @@ -58834,6 +56582,7 @@ self: { libraryHaskellDepends = [ base dates time ]; description = "Discordian Date Types for Haskell"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-base" = callPackage @@ -58885,6 +56634,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler base libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-core" = callPackage @@ -59246,6 +56996,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debug" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, directory, extra + , ghc-prim, js-jquery, open-browser, template-haskell, uniplate + }: + mkDerivation { + pname = "debug"; + version = "0.0.2"; + sha256 = "13dx8fqyczba1qldl0nk5i8c1hxsqi5497dylkjyzjmxphs6fi53"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-wl-pprint base containers directory extra ghc-prim js-jquery + open-browser template-haskell uniplate + ]; + testHaskellDepends = [ base extra ]; + homepage = "https://github.com/ndmitchell/debug"; + description = "Simple trace-based debugger"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "debug-diff" = callPackage ({ mkDerivation, base, groom, process, temporary }: mkDerivation { @@ -59286,6 +57055,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "debug-pp" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "debug-pp"; + version = "0.1.0.0"; + sha256 = "05cq6qlp014a9d7zvi7kablswxdf0801ybi29c4m2v9vkqakhwcj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/pepeiborra/debug-hoed-pp#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "debug-time" = callPackage ({ mkDerivation, base, clock, containers }: mkDerivation { @@ -59299,6 +57081,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "debug-tracy" = callPackage + ({ mkDerivation, base, random, transformers }: + mkDerivation { + pname = "debug-tracy"; + version = "0.1.0.1"; + sha256 = "1cp3m776yrg8r2lmcbn81y5as27qidzgb3j49ksnq4swry78jhg5"; + libraryHaskellDepends = [ base random transformers ]; + description = "More useful trace functions for investigating bugs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "deburr" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -59353,7 +57146,6 @@ self: { homepage = "https://github.com/leftaroundabout/decimal-literals"; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "declarative" = callPackage @@ -59736,36 +57528,16 @@ self: { homepage = "https://github.com/YoEight/deiko-config"; description = "Small and typesafe configuration library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dejafu" = callPackage - ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, mtl, random, ref-fd, semigroups, transformers - , transformers-base - }: - mkDerivation { - pname = "dejafu"; - version = "0.7.3.0"; - sha256 = "163aw8qw18lqw0q8pr88d3i3m1r1v5ny73xy5ryxlls5wiyn2ds8"; - libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck mtl random - ref-fd semigroups transformers transformers-base - ]; - homepage = "https://github.com/barrucadu/dejafu"; - description = "Systematic testing for Haskell concurrency"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "dejafu_0_9_1_0" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.1.0"; - sha256 = "0s3acf1dggp6bc5140k0hbbfcwrbhl35g80qfs33nbjdbjjsfakj"; + version = "0.9.1.2"; + sha256 = "1cxskfl2wg3m9hja97yc0sjghskhs442l2jqwcynlhjr308g84as"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck random ref-fd transformers transformers-base @@ -59773,6 +57545,23 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; license = stdenv.lib.licenses.mit; + }) {}; + + "dejafu_1_0_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, exceptions + , leancheck, profunctors, random, ref-fd, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "1.0.0.0"; + sha256 = "0d7darip6dkvpn9gqvr8lkid0b19a5sxd31f5rn8b5fpgc368i8v"; + libraryHaskellDepends = [ + base concurrency containers deepseq exceptions leancheck + profunctors random ref-fd transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -59888,6 +57677,7 @@ self: { homepage = "https://github.com/atzedijkstra/delimiter-separated"; description = "Library for dealing with tab and/or comma (or other) separated files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "delta" = callPackage @@ -59947,6 +57737,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Generalized the Prelude more functionally"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "demarcate" = callPackage @@ -60122,7 +57913,6 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derangement" = callPackage @@ -60247,7 +58037,6 @@ self: { homepage = "https://www.github.com/mkloczko/derive-storable/"; description = "Derive Storable instances with GHC.Generics."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-storable-plugin" = callPackage @@ -60268,7 +58057,6 @@ self: { homepage = "https://www.github.com/mkloczko/derive-storable-plugin/"; description = "GHC core plugin supporting the derive-storable package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-topdown" = callPackage @@ -60329,6 +58117,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_4" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.4"; + sha256 = "1jza92p1x3dbm4gx891miaihq3ly30mlz20ddwdsz0xyk7c1wk15"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + homepage = "https://github.com/haskell-compat/deriving-compat"; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -60357,8 +58169,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "0.0.3"; - sha256 = "19g7nrgd5z7larkw1nb4vm9hfid1j8s2pcqyqflff4mp764m2ipg"; + version = "0.0.4"; + sha256 = "0xdz9hfh9wyh5pyn82kapbjiq6hgrdr23krb2940q0hr0rf39ssb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -60580,8 +58392,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.8.0"; - sha256 = "0bfnylfjqp8065i2akz5b8p55c45396hi8h6lx0jkl1i597567c4"; + version = "1.8.2"; + sha256 = "1llr12rwnd39xs51faxxvrf9n9scwsz3j2ywqdfsrr3hiasq80aj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60621,7 +58433,6 @@ self: { ]; description = "Compile Dhall to Bash"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-check" = callPackage @@ -60645,25 +58456,21 @@ self: { "dhall-json" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , neat-interpolation, optparse-generic, text, trifecta, vector - , yaml + , optparse-generic, text, trifecta, vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.8"; - sha256 = "0icwbsx7a6m62klyghllvwj474f2kxghh40d7f5v01l135qrg8a1"; + version = "1.0.9"; + sha256 = "0xxgvsv8maccf81mdip1jnw4y3jlpnjhhxvyp4d3ph0xnng7z9l6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - aeson base dhall neat-interpolation text vector - ]; + libraryHaskellDepends = [ aeson base dhall text vector ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring dhall optparse-generic text trifecta yaml ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-nix" = callPackage @@ -60686,7 +58493,6 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-text" = callPackage @@ -60700,7 +58506,6 @@ self: { executableHaskellDepends = [ base dhall optparse-generic text ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhcp-lease-parser" = callPackage @@ -60785,7 +58590,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-boolean" = callPackage @@ -60831,6 +58635,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -60903,7 +58708,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage @@ -60940,6 +58744,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Graph layout and drawing with GrahpViz and diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-gtk" = callPackage @@ -60954,6 +58759,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock" = callPackage @@ -60985,6 +58791,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -61022,6 +58829,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-lib" = callPackage @@ -61036,10 +58844,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.1.2"; - sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb"; - revision = "4"; - editedCabalFile = "0wlb4ng803rhx82msl49b39im4cw8naik0pcyyybpphyqbxxs6dd"; + version = "1.4.2"; + sha256 = "1rdg8b46hc1ybk1y9dw7w725rag58rkr7hs7z3gvk4isxm11gm79"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -61121,6 +58927,7 @@ self: { homepage = "http://github.com/cchalmers/diagrams-pgf"; description = "PGF backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-postscript" = callPackage @@ -61179,6 +58986,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-reflex" = callPackage @@ -61206,8 +59014,8 @@ self: { }: mkDerivation { pname = "diagrams-rubiks-cube"; - version = "0.2.0.1"; - sha256 = "14l5qc74hp9ngjh9ndz7ily1nhf5z0swv8brv5yp77a80dzlxxgq"; + version = "0.3.0.0"; + sha256 = "10j9zag6b5mlhhmd3j0p2vxpm26rhm74ihs8xjcwh77xkywbfi7z"; libraryHaskellDepends = [ adjunctions base data-default-class diagrams-lib distributive lens ]; @@ -61312,8 +59120,10 @@ self: { }: mkDerivation { pname = "dib"; - version = "0.6.1"; - sha256 = "0y7bkmmzqi9rgiq98m006gfjkr3q2wz2hpxx1dn9pyv896g1cr9l"; + version = "0.7.1"; + sha256 = "19qk3k39ckjjinsiixapjnslv2y7abnb0vivp33g054lhjv066z3"; + revision = "1"; + editedCabalFile = "19kzycbym6q077kwz5xw6gqkzc8bd6ig6pvx0pri4d1r1bkmgy0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61325,6 +59135,7 @@ self: { ]; description = "A simple, forward build system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dice" = callPackage @@ -61371,6 +59182,7 @@ self: { executableHaskellDepends = [ base ]; description = "Convert a Diceware wordlist into a printer-ready LaTeX file"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dicom" = callPackage @@ -61576,6 +59388,7 @@ self: { homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digamma" = callPackage @@ -61656,8 +59469,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.2.0"; - sha256 = "0jkdn8hwpn01hn0ddsc5ary52r512hzvcyn6f422v0a0sikg49mg"; + version = "0.8.3.0"; + sha256 = "00nnhjd85fwav95k8f2pdsfk96rqmg7pc54zysqva3h2n5drhmp6"; libraryHaskellDepends = [ base bytestring containers mtl old-locale text time ]; @@ -61669,6 +59482,7 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-aeson" = callPackage @@ -61691,6 +59505,7 @@ self: { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-blaze" = callPackage @@ -61699,8 +59514,8 @@ self: { }: mkDerivation { pname = "digestive-functors-blaze"; - version = "0.6.1.0"; - sha256 = "03czax6c5ch3z99azf8a6zpfawvkzfwq2nxicx9kkz460di5irsb"; + version = "0.6.2.0"; + sha256 = "19019nmzg84mgdvhpkyrd4v9dsnd9yjn3cmgcj3aj7yx4z4m1c24"; libraryHaskellDepends = [ base blaze-html blaze-markup digestive-functors text ]; @@ -61716,14 +59531,15 @@ self: { }: mkDerivation { pname = "digestive-functors-happstack"; - version = "0.6.1.1"; - sha256 = "0d613rxwja327fb2dm79xh55vhpa4mg8c1ch4xzrgw3jcchykag5"; + version = "0.6.1.2"; + sha256 = "18i4hb39rkgj2jz2ii697gayxi02dqpfbx5arv6zyjvmp1ydynvz"; libraryHaskellDepends = [ base bytestring digestive-functors happstack-server text ]; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-heist" = callPackage @@ -61732,8 +59548,8 @@ self: { }: mkDerivation { pname = "digestive-functors-heist"; - version = "0.8.7.0"; - sha256 = "13m7kz8mrc1a0il86xcqc4bfcipml2kynhpw01mjcz7cwxgcrlg6"; + version = "0.8.8.0"; + sha256 = "0i9aqabrlk4hj6l3dbc0fl1vwq6bpdwfgc03m2xl4lwlhj14j56w"; libraryHaskellDepends = [ base blaze-builder digestive-functors heist map-syntax mtl text xmlhtml @@ -61768,6 +59584,7 @@ self: { homepage = "https://github.com/athanclark/digestive-functors-lucid"; description = "Lucid frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-scotty" = callPackage @@ -61787,6 +59604,7 @@ self: { homepage = "https://github.com/mmartin/digestive-functors-scotty"; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -61804,6 +59622,7 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digit" = callPackage @@ -61917,6 +59736,7 @@ self: { homepage = "http://dimensional.googlecode.com/"; description = "Statically checked physical dimensions, implemented using type families"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dimensions" = callPackage @@ -61930,7 +59750,6 @@ self: { homepage = "https://github.com/achirkin/easytensor#readme"; description = "Safe type-level dimensionality for multidimensional data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dingo-core" = callPackage @@ -62340,6 +60159,7 @@ self: { homepage = "https://github.com/jano017/Discord.hs"; description = "An API wrapper for Discord in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "discord-hs" = callPackage @@ -62394,6 +60214,7 @@ self: { homepage = "https://github.com/jano017/Discord.hs"; description = "Type information for discord-hs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "discordian-calendar" = callPackage @@ -62422,6 +60243,18 @@ self: { license = stdenv.lib.licenses.mit; }) {markdown = null;}; + "discrete-intervals" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "discrete-intervals"; + version = "0.0.3"; + sha256 = "1in70wlm6qcmc743v0w1lha4wffjinbwsgcyq44gzk0lb79ix6lb"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/chessai/discrete-intervals"; + description = "Discrete Intervals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "discrete-space-map" = callPackage ({ mkDerivation, adjunctions, base, comonad, distributive, keys , semigroupoids @@ -62464,19 +60297,21 @@ self: { "disjoint-containers" = callPackage ({ mkDerivation, aeson, base, containers, doctest, QuickCheck - , quickcheck-classes, transformers + , quickcheck-classes, semigroups, transformers }: mkDerivation { pname = "disjoint-containers"; - version = "0.2.2"; - sha256 = "1g1rgmgjan7zwzm38iga5hn4yri54jvmlpzkjn4c57vgjm6wbl6p"; + version = "0.2.3"; + sha256 = "0a6y1m0jq3lxj5vwgn4j4ij8xgkrkxb4nr7n3ba98sv8iaf1q8gw"; libraryHaskellDepends = [ aeson base containers transformers ]; testHaskellDepends = [ aeson base containers doctest QuickCheck quickcheck-classes + semigroups ]; homepage = "https://github.com/andrewthad/disjoint-containers#readme"; description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "disjoint-set" = callPackage @@ -62508,6 +60343,7 @@ self: { homepage = "https://github.com/clintonmead/disjoint-set-stateful"; description = "Monadic disjoint set"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "disjoint-sets-st" = callPackage @@ -62552,7 +60388,7 @@ self: { ]; description = "Disk-based hash table"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "display" = callPackage @@ -62603,6 +60439,7 @@ self: { doHaddock = false; description = "Generate/Upload cabal package to Hackage"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distance" = callPackage @@ -62630,7 +60467,6 @@ self: { homepage = "https://github.com/joshuaclayton/distance-of-time#readme"; description = "Generate readable distances between times"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-closure" = callPackage @@ -62671,7 +60507,6 @@ self: { homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-async" = callPackage @@ -62769,7 +60604,6 @@ self: { ]; description = "Collect node stats for EKG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-execution" = callPackage @@ -62919,7 +60753,6 @@ self: { homepage = "http://haskell-distributed.github.io"; description = "Orphan instances for MonadBase and MonadBaseControl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-p2p" = callPackage @@ -63031,7 +60864,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Simple zero-configuration backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-supervisor" = callPackage @@ -63149,7 +60981,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests"; description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-zookeeper" = callPackage @@ -63259,8 +61090,8 @@ self: { pname = "distributive"; version = "0.5.3"; sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "1"; - editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax"; + revision = "3"; + editedCabalFile = "17qqdl8p04vy314jp045100989lh84cbhqv6ghizm87xpk7ck4j3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -63488,6 +61319,7 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu"; description = "Complete bindings to the dmenu and dmenu2 command line tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmenu-pkill" = callPackage @@ -63506,6 +61338,7 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu-pkill"; description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmenu-pmount" = callPackage @@ -63524,6 +61357,7 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu-pmount"; description = "Mounting and unmounting linux devices as user with dmenu and pmount"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmenu-search" = callPackage @@ -63542,32 +61376,10 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu-search"; description = "dmenu script for searching the web with customizable search engines"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.13"; - sha256 = "0rrv49rvnpd1pf37imhm82ngy9z0vk80sz0zvikpccc0parbmvx0"; - libraryHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-extra containers - iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_3_0_0" = callPackage ({ mkDerivation, async, attoparsec, auto-update, base , base64-bytestring, binary, bytestring, conduit, conduit-extra , containers, cryptonite, doctest, hspec, iproute, mtl, network @@ -63588,7 +61400,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -63751,22 +61562,20 @@ self: { homepage = "https://github.com/denibertovic/docker-hs"; 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-dockerfile + ({ mkDerivation, base, containers, foldl, language-docker , system-filepath, text, turtle }: mkDerivation { pname = "docker-build-cacher"; - version = "1.7.1"; - sha256 = "0b10irbr75y0hl9mzpp6ws72gk3vqzpy5axdqa7f45zaxam8iim9"; + version = "1.8.2"; + sha256 = "0kmr7b0i5wbcn6r2f2pi4ndnzr4kdi3yj2v1pxwqyv8v0d6h55gi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers foldl language-dockerfile system-filepath text - turtle + base containers foldl language-docker system-filepath text turtle ]; description = "Builds a services with docker and caches all of its intermediate stages"; license = stdenv.lib.licenses.bsd3; @@ -63855,26 +61664,6 @@ self: { }) {}; "doctemplates" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, hspec, parsec, scientific, text, unordered-containers - , vector - }: - mkDerivation { - pname = "doctemplates"; - version = "0.1.0.2"; - sha256 = "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers parsec - scientific text unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec text ]; - homepage = "https://github.com/jgm/doctemplates#readme"; - description = "Pandoc-style document templates"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "doctemplates_0_2_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, hspec, parsec, scientific, text, unordered-containers , vector @@ -63892,37 +61681,9 @@ self: { homepage = "https://github.com/jgm/doctemplates#readme"; description = "Pandoc-style document templates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers - , with-location - }: - mkDerivation { - pname = "doctest"; - version = "0.11.4"; - sha256 = "09a170wr13p2c0w085d7qbf2blrvj1qmg92j61xqi17rwdwkvyjs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently - stringbuilder syb transformers with-location - ]; - homepage = "https://github.com/sol/doctest#readme"; - description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - }) {}; - - "doctest_0_13_0" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -63947,7 +61708,6 @@ self: { homepage = "https://github.com/sol/doctest#readme"; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover" = callPackage @@ -64262,54 +62022,28 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, exceptions, hspec + ({ mkDerivation, base, base-compat, directory, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers + , transformers, yaml }: mkDerivation { pname = "dotenv"; - version = "0.3.4.0"; - sha256 = "0rbz73wfsw89pc4l06xqk3x9m5r43r0w1swbmnciwy238v9w7bz8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat exceptions megaparsec text transformers - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers - ]; - testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec text - transformers - ]; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_5_1_1" = callPackage - ({ mkDerivation, base, base-compat, exceptions, hspec - , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers - }: - mkDerivation { - pname = "dotenv"; - version = "0.5.1.1"; - sha256 = "1i4892xc2d05qnswcyf40ww5idjd1m3wwqz9wxwhph1jqzvsgc9b"; + version = "0.5.2.1"; + sha256 = "0nd4d12sj93gs0n7pgdhailrwd56h33xy894n5m6zfi4ay43s62r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base-compat exceptions megaparsec process text transformers + base base-compat directory exceptions megaparsec process text + transformers yaml ]; executableHaskellDepends = [ base base-compat megaparsec optparse-applicative process text - transformers + transformers yaml ]; testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec - process text transformers + base base-compat directory exceptions hspec hspec-megaparsec + megaparsec process text transformers yaml ]; homepage = "https://github.com/stackbuilders/dotenv-hs"; description = "Loads environment variables from dotenv files"; @@ -64434,6 +62168,7 @@ self: { homepage = "https://github.com/doublifyapis/toolkit-haskell"; description = "Doublify API toolkit for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dove" = callPackage @@ -64463,7 +62198,6 @@ self: { ]; description = "Dungeons of Wor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "download" = callPackage @@ -64477,7 +62211,6 @@ self: { homepage = "https://github.com/psibi/download"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-curl" = callPackage @@ -64830,14 +62563,16 @@ self: { "drifter-postgresql" = callPackage ({ mkDerivation, base, containers, drifter, either, mtl - , postgresql-simple, tasty, tasty-hunit, text, time + , postgresql-simple, tasty, tasty-hunit, text, time, transformers + , transformers-compat }: mkDerivation { pname = "drifter-postgresql"; - version = "0.1.0"; - sha256 = "0983p5l90kx723h0zaq9spqk4rpc2vxzja4sji3zj8vck04q7pqh"; + version = "0.2.1"; + sha256 = "0p7ddvfmjhf22psga0phhw2m0sdhymsc5k13jrwrdawsxivh2clk"; libraryHaskellDepends = [ - base containers drifter either mtl postgresql-simple time + base containers drifter mtl postgresql-simple time transformers + transformers-compat ]; testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text @@ -64848,6 +62583,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "drinkery" = callPackage + ({ mkDerivation, base, criterion, mtl, transformers }: + mkDerivation { + pname = "drinkery"; + version = "0"; + sha256 = "06ad33l3xv9paspb5ymr97zzb4dkdfq9sg40b3i62nf52gpjfdly"; + libraryHaskellDepends = [ base mtl transformers ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/fumieval/drinkery#readme"; + description = "Boozy streaming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "drmaa" = callPackage ({ mkDerivation, base, directory, drmaa, inline-c }: mkDerivation { @@ -65031,15 +62779,15 @@ self: { }) {}; "dsp" = callPackage - ({ mkDerivation, array, base, random }: + ({ mkDerivation, array, base, containers, QuickCheck, random }: mkDerivation { pname = "dsp"; - version = "0.2.3.1"; - sha256 = "18nxj4qw92rm1fx3a69w786pf6i5a11d1zhvgx50pi57y2dirhnm"; + version = "0.2.4"; + sha256 = "0bwvb2axzv19lmv61ifvpmp3kpyzn62vi87agkyyjaip3psxzr7y"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ array base random ]; - executableHaskellDepends = [ array base ]; + libraryHaskellDepends = [ array base containers random ]; + testHaskellDepends = [ array base containers QuickCheck ]; homepage = "http://www.haskell.org/haskellwiki/DSP"; description = "Haskell Digital Signal Processing"; license = "GPL"; @@ -65214,7 +62962,6 @@ self: { homepage = "https://github.com/k0ral/dublincore-xml-conduit"; description = "XML streaming parser/renderer for the Dublin Core standard elements"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "duckling" = callPackage @@ -65255,8 +63002,8 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.1.1.1"; - sha256 = "0pimlspgrfv04hwz91krbcq0g01fhrp9vgi2sj1kc7wz9hcd1pva"; + version = "0.1.2.0"; + sha256 = "03zyv1p69lhxg3z86rlyywzh305kpld3a79kr6c5swsm3pw8mnh5"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -65265,7 +63012,6 @@ self: { homepage = "https://github.com/leftaroundabout/dumb-cas"; description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dump" = callPackage @@ -65307,12 +63053,15 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, transformers, transformers-base }: + ({ mkDerivation, base, MonadRandom, transformers, transformers-base + }: mkDerivation { pname = "dunai"; - version = "0.3.0.0"; - sha256 = "0ncznc3khbanqsq4ab0n246sx30slq13awclafln5bjxvi1cx3yl"; - libraryHaskellDepends = [ base transformers transformers-base ]; + version = "0.4.0.0"; + sha256 = "05xqhbz0x7wzfka4wl2wvfhzr242nx4ci4r3zvm89mcyxn9q7x6n"; + libraryHaskellDepends = [ + base MonadRandom transformers transformers-base + ]; homepage = "https://github.com/ivanperez-keera/dunai"; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -65584,8 +63333,8 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.9"; - sha256 = "0paa9y5h0pp4b44kq5yn8m43nir4wg9hgfmns2d76r8qjry617qp"; + version = "0.1.0.10"; + sha256 = "14bgkrd14a62dnkk9h3syzgxqmkjd50br9qxmiqq2b9fnqd7nf34"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes @@ -65706,21 +63455,6 @@ self: { }) {}; "dynamic-state" = callPackage - ({ mkDerivation, base, binary, bytestring, hashable - , unordered-containers - }: - mkDerivation { - pname = "dynamic-state"; - version = "0.2.2.0"; - sha256 = "1ky739y1mqkw7lrs0l2cb9156v46k065srwd9dv19rihh6h4z0s8"; - libraryHaskellDepends = [ - base binary bytestring hashable unordered-containers - ]; - description = "Optionally serializable dynamic state keyed by type"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "dynamic-state_0_3" = callPackage ({ mkDerivation, base, binary, bytestring, hashable , unordered-containers }: @@ -65733,7 +63467,6 @@ self: { ]; description = "Optionally serializable dynamic state keyed by type"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamodb-simple" = callPackage @@ -65916,6 +63649,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 @@ -65996,18 +63730,15 @@ self: { }) {}; "easyrender" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, superdoc, zlib + ({ mkDerivation, base, bytestring, Cabal, containers, mtl, superdoc + , zlib }: mkDerivation { pname = "easyrender"; - version = "0.1.1.2"; - sha256 = "05m65ap055kayi9jj6c0z6csh0kq9pzk889q4zyrmgh504qmyg9h"; - revision = "1"; - editedCabalFile = "0gpx9gx2swmvkgddsnqncyy80gqjvnl9hwkqzmv72gc0dswkkki6"; - setupHaskellDepends = [ base superdoc ]; - libraryHaskellDepends = [ - base bytestring containers mtl superdoc zlib - ]; + version = "0.1.1.3"; + sha256 = "105s3d5yz7qz9cv5jq005kzd7jfdn2fccnc4s1xgkszk46y83qbx"; + setupHaskellDepends = [ base Cabal superdoc ]; + libraryHaskellDepends = [ base bytestring containers mtl zlib ]; homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/"; description = "User-friendly creation of EPS, PostScript, and PDF files"; license = stdenv.lib.licenses.gpl3; @@ -66028,7 +63759,6 @@ self: { homepage = "https://github.com/achirkin/easytensor#readme"; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ebeats" = callPackage @@ -66173,6 +63903,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ecstasy" = callPackage + ({ mkDerivation, base, containers, mtl, transformers }: + mkDerivation { + pname = "ecstasy"; + version = "0.1.0.0"; + sha256 = "0hid87vwyzxf1fsp0y8yw69wpsxzljyjr27bm1q7b79r9zsg63vj"; + libraryHaskellDepends = [ base containers mtl transformers ]; + homepage = "http://github.com/isovector/ecstasy/"; + description = "A GHC.Generics based entity component system."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ecu" = callPackage ({ mkDerivation, base, bytestring, canlib, digest, directory , process, vcd @@ -66599,8 +64342,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.9"; - sha256 = "1jx6nrp2v581nbwgblrpqv052lbnbba5nppd3m8npbx5pvpda994"; + version = "3.7.10"; + sha256 = "129g0xw951pkizs4rmbn5mhy1w0lhqw06hj2sr8sf7r2wnqmn0dy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66741,7 +64484,6 @@ self: { homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either" = callPackage @@ -66751,10 +64493,8 @@ self: { }: mkDerivation { pname = "either"; - version = "4.4.1.1"; - sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh"; - revision = "2"; - editedCabalFile = "1n7792mcrvfh31qrbj8mpnx372s03kz83mypj7l4fm5h6zi4a3hs"; + version = "4.5"; + sha256 = "1mzj86pbplgs3h7a49j3rk22s5cbw06wmd992gdm6harm15hzyzc"; libraryHaskellDepends = [ base bifunctors exceptions free mmorph monad-control MonadRandom mtl profunctors semigroupoids semigroups transformers @@ -66794,6 +64534,7 @@ self: { homepage = "https://github.com/chris-martin/either-list-functions#readme"; description = "Functions involving lists of Either"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either-unwrap" = callPackage @@ -66925,23 +64666,26 @@ self: { homepage = "https://github.com/cdodev/ekg-elastic"; description = "Push metrics to elastic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-elasticsearch" = callPackage - ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname - , http-client, lens, text, time, unordered-containers, wreq + ({ mkDerivation, aeson, base, bytestring, data-default-class + , ekg-core, hostname, http-client, lens, req, text, time + , unordered-containers }: mkDerivation { pname = "ekg-elasticsearch"; - version = "0.3.1.1"; - sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q"; + version = "0.4.0.0"; + sha256 = "03bh278n6xvvjr9z8lws25nf1x0j5rw12zmd7h55vmfjn0iblajy"; libraryHaskellDepends = [ - aeson base bytestring ekg-core hostname http-client lens text time - unordered-containers wreq + aeson base bytestring data-default-class ekg-core hostname + http-client lens req text time unordered-containers ]; homepage = "https://github.com/cdodev/ekg-elasticsearch"; description = "Push metrics to elasticsearch"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-influxdb" = callPackage @@ -66959,6 +64703,7 @@ self: { homepage = "https://github.com/angerman/ekg-influxdb"; description = "An EKG backend to send statistics to influxdb"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-json" = callPackage @@ -67010,6 +64755,7 @@ self: { homepage = "https://github.com/adinapoli/ekg-prometheus-adapter#readme"; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-push" = callPackage @@ -67139,7 +64885,6 @@ self: { executableHaskellDepends = [ base elerea GLFW OpenGL ]; description = "Example applications for Elerea"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elerea-sdl" = callPackage @@ -67152,7 +64897,6 @@ self: { homepage = "http://github.com/singpolyma/elerea-sdl"; description = "Elerea FRP wrapper for SDL"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elevator" = callPackage @@ -67197,7 +64941,6 @@ self: { homepage = "https://github.com/RyanGlScott/eliminators"; description = "Dependently typed elimination functions using singletons"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elision" = callPackage @@ -67233,6 +64976,7 @@ self: { homepage = "https://github.com/agrafix/elm-bridge"; description = "Derive Elm types and Json code from Haskell types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-build-lib" = callPackage @@ -67558,6 +65302,7 @@ self: { homepage = "http://github.com/rhyskeepence/elm-websocket"; description = "Generate ELM code from a Wai websocket application"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-yesod" = callPackage @@ -67691,6 +65436,7 @@ self: { homepage = "http://github.com/knrafto/email-header"; description = "Parsing and rendering of email and MIME headers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-postmark" = callPackage @@ -67871,6 +65617,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "emoji" = callPackage + ({ mkDerivation, aeson, base, bytestring, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "emoji"; + version = "0.1.0.2"; + sha256 = "1307phy81cki9ijpsl8hfczxm5wi1lrmmvmyxxn9a109nz9aqfla"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring template-haskell text unordered-containers + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/nakaji-dayo/hs-emoji#readme"; + description = "emoji utility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -67987,6 +65752,7 @@ self: { homepage = "https://github.com/TerrorJack/encoding-io#readme"; description = "Encoding-aware file I/O"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "endo" = callPackage @@ -68007,6 +65773,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eng-stemmer" = callPackage + ({ mkDerivation, base, containers, doctest, mtl, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "eng-stemmer"; + version = "0.1.0.1"; + sha256 = "0v0k2hqh2270djy5pgj9c5biywfb4amssv3410y9dqgl9jpsjdg8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers mtl text ]; + executableHaskellDepends = [ base containers text ]; + testHaskellDepends = [ + base containers doctest tasty tasty-hunit text + ]; + homepage = "https://github.com/ChrisCoffey/eng-stemmer"; + description = "An English language stemmer (Porter2)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "engine-io" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay @@ -68024,6 +65810,7 @@ self: { homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-growler" = callPackage @@ -68061,6 +65848,7 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-wai" = callPackage @@ -68070,15 +65858,17 @@ self: { }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.6"; - sha256 = "0jhhvqcjgydwja16hvaif9ldjsvlhzm6r2q7yy4j1i2xiqx3xf4x"; + version = "1.0.7"; + sha256 = "13aa7x94z32c2gfzwjxh9808alcwqhxmxgn42r4jyqfylis2p73a"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai wai-websockets websockets ]; homepage = "http://github.com/ocharles/engine.io"; + description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-yesod" = callPackage @@ -68141,6 +65931,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "entropy_0_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, unix + }: + mkDerivation { + pname = "entropy"; + version = "0.4"; + sha256 = "0h8icprikafidq4x88crz5phfgp6zgmxq4awam2dhs0z2fswd9wc"; + revision = "1"; + editedCabalFile = "1hx5yxzypi708zlg1almqhfasfgmaisrv44fr0i8ldvvqxf5slza"; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ base bytestring unix ]; + homepage = "https://github.com/TomMD/entropy"; + description = "A platform independent entropy source"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "enumerable" = callPackage ({ mkDerivation, base, control-monad-omega, tagged }: mkDerivation { @@ -68405,6 +66213,7 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epanet-haskell" = callPackage @@ -68449,7 +66258,7 @@ self: { homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php"; description = "Compiler for a simple functional language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epoll" = callPackage @@ -68526,8 +66335,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "2.9"; - sha256 = "198fzgd04j1dyiv9cpkg6aqvawfiqb4k5awyqbiw6ll84sy0ymgb"; + version = "2.10"; + sha256 = "0bahnq1fs31j5bmfm5pi9cn72c64bv5ib29w5qw1lqhp10zr3j17"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68537,10 +66346,9 @@ self: { testHaskellDepends = [ base directory epub-metadata filepath HUnit mtl parsec regex-compat ]; - homepage = "http://hub.darcs.net/dino/epub-tools"; + homepage = "https://github.com/dino-/epub-tools.git"; description = "Command line utilities for working with epub files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epubname" = callPackage @@ -68844,7 +66652,6 @@ self: { homepage = "http://github.com/pmlodawski/error-util"; description = "Set of utils and operators for error handling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "errorcall-eq-instance" = callPackage @@ -68876,15 +66683,21 @@ self: { }) {}; "errors-ext" = callPackage - ({ mkDerivation, base, errors, exceptions, HUnit, transformers }: + ({ mkDerivation, base, errors, exceptions, HUnit, monad-control + , mtl, transformers + }: mkDerivation { pname = "errors-ext"; - version = "0.2"; - sha256 = "1hsr3aa3p76hj2nvfdhlchqgk3xn17nrs2972wj112xnyh877q8x"; - libraryHaskellDepends = [ base errors exceptions transformers ]; - testHaskellDepends = [ base errors exceptions HUnit transformers ]; + version = "0.4.1"; + sha256 = "1xly8pgkbqkm4mb1zg9bga08gx5fj4nrmidzj5p8anqdksq7ib5h"; + libraryHaskellDepends = [ + base errors exceptions monad-control mtl transformers + ]; + testHaskellDepends = [ + base errors exceptions HUnit monad-control mtl transformers + ]; homepage = "https://github.com/A1-Triard/errors-ext#readme"; - description = "Bracket-like functions for ExceptT over IO monad"; + description = "`bracket`-like functions for `ExceptT` over `IO` monad"; license = stdenv.lib.licenses.asl20; }) {}; @@ -68910,6 +66723,7 @@ self: { homepage = "https://github.com/tonymorris/ersaconcat"; description = "A script to concatenate AIP ERSA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ersatz" = callPackage @@ -69134,6 +66948,7 @@ self: { homepage = "https://github.com/roman/Haskell-etc"; description = "Declarative configuration spec for Haskell projects"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "etcd" = callPackage @@ -69206,8 +67021,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer"; - version = "3.2.0"; - sha256 = "1rqzx2b6fn8vzls05g7hs163h5fjw2cdhkyqbfr8a7p9cyv32nk8"; + version = "3.3.4"; + sha256 = "0d9xw77i8dzb4sk3j7qhnbdand58vz1bhfvqb0qhvg0qdfg732vi"; libraryHaskellDepends = [ aeson base bimap bytestring containers ethereum-analyzer-deps extra fgl GenericPretty graphviz hexstring hoopl pretty protolude split @@ -69232,8 +67047,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "3.2.0"; - sha256 = "1svyxmk4441x95xxfqn3z18dqvkqykyksqiyb4298pb8g0cq54sx"; + version = "3.3.4"; + sha256 = "1bpr5l8hsn6ggiqs3b4mw27r52ikpqibdhn4w22k1gk8mdfr9gzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69259,15 +67074,14 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "3.2.0"; - sha256 = "1ahpk43ihr3ddzzpxi6vx27f77i84grny5avsakjn0hlzz3ady19"; + version = "3.3.4"; + sha256 = "00v0f797z99yil4ihgirsyw9l4yiscg3aidlwjq4maixvzsqvr02"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base16-bytestring binary bytestring containers deepseq fast-logger global-lock monad-logger split text ]; description = "Stripped dependencies of ethereum-analyzer"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ethereum-analyzer-webui" = callPackage @@ -69280,8 +67094,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "3.2.0"; - sha256 = "17hmsmr13qvmfl9w9yfmxbbi6lv3b3r3kqsgnbji5i01jvgnggvs"; + version = "3.3.4"; + sha256 = "11h5q6xmig8fk3bxk797s231pk5dnsvvxs9r68zbxv7jk466yq97"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69406,6 +67220,7 @@ self: { ]; description = "Random etymology online entry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "euler" = callPackage @@ -69427,6 +67242,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "euler-tour-tree" = callPackage + ({ mkDerivation, base, containers, fingertree, hlint, keys, mtl + , parser-combinators, QuickCheck, sequence, tasty, tasty-hunit + , tasty-quickcheck, transformers, Unique + }: + mkDerivation { + pname = "euler-tour-tree"; + version = "0.1.0.1"; + sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4"; + libraryHaskellDepends = [ + base containers fingertree mtl parser-combinators transformers + Unique + ]; + testHaskellDepends = [ + base containers hlint keys QuickCheck sequence tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/k0ral/euler-tour-tree"; + description = "Euler tour trees"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "euphoria" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, elerea , enummapset-th, hashable, HUnit, test-framework @@ -69450,6 +67287,7 @@ self: { homepage = "http://github.com/tsurucapital/euphoria"; description = "Dynamic network FRP with events and continuous values"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eurofxref" = callPackage @@ -69580,29 +67418,6 @@ self: { }) {}; "eventful-core" = callPackage - ({ mkDerivation, aeson, base, containers, contravariant, hlint - , hspec, http-api-data, HUnit, path-pieces, sum-type-boilerplate - , template-haskell, text, transformers, uuid - }: - mkDerivation { - pname = "eventful-core"; - version = "0.1.3"; - sha256 = "1lify1ama6a479w0mcvr4qmp0mrfgwf6nsy902hrx20sn5ik02h9"; - libraryHaskellDepends = [ - aeson base containers contravariant http-api-data path-pieces - sum-type-boilerplate template-haskell text transformers uuid - ]; - testHaskellDepends = [ - aeson base containers contravariant hlint hspec http-api-data HUnit - path-pieces sum-type-boilerplate template-haskell text transformers - uuid - ]; - homepage = "https://github.com/jdreaver/eventful#readme"; - description = "Core module for eventful"; - license = stdenv.lib.licenses.mit; - }) {}; - - "eventful-core_0_2_0" = callPackage ({ mkDerivation, aeson, base, containers, contravariant, hspec , http-api-data, HUnit, path-pieces, sum-type-boilerplate , template-haskell, text, transformers, uuid @@ -69623,36 +67438,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "Core module for eventful"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventful-dynamodb" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base - , bytestring, conduit, eventful-core, eventful-test-helpers, hlint - , hspec, HUnit, lens, QuickCheck, quickcheck-instances, safe, text - , unordered-containers, vector - }: - mkDerivation { - pname = "eventful-dynamodb"; - version = "0.1.3"; - sha256 = "1ymzryyz77705vwb05nhjhw6sz2ksjfpld5g569pnbdlr03m257y"; - libraryHaskellDepends = [ - aeson amazonka amazonka-dynamodb base bytestring conduit - eventful-core lens safe text unordered-containers vector - ]; - testHaskellDepends = [ - aeson amazonka amazonka-dynamodb base bytestring conduit - eventful-core eventful-test-helpers hlint hspec HUnit lens - QuickCheck quickcheck-instances safe text unordered-containers - vector - ]; - homepage = "https://github.com/jdreaver/eventful#readme"; - description = "Library for eventful DynamoDB event stores"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventful-dynamodb_0_2_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base , bytestring, conduit, eventful-core, eventful-test-helpers, hspec , HUnit, lens, QuickCheck, quickcheck-instances, safe, text @@ -69678,26 +67466,6 @@ self: { }) {}; "eventful-memory" = callPackage - ({ mkDerivation, base, containers, eventful-core - , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm - }: - mkDerivation { - pname = "eventful-memory"; - version = "0.1.3"; - sha256 = "0r35bg40j4bdpf5ibxi5acjnmdl9piaysyzswapwcjq4jyibcdk9"; - libraryHaskellDepends = [ - base containers eventful-core mtl safe stm - ]; - testHaskellDepends = [ - base containers eventful-core eventful-test-helpers hlint hspec - HUnit mtl safe stm - ]; - homepage = "https://github.com/jdreaver/eventful#readme"; - description = "In-memory implementations for eventful"; - license = stdenv.lib.licenses.mit; - }) {}; - - "eventful-memory_0_2_0" = callPackage ({ mkDerivation, base, containers, eventful-core , eventful-test-helpers, hspec, HUnit, mtl, safe, stm }: @@ -69715,34 +67483,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "In-memory implementations for eventful"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventful-postgresql" = callPackage - ({ mkDerivation, aeson, base, bytestring, eventful-core - , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit - , mtl, persistent, persistent-postgresql, text - }: - mkDerivation { - pname = "eventful-postgresql"; - version = "0.1.3"; - sha256 = "0vc36qfi2q1im60nwzb9ivpsz7kk2y83rbzbbv4b2mjk3cvvjnyr"; - libraryHaskellDepends = [ - aeson base bytestring eventful-core eventful-sql-common mtl - persistent text - ]; - testHaskellDepends = [ - aeson base bytestring eventful-core eventful-sql-common - eventful-test-helpers hlint hspec HUnit mtl persistent - persistent-postgresql text - ]; - homepage = "https://github.com/jdreaver/eventful#readme"; - description = "Postgres implementations for eventful"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventful-postgresql_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl , persistent, persistent-postgresql, text @@ -69767,23 +67510,6 @@ self: { }) {}; "eventful-sql-common" = callPackage - ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl - , persistent, persistent-template, text, uuid - }: - mkDerivation { - pname = "eventful-sql-common"; - version = "0.1.3"; - sha256 = "0mddqciaiq90cgf0syw0y1qvvkpvqbx0lkx8mwz3g8zf57h98awc"; - libraryHaskellDepends = [ - aeson base bytestring eventful-core mtl persistent - persistent-template text uuid - ]; - homepage = "https://github.com/jdreaver/eventful#readme"; - description = "Common library for SQL event stores"; - license = stdenv.lib.licenses.mit; - }) {}; - - "eventful-sql-common_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl , persistent, persistent-template, text, uuid }: @@ -69798,33 +67524,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "Common library for SQL event stores"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventful-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, eventful-core - , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit - , mtl, persistent, persistent-sqlite, text, uuid - }: - mkDerivation { - pname = "eventful-sqlite"; - version = "0.1.3"; - sha256 = "08xk3kyxm23843kr2y9l39d9d9ykcahz2q2730c1skgnwcd3y0c2"; - libraryHaskellDepends = [ - aeson base bytestring eventful-core eventful-sql-common mtl - persistent text uuid - ]; - testHaskellDepends = [ - aeson base bytestring eventful-core eventful-sql-common - eventful-test-helpers hlint hspec HUnit mtl persistent - persistent-sqlite text uuid - ]; - homepage = "https://github.com/jdreaver/eventful#readme"; - description = "SQLite implementations for eventful"; - license = stdenv.lib.licenses.mit; - }) {}; - - "eventful-sqlite_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl , persistent, persistent-sqlite, text, uuid @@ -69845,26 +67547,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "SQLite implementations for eventful"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventful-test-helpers" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra - , hspec, monad-logger, text - }: - mkDerivation { - pname = "eventful-test-helpers"; - version = "0.1.3"; - sha256 = "16ba3184niy3dsh6h08czj7x0bd4abx7ji2aaddd5pvxra9494xl"; - libraryHaskellDepends = [ - aeson aeson-casing base eventful-core extra hspec monad-logger text - ]; - homepage = "https://github.com/jdreaver/eventful#readme"; - description = "Common module used for eventful tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "eventful-test-helpers_0_2_0" = callPackage ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra , hspec, monad-logger, text }: @@ -69878,7 +67563,6 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "Common module used for eventful tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventloop" = callPackage @@ -69887,8 +67571,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.5"; - sha256 = "0vl9kc0grhp72rlx922khvf5833qshyx4danismf8n5r3i9f7qr0"; + version = "0.8.2.6"; + sha256 = "1f3dmkrxjfj128pdkarrc6mka09jmh360bn6vgbp4qm2xv5hl16s"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -69915,6 +67599,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eventsource-api_1_2_0" = 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 + }: + mkDerivation { + pname = "eventsource-api"; + version = "1.2.0"; + sha256 = "1hiigk22f5w1bgnvmpi2gs8s1c80x2ddd44rczj5dfrfawvm8jr2"; + libraryHaskellDepends = [ + 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 + ]; + homepage = "https://github.com/YoEight/eventsource-api#readme"; + description = "Provides an eventsourcing high level API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventsource-geteventstore-store" = callPackage ({ mkDerivation, aeson, base, eventsource-api , eventsource-store-specs, eventstore, mtl, protolude, tasty @@ -69937,6 +67642,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventsource-geteventstore-store_1_0_6" = callPackage + ({ mkDerivation, aeson, base, eventsource-api + , eventsource-store-specs, eventstore, mtl, protolude + , string-conversions, tasty, tasty-hspec, transformers-base + }: + mkDerivation { + pname = "eventsource-geteventstore-store"; + version = "1.0.6"; + sha256 = "0fy1sgc43a6d4hrwyc3kawcnvpm4zlmwnznw27zd40hrbzkkkzw2"; + libraryHaskellDepends = [ + aeson base eventsource-api eventstore mtl string-conversions + transformers-base + ]; + testHaskellDepends = [ + base eventsource-api eventsource-store-specs eventstore protolude + tasty tasty-hspec + ]; + homepage = "https://github.com/YoEight/eventsource-api#readme"; + description = "GetEventStore store implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventsource-store-specs" = callPackage ({ mkDerivation, aeson, base, eventsource-api, mtl, protolude , tasty, tasty-hspec, uuid @@ -69953,6 +67681,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eventsource-store-specs_1_1_0" = callPackage + ({ mkDerivation, aeson, async, base, eventsource-api, mtl, tasty + , tasty-hspec, text, transformers-base, uuid + }: + mkDerivation { + pname = "eventsource-store-specs"; + version = "1.1.0"; + sha256 = "0z4c6p8f0w72kz682i7f0zjy3qqz7n2pkgjfb258w7xx642434g0"; + libraryHaskellDepends = [ + aeson async base eventsource-api mtl tasty tasty-hspec text + transformers-base uuid + ]; + homepage = "https://github.com/YoEight/eventsource-api#readme"; + description = "Provides common test specification for Store implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventsource-stub-store" = callPackage ({ mkDerivation, aeson, base, containers, eventsource-api , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec @@ -69973,6 +67719,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eventsource-stub-store_1_0_3" = callPackage + ({ mkDerivation, aeson, async, base, containers, eventsource-api + , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec + , transformers-base + }: + mkDerivation { + pname = "eventsource-stub-store"; + version = "1.0.3"; + sha256 = "12vsn32m2h3bgssp2s6p1x90lj3h814iwplzhiyhmnaapq451h2w"; + libraryHaskellDepends = [ + async base containers eventsource-api mtl stm transformers-base + ]; + testHaskellDepends = [ + aeson base eventsource-api eventsource-store-specs protolude tasty + tasty-hspec + ]; + homepage = "https://github.com/YoEight/eventsource-api#readme"; + description = "An in-memory stub store implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventsourced" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, HUnit, wai , wai-extra, warp @@ -70031,6 +67799,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventstore_1_0_0" = callPackage + ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring + , cereal, clock, connection, containers, dns, dotnet-timespan + , ekg-core, exceptions, fast-logger, hashable, http-client + , interpolate, lifted-async, lifted-base, machines, monad-control + , monad-logger, mono-traversable, mtl, protobuf, random + , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec + , tasty-hunit, text, text-format, time, transformers-base + , unordered-containers, uuid + }: + mkDerivation { + pname = "eventstore"; + version = "1.0.0"; + sha256 = "1mhgvh1mm6fkibjd9p8k2wjhi064b22knwkjdk4i396zya6210f0"; + 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 text-format 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 + ]; + homepage = "https://github.com/YoEight/eventstore#readme"; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -70082,8 +67886,8 @@ self: { }: mkDerivation { pname = "ex-pool"; - version = "0.2"; - sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva"; + version = "0.2.1"; + sha256 = "0djk2g99jn24jcnq2l5yzrs2ra7wq1h3p80xkqx30arkqq5wbf0d"; libraryHaskellDepends = [ base exceptions hashable stm time transformers vector ]; @@ -70121,6 +67925,7 @@ self: { homepage = "https://github.com/arthurl/exact-cover"; description = "Efficient exact cover solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-pi" = callPackage @@ -70165,6 +67970,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Framework for Exact Real Arithmetic in the Positional Number System"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-hierarchy" = callPackage @@ -70222,6 +68028,7 @@ self: { ]; description = "Exception monad transformer instances for monads-tf classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-mtl" = callPackage @@ -70235,6 +68042,7 @@ self: { ]; description = "Exception monad transformer instances for mtl classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-transformers" = callPackage @@ -70254,6 +68062,7 @@ self: { ]; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exceptional" = callPackage @@ -70355,6 +68164,7 @@ self: { homepage = "https://github.com/GianlucaGuarini/executor"; description = "Shell helpers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exference" = callPackage @@ -70465,6 +68275,7 @@ self: { homepage = "https://github.com/k0001/exinst"; description = "Recover type indexes and instances for your existentialized types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-aeson" = callPackage @@ -70606,6 +68417,7 @@ self: { homepage = "https://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exp-pairs" = callPackage @@ -70707,6 +68519,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "explicit-constraint-lens" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "explicit-constraint-lens"; + version = "0.1.0.0"; + sha256 = "181frvmgv65rcjpiya4gswvpq9ahz97c8lalhgmwknx9jx5nqd98"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/leftaroundabout/explicit-constraint-lens"; + description = "Fully-flexible polymorphic lenses, without any bizarre profunctors"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "explicit-determinant" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -70851,7 +68676,6 @@ self: { ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expressions-z3" = callPackage @@ -70867,7 +68691,6 @@ self: { ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -70955,8 +68778,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.4.6"; - sha256 = "0khi212qc834qnrssbn4xcfiypi2m7x8gwpwvpd6sbi6hi6c052v"; + version = "0.4.7"; + sha256 = "0a0xmixyhfxlkrqr0nk1nvi8177i4432xamg91y5971mgail7kgv"; libraryHaskellDepends = [ base comonad constraints deepseq ghc-prim hashable monad-skeleton mtl primitive profunctors QuickCheck semigroups StateVar tagged @@ -70985,29 +68808,6 @@ self: { }) {}; "extensible-effects" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, transformers, transformers-base, type-aligned - , void - }: - mkDerivation { - pname = "extensible-effects"; - version = "1.11.1.0"; - sha256 = "1z2k79pxy73rh7fxp70zbnzrcnqs9kchwm6hciyl2wr66bf58v4b"; - libraryHaskellDepends = [ - base transformers transformers-base type-aligned void - ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th void - ]; - homepage = "https://github.com/suhailshergill/extensible-effects"; - description = "An Alternative to Monad Transformers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "extensible-effects_2_1_0_0" = callPackage ({ mkDerivation, base, directory, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 , test-framework-th, transformers, transformers-base, type-aligned @@ -71029,6 +68829,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "extensible-effects_2_4_0_0" = callPackage + ({ mkDerivation, base, criterion, HUnit, mtl, QuickCheck, silently + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, transformers, transformers-base + }: + mkDerivation { + pname = "extensible-effects"; + version = "2.4.0.0"; + sha256 = "024566vv5mmnma2fwnbfg9bzayi6inl1a6ys4nqg0cv57rqny6nc"; + libraryHaskellDepends = [ base transformers transformers-base ]; + testHaskellDepends = [ + base HUnit QuickCheck silently test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th + ]; + benchmarkHaskellDepends = [ + base criterion HUnit mtl test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th + ]; + homepage = "https://github.com/suhailshergill/extensible-effects"; + description = "An Alternative to Monad Transformers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -71071,39 +68895,17 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.5.3"; - sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4"; + version = "1.6.2"; + sha256 = "1l8l8724g3kd3f01pq429y7czr1bnhbrq2y0lii1hi767sjxgnz4"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; - testHaskellDepends = [ - base clock directory filepath QuickCheck time unix - ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_6_1" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.6.1"; - sha256 = "0x2byc1k8lznrq226pg1xrd48q6x9l7id6b2cdah0b6xigr0mya2"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ - base clock directory filepath QuickCheck unix - ]; - homepage = "https://github.com/ndmitchell/extra#readme"; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -71123,6 +68925,7 @@ self: { homepage = "https://github.com/yamadapc/stack-run-auto"; description = "Given a hackage package outputs the list of its dependencies"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extractable-singleton" = callPackage @@ -71178,8 +68981,8 @@ self: { ({ mkDerivation, base, leancheck, speculate, template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.2.4"; - sha256 = "14i1kb4l1wnc47fp2if95yk5jrb4s0p81c8bgda7lwihas9x8h9r"; + version = "0.3.0"; + sha256 = "1mqhn515mq730frzcadw4m0zsizk1vkhcygazy6y03533mai0z2g"; libraryHaskellDepends = [ base leancheck speculate template-haskell ]; @@ -71187,7 +68990,6 @@ self: { homepage = "https://github.com/rudymatela/extrapolate#readme"; description = "generalize counter-examples of test properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -71392,6 +69194,7 @@ self: { ]; description = "Failure Detectors implimented in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fair-predicates" = callPackage @@ -71507,6 +69310,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-arithmetic" = callPackage + ({ mkDerivation, base, Cabal, composition-prelude, criterion + , directory, hspec, http-client, http-client-tls, parallel-io + , QuickCheck, recursion-schemes, tar, zlib + }: + mkDerivation { + pname = "fast-arithmetic"; + version = "0.1.1.5"; + sha256 = "1pp9wdzzjfsjdbf8vnbpf1a29x6xzigzrjivrdpw7l6cwkhs9gff"; + setupHaskellDepends = [ + base Cabal directory http-client http-client-tls parallel-io tar + zlib + ]; + libraryHaskellDepends = [ + base composition-prelude recursion-schemes + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/vmchale/fast-arithmetic#readme"; + description = "Fast functions on integers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, process, QuickCheck, scientific, stm @@ -71528,6 +69354,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-combinatorics" = callPackage + ({ mkDerivation, base, Cabal, composition-prelude, criterion + , directory, hspec, http-client, http-client-tls, tar, zlib + }: + mkDerivation { + pname = "fast-combinatorics"; + version = "0.1.0.9"; + sha256 = "0p9pdp51ii0ggf6ghh7aijk1q1crf850qwdvyi7nkx65nfi9qc7z"; + setupHaskellDepends = [ + base Cabal directory http-client http-client-tls tar zlib + ]; + libraryHaskellDepends = [ base composition-prelude ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com//fast-combinatorics#readme"; + description = "Fast combinatorics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fast-digits" = callPackage ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck @@ -71597,6 +69442,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Natural Numbers with no overhead"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-tags" = callPackage @@ -71642,6 +69488,7 @@ self: { homepage = "https://github.com/vshabanov/fast-tagsoup"; description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-tagsoup-utf8-only" = callPackage @@ -71699,6 +69546,7 @@ 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 @@ -71815,15 +69663,13 @@ self: { , haskell-src-exts, language-ecmascript, mtl, mtl-compat , optparse-applicative, process, safe, sourcemap, split, spoon, syb , text, time, transformers, transformers-compat - , traverse-with-class, type-eq, uniplate, unordered-containers - , utf8-string, vector + , traverse-with-class, uniplate, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "fay"; - version = "0.23.1.16"; - sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4"; - revision = "8"; - editedCabalFile = "1ybc4vv0d3vya4a1xgr2sbq1zx1bzm82acxivs458i9pj56wp87j"; + version = "0.23.2.0"; + sha256 = "1fhdznpqyrgk2m239qdq6zxsdhx3qhciq8fi2ka7s6l7h9z277dw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -71832,8 +69678,8 @@ self: { data-lens-light directory filepath ghc-paths haskell-src-exts language-ecmascript mtl mtl-compat process safe sourcemap split spoon syb text time transformers transformers-compat - traverse-with-class type-eq uniplate unordered-containers - utf8-string vector + traverse-with-class uniplate unordered-containers utf8-string + vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; homepage = "https://github.com/faylang/fay/wiki"; @@ -72092,6 +69938,7 @@ self: { homepage = "http://github.com/ylilarry/fcache#readme"; description = "Cache a function (a -> b)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fcd" = callPackage @@ -72264,15 +70111,15 @@ self: { ({ mkDerivation, base, directory, filepath, process, time, unix }: mkDerivation { pname = "fedora-haskell-tools"; - version = "0.3"; - sha256 = "0ml5laiwkpd68j87px57jdvjc90pw1ma41gsc06h1qjlhnvhhill"; + version = "0.4"; + sha256 = "0105i1klks1f0gcq9fyv1pbfrm3mfiwp14pdac0xb8hm1fbhbs70"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath process time unix ]; homepage = "https://github.com/fedora-haskell/fedora-haskell-tools"; - description = "Building and tracking tools for Fedora Haskell"; + description = "Building and managing tools for Fedora Haskell"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -72300,30 +70147,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "feed" = callPackage - ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework - , test-framework-hunit, time, time-locale-compat, utf8-string, xml - }: + "fee-estimate" = callPackage + ({ mkDerivation, base, QuickCheck }: mkDerivation { - pname = "feed"; - version = "0.3.12.0"; - sha256 = "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc"; - revision = "2"; - editedCabalFile = "0ggpqv0i2k38dl8dqwn159n7ys0xr8shrsr3l838883rs8rrnf1j"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base old-locale old-time time time-locale-compat utf8-string xml - ]; - testHaskellDepends = [ - base HUnit old-locale old-time test-framework test-framework-hunit - time time-locale-compat utf8-string xml - ]; - homepage = "https://github.com/bergmark/feed"; - description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; + pname = "fee-estimate"; + version = "0.1.0.0"; + sha256 = "06qfc18dhkhxpy0rhs20kw83bf1mzq94wy6azv3zj2ik8shq501r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base QuickCheck ]; + executableHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/sahabi/fee-estimate#readme"; + description = "Short description of your package"; license = stdenv.lib.licenses.bsd3; }) {}; - "feed_1_0_0_0" = callPackage + "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 @@ -72347,7 +70187,6 @@ self: { homepage = "https://github.com/bergmark/feed"; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-cli" = callPackage @@ -72386,6 +70225,7 @@ self: { homepage = "http://rel4tion.org/projects/feed-collect/"; description = "Watch RSS/Atom feeds (and do with them whatever you like)"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-crawl" = callPackage @@ -72804,10 +70644,8 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.5.3.1"; - sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; - revision = "1"; - editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g"; + version = "5.5.4.0"; + sha256 = "04bjm44qr63cl0g5lh07hbq78x5sbvdjf6ryymysi658q0fqjxji"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -73017,23 +70855,6 @@ self: { }) {}; "file-embed" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , template-haskell - }: - mkDerivation { - pname = "file-embed"; - version = "0.0.10"; - sha256 = "04gpylngm2aalqcgdk7gy7jiw291dala1354spxa8wspxif94lgp"; - libraryHaskellDepends = [ - base bytestring directory filepath template-haskell - ]; - testHaskellDepends = [ base filepath ]; - homepage = "https://github.com/snoyberg/file-embed"; - description = "Use Template Haskell to embed file contents directly"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "file-embed_0_0_10_1" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , template-haskell }: @@ -73048,7 +70869,6 @@ self: { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-embed-poly" = callPackage @@ -73150,7 +70970,6 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "A Linux-only cache system associating values to files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "filediff" = callPackage @@ -73314,6 +71133,7 @@ self: { ]; description = "Interface for versioning file stores"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filesystem-conduit" = callPackage @@ -73469,6 +71289,7 @@ self: { ]; description = "Extensible pretty printing with semantic annotations and proportional fonts"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "find-clumpiness" = callPackage @@ -73550,8 +71371,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.2.1"; - sha256 = "03vchlbhx9ipjx1w8y4pfc4awb1gjjgr5f95h977lknzb5ad9fx5"; + version = "0.1.3.1"; + sha256 = "08wqzrjdndd7svkil1wr964w4d7zay04nlg7dyzw7wm4d3d3ak4p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -73561,24 +71382,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fingertree_0_1_3_0" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "fingertree"; - version = "0.1.3.0"; - sha256 = "1ryjj7qrx70ckcjlr02x9zh86kfp76azbxq05r7hawqkaqg44sfs"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "fingertree-psqueue" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -73619,21 +71422,10 @@ self: { ]; description = "Finite Fields"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "finite-typelits" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "finite-typelits"; - version = "0.1.2.0"; - sha256 = "09qmif1xvfcaylz9zfa1w8bs9ls3pcip509b1iyka94p8c6j6liw"; - libraryHaskellDepends = [ base deepseq ]; - homepage = "https://github.com/mniip/finite-typelits"; - description = "A type inhabited by finitely many values, indexed by type-level naturals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "finite-typelits_0_1_3_0" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "finite-typelits"; @@ -73643,7 +71435,6 @@ self: { homepage = "https://github.com/mniip/finite-typelits"; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "firefly" = callPackage @@ -73653,8 +71444,8 @@ self: { }: mkDerivation { pname = "firefly"; - version = "0.1.0.1"; - sha256 = "1ismyiwcjh6yvrka3769921ii99m2yb52pb3b8nyx6jprrbfbgya"; + version = "0.2.1.0"; + sha256 = "1mhqh9circxlz5vxhl3m4lg5c63jn3is6c963h0r2kawlaaxjkiz"; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers cookie http-types mtl regex-pcre text transformers wai warp @@ -73679,6 +71470,7 @@ self: { homepage = "https://github.com/ChrisPenner/Firefly#readme"; description = "A simple example using Firefly"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "first-and-last" = callPackage @@ -73789,19 +71581,16 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.3"; - sha256 = "0kbv2bz4cf8bvv8i5ypcldcyxd6l7f6wwsb85vfmjqrq7kn2apr2"; + version = "0.4.4"; + sha256 = "15vmdipw3pz6x4x2c1ywf0h0jbiy14p557mx3hm2zhdpxn1bdwyr"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; - testHaskellDepends = [ base cmdargs leancheck template-haskell ]; - benchmarkHaskellDepends = [ - base cmdargs leancheck pretty template-haskell - ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base pretty ]; homepage = "https://github.com/rudymatela/fitspec#readme"; description = "refining property sets for testing Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fix-imports" = callPackage @@ -73949,18 +71738,6 @@ self: { }) {}; "fixed-vector" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; - version = "0.9.0.0"; - sha256 = "11scilp5j33pkq4ksg008a3qgm7sxnv0n958r60wc5n9lkx4pdic"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector_1_0_0_0" = callPackage ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; @@ -73970,7 +71747,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 @@ -73987,7 +71763,6 @@ self: { ]; description = "Binary instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-cborg" = callPackage @@ -74004,7 +71779,6 @@ self: { ]; description = "Binary instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-cereal" = callPackage @@ -74021,28 +71795,9 @@ self: { ]; description = "Cereal instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-hetero" = callPackage - ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim, primitive - , transformers - }: - mkDerivation { - pname = "fixed-vector-hetero"; - version = "0.3.1.2"; - sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd"; - revision = "1"; - editedCabalFile = "05scgl0r3g9nnb0pfg39cinylm11wdyqr8f51k69wj5y79fzf5yz"; - libraryHaskellDepends = [ - base deepseq fixed-vector ghc-prim primitive transformers - ]; - homepage = "http://github.org/Shimuuar/fixed-vector-hetero"; - description = "Generic heterogeneous vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector-hetero_0_4_0_0" = callPackage ({ mkDerivation, base, deepseq, fixed-vector, primitive }: mkDerivation { pname = "fixed-vector-hetero"; @@ -74052,7 +71807,6 @@ self: { homepage = "http://github.org/Shimuuar/fixed-vector-hetero"; description = "Generic heterogeneous vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-width" = callPackage @@ -74162,6 +71916,7 @@ self: { homepage = "http://github.com/jxv/fixie#readme"; description = "Opininated testing framework for mtl style (spies, stubs, and mocks)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixplate" = callPackage @@ -74179,7 +71934,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Uniplate-style generic traversals for optionally annotated fixed-point types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fixpoint" = callPackage @@ -74226,6 +71980,7 @@ self: { libraryHaskellDepends = [ base ]; description = "test"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fizzbuzz-as-a-service" = callPackage @@ -74244,6 +71999,7 @@ self: { homepage = "https://github.com/chris-martin/fizzbuzz-as-a-service"; description = "FizzBuzz as a service"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flac" = callPackage @@ -74307,7 +72063,6 @@ self: { homepage = "http://noaxiom.org/flAccurateRip"; description = "Verify FLAC files ripped form CD using AccurateRip™"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flamethrower" = callPackage @@ -74360,6 +72115,7 @@ self: { homepage = "http://github.com/tittoassini/flat"; description = "Principled and efficient bit-oriented binary serialization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-maybe" = callPackage @@ -74409,15 +72165,17 @@ self: { }) {}; "flay" = callPackage - ({ mkDerivation, base, constraints, tasty, tasty-quickcheck }: + ({ mkDerivation, base, constraints, ghc-prim, tasty + , tasty-quickcheck + }: mkDerivation { pname = "flay"; - version = "0.1"; - sha256 = "18wdvidn1d4cnxcl11nfabqjqx5dpgvijim46wvp3dfvh8lc8kn4"; - libraryHaskellDepends = [ base constraints ]; + version = "0.2"; + sha256 = "1sdwcjjsgq0ba84474pdnvppg66vmqsqn6frb97ricdnyy78lg11"; + libraryHaskellDepends = [ base constraints ghc-prim ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/k0001/flay"; - description = "Work on your datatype without knowing its shape nor its contents"; + description = "Work generically on your datatype without knowing its shape nor its contents"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -74633,22 +72391,23 @@ self: { pname = "flock"; version = "0.3.1.8"; sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n"; - revision = "2"; - editedCabalFile = "0xsi6bwqd57qwr9bjd2nck7q3gbmbsl9pb1rk6h4bbmm1ciybv19"; + revision = "3"; + editedCabalFile = "06hdirzgghlxpdymb5b5l58v20m34lmn2z8hmp9lwcskc8xfqqfn"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; homepage = "http://github.com/hesselink/flock"; 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.9"; - sha256 = "1rqljbq4s9swh19r57gpp3nzxwgwa1j0q53m971i455wq1xszx1m"; + version = "1.0.10"; + sha256 = "1k8p475m1485nq4236jf53gmls264c5dy8x57zihb7gbvgnl71fj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; homepage = "https://github.com/tfausak/flow#readme"; @@ -74835,8 +72594,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.1"; - sha256 = "0yclwq488g9mz6wsjcch7c5kwgc97rxp0lqjlfj44vbqbjk72l5x"; + version = "0.5.4.3"; + sha256 = "1cn98f0lzzgyrjcw2xr68xm5129wl9zr3jy4la8hw4fwbvcjphnv"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -75074,41 +72833,28 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; - version = "0.9"; - sha256 = "1gzwmsrbxk22v7syf8zfvxphm23dmjzfpysz6qww3qvib8wm64aq"; + version = "0.9.1"; + sha256 = "0v83rxr4889c6m5djfp3vx450kzsj1wi5d0qmd7myvh7i0r4afqv"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/sjoerdvisscher/fmlist"; description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; }) {}; - "fmt" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, containers, criterion, deepseq, formatting, hspec - , interpolate, microlens, neat-interpolation, text, text-format - , time, time-locale-compat, vector - }: + "fmlist_0_9_2" = callPackage + ({ mkDerivation, base }: mkDerivation { - pname = "fmt"; - version = "0.3.0.0"; - sha256 = "1dihbcawpf082maxw3g6gsp1n8cmfdil4llqa3wmf37dqyi2bvjm"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring containers - microlens text text-format time time-locale-compat - ]; - testHaskellDepends = [ - base bytestring containers hspec neat-interpolation text vector - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq formatting interpolate - text text-format vector - ]; - homepage = "http://github.com/aelve/fmt"; - description = "A new formatting library"; + pname = "fmlist"; + version = "0.9.2"; + sha256 = "02868865hqm189h5wjd916abvqwkhbrx5b0119s1dwp70ifvbi4g"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/sjoerdvisscher/fmlist"; + description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fmt_0_5_0_0" = callPackage + "fmt" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, containers, criterion, deepseq, formatting, hspec , interpolate, microlens, neat-interpolation, text, text-format @@ -75132,7 +72878,6 @@ self: { homepage = "http://github.com/aelve/fmt"; description = "A new formatting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fn" = callPackage @@ -75228,27 +72973,6 @@ self: { }) {}; "foldl" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, hashable, mwc-random, primitive - , profunctors, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "foldl"; - version = "1.2.5"; - sha256 = "0jzc00dqwkr3kvy40f8f9klh24s8zvhfk2flrlyichc6zcy5qbda"; - revision = "1"; - editedCabalFile = "02lk5838594mi15bylz2kpcm1c4akbsswj73i7k8xw4ns66iaq04"; - libraryHaskellDepends = [ - base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors text transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Composable, streaming, and efficient left folds"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foldl_1_3_4" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive , profunctors, semigroups, text, transformers, unordered-containers @@ -75256,8 +72980,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.3.4"; - sha256 = "0zzh9v1ha6wgn015128pj85sf8jlvbvhfsn6i3pfwkm15px0k2md"; + version = "1.3.5"; + sha256 = "10qsp7dj2xsq4q2xm6x6b12y5pq32qf7my41hnkmdwwbccvhdxb2"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroups text transformers @@ -75266,7 +72990,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 @@ -75655,15 +73378,15 @@ self: { }) {}; "forest" = callPackage - ({ mkDerivation, aeson, base, bifunctors, deepseq, hashable - , profunctors, semigroupoids + ({ mkDerivation, aeson, base, deepseq, hashable, profunctors + , semigroupoids }: mkDerivation { pname = "forest"; version = "0.2"; sha256 = "0z8wfvylzcls994yg3s4bywjxl3592y4ba6gcn2h8ndc7c8w09v4"; libraryHaskellDepends = [ - aeson base bifunctors deepseq hashable profunctors semigroupoids + aeson base deepseq hashable profunctors semigroupoids ]; homepage = "https://github.com/duairc/forest"; description = "Tree and Forest types"; @@ -75676,8 +73399,8 @@ self: { }: mkDerivation { pname = "forest-fire"; - version = "0.2.2"; - sha256 = "053gp1wmzfhn26gq0awhz3fas8vcjbx953cis4r4ahfzwvy71r7r"; + version = "0.3"; + sha256 = "09h8hpb9b0hsj2bpwywxdk2a1ww1si3g5rn5n6ajq5dgvqki8rlp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75845,6 +73568,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, text, time, transformers + }: + mkDerivation { + pname = "formatting"; + version = "6.3.0"; + sha256 = "16xngayk1jd92bj2qaf7fmrgzdskdnc7rsgpk1ij06xd8cdgahf1"; + libraryHaskellDepends = [ + array base bytestring clock ghc-prim integer-gmp old-locale + scientific text time transformers + ]; + testHaskellDepends = [ base hspec ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -75975,8 +73716,8 @@ self: { }: mkDerivation { pname = "fortytwo"; - version = "1.0.2"; - sha256 = "15imj5ps040iz5abfnzjpgfq726j9c28bwwg06zbf07ji74dz190"; + version = "1.0.3"; + sha256 = "113z46b5dnf6z7bxw1a4vhr84w5pw0iridsi3wjimhjz0rr530cm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; @@ -75985,6 +73726,7 @@ self: { homepage = "https://github.com/gianlucaguarini/fortytwo#readme"; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forward-chan" = callPackage @@ -76095,7 +73837,6 @@ self: { homepage = "https://github.com/haskell-foundation/foundation"; description = "foundation's edge with the conventional set of packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fountain" = callPackage @@ -76446,7 +74187,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Free functors, adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-game" = callPackage @@ -76611,7 +74351,6 @@ self: { homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -76672,7 +74411,6 @@ self: { homepage = "https://github.com/clintonmead/freelude#readme"; description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freenect" = callPackage @@ -76727,6 +74465,7 @@ self: { ]; description = "Handle effects conversely using monadic conversation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freer-effects" = callPackage @@ -76748,6 +74487,33 @@ self: { homepage = "https://github.com/IxpertaSolutions/freer-effects"; description = "Implementation of effect system for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "freer-simple" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.0.0.0"; + sha256 = "11nh0majlmn6aw5qzv5jfs6jx9vxk7jn72568frmryvymn2aqax8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + homepage = "https://github.com/lexi-lambda/freer-simple#readme"; + description = "Implementation of a friendly effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "freesect" = callPackage @@ -76910,8 +74676,8 @@ self: { }: mkDerivation { pname = "friday-juicypixels"; - version = "0.1.2.1"; - sha256 = "1x0s4m4zmmaz9sa000pwip6cagjza6c8w7i9zikpb8z7xn21i1na"; + version = "0.1.2.3"; + sha256 = "19j321vqca8sl366j3acdskr8zhzcki429zxzs8xawdmxqh93vzv"; libraryHaskellDepends = [ base friday JuicyPixels vector ]; testHaskellDepends = [ base bytestring file-embed friday hspec JuicyPixels @@ -76956,8 +74722,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, semigroups }: mkDerivation { pname = "frisby"; - version = "0.2.1"; - sha256 = "1xlfidsivvq9a152k3cg3ancyma3lc177jcbk6c0cgpd7zzpiib4"; + version = "0.2.2"; + sha256 = "1mdncc38qwakadr8q4ncz9vzvx9scfhlgk2m540y2mjdypdiicy1"; libraryHaskellDepends = [ array base containers mtl semigroups ]; homepage = "http://repetae.net/computer/frisby/"; description = "Linear time composable parser for PEG grammars"; @@ -77005,6 +74771,7 @@ self: { executableHaskellDepends = [ base directory ]; description = "LALR(k) parser generator"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frp-arduino" = callPackage @@ -77078,7 +74845,6 @@ self: { homepage = "https://github.com/george-steel/frpnow-gtk3"; description = "Program GUIs with GTK3 and frpnow!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "frquotes" = callPackage @@ -77187,7 +74953,6 @@ self: { homepage = "https://github.com/fpco/fsnotify-conduit#readme"; description = "Get filesystem notifications as a stream of events"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fst" = callPackage @@ -77241,6 +75006,7 @@ self: { homepage = "https://github.com/ixmatus/fswait"; description = "Wait and observe events on the filesystem for a path, with a timeout"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fswatch" = callPackage @@ -77262,7 +75028,6 @@ self: { homepage = "https://github.com/kelemzol/watch"; description = "File System watching tool with cli and slave functionalities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fswatcher" = callPackage @@ -77319,6 +75084,7 @@ self: { homepage = "https://github.com/mr/ftp-client"; description = "Transfer files with FTP and FTPS"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ftp-client-conduit" = callPackage @@ -77448,7 +75214,6 @@ self: { ]; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fullstop" = callPackage @@ -77724,6 +75489,7 @@ self: { homepage = "https://github.com/fmap/functor-infix"; 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 @@ -77959,8 +75725,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.2"; - sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz"; + version = "0.1.0.3"; + sha256 = "11sbdqmcvmqzb9xhvs4bgjj8wb1i2ls5gm1pgiy757h4clcyl4k1"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -77974,6 +75740,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fuzzyset_0_1_0_4" = callPackage + ({ mkDerivation, base, base-unicode-symbols, data-default, hspec + , ieee754, lens, text, text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.1.0.4"; + sha256 = "1nk3qrjcg5q4mnv2lzbw08ikgibix0ns6910z9xixcfq5kgij6my"; + libraryHaskellDepends = [ + base base-unicode-symbols data-default lens text text-metrics + unordered-containers vector + ]; + testHaskellDepends = [ + base base-unicode-symbols hspec ieee754 lens text + unordered-containers + ]; + homepage = "https://github.com/laserpants/fuzzyset-haskell"; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -77988,7 +75776,6 @@ self: { ]; description = "A 'ten past six' style clock"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fwgl" = callPackage @@ -78044,12 +75831,12 @@ self: { }) {}; "fx" = callPackage - ({ mkDerivation, base, base-prelude, transformers }: + ({ mkDerivation, base }: mkDerivation { pname = "fx"; - version = "0.7"; - sha256 = "114psjyz9jvda86gk29x9xl2h1r6a6lxxhpl4zw5wkf3zszjsylc"; - libraryHaskellDepends = [ base base-prelude transformers ]; + version = "0.10"; + sha256 = "0nki5nb55qahjf3f2dqrfvrx77i3kba6aqiv1pwwkinnlv3k7n7i"; + libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/fx"; description = "Horizontally composable effects"; license = stdenv.lib.licenses.mit; @@ -78084,16 +75871,19 @@ self: { }) {}; "g4ip-prover" = callPackage - ({ mkDerivation, array, base }: + ({ mkDerivation, array, base, directory, system-filepath }: mkDerivation { pname = "g4ip-prover"; - version = "0.1.0.0"; - sha256 = "0sx2qvji1vj8p67bfdj9vdyvyin62r5rh39zfr9njx43m9may48g"; + version = "0.1.0.1"; + sha256 = "1r1i8i5vwy02zaccqjlv6w5qlpbp61lc4im9sz2wlkc8yx2yj8bg"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ array base ]; + executableHaskellDepends = [ + array base directory system-filepath + ]; description = "Theorem prover for intuitionistic propositional logic using G4ip"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gact" = callPackage @@ -78222,6 +76012,7 @@ self: { ]; description = "Automatically spin up and spin down local daemons"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gargoyle-postgresql" = callPackage @@ -78242,6 +76033,7 @@ self: { ]; description = "Manage PostgreSQL servers with gargoyle"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "garsia-wachs" = callPackage @@ -78288,6 +76080,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gauge_0_2_0" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, directory + , HUnit, math-functions, mwc-random, process, tasty, tasty-hunit + , vector + }: + mkDerivation { + pname = "gauge"; + version = "0.2.0"; + sha256 = "05sq8lgg7a7y5wpvsvx847whwdznsarxf41vndjx264v8x61jv86"; + libraryHaskellDepends = [ + base basement deepseq directory math-functions mwc-random process + vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory HUnit tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/vincenthz/hs-gauge"; + description = "small framework for performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -78536,6 +76351,7 @@ self: { homepage = "https://github.com/CLowcay/hs-gedcom"; description = "Parser for the GEDCOM genealogy file format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geek" = callPackage @@ -78624,7 +76440,6 @@ self: { homepage = "https://github.com/schell/gelatin"; description = "A graphics description language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gelatin-freetype2" = callPackage @@ -78899,8 +76714,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.9"; sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; - revision = "1"; - editedCabalFile = "10dy6kdn48pfl6njdhv7zwfkb3qkwazl9238n2sz9gmw575gqnjn"; + revision = "2"; + editedCabalFile = "05hn4bjqrx1fimlwwbv9358806m4q1dkbfw886lpkkhbflr7jmn9"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -78982,8 +76797,8 @@ self: { }: mkDerivation { pname = "generic-deriving"; - version = "1.11.2"; - sha256 = "1y92q4dmbyc24hjjvq02474s9grwabxffn16y31gzaqhm0m0z5i9"; + version = "1.12"; + sha256 = "09nl2c2b54ngqv4rgv3avvallyvfnv5jfld0wk2v90srl3x6p5vk"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -79003,25 +76818,25 @@ self: { testHaskellDepends = [ array base bytestring hspec ]; description = "An Enum class that fixes some deficiences with Prelude's Enum"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-lens" = callPackage - ({ mkDerivation, base, criterion, deepseq, inspection-testing, lens - , profunctors, QuickCheck + ({ mkDerivation, base, criterion, deepseq, doctest + , inspection-testing, lens, profunctors, QuickCheck, tagged }: mkDerivation { pname = "generic-lens"; - version = "0.4.1.0"; - sha256 = "1nlizrgnfivabc35199aizahv0za9wvp7dhsqmvhafkjj0sr5113"; - libraryHaskellDepends = [ base profunctors ]; - testHaskellDepends = [ base inspection-testing ]; + version = "0.5.1.0"; + sha256 = "09q13axb00kgy2w9c7lq84sh113vhxlw0g8zcjg07a1kp9wj7l47"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ base doctest inspection-testing lens ]; benchmarkHaskellDepends = [ base criterion deepseq lens QuickCheck ]; homepage = "https://github.com/kcsongor/generic-lens"; description = "Generic data-structure operations exposed as lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-lucid-scaffold" = callPackage @@ -79082,24 +76897,23 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "0.5.0.0"; - sha256 = "00v514nadzm1g7pni1jqmxyzxs03v4vqj9p1qrxa46grk8ya3zsf"; - revision = "2"; - editedCabalFile = "0h2gyf92p8afgsprb9wnfswh53kgrnlvkdixncmm5vm2dsi45xg5"; + version = "1.0.0.0"; + sha256 = "16wlfmfms5544aag1bkzaq9wwsd5zkq7mhwlz9fvsngmkbfa07g7"; + revision = "3"; + editedCabalFile = "12l53dxv400g9fvz07jv42gn7x6825kxsyvpnhd3snsklvjrhl70"; libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/lysxia/generic-random"; description = "Generic random generators"; license = stdenv.lib.licenses.mit; }) {}; - "generic-random_1_0_0_0" = callPackage + "generic-random_1_1_0_1" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "1.0.0.0"; - sha256 = "16wlfmfms5544aag1bkzaq9wwsd5zkq7mhwlz9fvsngmkbfa07g7"; - revision = "3"; - editedCabalFile = "12l53dxv400g9fvz07jv42gn7x6825kxsyvpnhd3snsklvjrhl70"; + version = "1.1.0.1"; + sha256 = "0axbsrxcczhlci4zm4brq2lmd7cjgmixl9hk6jnd86w4v107xiph"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/lysxia/generic-random"; @@ -79165,6 +76979,7 @@ self: { homepage = "http://github.com/glguy/tries"; description = "A map, where the keys may be complex structured data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-xml" = callPackage @@ -79190,8 +77005,8 @@ self: { pname = "generic-xmlpickler"; version = "0.1.0.5"; sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; - revision = "3"; - editedCabalFile = "17z1kfyshlqr8ayljs5f2jbahvc58kqyd272afcpqvs7kq1c0aja"; + revision = "5"; + editedCabalFile = "18hs5adb6wfasazdlv2wf92xszyjw94i3v20w8058hl7q1ax9dv0"; libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt hxt-pickle-utils tasty tasty-hunit tasty-th @@ -79231,6 +77046,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generics-sop_0_3_2_0" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: + mkDerivation { + pname = "generics-sop"; + version = "0.3.2.0"; + sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; + libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; + testHaskellDepends = [ base ]; + description = "Generic Programming using True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { @@ -79517,6 +77345,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for aeson"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage @@ -79536,6 +77365,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage @@ -79555,6 +77385,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -79575,6 +77406,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -79597,6 +77429,7 @@ self: { homepage = "http://cs-syd.eu"; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-binary" = callPackage @@ -79614,6 +77447,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for binary-related Instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-cereal" = callPackage @@ -79631,6 +77465,7 @@ self: { homepage = "http://cs-syd.eu"; description = "Standard spec's for cereal-related instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-hashable" = callPackage @@ -79669,6 +77504,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Path"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-property" = callPackage @@ -79705,6 +77541,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Scientific"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-text" = callPackage @@ -79724,6 +77561,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -79741,6 +77579,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-unordered-containers" = callPackage @@ -79762,6 +77601,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for unordered-containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -79781,6 +77621,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for UUID"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-vector" = callPackage @@ -79800,6 +77641,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for vector"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geo-resolver" = callPackage @@ -80100,6 +77942,7 @@ self: { homepage = "http://www.grammaticalframework.org/"; description = "Grammatical Framework"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ggtsTC" = callPackage @@ -80160,16 +78003,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_2_1" = callPackage + "ghc-boot_8_2_2" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.2.1"; - sha256 = "1v9cdbhxsx7pbig4c3gq5gdp46fwq0blq6zn89x4fpq1vl1kcr6h"; - revision = "1"; - editedCabalFile = "0826xd0ccr77v7zqjml266g067qj2bd3mb7d7d8mipqv42j7cy8y"; + version = "8.2.2"; + sha256 = "0fwpfsdx584mcvavj1m961rnaryif9a0yibhlw0b2i59g3ca8f6g"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -80178,19 +78019,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_2_1" = callPackage + "ghc-boot-th_8_2_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.2.1"; - sha256 = "18gmrfxyqqv0gchpn35bqsk66if1q8yy4amajdz2kh9v8jz4yfz4"; + version = "8.2.2"; + sha256 = "0pdgimqqn1w04qw504bgcji74wj5wmxpwgj5w3wdrid47sr2d3kc"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-compact" = callPackage + "ghc-compact_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { pname = "ghc-compact"; @@ -80292,23 +78133,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers }: - mkDerivation { - pname = "ghc-events"; - version = "0.6.0"; - sha256 = "0s87rrap5j9xca8l1x6gi8nmx3w6fn4avckn1i9hx4d1v7fajz97"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base bytestring ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-events_0_7_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: @@ -80325,7 +78149,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -80396,6 +78219,7 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -80494,7 +78318,6 @@ self: { homepage = "https://github.com/ndmitchell/ghc-make#readme"; description = "Accelerated version of ghc --make"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-man-completion" = callPackage @@ -80558,6 +78381,7 @@ self: { homepage = "https://github.com/DanielG/ghc-mod"; description = "Happy Haskell Hacking"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {shelltest = null;}; "ghc-mtl" = callPackage @@ -80629,8 +78453,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.2.0.0"; - sha256 = "0jd02qgjs529ac0jvg59rgrjvpm541j993lyfpqr9aqwqj1n3ylp"; + version = "0.2.0.1"; + sha256 = "10xx2d9awgizjz1jrlw2m30nsl938mh297azp7zay7zkdzsv0fyh"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; homepage = "https://github.com/gibiansky/IHaskell"; @@ -80687,12 +78511,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_1_0" = callPackage + "ghc-prim_0_5_1_1" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.1.0"; - sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9"; + version = "0.5.1.1"; + sha256 = "1dkl0l891min86jpndcah8dx7i3ssnaj6yf2ghxplp8619bmqhb2"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -80705,8 +78529,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.0.3"; - sha256 = "0zlarx19czj9vrckh9vam58l4vybszznxr4kwn7x2mb3vdhv0ghd"; + version = "1.4.0.4"; + sha256 = "037g6ianbij9gx1324fbdmamqjkn6mmw9nvqh5bwpz33srf30lpn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80747,7 +78571,6 @@ self: { homepage = "https://github.com/nomeata/ghc-proofs"; description = "GHC plugin to prove program equations by simplification"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-server" = callPackage @@ -80803,10 +78626,8 @@ self: { ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { pname = "ghc-srcspan-plugin"; - version = "0.2.2.0"; - sha256 = "1wdgc1m914iy4876cf8qwxad0q2abqvs10f6dj0dnfs6sgqyqdz1"; - revision = "1"; - editedCabalFile = "1h821qji9xgf9d4sd040fw10v1312dxzin556ppc67wxbx5mjc9i"; + version = "0.2.2.1"; + sha256 = "10zh7i4nx4ds3f1d7m2m1caqnxmi3dh6a900fl8mcp6a09isvglh"; libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; @@ -80843,8 +78664,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.2.1"; - sha256 = "04m8cblgxb3axjhsbwlb18jmlcfhcllm68c1d5pzv6av404ild4z"; + version = "0.2.2"; + sha256 = "1k52r8hdbhsp5ydfi010976nck81q38lm8x069x6sdvslmwda1wq"; libraryHaskellDepends = [ base ghc ]; homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; description = "Utilities for writing GHC type-checker plugins"; @@ -80887,15 +78708,15 @@ self: { "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , singletons, tasty, tasty-hunit, template-haskell, transformers + , tasty, tasty-hunit, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2.3"; - sha256 = "1fl1bbsn1hkz3i7100k1k0pwniv7iyxnq1l0i50gj5s8ygxi78zw"; + version = "0.2.4"; + sha256 = "0inj776401846brd945p00qkjylniwlvycn1c300p90kyighkpdg"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp singletons transformers + ghc-typelits-natnormalise integer-gmp transformers ]; testHaskellDepends = [ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty @@ -80908,20 +78729,19 @@ self: { "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, transformers + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.3.1"; - sha256 = "1kprh0fahkbpf7rqbgi8l6883784a8n7k8g40nkdhii7gal9715g"; + version = "0.4"; + sha256 = "0qwp44jpp8jbrgri0i3yviqnypdj79b8hpxxbk80dwwsjg1q5ynv"; libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers ]; testHaskellDepends = [ - base ghc-typelits-natnormalise singletons tasty tasty-hunit - tasty-quickcheck + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck ]; homepage = "http://clash-lang.org/"; description = "Derive KnownNat constraints from other KnownNat constraints"; @@ -80934,8 +78754,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.4"; - sha256 = "1qi4nwjkymjgag8m1yf04hddqzcj3iq1xllfffwwdp7g57b4p917"; + version = "0.5.8"; + sha256 = "0xkhj0kka7j9achgzn66zbxs84pxr5h9jq35x4kdnha5hw34c0i1"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -80945,24 +78765,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_5_7" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit, template-haskell - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.5.7"; - sha256 = "0spqlrj7iys6i355sv7r71niimaqx9n3p4p5pfkfck8n5rfc9lq3"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, equational-reasoning, ghc , ghc-tcplugins-extra, presburger, reflection, singletons @@ -80999,7 +78801,6 @@ self: { executableHaskellDepends = [ base ghc-paths unix ]; description = "Print minimal export lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-vis" = callPackage @@ -81022,15 +78823,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_2_1" = callPackage + "ghci_8_2_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell , transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.2.1"; - sha256 = "1nxcqnfnggpg8a04496nk59p4jmvxsjqi7425g6h970cinh2lm5f"; + version = "8.2.2"; + sha256 = "0j6aq2scjv0fpr5b60ac46r1n2hrcgbkrhv31yfnallwlwyqz5zn"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th template-haskell transformers unix @@ -81518,7 +79319,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) cairo;}; "gi-gdk" = callPackage @@ -81542,7 +79342,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gdkpixbuf" = callPackage @@ -81564,6 +79364,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf;}; "gi-gdkx11" = callPackage @@ -81629,6 +79430,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage @@ -81659,8 +79461,8 @@ self: { }: mkDerivation { pname = "gi-glib"; - version = "2.0.14"; - sha256 = "09bmrrppbjcy90f66qdhsj2hz3x7ci80mrdgryajzqrin4zs7aqx"; + version = "2.0.15"; + sha256 = "1gfkqvw2m5i5cg9c3y33l1wqxcr8s80w0sx8kdnnfial0c4ba6cz"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -81713,6 +79515,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -81734,6 +79537,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage @@ -81755,6 +79559,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -81822,6 +79627,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -81832,8 +79638,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.17"; - sha256 = "1rplvhn3lbss66yps6jrhd9f9m6znj8ybss0rpik3dxwgmac3rw3"; + version = "3.0.18"; + sha256 = "1fp84dba8hg6pvkdy0mip2pz9npx0kwp492gx8p1bgf119rqqfl1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -81845,7 +79651,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gtk-hs" = callPackage @@ -81864,7 +79670,7 @@ self: { homepage = "https://github.com/haskell-gi/gi-gtk-hs"; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gi-gtkosxapplication" = callPackage @@ -81910,32 +79716,10 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , webkitgtk24x-gtk3 - }: - mkDerivation { - pname = "gi-javascriptcore"; - version = "3.0.14"; - sha256 = "1r2q176a38ylbawkrd17vdiqg0cnk5vzbp4rfgrlzfz6vp6gimi4"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "JavaScriptCore bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; - - "gi-javascriptcore_4_0_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers , webkitgtk @@ -81998,7 +79782,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "OSTree bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -82024,6 +79808,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage @@ -82050,7 +79835,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage @@ -82094,6 +79879,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -82115,6 +79901,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) libsoup;}; "gi-vte" = callPackage @@ -82189,20 +79976,20 @@ self: { }) {inherit (pkgs.gnome3) webkitgtk;}; "gi-webkit2webextension" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject - , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-gobject, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers , webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.14"; - sha256 = "098p54q8rrfd9syzh10q5rcb70lihjkwx7amj7s5y8wix38f372k"; + version = "4.0.15"; + sha256 = "100m6m13gcyz1wgwj20gh2mybmfpzq9fvqn44a9as37680srx2bi"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gobject gi-gtk gi-javascriptcore - gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text - transformers + base bytestring containers gi-gio gi-gobject gi-gtk + gi-javascriptcore gi-soup haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; @@ -82266,38 +80053,6 @@ self: { }) {}; "ginger" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "ginger"; - version = "0.5.3.0"; - sha256 = "049ys725scrrkxc2q4wx085hbzdnjpm1jd9wqraqg5fa23vpfy34"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring data-default filepath http-types mtl parsec - safe scientific text time transformers unordered-containers - utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring data-default text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring data-default mtl tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers - utf8-string - ]; - homepage = "https://bitbucket.org/tdammers/ginger"; - description = "An implementation of the Jinja2 template language in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ginger_0_7_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , data-default, filepath, http-types, mtl, parsec, safe, scientific , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers @@ -82327,7 +80082,6 @@ self: { homepage = "https://bitbucket.org/tdammers/ginger"; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ginsu" = callPackage @@ -82352,6 +80106,7 @@ self: { homepage = "http://repetae.net/computer/ginsu/"; description = "Ginsu Gale Client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "gio" = callPackage @@ -82360,8 +80115,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.3.1"; - sha256 = "09yq753qld2p5h7apg5wyzyh8z47xqkkyx8zvjwk21w044iz8qxc"; + version = "0.13.4.1"; + sha256 = "11w567c4zafcdm5i6wpi1dr4m6mpfvyqyda4llq7wgvjbshy5fqk"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -82373,26 +80128,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {system-glib = pkgs.glib;}; - "gio_0_13_4_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers, glib - , gtk2hs-buildtools, mtl, system-glib - }: - mkDerivation { - pname = "gio"; - version = "0.13.4.0"; - sha256 = "1jjkz7d81dljhgdcpc5zr5bn1jxnlb23f8hpzx4xz5v9jfy0bflr"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring containers glib mtl - ]; - libraryPkgconfigDepends = [ system-glib ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to GIO"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {system-glib = pkgs.glib;}; - "gipeda" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava , concurrent-output, containers, directory, extra, file-embed @@ -82465,17 +80200,17 @@ self: { "git" = callPackage ({ mkDerivation, base, byteable, bytedump, bytestring, containers - , cryptonite, hourglass, memory, mtl, patience, random - , system-fileio, system-filepath, tasty, tasty-quickcheck - , unix-compat, utf8-string, vector, zlib, zlib-bindings + , cryptonite, hourglass, memory, patience, random, system-fileio + , system-filepath, tasty, tasty-quickcheck, unix-compat + , utf8-string, vector, zlib, zlib-bindings }: mkDerivation { pname = "git"; - version = "0.2.0"; - sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp"; + version = "0.2.1"; + sha256 = "0j0hzlxb58g0q8fibg09ppag6bnhk7ym3nyzmqpwjbr6hxkdidsz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base byteable bytestring containers cryptonite hourglass memory mtl + base byteable bytestring containers cryptonite hourglass memory patience random system-fileio system-filepath unix-compat utf8-string vector zlib zlib-bindings ]; @@ -82522,19 +80257,20 @@ self: { , 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, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core - , yesod-default, yesod-form, yesod-static + , yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20171124"; - sha256 = "066m5s0wp1sw5ngjwgvd4cq1nxnm6jybb4qsyjwm828k4mcwywp7"; + version = "6.20171214"; + sha256 = "06nmsibpb1ng058gkfdspwkmv8psgd144qrxchwf3d8lfdphpkih"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" - "-ftahoe" "-ftdfa" "-f-testsuite" "-ftorrentparser" "-fwebapp" + "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" "-fwebapp-secure" "-fwebdav" "-fxmpp" ]; isLibrary = false; @@ -82550,15 +80286,15 @@ self: { 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 template-haskell - text time torrent transformers unix unix-compat - unordered-containers utf8-string uuid wai wai-extra warp warp-tls - yesod yesod-core yesod-default yesod-form yesod-static + 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 wai wai-extra warp warp-tls yesod yesod-core + yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which ]; - doCheck = false; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; installPhase = "make PREFIX=$out BUILDER=: install"; checkPhase = '' @@ -82880,6 +80616,7 @@ self: { homepage = "http://github.com/gbataille/gitHUD#readme"; description = "More efficient replacement to the great git-radar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitcache" = callPackage @@ -82925,45 +80662,18 @@ self: { ({ mkDerivation, aeson, aeson-compat, base, base-compat , base16-bytestring, binary, binary-orphans, byteable, bytestring , containers, cryptohash, deepseq, deepseq-generics, exceptions - , file-embed, hashable, hspec, 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.16.0"; - sha256 = "0cr5cw3057sk86flb3annjn0yndbw4xz059vsigk52xwydjgxyqw"; - 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 - ]; - testHaskellDepends = [ - aeson-compat base base-compat file-embed hspec unordered-containers - vector - ]; - homepage = "https://github.com/phadej/github"; - description = "Access to the GitHub API, v3"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "github_0_18" = 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, 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 + , 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.18"; sha256 = "0i4cs6d95ik5c8zs2508nmhjh2v30a0qjyxfqyxhjsz48p9h5p1i"; + revision = "1"; + editedCabalFile = "1krz0plxhm1q1k7bb0wzl969zd5fqkgqcgfr6rmqw60njpwrdsrp"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -82976,10 +80686,10 @@ self: { aeson-compat base base-compat bytestring file-embed hspec unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/phadej/github"; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage @@ -83008,7 +80718,6 @@ self: { homepage = "https://github-backup.branchable.com/"; 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-post-receive" = callPackage @@ -83035,8 +80744,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.0.7"; - sha256 = "17v9rpl6nljf2xa16s3zi6dr8w8385pxdsa1ksyzn84kpq58kdn9"; + version = "1.1.2"; + sha256 = "0czc53xwg21jvd7g4ggjva0nzc2rpyf36rc4876dss9lckcc2p93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83238,6 +80947,7 @@ self: { ]; description = "Gitlib repository backend that uses the git command-line tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-cross" = callPackage @@ -83285,6 +80995,7 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-s3" = callPackage @@ -83510,27 +81221,6 @@ self: { }) {}; "glabrous" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , cereal, cereal-text, directory, either, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "glabrous"; - version = "0.3.3"; - sha256 = "10g1daxf29vdm62l5fyah3lh7sh9q00yvv3xa7wpzhnm6k2liadn"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - homepage = "https://github.com/MichelBoucey/glabrous"; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_0_3_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers @@ -83549,7 +81239,6 @@ self: { homepage = "https://github.com/MichelBoucey/glabrous"; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -83701,6 +81390,7 @@ self: { homepage = "https://github.com/louispan/glazier-react#readme"; description = "ReactJS binding using Glazier and Pipes.Fluid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier-react-examples" = callPackage @@ -83724,6 +81414,7 @@ self: { homepage = "https://github.com/louispan/glazier-react#readme"; description = "Examples of using glazier-react"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier-react-widget" = callPackage @@ -83743,6 +81434,7 @@ self: { homepage = "https://github.com/louispan/glazier-react-widget#readme"; description = "Generic widget library using glazier-react"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gli" = callPackage @@ -83803,6 +81495,7 @@ self: { testHaskellDepends = [ base data-default hspec lens QuickCheck ]; description = "Glicko-2 implementation in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glider-nlp" = callPackage @@ -83816,6 +81509,7 @@ self: { homepage = "https://github.com/klangner/glider-nlp"; description = "Natural Language Processing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glintcollider" = callPackage @@ -83844,8 +81538,8 @@ self: { pname = "glirc"; version = "2.24"; sha256 = "1fhpwr7v2ad49j9699f5za1ww2m1ln39cvnm82z57cngjghpnngs"; - revision = "1"; - editedCabalFile = "11z35bs1zz6fw61m41cwbns4flwhjgmfk3hnghfga77x8s36nc08"; + revision = "2"; + editedCabalFile = "0fz8vr8kiny3jhh2jr3c5pv2283zm6nkfi93pj34v7xs62zcpg59"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -83861,7 +81555,6 @@ self: { homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gll" = callPackage @@ -83877,7 +81570,6 @@ self: { ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glob-posix" = callPackage @@ -84098,7 +81790,6 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-game" = callPackage @@ -84260,6 +81951,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-core" = callPackage @@ -84283,6 +81975,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-ekg" = callPackage @@ -84306,6 +81999,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-example" = callPackage @@ -84326,6 +82020,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gluturtle" = callPackage @@ -84436,8 +82131,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.24"; - sha256 = "18m2mw0pzry3hkq0w3gcky45na5z600wkni856k3fc97w050qym3"; + version = "0.3.25"; + sha256 = "1ps3jjlf9igqmllyapqznzxjkf7291i7zv8w86p2fnm6wxsd73q9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84478,7 +82173,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage @@ -84691,6 +82385,7 @@ self: { homepage = "http://github.com/cstrahan/gochan"; description = "Go-style channels"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gofer-prelude" = callPackage @@ -84706,6 +82401,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "goggles" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, containers, cryptonite, exceptions, filepath, hspec + , http-client, http-client-tls, http-types, memory, mtl, pem + , QuickCheck, req, scientific, stm, text, time, transformers + , unix-time, x509, x509-store + }: + mkDerivation { + pname = "goggles"; + version = "0.1.0.3"; + sha256 = "0if045sxm1xss91hx2hi4hcjy2b4w7q0sas8h9ra75vmzxfn6hjz"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring + containers cryptonite exceptions filepath hspec http-client + http-client-tls http-types memory mtl pem QuickCheck req scientific + stm text time transformers unix-time x509 x509-store + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/goggles"; + description = "Interface to Google Cloud APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gogol" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , conduit-extra, cryptonite, directory, exceptions, filepath @@ -84848,7 +82566,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-android-enterprise" = callPackage @@ -85352,7 +83069,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-games-configuration" = callPackage @@ -86002,7 +83718,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-analytics" = callPackage @@ -86147,6 +83862,7 @@ self: { homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme"; description = "Google Maps Geocoding API bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -86184,7 +83900,6 @@ self: { homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme"; description = "Get Google OAuth2 token for CLI tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-oauth2-jwt" = callPackage @@ -86309,6 +84024,7 @@ self: { homepage = "https://github.com/sternenseemann/gopher-proxy"; description = "proxy gopher over http"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gopherbot" = callPackage @@ -86364,6 +84080,7 @@ self: { homepage = "https://github.com/Teaspot-Studio/gore-and-ash-actor"; description = "Gore&Ash engine extension that implements actor style of programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-async" = callPackage @@ -86387,6 +84104,7 @@ self: { homepage = "https://github.com/TeaspotStudio/gore-and-ash-async#readme"; description = "Core module for Gore&Ash engine that embeds async IO actions into game loop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-demo" = callPackage @@ -86559,7 +84277,6 @@ self: { homepage = "https://github.com/hot-leaf-juice/gotta-go-fast"; description = "A command line utility for practicing typing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gpah" = callPackage @@ -86613,7 +84330,6 @@ self: { homepage = "http://github.com/tgolson/gpio"; description = "Haskell GPIO interface, designed specifically for the RaspberryPi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gpolyline" = callPackage @@ -86731,8 +84447,8 @@ self: { }: mkDerivation { pname = "grakn"; - version = "0.2.0"; - sha256 = "0k6l3bd9bb5wzlk5b5kqp7pdza9vymhm03b65hjcv1djs8lf8hk4"; + version = "0.3.0"; + sha256 = "1difz80dv4ywyshsdd1i65x5kfb8ix9amh0gn7glcnlqgqjrn2jn"; libraryHaskellDepends = [ aeson base containers http-client http-media mtl process regex-posix scientific servant servant-client text @@ -86743,9 +84459,8 @@ self: { servant-client text ]; homepage = "https://github.com/graknlabs/grakn-haskell"; - description = "A Haskell client for "; + description = "A Haskell client for Grakn"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grammar-combinators" = callPackage @@ -86774,8 +84489,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.2.1"; - sha256 = "0225lgg44plnz1140fj91rc45x59a7920hw494qavn968cldkv17"; + version = "0.2.2"; + sha256 = "0l1zjgn4jix9m2zbiwnms3c6004zqzpqxwvsdq9fmafbh7zhfvvx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86876,7 +84591,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "graph-core" = callPackage @@ -86948,6 +84662,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Monadic graph rewriting of hypergraphs with ports and multiedges"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-cl" = callPackage @@ -86986,6 +84701,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "OpenGL interface for interactive port graph rewriting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-lambdascope" = callPackage @@ -87008,6 +84724,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-layout" = callPackage @@ -87024,6 +84741,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Force-directed node placement intended for incremental graph drawing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-ski" = callPackage @@ -87044,6 +84762,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-strategies" = callPackage @@ -87060,6 +84779,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluation strategies for port-graph rewriting systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-trs" = callPackage @@ -87104,6 +84824,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-serialize" = callPackage @@ -87293,25 +85014,26 @@ self: { homepage = "https://github.com/alx741/graphite#readme"; description = "Graphs and networks library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphmod" = callPackage ({ mkDerivation, base, Cabal, containers, directory, dotgen - , filepath, haskell-lexer + , filepath, haskell-lexer, pretty }: mkDerivation { pname = "graphmod"; - version = "1.4"; - sha256 = "11gikmhdamsi900nk206hwm9fjjhdcsspj6aa06i8wqg8g4zbblq"; + version = "1.4.1"; + sha256 = "029lrdgms3kvqh5g9r762r31nwr0cjkzwksbc501d9kd0gk0ymjh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal containers directory dotgen filepath haskell-lexer + pretty ]; homepage = "http://github.com/yav/graphmod/wiki"; description = "Present the module dependencies of a program as a \"dot\" graph"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphql" = callPackage @@ -87403,34 +85125,6 @@ self: { }) {}; "graphviz" = callPackage - ({ mkDerivation, base, bytestring, colour, containers, criterion - , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath - , polyparse, process, QuickCheck, temporary, text, transformers - , wl-pprint-text - }: - mkDerivation { - pname = "graphviz"; - version = "2999.18.1.2"; - sha256 = "1z453is01v0rnxlv6xx4iyaqv5vrp3bpz829mpv1a341sck2135h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring colour containers directory dlist fgl filepath - polyparse process temporary text transformers wl-pprint-text - ]; - executableHaskellDepends = [ - base bytestring directory filepath text - ]; - testHaskellDepends = [ - base containers fgl fgl-arbitrary filepath QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion deepseq text ]; - homepage = "http://projects.haskell.org/graphviz/"; - description = "Bindings to Graphviz for graph visualisation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "graphviz_2999_19_0_0" = callPackage ({ mkDerivation, base, bytestring, colour, containers, criterion , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath , polyparse, process, QuickCheck, temporary, text, transformers @@ -87456,7 +85150,6 @@ self: { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graql" = callPackage @@ -87703,6 +85396,7 @@ self: { homepage = "https://github.com/NICTA/greplicate"; description = "Generalised replicate functions"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grid" = callPackage @@ -87837,6 +85531,7 @@ self: { executableHaskellDepends = [ base lens mtl ncurses ]; description = "A spoof on gloss for terminal animation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog" = callPackage @@ -87961,8 +85656,8 @@ self: { }: mkDerivation { pname = "groundhog-th"; - version = "0.8.0.1"; - sha256 = "00vk26qa7r6znyz848rh66nn4blybprpqvvyh53h22i9ibrk2b1s"; + version = "0.8.0.2"; + sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596"; libraryHaskellDepends = [ aeson base bytestring containers groundhog template-haskell text time unordered-containers yaml @@ -87988,7 +85683,6 @@ self: { homepage = "http://hub.darcs.net/thielema/group-by-date/"; description = "Shell command for grouping files by dates into folders"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "group-with" = callPackage @@ -88015,8 +85709,8 @@ self: { }: mkDerivation { pname = "grouped-list"; - version = "0.2.1.3"; - sha256 = "1ggmjn9gmq3ksbavvi0cqb96fnkbmhr9bsadkilpdnnndfdz0rdy"; + version = "0.2.1.4"; + sha256 = "171n9mc7y3sxkcg1yx02c3snag13rkzf8n06fbc5ny7g15a8p79h"; libraryHaskellDepends = [ base containers deepseq pointed ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -88051,17 +85745,6 @@ self: { }) {}; "groups" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "groups"; - version = "0.4.0.0"; - sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k"; - libraryHaskellDepends = [ base ]; - description = "Haskell 98 groups"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "groups_0_4_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "groups"; @@ -88070,7 +85753,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Haskell 98 groups"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "growler" = callPackage @@ -88357,7 +86039,6 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gtk-mac-integration" = callPackage @@ -88444,34 +86125,9 @@ self: { homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; "gtk2hs-buildtools" = callPackage - ({ mkDerivation, alex, array, base, Cabal, containers, directory - , filepath, happy, hashtables, pretty, process, random - }: - mkDerivation { - pname = "gtk2hs-buildtools"; - version = "0.13.3.0"; - sha256 = "1kz5631vpi4wbi0jldj7gs1xc86vfxdcs750a72x3nbdddbc0asv"; - revision = "1"; - editedCabalFile = "0nbfvza67z6wi7lgpa8zdr7smqzh5xjvhjd7a4iigls8jj74h78s"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base Cabal containers directory filepath hashtables pretty - process random - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "gtk2hs-buildtools_0_13_3_1" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory , filepath, happy, hashtables, pretty, process, random }: @@ -88491,7 +86147,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; 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 @@ -88626,32 +86281,6 @@ self: { }) {}; "gtk3" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time - , transformers - }: - mkDerivation { - pname = "gtk3"; - version = "0.14.7"; - sha256 = "0mvzpx4ciral5hnz2iimwag4gbjjciqhjxbbdssg8mg4yvzpb99s"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk3 ]; - executableHaskellDepends = [ - array base cairo text time transformers - ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) gtk3;}; - - "gtk3_0_14_8" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time , transformers @@ -88674,7 +86303,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -88770,7 +86398,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage @@ -88790,7 +86417,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "guarded-rewriting" = callPackage @@ -88845,7 +86471,6 @@ self: { homepage = "https://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gutenberg-fibonaccis" = callPackage @@ -88874,6 +86499,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gym-http-api" = callPackage + ({ mkDerivation, aeson, base, exceptions, http-client, servant + , servant-client, servant-lucid, text, unordered-containers + }: + mkDerivation { + pname = "gym-http-api"; + version = "0.1.0.0"; + sha256 = "0id8npw9ziqibm0j5fqkjw7r75la2cd4zlyzsk90rpx2xf5xy20p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base servant servant-client servant-lucid text + unordered-containers + ]; + executableHaskellDepends = [ + base exceptions http-client servant-client + ]; + homepage = "https://github.com/stites/gym-http-api#readme"; + description = "REST client to the gym-http-api project"; + license = stdenv.lib.licenses.mit; + }) {}; + "h-booru" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , http-conduit, hxt, mtl, stm, template-haskell, transformers @@ -89158,6 +86805,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOff-display" = callPackage + ({ mkDerivation, base, GLFW, hOff-parser, OpenGL, parsec }: + mkDerivation { + pname = "hOff-display"; + version = "0.1.0.0"; + sha256 = "086a2z57nbfjn7xs2y2mngw4bi0a0d4gxrxd5l5ic15gjr62fa0r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hOff-parser OpenGL ]; + executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ]; + homepage = "https://github.com/Qinka/hOff"; + description = "The tool to transform the OFF to other image format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "hOff-parser" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "hOff-parser"; + version = "0.1.0.0"; + sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci"; + libraryHaskellDepends = [ base parsec ]; + homepage = "https://github.com/Qinka/hOff"; + description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hOpenPGP" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, binary, binary-conduit, byteable @@ -89211,26 +86885,6 @@ self: { }) {}; "hPDB" = callPackage - ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq - , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel - , QuickCheck, tagged, template-haskell, text, unordered-containers - , vector, zlib - }: - mkDerivation { - pname = "hPDB"; - version = "1.2.0.9"; - sha256 = "1kcfizpsvs4nsq8yrqk6syvr9kbbff1krlc4azkpmw4s3r68hjs4"; - libraryHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - iterable mmap mtl Octree parallel QuickCheck tagged - template-haskell text unordered-containers vector zlib - ]; - homepage = "https://github.com/BioHaskell/hPDB"; - description = "Protein Databank file format library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hPDB_1_2_0_10" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel , QuickCheck, tagged, template-haskell, text, unordered-containers @@ -89248,36 +86902,9 @@ self: { homepage = "https://github.com/BioHaskell/hPDB"; description = "Protein Databank file format library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB-examples" = callPackage - ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq - , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree - , OpenGL, process, QuickCheck, template-haskell, text, text-format - , time, vector - }: - mkDerivation { - pname = "hPDB-examples"; - version = "1.2.0.7"; - sha256 = "06wqvr7msvvymkbzfc16zpk4klymhpgw95r8hvxaqrwph80y0c1k"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell - text text-format vector - ]; - testHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - hPDB IfElse iterable mtl process template-haskell text time vector - ]; - homepage = "https://github.com/BioHaskell/hPDB-examples"; - description = "Examples for hPDB library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hPDB-examples_1_2_0_8" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree , OpenGL, process, QuickCheck, template-haskell, text, text-format @@ -89301,7 +86928,6 @@ self: { homepage = "https://github.com/BioHaskell/hPDB-examples"; description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPushover" = callPackage @@ -89458,7 +87084,6 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haar" = callPackage @@ -89537,6 +87162,7 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hacanon-light" = callPackage @@ -89630,6 +87256,7 @@ 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 @@ -89876,6 +87503,7 @@ self: { homepage = "https://github.com/nfjinjing/hack2-contrib"; description = "Hack2 contrib extra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-happstack-server" = callPackage @@ -89975,25 +87603,6 @@ self: { }) {}; "hackage-db" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, tar, utf8-string - }: - mkDerivation { - pname = "hackage-db"; - version = "1.22"; - sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd"; - revision = "1"; - editedCabalFile = "0xj3wwf0wl8qfcz4zsxw0r6f79rg7h010jfv54gsiyzwpf67l9xm"; - libraryHaskellDepends = [ - base bytestring Cabal containers directory filepath tar utf8-string - ]; - homepage = "http://github.com/peti/hackage-db"; - description = "access Hackage's package database via Data.Map"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "hackage-db_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, filepath, tar, time, utf8-string }: @@ -90013,7 +87622,6 @@ self: { homepage = "https://github.com/peti/hackage-db#readme"; description = "Access Hackage's package database via Data.Map"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -90100,6 +87708,7 @@ self: { homepage = "http://hub.darcs.net/thielema/hackage-processing"; description = "Process 00-index.tar.gz from Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-proxy" = callPackage @@ -90147,6 +87756,7 @@ self: { homepage = "https://github.com/well-typed/hackage-security"; description = "Utility to manage secure file-based package repositories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security" = callPackage @@ -90252,7 +87862,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage-sparks"; description = "Generate sparkline graphs of hackage statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-whatsnew" = callPackage @@ -90261,8 +87870,8 @@ self: { }: mkDerivation { pname = "hackage-whatsnew"; - version = "0.1.0.1"; - sha256 = "0bg0l6y6v0nrjz3ywfjx5jknhn9898q2h04m8q3iz1j5y6pzj80d"; + version = "0.1.0.2"; + sha256 = "0z57nnp0sn15399b11h7kb5dxqmg1gd3l8qv7vw8knxv65yfgra3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90321,6 +87930,7 @@ self: { homepage = "https://github.com/dterei/Hackager"; description = "Hackage testing tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackernews" = callPackage @@ -90330,8 +87940,8 @@ self: { }: mkDerivation { pname = "hackernews"; - version = "1.2.0.0"; - sha256 = "08akddv2n1zll630vqi5i9ja1q99zp75hbx1jkgzp9ly81pdf1v7"; + version = "1.3.0.0"; + sha256 = "184hf3lwp275dyq5n2szr1mwp5zpa22x48wqddy9c3clxc7lv535"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90348,15 +87958,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hackernews_1_3_0_0" = callPackage + "hackernews_1_4_0_0" = callPackage ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls , http-types, QuickCheck, quickcheck-instances, servant , servant-client, string-conversions, text }: mkDerivation { pname = "hackernews"; - version = "1.3.0.0"; - sha256 = "184hf3lwp275dyq5n2szr1mwp5zpa22x48wqddy9c3clxc7lv535"; + version = "1.4.0.0"; + sha256 = "0ilj91vjnsfdlzhjh35nqrr3c1z7p6qfabvk3xdz6iqzmpcq3ys8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90496,23 +88106,6 @@ self: { }) {}; "haddock" = callPackage - ({ mkDerivation, base, filepath, haddock-api, hspec }: - mkDerivation { - pname = "haddock"; - version = "2.17.4"; - sha256 = "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base haddock-api ]; - testHaskellDepends = [ base filepath hspec ]; - doCheck = false; - preCheck = "unset GHC_PACKAGE_PATH"; - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haddock_2_18_1" = callPackage ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { pname = "haddock"; @@ -90570,7 +88163,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-api" = callPackage + "haddock-api_2_17_4" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths , haddock-library, hspec, QuickCheck, transformers, xhtml @@ -90590,12 +88183,14 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-api_2_18_1" = callPackage + "haddock-api" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths - , haddock-library, hspec, QuickCheck, transformers, xhtml + , haddock-library, hspec, hspec-discover, QuickCheck, transformers + , xhtml }: mkDerivation { pname = "haddock-api"; @@ -90609,6 +88204,7 @@ self: { ghc ghc-boot ghc-paths haddock-library transformers xhtml ]; testHaskellDepends = [ base containers ghc hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -90670,21 +88266,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock-library_1_4_5" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq - , hspec, QuickCheck, transformers + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , hspec-discover, QuickCheck, transformers }: mkDerivation { pname = "haddock-library"; version = "1.4.5"; sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9"; - libraryHaskellDepends = [ - attoparsec base bytestring transformers - ]; + libraryHaskellDepends = [ base bytestring deepseq transformers ]; testHaskellDepends = [ - attoparsec base base-compat bytestring deepseq hspec QuickCheck - transformers + base base-compat bytestring deepseq hspec QuickCheck transformers ]; + testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; @@ -90705,6 +88318,7 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "Test utilities for Haddock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haddocset" = callPackage @@ -90730,6 +88344,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hadolint" = callPackage + ({ mkDerivation, base, bytestring, gitrev, hspec, HUnit + , language-docker, optparse-applicative, parsec, ShellCheck, split + }: + mkDerivation { + pname = "hadolint"; + version = "1.2.5"; + sha256 = "1rnbxkzqj493yn41ln9hxpmbdvgynb1mm86kl4l522is96smqp7v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring language-docker parsec ShellCheck split + ]; + executableHaskellDepends = [ + base gitrev language-docker optparse-applicative parsec + ]; + testHaskellDepends = [ + base bytestring hspec HUnit language-docker parsec ShellCheck split + ]; + homepage = "https://github.com/hadolint/hadolint"; + description = "Dockerfile Linter JavaScript API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hadoop-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, snappy , text, vector @@ -90919,6 +88557,7 @@ self: { homepage = "https://github.com/TaktInc/hail"; description = "A service for pull-based continuous deployment based on hydra"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun" = callPackage @@ -91135,6 +88774,7 @@ self: { executableHaskellDepends = [ base ]; description = "Minimal akka-inspired actor library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hako" = callPackage @@ -91167,8 +88807,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.8.0"; - sha256 = "0jjy1j79vzkdpi2ksql5bzwv2bw3bk6h0jgi73ngj8lkrm6q80b3"; + version = "4.10.0.0"; + sha256 = "0zz5g8ildihng1cw12hxfv3ihd604id20llnpaasrg25b96bidw2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91351,6 +88991,7 @@ self: { homepage = "http://github.com/Minoru/hakyll-convert"; description = "Convert from other blog engines to Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -91396,14 +89037,15 @@ self: { homepage = "https://gitlab.com/aergus/hakyll-filestore"; description = "FileStore utilities for Hakyll"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage ({ mkDerivation, base, hakyll, ogmarkup }: mkDerivation { pname = "hakyll-ogmarkup"; - version = "3.0"; - sha256 = "088hcjy34xxyaphy8c7kj82w88pwzdaww1xww791hjrq0r75icf7"; + version = "4.0"; + sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d"; libraryHaskellDepends = [ base hakyll ogmarkup ]; homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; description = "Integrate ogmarkup document with Hakyll"; @@ -91698,36 +89340,9 @@ self: { libraryHaskellDepends = [ base HCodecs newtype ]; description = "Binding to the OS level Midi services (fork of system-midi)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hamilton" = callPackage - ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers - , free, hmatrix, hmatrix-gsl, optparse-applicative - , typelits-witnesses, vector, vector-sized, vty - }: - mkDerivation { - pname = "hamilton"; - version = "0.1.0.0"; - sha256 = "1mwqrwxvrdbkigdkrq0fl5djd3pvp8g7g27qzsdsazrf4z9m71ic"; - revision = "2"; - editedCabalFile = "17d4qaib8539pyzagq8vrqyc8g3a1g0jgw67jpzjyjs7v2f0kagh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ad base comonad free hmatrix hmatrix-gsl typelits-witnesses - vector-sized - ]; - executableHaskellDepends = [ - ansi-wl-pprint base containers hmatrix optparse-applicative vector - vector-sized vty - ]; - homepage = "https://github.com/mstksg/hamilton"; - description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hamilton_0_1_0_1" = callPackage ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers , free, hmatrix, hmatrix-gsl, optparse-applicative , typelits-witnesses, vector, vector-sized, vty @@ -91749,7 +89364,6 @@ self: { homepage = "https://github.com/mstksg/hamilton"; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamlet" = callPackage @@ -91844,6 +89458,7 @@ self: { homepage = "https://github.com/tfc/hamtsolo#readme"; description = "Intel AMT serial-over-lan (SOL) client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamusic" = callPackage @@ -92110,22 +89725,23 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath, hspec - , mtl, optparse-applicative, path, path-io, process, stm, temporary - , time, transformers, yaml + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.3.0"; - sha256 = "1skpygsnzl940703fxd103lxhyi4cjpp5il9kwjqfavsnbfi0c46"; + version = "0.3.5.1"; + sha256 = "1zpvwdq9dzfkq9jh1bpc5x8vh41508x0wph5a020q31rknc8llad"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base filepath mtl path process time transformers + base filepath formatting gitrev mtl path process time transformers ]; executableHaskellDepends = [ - aeson async base optparse-applicative path path-io stm yaml + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml ]; testHaskellDepends = [ base directory filepath hspec mtl path path-io process temporary @@ -92135,33 +89751,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hapistrano_0_3_4_0" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath, hspec - , mtl, optparse-applicative, path, path-io, process, stm, temporary - , time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.3.4.0"; - sha256 = "04wfaaj4qr9ysincnvcghm3bpi8l0z7a7b18zg674qaq3rsr3rn6"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base optparse-applicative path path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - homepage = "https://github.com/stackbuilders/hapistrano"; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -92350,6 +89939,7 @@ self: { homepage = "http://happstack.com"; description = "client-side session data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-contrib" = callPackage @@ -92459,6 +90049,7 @@ self: { ]; description = "Happstack extension for use with FastCGI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-fay" = callPackage @@ -92653,6 +90244,7 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack minus the useless stuff"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-monad-peel" = callPackage @@ -92689,35 +90281,6 @@ self: { }) {}; "happstack-server" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring - , containers, directory, exceptions, extensible-exceptions - , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, sendfile, syb - , system-filepath, template-haskell, text, threads, time - , time-compat, transformers, transformers-base, transformers-compat - , unix, utf8-string, xhtml, zlib - }: - mkDerivation { - pname = "happstack-server"; - version = "7.4.6.4"; - sha256 = "1fd19qxpdj7iz4rjjwgi527naiw32l09gazr39skgzzf7m8ckiml"; - libraryHaskellDepends = [ - base base64-bytestring blaze-html bytestring containers directory - exceptions extensible-exceptions filepath hslogger html - monad-control mtl network network-uri old-locale parsec process - sendfile syb system-filepath template-haskell text threads time - time-compat transformers transformers-base transformers-compat unix - utf8-string xhtml zlib - ]; - testHaskellDepends = [ - base bytestring containers HUnit parsec zlib - ]; - homepage = "http://happstack.com"; - description = "Web related tools and services"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "happstack-server_7_5_0_1" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -92744,7 +90307,6 @@ self: { homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-server-tls" = callPackage @@ -92820,6 +90382,7 @@ self: { homepage = "https://github.com/scrive/happstack-static-routing"; description = "Support for static URL routing with overlap detection for Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-util" = callPackage @@ -93011,6 +90574,25 @@ self: { homepage = "https://github.com/crufter/haquery"; description = "jQuery for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haquil" = callPackage + ({ mkDerivation, base, hTensor, MonadRandom, QuickCheck + , template-haskell, vector + }: + mkDerivation { + pname = "haquil"; + version = "0.1.7.5"; + sha256 = "0zmwp7839b6apjakrw7iksmx4dgiap5ak4wydcn0b2xj1wff7aq4"; + libraryHaskellDepends = [ base hTensor MonadRandom vector ]; + testHaskellDepends = [ + base hTensor MonadRandom QuickCheck template-haskell vector + ]; + homepage = "https://bitbucket.org/functionally/haquil"; + description = "A Haskell implementation of the Quil instruction set for quantum computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "har" = callPackage @@ -93287,7 +90869,6 @@ self: { homepage = "https://github.com/VirtualForgeGmbH/hascar"; description = "Decompress SAPCAR archives"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascas" = callPackage @@ -93537,6 +91118,7 @@ self: { homepage = "https://github.com/jberryman/hashabler"; description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashed-storage" = callPackage @@ -93614,8 +91196,8 @@ self: { ({ mkDerivation, base, containers, deepseq, hashable }: mkDerivation { pname = "hashmap"; - version = "1.3.2"; - sha256 = "15jppbxwqkwccdif789c7gvlfypyd98gnv1p5dh2kx977r19sh01"; + version = "1.3.3"; + sha256 = "0ma7svf9nanlfbj9nkk6bzk4m98i7xd71xrdc3a5dmmws5yba1nw"; libraryHaskellDepends = [ base containers deepseq hashable ]; homepage = "https://github.com/foxik/hashmap"; description = "Persistent containers Map and Set based on hashing"; @@ -93919,20 +91501,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_0" = callPackage + "haskeline_0_7_4_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , process, terminfo, transformers, unix + , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.0"; - sha256 = "0y1rspmgmgfvx91zkwwgfnfwvdp7q4zxcfl2hq81fcqpi5bgbmcs"; + version = "0.7.4.2"; + sha256 = "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ - base bytestring containers directory filepath process terminfo + base bytestring containers directory filepath process stm terminfo transformers unix ]; - homepage = "http://trac.haskell.org/haskeline"; + homepage = "https://github.com/judah/haskeline"; description = "A command-line interface for user input, written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -93974,6 +91556,7 @@ self: { homepage = "http://github.com/githubuser/haskelisp#readme"; description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-abci" = callPackage @@ -94160,6 +91743,7 @@ self: { homepage = "https://github.com/mgajda/haskell-conll#readme"; description = "Core Types for NLP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-course-preludes" = callPackage @@ -94174,6 +91758,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-dap" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghci, haskeline, process + , time, transformers, unix + }: + mkDerivation { + pname = "haskell-dap"; + version = "0.0.1.0"; + sha256 = "1wny1ab0x1wdaa8xhza478abyv1sd2pq4clc08bz3b2aa0qd13y8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghci haskeline process time transformers unix + ]; + homepage = "https://github.com/phoityne/haskell-dap"; + description = "haskell-dap is a GHCi having DAP interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-disque" = callPackage ({ mkDerivation, base, bytestring, hedis, string-conversions , transformers @@ -94194,8 +91799,7 @@ self: { "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths - , haddock-api, haddock-library, monad-loops, process, text - , unordered-containers + , haddock-api, monad-loops, process, text, unordered-containers }: mkDerivation { pname = "haskell-docs"; @@ -94205,14 +91809,15 @@ self: { isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Cabal containers cryptohash - directory filepath ghc ghc-paths haddock-api haddock-library - monad-loops process text unordered-containers + directory filepath ghc ghc-paths haddock-api monad-loops process + text unordered-containers ]; executableHaskellDepends = [ base ghc text ]; testHaskellDepends = [ base ]; homepage = "http://github.com/ivan-m/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-eigen-util" = callPackage @@ -94226,7 +91831,6 @@ self: { homepage = "https://github.com/dilawar/haskell-eigen-util#README.md"; description = "Some utility functions for haskell-eigen library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-exp-parser" = callPackage @@ -94383,8 +91987,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.20.5"; - sha256 = "1854v6z8ragc5bbv4jc1qwbn85pw7z9gsqd17qizps6zmpx3gm9a"; + version = "0.20.8"; + sha256 = "1qfkzsr5z8c71hps66zj90j70s258d85r0zpw5s87vcj1cbjza4i"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -94429,6 +92033,7 @@ self: { homepage = "https://github.com/prateekkumarweb/haskell-go-checkers"; description = "Go and Checkers game in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-google-trends" = callPackage @@ -94450,6 +92055,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "haskell-holes-th" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "haskell-holes-th"; + version = "1.0.0.0"; + sha256 = "13xyxck9f15mwi641zs9zw77cnrgh30p2771f66haby96k8wx9jf"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/8084/haskell-holes-th"; + description = "Infer haskell code by given type"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-igraph" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs , colour, data-default-class, data-ordlist, hashable, hxt, igraph @@ -94540,39 +92158,6 @@ self: { }) {}; "haskell-lsp" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec - , stm, text, time, transformers, unordered-containers, vector - , yi-rope - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.1.0.0"; - sha256 = "135f9xqzlvz01gwdqwxvdmxiwwqvka5j3iv13zczzzzn7vwfnbbd"; - revision = "1"; - editedCabalFile = "1xn4nlq0a48fcjngigmvwnadh94nxsvvi56wahghi83zgx28s0k1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hslogger lens mtl parsec stm text time - unordered-containers yi-rope - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hslogger lens mtl parsec stm text time transformers - unordered-containers vector yi-rope - ]; - testHaskellDepends = [ - aeson base containers directory hashable hspec lens text yi-rope - ]; - homepage = "https://github.com/alanz/haskell-lsp"; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-lsp_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec , sorted-list, stm, text, time, transformers, unordered-containers @@ -94580,8 +92165,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.2.0.0"; - sha256 = "1hvqimg580hbanlhim2kxni3wk6rfwsd93agkfjhy216lb8bd9h8"; + version = "0.2.0.1"; + sha256 = "0xvgm1kkfz5yf1949f07phg5lic1zhwy5pdbgfnqdpaxrwscxm8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94601,7 +92186,27 @@ self: { homepage = "https://github.com/alanz/haskell-lsp"; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskell-lsp-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , haskell-lsp, lens, process, text, unix + }: + mkDerivation { + pname = "haskell-lsp-client"; + version = "1.0.0.1"; + sha256 = "06zx80nhhf5fik84rijaxzjy9yv1c29g6hwfx73axlav80g176qw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers haskell-lsp lens process text + ]; + executableHaskellDepends = [ + base directory haskell-lsp lens process text unix + ]; + homepage = "https://github.com/noughtmare/haskell-lsp-client#readme"; + description = "A haskell package to build your own Language Server client"; + license = stdenv.lib.licenses.gpl2; }) {}; "haskell-menu" = callPackage @@ -94686,7 +92291,6 @@ self: { homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-neo4j-client" = callPackage @@ -94755,6 +92359,7 @@ self: { homepage = "http://documentup.com/haskell-suite/haskell-packages"; description = "Haskell suite library for package management and integration with Cabal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-pdf-presenter" = callPackage @@ -94959,8 +92564,8 @@ self: { }: mkDerivation { pname = "haskell-src-exts"; - version = "1.18.2"; - sha256 = "0hq9f6r67gkhad4cc4dhahrwrz9kxfibhk8qrw5j0p7cvh23hn1i"; + version = "1.19.1"; + sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -94973,15 +92578,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts_1_19_1" = callPackage + "haskell-src-exts_1_20_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.19.1"; - sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh"; + version = "1.20.1"; + sha256 = "1jsjl9hja2dpcfq4mzlfpwyr6axwnwgacfb7aa070kz4lbygzaa8"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -95054,6 +92659,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-src-exts-simple_1_20_0_0" = callPackage + ({ mkDerivation, base, haskell-src-exts }: + mkDerivation { + pname = "haskell-src-exts-simple"; + version = "1.20.0.0"; + sha256 = "0p79ppmwb14lj2a1wy42zgm3z3zk5jbyn7rfgwxsyw2g424bw1dk"; + libraryHaskellDepends = [ base haskell-src-exts ]; + homepage = "https://github.com/int-e/haskell-src-exts-simple"; + description = "A simplified view on the haskell-src-exts AST"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts-util" = callPackage ({ mkDerivation, base, containers, data-default, haskell-src-exts , transformers, uniplate @@ -95151,8 +92769,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.8.1.0"; - sha256 = "0ryny34zlbyy15m18f5539gaqwghbk1msz5ijv3x04n1c87vj7h4"; + version = "1.0.0.3"; + sha256 = "1zfcwm6na7ivl4xy6yfdbgncklxp70g5llzl7i754sqvacbp7ygv"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -95161,23 +92779,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-ast_1_0_0_0" = callPackage - ({ mkDerivation, base, ghc, mtl, references, template-haskell - , uniplate - }: - mkDerivation { - pname = "haskell-tools-ast"; - version = "1.0.0.0"; - sha256 = "174xh6a0p43kb0cia3z1n18kqhpsnbf51299l0rbn2makvn68zk4"; - libraryHaskellDepends = [ - base ghc mtl references template-haskell uniplate - ]; - homepage = "https://github.com/nboldi/haskell-tools"; - description = "Haskell AST for efficient tooling"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -95239,8 +92840,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.8.1.0"; - sha256 = "1abbqgv43rbkwabnhm0p7i39sgiq952hg5xy7bc8g3jbnaallaaf"; + version = "1.0.0.3"; + sha256 = "1k8ykgasq621dndazb99834l6c0gz3qp40r81ja5mjwfqnihy2wk"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -95250,25 +92851,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-backend-ghc_1_0_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th - , haskell-tools-ast, mtl, references, safe, split, template-haskell - , transformers, uniplate - }: - mkDerivation { - pname = "haskell-tools-backend-ghc"; - version = "1.0.0.0"; - sha256 = "09jhc2i7ypfcgpdmjfg7bacf9a0nlxrvbz99zh86kgbrjh1xjr8f"; - libraryHaskellDepends = [ - base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl - references safe split template-haskell transformers uniplate - ]; - homepage = "https://github.com/nboldi/haskell-tools"; - description = "Creating the Haskell-Tools AST from GHC's representations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-tools-builtin-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -95279,8 +92861,8 @@ self: { }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.0.0.0"; - sha256 = "0mhigqzivx1r04gi9v4jb7cvzirly8bbm3nckib170yws884gcba"; + version = "1.0.0.3"; + sha256 = "0m6wwx3z5gbh9pak7r6lirk66clyb6yzryhbzcqhnwlnaawrpnh4"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95302,36 +92884,6 @@ self: { }) {}; "haskell-tools-cli" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , directory, filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl - , process, references, split, strict, tasty, tasty-hunit, time - }: - mkDerivation { - pname = "haskell-tools-cli"; - version = "0.8.0.0"; - sha256 = "02f5fhb20wb49gchqx8mjc6khdlc3g6lfawxl3v0xr8fargyyiz5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath ghc ghc-paths haskell-tools-ast - haskell-tools-prettyprint haskell-tools-refactor mtl references - split strict - ]; - executableHaskellDepends = [ base directory process split ]; - testHaskellDepends = [ - base bytestring directory filepath knob tasty tasty-hunit - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion directory filepath knob split time - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Command-line frontend for Haskell-tools Refact"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-cli_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-daemon @@ -95340,8 +92892,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.0.0.0"; - sha256 = "1y0jlgp3b8bxgrs406c32drdphblnn5c7rsqj2n9gvmhmdj01iwc"; + version = "1.0.0.3"; + sha256 = "1cbp5n2b4q3kjacj4adnblb5znwi9waqx0pg14khk6nhdpqbp4l7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95369,33 +92921,6 @@ self: { }) {}; "haskell-tools-daemon" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, Diff - , directory, filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl - , network, process, references, split, strict, tasty, tasty-hunit - }: - mkDerivation { - pname = "haskell-tools-daemon"; - version = "0.8.1.0"; - sha256 = "1h5xh235b68kfjq8hkrmr0zhj6csaslm7qwkaqs3ygxkkrq152ic"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers Diff directory filepath ghc - ghc-paths haskell-tools-ast haskell-tools-prettyprint - haskell-tools-refactor mtl network process references split strict - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson base bytestring directory filepath ghc HUnit network process - tasty tasty-hunit - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Background process for Haskell-tools refactor that editors can connect to"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-daemon_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-prettyprint @@ -95405,8 +92930,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.0.0.0"; - sha256 = "0pgpir9p693wym1krw2pyk17aq0dv10xbypw44ik6syzmy8j1zla"; + version = "1.0.0.3"; + sha256 = "1g25i9ilsrk0201cnnm2r5xbcnlmknpvw3h99vl087i3d913wln7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95431,28 +92956,6 @@ self: { }) {}; "haskell-tools-debug" = callPackage - ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-refactor, references, template-haskell - }: - mkDerivation { - pname = "haskell-tools-debug"; - version = "0.8.1.0"; - sha256 = "1c6apmv2x4wrjh22nm7v151hy4r2sksrbcwin80dc8ya4zc3fqr6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath ghc ghc-paths haskell-tools-ast - haskell-tools-backend-ghc haskell-tools-prettyprint - haskell-tools-refactor references template-haskell - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Debugging Tools for Haskell-tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-debug_1_0_0_0" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings , haskell-tools-prettyprint, haskell-tools-refactor, references @@ -95460,8 +92963,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.0.0.0"; - sha256 = "0jbiid1plb2y2sfpi5m46kl6waap8xhk8bqk5q9km2w7np0fv5dc"; + version = "1.0.0.3"; + sha256 = "1f2m1ggjjbdwl23v558dlyqzcl00dg2almhppf8m3xg5vzgjzlpj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95478,36 +92981,6 @@ self: { }) {}; "haskell-tools-demo" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-refactor, http-types, HUnit, mtl, network - , references, tasty, tasty-hunit, transformers, wai, wai-websockets - , warp, websockets - }: - mkDerivation { - pname = "haskell-tools-demo"; - version = "0.8.1.0"; - sha256 = "011p9xdqgr93qxwvhcf8k2xr2ycgfjf0d60g8yfgjkgy9zx6fsma"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-refactor http-types mtl - references transformers wai wai-websockets warp websockets - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson base bytestring directory filepath HUnit network tasty - tasty-hunit websockets - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "A web-based demo for Haskell-tools Refactor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-demo_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -95517,8 +92990,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.0.0.0"; - sha256 = "0kyf83wg514yl795k63wlklrdlz3fnnxl9qjkcwv5fxkxxixxf07"; + version = "1.0.0.3"; + sha256 = "17cqnchan6qm9hhrrzk8m9v3qqzr3rfb1q8iyf8daa50qj9s836p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95549,8 +93022,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.0.0.0"; - sha256 = "1k3grr8jca4samw0hqm1yrq8yjg4nw0z4gwx366anjpvwb1chr9a"; + version = "1.0.0.3"; + sha256 = "0y8dzrxv62ad164nikzhlny55im4ys16nkiak041yqygzg9qzshz"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95568,7 +93041,6 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-prettyprint" = callPackage @@ -95577,8 +93049,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.8.1.0"; - sha256 = "1zcxg6drw3zfc93awmamhh8mqfyrp1pyrnk137yc0dz4293z9rdw"; + version = "1.0.0.3"; + sha256 = "0gm48sikbm3dzv687wy7qn7j6159jf6j2gq0yhrhvxqhss4r03md"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -95588,55 +93060,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-prettyprint_1_0_0_0" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl - , references, split, text, uniplate - }: - mkDerivation { - pname = "haskell-tools-prettyprint"; - version = "1.0.0.0"; - sha256 = "1f27xziimiz81sjns8hia6xsk94zm3yjpcdvihaqr0g0dq1mkfwl"; - libraryHaskellDepends = [ - base containers ghc haskell-tools-ast mtl references split text - uniplate - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Pretty printing of Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-tools-refactor" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, either - , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-rewrite, mtl, old-time, polyparse, references - , split, tasty, tasty-hunit, template-haskell, time, transformers - , uniplate - }: - mkDerivation { - pname = "haskell-tools-refactor"; - version = "0.8.1.0"; - sha256 = "04jx9qq04krk8wk7v5b6xv7gi8cd1sgzwraw916a11cgn0p52grr"; - libraryHaskellDepends = [ - base Cabal containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl references - split template-haskell transformers uniplate - ]; - testHaskellDepends = [ - base Cabal containers directory either filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl old-time - polyparse references split tasty tasty-hunit template-haskell time - transformers uniplate - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-refactor_1_0_0_0" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references @@ -95644,8 +93068,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "1.0.0.0"; - sha256 = "0s3mdwpsla79ppcsl7n3r1yjbi0db0w6yk2zf143p5ngbhj08rs4"; + version = "1.0.0.3"; + sha256 = "1gfy04fj3rg900ii32msyqrhzzwfcj6sl9z3ldjfm0c0jpdx4bm3"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95655,7 +93079,6 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-rewrite" = callPackage @@ -95665,8 +93088,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.8.1.0"; - sha256 = "1ckn103f5jg3yqpf2ki8n62a663hj5q2zyd5mzx6n4nlkr47bc57"; + version = "1.0.0.3"; + sha256 = "15i25crjz50i9kxj2r2dsvmckfq8c0hkwypqrivy7c39cmqhv504"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -95680,29 +93103,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-rewrite_1_0_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc - , haskell-tools-ast, haskell-tools-prettyprint, mtl, references - , tasty, tasty-hunit - }: - mkDerivation { - pname = "haskell-tools-rewrite"; - version = "1.0.0.0"; - sha256 = "0zm7bdlfda29md86s0bz40y3ml1pb6x8fvp4br8gxj7r3j1l8852"; - libraryHaskellDepends = [ - base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl - references - ]; - testHaskellDepends = [ - base directory filepath haskell-tools-ast haskell-tools-prettyprint - tasty tasty-hunit - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Facilities for generating new parts of the Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -95784,8 +93184,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.3"; - sha256 = "1q9rjy36wqagy665k0ifnfwr9r1fy2if5gnva9q069hdir15lkzm"; + version = "1.3.1"; + sha256 = "0q2aix579mm3ksi0hipcmw8g2p5xfbgk6ph7jnraq5i2rxjchg7v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96462,27 +93862,6 @@ self: { }) {}; "haskintex" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text - , transformers - }: - mkDerivation { - pname = "haskintex"; - version = "0.7.0.1"; - sha256 = "06z3vb34rgap99r90l00bncxvd02z59lq6phdy4bxq6ccjcz2ivn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers directory filepath - haskell-src-exts HaTeX hint parsec process text transformers - ]; - executableHaskellDepends = [ base ]; - homepage = "http://daniel-diaz.github.io/projects/haskintex"; - description = "Haskell Evaluation inside of LaTeX code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskintex_0_8_0_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text , transformers @@ -96501,7 +93880,6 @@ self: { homepage = "http://daniel-diaz.github.io/projects/haskintex"; description = "Haskell Evaluation inside of LaTeX code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskmon" = callPackage @@ -96941,6 +94319,7 @@ self: { homepage = "http://www.haskus.org/system"; description = "Haskus binary format manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-system-build" = callPackage @@ -96961,6 +94340,7 @@ self: { homepage = "http://www.haskus.org/system"; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-utils" = callPackage @@ -96980,6 +94360,7 @@ self: { homepage = "http://www.haskus.org/system"; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haslo" = callPackage @@ -97017,24 +94398,25 @@ self: { }) {}; "hasmin" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , criterion, directory, doctest, doctest-discover, gitrev, hopfli - , hspec, hspec-attoparsec, matrix, mtl, numbers + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, criterion, directory, doctest, doctest-discover + , gitrev, hopfli, hspec, hspec-attoparsec, matrix, mtl, numbers , optparse-applicative, parsers, QuickCheck, text }: mkDerivation { pname = "hasmin"; - version = "0.3.3.1"; - sha256 = "0hcrdyyhaj3s7mam8i0lbaljgs0xmdv5076jaxb3jhh459fl682c"; + version = "1.0.1"; + sha256 = "1h5ygl9qmzmbhqfb58hhm2zw850dqfkp4b8cp3bhsnangg4lgbjk"; + revision = "1"; + editedCabalFile = "18qpp71nkf0sayzwxwfn2nz1g8fklsa55h2jrazqilhrdq82gq7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers matrix mtl numbers parsers + attoparsec base bifunctors containers matrix mtl numbers parsers text ]; executableHaskellDepends = [ - attoparsec base bytestring containers gitrev hopfli matrix mtl - numbers optparse-applicative parsers text + base bytestring gitrev hopfli optparse-applicative text ]; testHaskellDepends = [ attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl @@ -97046,37 +94428,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hasmin_1_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , criterion, directory, doctest, doctest-discover, gitrev, hopfli - , hspec, hspec-attoparsec, matrix, mtl, numbers - , optparse-applicative, parsers, QuickCheck, text - }: - mkDerivation { - pname = "hasmin"; - version = "1.0"; - sha256 = "1a512s1fd472agy2pv9qizp61jrz1jzdpxla3213y6wsahi9wdnm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers matrix mtl numbers parsers - text - ]; - executableHaskellDepends = [ - attoparsec base bytestring containers gitrev hopfli matrix mtl - numbers optparse-applicative parsers text - ]; - testHaskellDepends = [ - attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl - QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion directory text ]; - homepage = "https://github.com/contivero/hasmin#readme"; - description = "CSS Minifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hasparql-client" = callPackage ({ mkDerivation, base, HTTP, monads-fd, network, xml }: mkDerivation { @@ -97104,35 +94455,6 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, dlist, either, hashable - , hashtables, loch-th, mtl, placeholders, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rebase, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, transformers, vector - }: - mkDerivation { - pname = "hasql"; - version = "0.19.18.2"; - sha256 = "064866vgiwpp39g3drw0gralra4via77rcqxri8279svm8m5vmbi"; - libraryHaskellDepends = [ - attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras data-default-class dlist either - hashable hashtables loch-th mtl placeholders postgresql-binary - postgresql-libpq profunctors semigroups text transformers vector - ]; - testHaskellDepends = [ - bug data-default-class QuickCheck quickcheck-instances rebase - rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - benchmarkHaskellDepends = [ bug criterion rerebase ]; - homepage = "https://github.com/nikita-volkov/hasql"; - description = "An efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_1_1_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, data-default-class, dlist, hashable, hashtables @@ -97245,6 +94567,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction"; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-generic" = callPackage @@ -97254,8 +94577,8 @@ self: { }: mkDerivation { pname = "hasql-generic"; - version = "0.1.0.4"; - sha256 = "10ps2kf0q4lxcmrvyqsw7gkamcyqlyjlj3ljgs68fniri0pbw3fn"; + version = "0.1.0.5"; + sha256 = "0prf7ikjccp4bvlxxv78xg34mz0m3gn2y3c2z1lq14jzarya4pcf"; libraryHaskellDepends = [ aeson base binary-parser bytestring containers contravariant generics-sop hasql postgresql-binary scientific text time uuid @@ -97288,6 +94611,7 @@ self: { homepage = "https://github.com/tvh/hasql-migration"; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-optparse-applicative" = callPackage @@ -97304,6 +94628,24 @@ self: { homepage = "https://github.com/sannsyn/hasql-optparse-applicative"; description = "\"optparse-applicative\" parsers for \"hasql\""; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql-optparse-applicative_0_3" = callPackage + ({ mkDerivation, base-prelude, hasql, hasql-pool + , optparse-applicative + }: + mkDerivation { + pname = "hasql-optparse-applicative"; + version = "0.3"; + sha256 = "05i9hij1z67l1sc53swwcmd88544dypc3qkzkh8f4n6nlmv82190"; + libraryHaskellDepends = [ + base-prelude hasql hasql-pool optparse-applicative + ]; + homepage = "https://github.com/sannsyn/hasql-optparse-applicative"; + description = "\"optparse-applicative\" parsers for \"hasql\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-pool" = callPackage @@ -97316,6 +94658,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-pool"; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-postgres" = callPackage @@ -97386,6 +94729,7 @@ self: { homepage = "https://github.com/agrafix/hasql-simple#readme"; description = "A somewhat opinionated \"simpler\" API to hasql"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-th" = callPackage @@ -97420,6 +94764,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-transaction"; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache" = callPackage @@ -97529,7 +94874,6 @@ self: { homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -97693,6 +95037,7 @@ self: { ]; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hath" = callPackage @@ -97788,6 +95133,7 @@ self: { ]; description = "Recursively retrieve maven dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haverer" = callPackage @@ -98507,8 +95853,8 @@ self: { }: mkDerivation { pname = "hdaemonize"; - version = "0.5.4"; - sha256 = "0r6bfb2bc9lg4iywbql7ik9swvvn4lfhq0qn7r20v4gq5fkpwgvw"; + version = "0.5.5"; + sha256 = "17q2zr9bv6xwnldgbsh1idwfgybp8q4xzq79p2lmmi3f0q6cnl6j"; libraryHaskellDepends = [ base bytestring extensible-exceptions filepath hsyslog mtl unix ]; @@ -98705,8 +96051,8 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.6.0"; - sha256 = "0yp270sbz501vla87nhzv53ag0b64ny9gza6chr8mbjqkj86d5j5"; + version = "0.1.6.1"; + sha256 = "0h1l74ky9a5an7j60i9razifm49v232g8f8p8fg1arv59b7nmr77"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98836,6 +96182,7 @@ self: { ]; description = "A Digital Ocean client in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdocs" = callPackage @@ -98861,6 +96208,7 @@ self: { homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdph" = callPackage @@ -98962,6 +96310,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heaps" = callPackage @@ -99113,6 +96462,7 @@ self: { homepage = "https://github.com/2016rshah/heckle"; description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog" = callPackage @@ -99124,10 +96474,8 @@ self: { }: mkDerivation { pname = "hedgehog"; - version = "0.5"; - sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk"; - revision = "1"; - editedCabalFile = "13079sdirdzch3r199lyxa7xrcq4xpaayxhdvg8v0d27w9z1chln"; + version = "0.5.1"; + sha256 = "0fx3dq45azxrhihhq6hlb89zkj3y8fmnfdrsz1wbvih9a3dhiwx7"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl @@ -99143,6 +96491,57 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog-checkers" = callPackage + ({ mkDerivation, base, containers, either, hedgehog, semigroupoids + , semigroups + }: + mkDerivation { + pname = "hedgehog-checkers"; + version = "0.1.0.0"; + sha256 = "0fr0jmvh3c6a1mvdppbjxxc1ps94p4kc1crxwdmw1487jlg2z8ps"; + libraryHaskellDepends = [ + base containers hedgehog semigroupoids semigroups + ]; + testHaskellDepends = [ base either hedgehog ]; + homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hedgehog-checkers-lens" = callPackage + ({ mkDerivation, base, hedgehog, hedgehog-checkers, lens }: + mkDerivation { + pname = "hedgehog-checkers-lens"; + version = "0.1.0.0"; + sha256 = "0zfk967xzpwfh3y3ys8d0c3zcz251dnp41xha11613ji3yfk0wff"; + libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; + testHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; + homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hedgehog-gen-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , hedgehog, lens, protolude, regex-genex, regex-posix, scientific + , tasty, tasty-hedgehog, text, unordered-containers, vector + }: + mkDerivation { + pname = "hedgehog-gen-json"; + version = "0.1.0"; + sha256 = "1b2sb33ah8df2v36hq1axf8dc5d3kflvpb70fcs2pbr44wzrv8x4"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions hedgehog lens protolude + regex-genex scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hedgehog lens protolude + regex-genex regex-posix scientific tasty tasty-hedgehog text + unordered-containers vector + ]; + homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; + description = "JSON generators for Hedgehog"; + license = stdenv.lib.licenses.mit; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -99306,6 +96705,7 @@ self: { homepage = "https://bitbucket.org/dpwiz/hedn"; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hein" = callPackage @@ -99339,8 +96739,10 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.0.1.1"; - sha256 = "1incy8w291k3vivnrxxqw12i77qzq8b840z8l99i0mkwbl3w3gf7"; + version = "1.0.1.2"; + sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71"; + revision = "1"; + editedCabalFile = "0aac04b374bi02nj1li7xf0w2z1d87l8qhzjmpsharg9jxrk8ngn"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -99479,6 +96881,7 @@ self: { homepage = "http://www.codersbase.com/index.php/Helisp"; description = "An incomplete Elisp compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "helium" = callPackage @@ -99833,8 +97236,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.11"; - sha256 = "1jpcwzi5pq82zlv1w987dlpfyi566gvabaj2wywyr9i95hv97jk8"; + version = "1.2.12"; + sha256 = "0kiwcknk145z7y48qgpf73f0kwz4nnqa72q14vypy21sb5bpcgxc"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -99883,6 +97286,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hermit" = callPackage @@ -100250,14 +97654,13 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hexchat"; - version = "0.0.1.0"; - sha256 = "15wzndvxc0v187gl0bwhlfqfwxs0l3p6wqwf9zx0acfw4471yn4v"; - revision = "1"; - editedCabalFile = "0jfnmiyp2lzs3msh479h0bdsqzhjra998bwmgwybk60p83nlvw1p"; + version = "0.0.2.0"; + sha256 = "1bx49z3ycc24bsn0x0617x0gmgapan6qnwnwq6v0w06gjrahr4r4"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/mniip/hexchat-haskell"; description = "Haskell scripting interface for HexChat"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexdump" = callPackage @@ -100371,6 +97774,7 @@ self: { homepage = "https://github.com/tel/hexpat-lens"; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle" = callPackage @@ -100451,7 +97855,6 @@ self: { homepage = "https://github.com/allonsy/hexpress"; description = "An express-like http framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexquote" = callPackage @@ -100515,8 +97918,8 @@ self: { }: mkDerivation { pname = "heyefi"; - version = "2.0.0.0"; - sha256 = "1m1r9fnjf2i60nwqwcbyqm6nrmyipwn4nm7klgq0ykaghpag3kw8"; + version = "2.0.0.2"; + sha256 = "1dhjvg5hhqj7apbsz5sq5p05rp3g07igc00r8qa7dmgixrp0a77b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100596,10 +97999,8 @@ self: { ({ mkDerivation, base, containers, template-haskell, text }: mkDerivation { pname = "hflags"; - version = "0.4.2"; - sha256 = "1i9c1xszaymiqxh3ss7601cw8m8zpzvzg3k92jvdj4a0gxihvlrc"; - revision = "1"; - editedCabalFile = "1kasg8y0ia3q2iy6vmjvwwn9dyxzy59s6s9chwxhdgsvncx38ra1"; + version = "0.4.3"; + sha256 = "0lmjgwgfp1s2ag2fbi6n8yryafb5qz87yb0p122lxzm3487sf98h"; libraryHaskellDepends = [ base containers template-haskell text ]; homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; @@ -100901,22 +98302,21 @@ self: { }) {geos_c = null;}; "hgettext" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath - , haskell-src-exts, process, setlocale, uniplate + ({ mkDerivation, base, Cabal, containers, deepseq, directory + , filepath, haskell-src-exts, process, setlocale, uniplate }: mkDerivation { pname = "hgettext"; - version = "0.1.30"; - sha256 = "1pgzyd1nqzl7g88pcw7sncija5sd2k4zif9d8qfw96cw6m6kli96"; - revision = "2"; - editedCabalFile = "1j65m70j7j64an9psqzhasrqdrmpg4p1h4hd1kvinygvg5gg3bxj"; + version = "0.1.31.0"; + sha256 = "0s7kgpjlkkw32rbksic099m9g07czi0vrhcn7mbiyi0lyhcbc7ym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers directory filepath process setlocale ]; - executableHaskellDepends = [ base haskell-src-exts uniplate ]; - homepage = "https://github.com/vasylp/hgettext"; + executableHaskellDepends = [ + base Cabal containers deepseq filepath haskell-src-exts uniplate + ]; description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101053,6 +98453,7 @@ self: { homepage = "https://github.com/thumphries/hgrep"; description = "Search Haskell source code from the command line"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrev" = callPackage @@ -101069,7 +98470,6 @@ self: { homepage = "https://github.com/bitnomial/hgrev"; description = "Compile Mercurial (hg) version info into Haskell code"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrib" = callPackage @@ -101207,7 +98607,6 @@ self: { homepage = "https://github.com/phaazon/hid"; description = "Interface to hidapi library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hidapi;}; "hidapi" = callPackage @@ -101231,12 +98630,14 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "hidden-char"; - version = "0.1.0.1"; - sha256 = "17g9wbk34x8gkgrlvj3barhirq0jkshysqrxhs8nxp60hb2zpxip"; + version = "0.1.0.2"; + sha256 = "167l83cn37mkq394pbanybz1kghnbim1m74fxskws1nclxr9747a"; + revision = "2"; + editedCabalFile = "1d0k297hxff31k0x5xbli6l7c151d2y9wq4w0x0prgagjc0l7z5n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/rcook/hidden-char#readme"; - description = "Provides getHiddenChar function"; + description = "Provides cross-platform getHiddenChar function"; license = stdenv.lib.licenses.mit; }) {}; @@ -101396,7 +98797,6 @@ self: { homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "higherorder" = callPackage @@ -101501,6 +98901,7 @@ self: { homepage = "https://github.com/cdepillabout/highlight"; 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 @@ -101517,6 +98918,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 @@ -101670,21 +99072,21 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , descriptive, Diff, directory, exceptions, ghc-prim - , haskell-src-exts, hspec, monad-loops, mtl, path, path-io, text - , transformers, unix-compat, utf8-string, yaml + ({ mkDerivation, base, bytestring, Cabal, containers, criterion + , deepseq, descriptive, Diff, directory, exceptions, filepath + , ghc-prim, haskell-src-exts, hspec, monad-loops, mtl, path + , path-io, text, transformers, unix-compat, utf8-string, yaml }: mkDerivation { pname = "hindent"; - version = "5.2.4.1"; - sha256 = "0m35gd2r49cnaxsn9k82g8arj5pz66glsijlji2g77psd9a3flff"; + version = "5.2.5"; + sha256 = "19lckzwsqy8d1wry7hlg5vcg10dc5isai1z0n8srap5hlqvifw1g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers exceptions haskell-src-exts monad-loops - mtl text transformers utf8-string yaml + base bytestring Cabal containers directory exceptions filepath + haskell-src-exts monad-loops mtl text transformers utf8-string yaml ]; executableHaskellDepends = [ base bytestring deepseq descriptive directory exceptions ghc-prim @@ -101824,7 +99226,6 @@ self: { homepage = "https://github.com/hasufell/hinotify-bytestring.git"; description = "Haskell binding to inotify, using ByteString filepaths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hinquire" = callPackage @@ -101927,6 +99328,7 @@ self: { homepage = "https://github.com/LTI2000/hinterface"; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinvaders" = callPackage @@ -101979,7 +99381,6 @@ self: { homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hipbot" = callPackage @@ -102426,29 +99827,6 @@ self: { }) {}; "hjsonpointer" = callPackage - ({ mkDerivation, aeson, base, hashable, hspec, http-types - , QuickCheck, semigroups, text, unordered-containers, vector - }: - mkDerivation { - pname = "hjsonpointer"; - version = "1.2.0"; - sha256 = "06rppqd9nnch3hmjv1izh7lkdrm54nywjg7p27wfar3ak1saw71g"; - revision = "3"; - editedCabalFile = "0rdnm2fvj2c9pjdrcpizgc2kyl6fivijfzs60z5mkagv3h7pkkq4"; - libraryHaskellDepends = [ - aeson base hashable QuickCheck semigroups text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base hspec http-types QuickCheck text unordered-containers - vector - ]; - homepage = "https://github.com/seagreen/hjsonpointer"; - description = "JSON Pointer library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hjsonpointer_1_3_0" = callPackage ({ mkDerivation, aeson, base, hashable, hspec, http-types , QuickCheck, semigroups, text, unordered-containers, vector }: @@ -102469,37 +99847,9 @@ self: { homepage = "https://github.com/seagreen/hjsonpointer"; description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hjsonschema" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, file-embed, filepath, hashable, hjsonpointer, hspec - , http-client, http-types, pcre-heavy, profunctors, protolude - , QuickCheck, scientific, semigroups, text, unordered-containers - , vector, wai-app-static, warp - }: - mkDerivation { - pname = "hjsonschema"; - version = "1.6.3"; - sha256 = "1phvxkwqxzsi7jzxs4z2zsak7hsgfqvld7m95jk1a0qysxf9gzx3"; - libraryHaskellDepends = [ - aeson base bytestring containers file-embed filepath hashable - hjsonpointer http-client http-types pcre-heavy profunctors - protolude QuickCheck scientific semigroups text - unordered-containers vector - ]; - testHaskellDepends = [ - aeson async base bytestring directory filepath hjsonpointer hspec - profunctors protolude QuickCheck semigroups text - unordered-containers vector wai-app-static warp - ]; - homepage = "https://github.com/seagreen/hjsonschema"; - description = "JSON Schema library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hjsonschema_1_7_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -102524,7 +99874,6 @@ self: { homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hjugement" = callPackage @@ -102649,7 +99998,7 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , cmdargs, containers, criterion, csv, data-default, Diff + , cmdargs, containers, criterion, csv, data-default, Decimal, Diff , directory, file-embed, filepath, hashable, haskeline, here , hledger-lib, html, HUnit, megaparsec, mtl, mtl-compat, old-time , parsec, pretty-show, process, regex-tdfa, safe, shakespeare @@ -102659,24 +100008,22 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.4"; - sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75"; - revision = "1"; - editedCabalFile = "16q9ji8qrgpxchxmx0k77qq3hhfz5h09qyc7r3pkav04nx3pv1sg"; + version = "1.5"; + sha256 = "0mmgjahdlyka2mi1271kawrvkvnw8bgd3a08r8bykskj9b9f5181"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Diff directory file-embed filepath hashable haskeline - here hledger-lib HUnit megaparsec mtl mtl-compat old-time + data-default Decimal Diff directory file-embed filepath hashable + haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time 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 bytestring cmdargs containers csv - data-default directory file-embed filepath haskeline here + data-default Decimal directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time unordered-containers utf8-string utility-ht @@ -102684,7 +100031,7 @@ self: { ]; testHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv - data-default directory file-embed filepath haskeline here + data-default Decimal directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework test-framework-hunit text time @@ -102709,10 +100056,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.4"; - sha256 = "00vpl1ch1v80f37y8yn2psdzm7ccxpfn3jp93xqxbasksxfawfa7"; - revision = "1"; - editedCabalFile = "1q3fvasxg32xza2pgf725x0j5dsz4rklng3blyw0kq70bccgdaka"; + version = "1.5"; + sha256 = "1wanah469danp0ljjxr258gdcd9lb175chz2jlq0y604wksaaj19"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -102724,7 +100069,6 @@ self: { homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -102751,8 +100095,8 @@ self: { ({ mkDerivation, base, hledger-lib, text, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.11"; - sha256 = "1y5f7xdw1rriz2d7qxnkywyjsa09bk6712rks3l1zkihi5i3fnr7"; + version = "0.2.0.13"; + sha256 = "0kngmnpn5qk76hbf1ynfz9zfzwvsslq7klih78k103zl76ggdvsv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; @@ -102771,10 +100115,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.6"; - sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "6"; - editedCabalFile = "06bk66lcd6ps370nwqns0dn00vxivg27hhln5bz57syjqlamfd0j"; + version = "1.3.1"; + sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102795,7 +100137,6 @@ self: { homepage = "https://github.com/hpdeifel/hledger-iadd#readme"; description = "A terminal UI as drop-in replacement for hledger add"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-interest" = callPackage @@ -102823,8 +100164,8 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.11"; - sha256 = "1rxpv70xfr7z8yn65dcac1a7l4mb2p1z30ld4bw75gr34lkirb1y"; + version = "0.1.1.13"; + sha256 = "16y195h5wjs8vrccs18dx65kz3xrcifcwy1ggrsblf0kgml0cj7l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102832,28 +100173,25 @@ 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 , blaze-markup, bytestring, cmdargs, containers, csv, data-default - , Decimal, deepseq, directory, doctest, filepath, Glob, hashtables - , HUnit, megaparsec, mtl, mtl-compat, old-time, parsec, pretty-show - , regex-tdfa, safe, semigroups, split, test-framework + , Decimal, deepseq, directory, doctest, extra, filepath, Glob + , hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec + , pretty-show, regex-tdfa, safe, semigroups, split, test-framework , test-framework-hunit, text, time, transformers, uglymemo , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.4"; - sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq"; - revision = "1"; - editedCabalFile = "0nyf7cvv5qhz1n48qj3ib1d56q694zj1b1wfqlrzzfj2a7mi2p4c"; + version = "1.5"; + sha256 = "00k0wqib3hadi4rcnldr14q2va57b09whfbwzd14pz824x7pnfd7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory + cmdargs containers csv data-default Decimal deepseq directory extra filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec pretty-show regex-tdfa safe semigroups split text time transformers uglymemo utf8-string @@ -102861,10 +100199,10 @@ self: { testHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory - doctest filepath Glob hashtables HUnit megaparsec mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe semigroups split - test-framework test-framework-hunit text time transformers uglymemo - utf8-string + doctest extra filepath Glob hashtables HUnit megaparsec mtl + mtl-compat old-time parsec pretty-show regex-tdfa safe semigroups + split test-framework test-framework-hunit text time transformers + uglymemo utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; @@ -102880,10 +100218,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.4"; - sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; - revision = "5"; - editedCabalFile = "0lplgg7xffpjk6qjzvjp2klmb178bc06wnyq0qlh6fm29g8d18yp"; + version = "1.5"; + sha256 = "104vjyqpddwv8g9mfbaw174nl4lb41zwl14i8225m6v1gxvs5w6x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -102929,10 +100265,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.4"; - sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h"; - revision = "1"; - editedCabalFile = "14ayvky2pjaj2hnxajpb5h0hi2r6fl2ps401abn4apk36y3w16ab"; + version = "1.5"; + sha256 = "10ar6ic9snrbwi60sz1729dshff01s3knmb7d7kwfk9svmilxq6f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103041,32 +100375,6 @@ self: { }) {inherit (pkgs) libsass;}; "hlint" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs - , containers, cpphs, data-default, directory, extra, filepath - , haskell-src-exts, haskell-src-exts-util, hscolour, process - , refact, text, transformers, uniplate, unordered-containers - , vector, yaml - }: - mkDerivation { - pname = "hlint"; - version = "2.0.10"; - sha256 = "1kmjgdj652lx269sppa35wga8a2376nzjd548nnc6h52kdpgix30"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra filepath haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers vector yaml - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/hlint#readme"; - description = "Source code suggestions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hlint_2_0_11" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, filepath , haskell-src-exts, haskell-src-exts-util, hscolour, process @@ -103090,9 +100398,50 @@ self: { homepage = "https://github.com/ndmitchell/hlint#readme"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hlint_2_0_12" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, filepath + , haskell-src-exts, haskell-src-exts-util, hscolour, process + , refact, text, transformers, uniplate, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "2.0.12"; + sha256 = "1cfq4g1h5c47nxqn7433jd40hajv5pq30p5rb132fc5sp68vx0by"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra filepath haskell-src-exts + haskell-src-exts-util hscolour process refact text transformers + uniplate unordered-containers vector yaml + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/hlint#readme"; + description = "Source code suggestions"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hlint-test" = callPackage + ({ mkDerivation, base, hlint }: + mkDerivation { + pname = "hlint-test"; + version = "0.1.0.0"; + sha256 = "1lvbhhcxs9axvpm5m3axni30aafa9d32jrx00072kywm536gnnny"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hlint ]; + executableHaskellDepends = [ base hlint ]; + homepage = "https://github.com/Siprj/hlint-test#readme"; + description = "Run hlint in test suite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -103207,26 +100556,6 @@ self: { }) {}; "hmatrix" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, split, storable-complex, vector - }: - mkDerivation { - pname = "hmatrix"; - version = "0.18.0.0"; - sha256 = "1ziwj4d52hakb8lsw8qyy99r5h5mm50bgj7i3s47l8pp9bxnsxim"; - configureFlags = [ "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random split storable-complex - vector - ]; - librarySystemDepends = [ openblasCompat ]; - preConfigure = "sed -i hmatrix.cabal -e '/\\/usr\\//D'"; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_18_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , openblasCompat, random, split, storable-complex, vector }: @@ -103244,7 +100573,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-banded" = callPackage @@ -103384,17 +100712,17 @@ self: { }) {}; "hmatrix-quadprogpp" = callPackage - ({ mkDerivation, base, hmatrix, QuadProgpp, vector }: + ({ mkDerivation, base, hmatrix, quadprog, vector }: mkDerivation { pname = "hmatrix-quadprogpp"; - version = "0.3.0.1"; - sha256 = "1m6iag3vv9vlxzigg0pzb4ci7x5jc20s6zxm9cz6yamgsx52iadl"; + version = "0.4.0.0"; + sha256 = "0bvgph7x5niryn4f1ah6726np2nv8xnrvqn3hbiw8f5m7314iv5l"; libraryHaskellDepends = [ base hmatrix vector ]; - librarySystemDepends = [ QuadProgpp ]; + librarySystemDepends = [ quadprog ]; description = "Bindings to the QuadProg++ quadratic programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {QuadProgpp = null;}; + }) {quadprog = null;}; "hmatrix-repa" = callPackage ({ mkDerivation, base, hmatrix, repa, vector }: @@ -103418,7 +100746,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Interface to GSL special functions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmatrix-static" = callPackage @@ -103574,6 +100901,7 @@ self: { homepage = "https://github.com/masterdezign/hmep#readme"; description = "HMEP Multi Expression Programming – a genetic programming variant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmidi" = callPackage @@ -103586,7 +100914,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Binding to the OS level MIDI services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmk" = callPackage @@ -103801,7 +101128,6 @@ self: { homepage = "http://github.com/jwiegley/hnix"; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hnn" = callPackage @@ -103846,8 +101172,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.5.0.0"; - sha256 = "01xiqkm94amm7kdwvdgcm3f4slylmvc04qxkbddh2xsm8wz4c9a2"; + version = "0.5.1.0"; + sha256 = "11p207fmkfkc6jimnq9y30xj3l1msc5r090qvg1klmyvmhjkh702"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103920,8 +101246,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.3.0"; - sha256 = "1aymrl28gs4dlzfxcnglfhnxk9l9ws0va0yvi1a966yfp0ps7w1n"; + version = "1.5.1"; + sha256 = "1lb76084ha2wkhccgcwvn5ffdsrxsqbvhmlhx9aw9dm39ganggva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103937,15 +101263,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_5_1" = callPackage + "hoauth2_1_6_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , http-conduit, http-types, microlens, text, unordered-containers , uri-bytestring, uri-bytestring-aeson, wai, warp }: mkDerivation { pname = "hoauth2"; - version = "1.5.1"; - sha256 = "1lb76084ha2wkhccgcwvn5ffdsrxsqbvhmlhx9aw9dm39ganggva"; + version = "1.6.1"; + sha256 = "0rmb3f4ci75fpzzqcq4qrjnqpnpmpr6i9j69z7cf8m2ji1vnvlw7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104024,7 +101350,6 @@ self: { ]; description = "A library for canonically representing terms with binding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hocilib" = callPackage @@ -104053,17 +101378,17 @@ self: { , bytestring, concurrentoutput, containers, cryptonite, data-fix , deepseq, directory, exceptions, filepath, foldl, hnix , http-client, http-types, lens, lens-aeson, lifted-base, memory - , mtl, neat-interpolation, network, network-uri, optional-args - , optparse-applicative, optparse-generic, pooled-io, pureMD5 - , scientific, tar, tasty, tasty-golden, tasty-hunit + , mtl, neat-interpolation, network, network-uri, nix-paths + , optional-args, optparse-applicative, optparse-generic, pooled-io + , pureMD5, scientific, tar, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, tasty-smallcheck, temporary, text, time , transformers, turtle, unordered-containers, uri-bytestring , vector, wreq, zlib }: mkDerivation { pname = "hocker"; - version = "1.0.2"; - sha256 = "1bdzbggvin83m778qq6367mpv2cwgwpbahhlzf290iwikmhmhgr2"; + version = "1.0.4"; + sha256 = "1lf8m6cd54vc436krl3j4kanmnd86r4ri45a1qp7y4qqlpplcnpf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104071,9 +101396,9 @@ self: { concurrentoutput containers cryptonite data-fix deepseq directory exceptions filepath foldl hnix http-client http-types lens lens-aeson lifted-base memory mtl neat-interpolation network - network-uri optparse-applicative optparse-generic pooled-io pureMD5 - scientific tar temporary text time transformers turtle - unordered-containers uri-bytestring vector wreq zlib + network-uri nix-paths optparse-applicative optparse-generic + pooled-io pureMD5 scientific tar temporary text time transformers + turtle unordered-containers uri-bytestring vector wreq zlib ]; executableHaskellDepends = [ base bytestring cryptonite data-fix filepath hnix lens mtl network @@ -104087,6 +101412,7 @@ self: { homepage = "https://github.com/awakesecurity/hocker#readme"; description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hodatime" = callPackage @@ -104422,6 +101748,7 @@ self: { homepage = "github.com/mikeizbicki/homoiconic"; description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "homplexity" = callPackage @@ -104474,7 +101801,6 @@ self: { homepage = "https://lambda.xyz/honk/"; description = "Cross-platform interface to the PC speaker"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hoobuddy" = callPackage @@ -104735,7 +102061,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle" = callPackage + "hoogle_5_0_14" = 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 @@ -104765,6 +102091,38 @@ self: { homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 + }: + mkDerivation { + pname = "hoogle"; + version = "5.0.16"; + sha256 = "0fkq0mgf48rkyscs5ca11dcz47wr9f2sayl2607rcj4v897kx1a5"; + 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 + storable-tuple tar template-haskell text time transformers uniplate + utf8-string vector wai wai-logger warp warp-tls zlib + ]; + executableHaskellDepends = [ base ]; + testTarget = "--test-option=--no-net"; + homepage = "http://hoogle.haskell.org/"; + description = "Haskell API Search"; + license = stdenv.lib.licenses.bsd3; }) {}; "hoogle-index" = callPackage @@ -105044,8 +102402,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.3.3"; - sha256 = "18n48kkf6pcmcwb85a74kqh84aadpm1s9jv1r56b43rya8ra3mgw"; + version = "0.3.4"; + sha256 = "09vc23id1f30270c6q3wadckzvbqj4hvaxzy3wfbmhsqbrmmrfwh"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -105059,8 +102417,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.3.1"; - sha256 = "0cbnhpwy3m0l7gcarg7xr1f5y6nwdnfa269vvza0fm4fhf3lz6g5"; + version = "0.3.2"; + sha256 = "0ax4aqbnxc80dbj8f7hykgj5agn59nwv4icfwmb4knxj2qw35kg3"; libraryHaskellDepends = [ base Cabal containers directory filepath ]; @@ -105195,30 +102553,6 @@ self: { }) {}; "hosc" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion - , data-binary-ieee754, deepseq, network, QuickCheck, test-framework - , test-framework-quickcheck2, time, transformers - }: - mkDerivation { - pname = "hosc"; - version = "0.15"; - sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary blaze-builder bytestring data-binary-ieee754 network - time transformers - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - homepage = "http://rd.slavepianos.org/t/hosc"; - description = "Haskell Open Sound Control"; - license = "GPL"; - }) {}; - - "hosc_0_16" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring , data-binary-ieee754, network, time, transformers }: @@ -105234,7 +102568,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hosc"; description = "Haskell Open Sound Control"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc-json" = callPackage @@ -105254,7 +102587,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hosc-json"; description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc-utils" = callPackage @@ -105530,38 +102862,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpack" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , containers, deepseq, directory, filepath, Glob, hspec - , interpolate, mockery, QuickCheck, temporary, text - , unordered-containers, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.18.1"; - sha256 = "1ssawa6187m0xzn7i5hn154qajq46jlpbvz1s28qk4bigpv38m7k"; - revision = "1"; - editedCabalFile = "193hxa5ar54dhr0acp1y1c0990689srqqr2bygrv31ivhz6hj1sx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring containers deepseq directory - filepath Glob text unordered-containers yaml - ]; - executableHaskellDepends = [ - aeson base base-compat bytestring containers deepseq directory - filepath Glob text unordered-containers yaml - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring containers deepseq - directory filepath Glob hspec interpolate mockery QuickCheck - temporary text unordered-containers yaml - ]; - homepage = "https://github.com/sol/hpack#readme"; - description = "An alternative format for Haskell packages"; - license = stdenv.lib.licenses.mit; - }) {}; - "hpack_0_20_0" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec @@ -105595,6 +102895,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hpack" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , HUnit, interpolate, mockery, pretty, QuickCheck, scientific + , temporary, text, transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.21.2"; + sha256 = "1grsr2418z42bcvqnr788n3lpfbscqvvfcnglba9v95nl8lpfm0c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob pretty scientific text transformers + unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob pretty scientific text transformers + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec HUnit interpolate mockery + pretty QuickCheck scientific temporary text transformers + unordered-containers yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -105625,6 +102958,7 @@ self: { homepage = "https://github.com/yamadapc/hpack-convert#readme"; description = "Convert Cabal manifests into hpack's package.yamls"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpaco" = callPackage @@ -105770,7 +103104,6 @@ self: { ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hpc_0_6_0_3" = callPackage @@ -105868,48 +103201,18 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "hpg"; - version = "0.7"; - sha256 = "0p2a8h9z5kbqpb99rclgkll1yv2in2fni5xvhrrzyphyhpqi1f6a"; + version = "0.8"; + sha256 = "1in245bwnymzxp1bzvzkmfwxs2pxnhw94c9j8z9v3vxvz7g0fygs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random ]; homepage = "https://darcs.alokat.org/hpg"; description = "a simple password generator"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpio" = callPackage - ({ mkDerivation, async, base, base-compat, bytestring, containers - , directory, doctest, exceptions, filepath, hlint, hspec, mtl - , mtl-compat, optparse-applicative, QuickCheck, text, transformers - , transformers-compat, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; - version = "0.8.0.10"; - sha256 = "05cpfym6jb27z557i1954jnz9v3ghjg45h4rjfl9ql54cx6bx429"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat bytestring containers directory exceptions - filepath mtl mtl-compat QuickCheck text transformers - transformers-compat unix unix-bytestring - ]; - executableHaskellDepends = [ - async base base-compat exceptions mtl mtl-compat - optparse-applicative transformers transformers-compat - ]; - testHaskellDepends = [ - async base base-compat bytestring containers directory doctest - exceptions filepath hlint hspec mtl mtl-compat QuickCheck text - transformers transformers-compat unix unix-bytestring - ]; - homepage = "https://github.com/quixoftic/hpio"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpio_0_9_0_2" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , doctest, exceptions, filepath, hlint, hspec, monad-control , monad-logger, mtl, optparse-applicative, protolude, QuickCheck @@ -105937,7 +103240,6 @@ self: { homepage = "https://github.com/quixoftic/hpio#readme"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -106000,8 +103302,8 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.4.1"; - sha256 = "0va60lvxgy52i064i62hln7kca55xk5f494khiax74bsn8iin7pq"; + version = "0.5.1"; + sha256 = "0bdx85k9c9cb5wkp91fi1sb0dahg6f4fknyddfh92wcywa485q9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106009,6 +103311,7 @@ self: { transformers ]; executableHaskellDepends = [ base directory filepath time ]; + testHaskellDepends = [ base bytestring transformers ]; homepage = "https://github.com/acowley/hpp"; description = "A Haskell pre-processor"; license = stdenv.lib.licenses.bsd3; @@ -106053,8 +103356,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.4.0.0"; - sha256 = "0hfs4i1h2pfy8hd2c24ig4zd1fw6v9wmm39616a0ipb7vgalra6b"; + version = "1.5.0.0"; + sha256 = "1hp9nn49a8kg58y8cywsiwcy64zq65c1hnsn2xi5ajk71hag8b8c"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -106077,8 +103380,10 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.5"; - sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3"; + version = "2.4.6"; + sha256 = "05n8mgrbskdx2r78kvl1q8zzgha9jsds7gvajkc54wcgprfhv42z"; + revision = "1"; + editedCabalFile = "0bs5h6mq6yrwiwfq0l20b4an73myxq6gbaxjffdifscqzq8pdk94"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106096,7 +103401,6 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hprotoc-fork" = callPackage @@ -106265,7 +103569,6 @@ self: { homepage = "http://github.com/paulrzcz/hquantlib.git"; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hquery" = callPackage @@ -106283,7 +103586,6 @@ self: { ]; description = "A query language for transforming HTML5"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hranker" = callPackage @@ -106373,7 +103675,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hruby" = callPackage + "hruby_0_3_4_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck , ruby, scientific, stm, text, unordered-containers, vector }: @@ -106391,6 +103693,27 @@ self: { ]; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) ruby;}; + + "hruby" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck + , ruby, scientific, stm, text, unordered-containers, vector + }: + mkDerivation { + pname = "hruby"; + version = "0.3.5.1"; + sha256 = "0gzg7yhkrzgqaip5fd1lbd15j1274w28kqv0k6ls6sfk52gq56wn"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring scientific stm text + unordered-containers vector + ]; + librarySystemDepends = [ ruby ]; + testHaskellDepends = [ + aeson attoparsec base QuickCheck text vector + ]; + description = "Embed a Ruby intepreter in your Haskell program !"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -106407,18 +103730,6 @@ self: { }) {GeoIP = null;}; "hs-bibutils" = callPackage - ({ mkDerivation, base, syb }: - mkDerivation { - pname = "hs-bibutils"; - version = "5.5"; - sha256 = "0pf5lh179rw9jkmw16ss3kiwydlj6zgfk868mjl5s57kx55z7ycm"; - libraryHaskellDepends = [ base syb ]; - homepage = "http://istitutocolli.org/repos/hs-bibutils/"; - description = "Haskell bindings to bibutils, the bibliography conversion utilities"; - license = "GPL"; - }) {}; - - "hs-bibutils_6_2_0_1" = callPackage ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; @@ -106428,7 +103739,6 @@ self: { homepage = "https://github.com/wilx/hs-bibutils"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-blake2" = callPackage @@ -107144,7 +104454,6 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; description = "I2C access for Haskell and Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsSqlite3" = callPackage @@ -107179,28 +104488,6 @@ self: { }) {xenctrl = null;}; "hsass" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, filepath - , hlibsass, hspec, hspec-discover, monad-loops, temporary - , transformers - }: - mkDerivation { - pname = "hsass"; - version = "0.4.2"; - sha256 = "0hv2falrm3dcmdx08mpk2z8yxfr1hahgrd3ff9yvw6xjcjzab5yh"; - libraryHaskellDepends = [ - base bytestring data-default-class filepath hlibsass monad-loops - transformers - ]; - testHaskellDepends = [ - base bytestring data-default-class hspec hspec-discover temporary - ]; - homepage = "https://github.com/jakubfijalkowski/hsass"; - description = "Integrating Sass into Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hsass_0_5_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath , hlibsass, hspec, hspec-discover, monad-loops, temporary , transformers @@ -107284,6 +104571,7 @@ self: { executableHaskellDepends = [ attoparsec base text vector ]; description = "A command line calculator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsbencher" = callPackage @@ -107386,7 +104674,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3"; description = "Haskell SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-auditor" = callPackage @@ -107403,6 +104690,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -107463,7 +104751,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-dot"; description = "haskell supercollider graph drawing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-forth" = callPackage @@ -107600,7 +104887,6 @@ self: { homepage = "https://github.com/kaoskorobase/hsc3-process"; description = "Create and control scsynth processes"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-rec" = callPackage @@ -107678,6 +104964,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-sf-hsndfile" = callPackage @@ -107695,6 +104982,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-unsafe" = callPackage @@ -107830,8 +105118,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; - version = "1.24.1"; - sha256 = "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4"; + version = "1.24.2"; + sha256 = "08ng635m1qylng1khm9nqvfw2wdhljy1q2wi4ly63nfaznx8dysm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -107939,14 +105227,14 @@ self: { ({ mkDerivation, base, hscurses, random, safe, unix }: mkDerivation { pname = "hscurses-fish-ex"; - version = "1.3.1"; - sha256 = "1s7b2v3cl0nl2b55agn5wkvxn30f2bgp6mznkn33148vlbya1mzs"; + version = "1.3.2"; + sha256 = "08qmnf8qrk3zlq3flkma8sll84czdaydv6nmyb79jaz5fknv12rn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hscurses random safe unix ]; - homepage = "http://ui3.info/darcs/hscurses-fish-ex/"; + homepage = "http://hub.darcs.net/dino/hscurses-fish-ex"; description = "hscurses swimming fish example"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.isc; }) {}; "hsdev" = callPackage @@ -107990,6 +105278,7 @@ self: { homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdif" = callPackage @@ -108099,17 +105388,16 @@ self: { }) {}; "hsemail-ns" = callPackage - ({ mkDerivation, base, mtl, old-time, parsec }: + ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: mkDerivation { pname = "hsemail-ns"; - version = "1.3.2"; - sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s"; - enableSeparateDataOutput = true; + version = "1.7.7"; + sha256 = "01vnlcv5gj7zj33b6m8mc4n6n8d15casywgicn1lr699hkh287hg"; libraryHaskellDepends = [ base mtl old-time parsec ]; - homepage = "http://patch-tag.com/r/hsemail-ns/home"; + testHaskellDepends = [ base doctest hspec old-time parsec ]; + homepage = "https://github.com/phlummox/hsemail-ns/tree/hsemail-ns"; description = "Internet Message Parsers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsenv" = callPackage @@ -108162,25 +105450,6 @@ self: { }) {}; "hsexif" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit - , iconv, text, time - }: - mkDerivation { - pname = "hsexif"; - version = "0.6.1.4"; - sha256 = "1ip2nyljjka99azygg2sx6a6d00vac6b8rd5y93yyhy6sp5d8m2r"; - libraryHaskellDepends = [ - base binary bytestring containers iconv text time - ]; - testHaskellDepends = [ - base binary bytestring containers hspec HUnit iconv text time - ]; - homepage = "https://github.com/emmanueltouzery/hsexif"; - description = "EXIF handling library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsexif_0_6_1_5" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit , iconv, text, time }: @@ -108197,7 +105466,6 @@ self: { homepage = "https://github.com/emmanueltouzery/hsexif"; description = "EXIF handling library in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsfacter" = callPackage @@ -108360,8 +105628,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.4"; - sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l"; + version = "0.8.5"; + sha256 = "05gdzl4h67rjpw2nhk6dvd9l8lmx1kdg4cy9hmk5l36vrk8s9ic6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108465,6 +105733,7 @@ self: { ]; description = "Resolves links to Haskell identifiers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslogger" = callPackage @@ -108557,70 +105826,28 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit - , lua5_1, QuickCheck, quickcheck-instances, text - }: - mkDerivation { - pname = "hslua"; - version = "0.4.1"; - sha256 = "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid"; - configureFlags = [ "-fsystem-lua" ]; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ lua5_1 ]; - testHaskellDepends = [ - base bytestring hspec hspec-contrib HUnit QuickCheck - quickcheck-instances text - ]; - description = "A Lua language interpreter embedding in Haskell"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) lua5_1;}; - - "hslua_0_9_2" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail - , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty + , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.9.2"; - sha256 = "1n1fw2ak3xk4llv3d3bbpcayjd6h2a83n06i96m2k30lzanbg0ys"; + version = "0.9.5"; + sha256 = "1j2zk7f7nyywg2b0n6kb2yf6ljc7cn2sk9jz0h76g3ag2b70l12n"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text ]; - librarySystemDepends = [ lua5_1 ]; + librarySystemDepends = [ lua5_3 ]; testHaskellDepends = [ base bytestring containers QuickCheck quickcheck-instances tasty tasty-expected-failure tasty-hunit tasty-quickcheck text ]; description = "A Lua language interpreter embedding in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) lua5_1;}; + }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage - ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit - , ieee754, QuickCheck, quickcheck-instances, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hslua-aeson"; - version = "0.1.0.4"; - sha256 = "179dgqx6827l7bk7h1dxpwprijdqgmjqxn5g5cfqa3mkzpgc51x8"; - libraryHaskellDepends = [ - aeson base hashable hslua scientific text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base hashable hslua hspec HUnit ieee754 QuickCheck - quickcheck-instances scientific text unordered-containers vector - ]; - homepage = "https://github.com/tarleb/hslua-aeson#readme"; - description = "Glue between aeson and hslua"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-aeson_0_3_0_1" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text , unordered-containers, vector @@ -108640,7 +105867,6 @@ self: { homepage = "https://github.com/tarleb/hslua-aeson#readme"; description = "Allow aeson data types to be used with lua"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua-module-text" = callPackage @@ -108654,7 +105880,6 @@ self: { homepage = "https://github.com/hslua/hslua-module-test"; description = "Lua module for text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsmagick" = callPackage @@ -109007,6 +106232,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_4_6" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.4.6"; + sha256 = "1lq24aszswn103l801vggmmd0sp75zrkjzskifz47p3njl1lb1pj"; + 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 + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -109080,6 +106329,53 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_4_6" = callPackage + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, temporary, tf-random, time, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.4.6"; + sha256 = "048bql9v6skxxjyapknpby0iisk2g2d8m6caxpkyd91cyrdvq4j6"; + libraryHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently temporary tf-random time + transformers + ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hspec-dirstream" = callPackage + ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core + , pipes, pipes-safe, system-filepath, text + }: + mkDerivation { + pname = "hspec-dirstream"; + version = "0.1.0.1"; + sha256 = "0dkxk45wlx051m1g36kxam22lvdzhmzcvls3268wc4m3r0clxjli"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base dirstream filepath hspec hspec-core pipes pipes-safe + system-filepath text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://hub.darcs.net/vmchale/hspec-dirstream"; + description = "Helper functions to simplify adding integration tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { @@ -109096,6 +106392,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_4_6" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.4.6"; + sha256 = "1qh07b5by9ry62l7f700zxlnbdsjnhr5s1ja8ws0ifx6xqsyl719"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -109208,8 +106524,8 @@ self: { }: mkDerivation { pname = "hspec-golden-aeson"; - version = "0.2.1.0"; - sha256 = "0qb50fbni4ma87lx356j412ii18b82svkrg8gv2kx67n1f84hisq"; + version = "0.4.0.0"; + sha256 = "03gsw9jamkjwj5vhlhg9xz7214d71py94qx0daym7gjiq4zpw1gk"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck quickcheck-arbitrary-adt random transformers @@ -109223,15 +106539,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hspec-golden-aeson_0_3_0_0" = callPackage + "hspec-golden-aeson_0_5_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt , random, silently, transformers }: mkDerivation { pname = "hspec-golden-aeson"; - version = "0.3.0.0"; - sha256 = "02w17sbvxjrmyxws7wgjr529fl8vwi22xh3q68z7iwvss46dykrc"; + version = "0.5.1.0"; + sha256 = "0d3ww44c0al841j6z5w6br1qa91v5nr0lfbzaa4cdydynvi4s6lq"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck quickcheck-arbitrary-adt random transformers @@ -109303,25 +106619,6 @@ self: { }) {}; "hspec-megaparsec" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "0.3.1"; - sha256 = "0kaif74f1qq92nvksnq12h0imsrr02q1nawgprbg1s9cpilq2vw2"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ - base containers hspec hspec-expectations megaparsec - ]; - homepage = "https://github.com/mrkkrp/hspec-megaparsec"; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-megaparsec_1_0_0" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: @@ -109336,7 +106633,6 @@ self: { homepage = "https://github.com/mrkkrp/hspec-megaparsec"; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-meta" = callPackage @@ -109462,6 +106758,7 @@ self: { homepage = "https://github.com/yamadapc/haskell-hspec-setup"; description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-shouldbe" = callPackage @@ -109594,34 +106891,9 @@ self: { testHaskellDepends = [ base hspec test-sandbox ]; description = "Hspec convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai" = callPackage - ({ mkDerivation, base, base-compat, bytestring, case-insensitive - , hspec, hspec-core, hspec-expectations, http-types, QuickCheck - , text, transformers, wai, wai-extra - }: - mkDerivation { - pname = "hspec-wai"; - version = "0.8.0"; - sha256 = "0h8i78kjc5bv8aly4r7m5p2a8mw5j9ms8qm79mkwqadx877y4zlb"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra - ]; - testHaskellDepends = [ - base base-compat bytestring case-insensitive hspec hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra - ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Experimental Hspec support for testing WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai_0_9_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck , text, transformers, wai, wai-extra @@ -109643,28 +106915,9 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Experimental Hspec support for testing WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring - , case-insensitive, hspec, hspec-wai, template-haskell - }: - mkDerivation { - pname = "hspec-wai-json"; - version = "0.8.0"; - sha256 = "1s46dggwq1f14x3d9ga9va9bq78fwlj5bnln8q4lgcmpk20k0ya6"; - libraryHaskellDepends = [ - aeson aeson-qq base bytestring case-insensitive hspec-wai - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-wai ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Testing JSON APIs with hspec-wai"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai-json_0_9_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell }: @@ -109680,7 +106933,6 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Testing JSON APIs with hspec-wai"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-webdriver" = callPackage @@ -109830,6 +107082,7 @@ self: { libraryHaskellDepends = [ base old-time ]; description = "Database access from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsql-mysql" = callPackage @@ -109857,6 +107110,7 @@ self: { librarySystemDepends = [ unixODBC ]; description = "A Haskell Interface to ODBC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unixODBC;}; "hsql-postgresql" = callPackage @@ -109869,6 +107123,7 @@ self: { librarySystemDepends = [ postgresql ]; description = "A Haskell Interface to PostgreSQL via the PQ library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; "hsql-sqlite3" = callPackage @@ -109881,6 +107136,7 @@ self: { librarySystemDepends = [ sqlite ]; description = "SQLite3 driver for HSQL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) sqlite;}; "hsqml" = callPackage @@ -110089,30 +107345,13 @@ self: { ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { pname = "hsshellscript"; - version = "3.4.1"; - sha256 = "0y7byqjcq8qwxz754v5z9s9h3y9g9384fmh02mri8lxdc0934931"; - revision = "1"; - editedCabalFile = "1gfz3ipvippjb8lmhi7j7di2pignibj1x662m1b2qhcpyhlqnabp"; + version = "3.4.5"; + sha256 = "0d66gsm7s2j4f60cjca6fsddg4i1m3l6rcyq29ywskifhfaxbgvx"; libraryHaskellDepends = [ base directory parsec random unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://www.volker-wysk.de/hsshellscript/"; description = "Haskell for Unix shell scripting tasks"; license = "LGPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "hsshellscript_3_4_2" = callPackage - ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: - mkDerivation { - pname = "hsshellscript"; - version = "3.4.2"; - sha256 = "04ihi45pi92ykhcn66ni6zybmzvmbl467yfr1dgidvj56xns33jw"; - libraryHaskellDepends = [ base directory parsec random unix ]; - libraryToolDepends = [ c2hs ]; - homepage = "http://www.volker-wysk.de/hsshellscript/"; - description = "Haskell for Unix shell scripting tasks"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hssourceinfo" = callPackage @@ -110128,7 +107367,6 @@ self: { ]; description = "get haskell source code info"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hssqlppp" = callPackage @@ -110551,8 +107789,8 @@ self: { }: mkDerivation { pname = "hsyslog-tcp"; - version = "0.2.0.0"; - sha256 = "1zbp8l5lj2xb6yczijd76dhdbxfzxpl7han1b01bc8qfw7pkj4g9"; + version = "0.2.1.0"; + sha256 = "09kr9mcjd41xl5an8ddfrcyx8dc1fgfq70mkw6m96dvcmhryf0gv"; libraryHaskellDepends = [ base bytestring hsyslog hsyslog-udp network text time ]; @@ -110568,8 +107806,8 @@ self: { }: mkDerivation { pname = "hsyslog-udp"; - version = "0.1.2"; - sha256 = "1bm4pbvyqjpfr55l0rzfdq76bsfx1g2bzd83c01scl4i0cc1svhs"; + version = "0.2.0"; + sha256 = "0z4jpgdp5brfpzw5xawwxx7i239xjxgr1rjvrv2fyd6d6ixg3gwl"; libraryHaskellDepends = [ base bytestring hsyslog network text time unix ]; @@ -110577,7 +107815,6 @@ self: { homepage = "https://github.com/ThoughtLeadr/hsyslog-udp"; description = "Log to syslog over a network via UDP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hszephyr" = callPackage @@ -110669,6 +107906,7 @@ self: { homepage = "https://github.com/nkartashov/htestu"; description = "A library for testing correctness of pseudo random number generators in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gcc;}; "htiled" = callPackage @@ -110726,6 +107964,7 @@ self: { homepage = "https://github.com/kelemzol/htlset"; description = "Heterogenous Set"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html" = callPackage @@ -110796,7 +108035,21 @@ self: { homepage = "https://github.com/nikita-volkov/html-entities"; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "html-entity-map" = callPackage + ({ mkDerivation, base, criterion, text, unordered-containers }: + mkDerivation { + pname = "html-entity-map"; + version = "0.1.0.0"; + sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; + libraryHaskellDepends = [ base text unordered-containers ]; + benchmarkHaskellDepends = [ + base criterion text unordered-containers + ]; + homepage = "https://github.com/mrkkrp/html-entity-map"; + description = "Map from HTML5 entity names to the corresponding Unicode text"; + license = stdenv.lib.licenses.bsd3; }) {}; "html-kure" = callPackage @@ -110993,8 +108246,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.0.1.11"; - sha256 = "09810a4s0gfza0sh4ldh355sbp3810qy8gkcpvq2048h6ajh2kz5"; + version = "1.0.1.12"; + sha256 = "1yzkhbsbxfpmy70nb52715gsppmlsnzr50vfmv0w0fqmw76abd8i"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl old-locale text time unordered-containers vector @@ -111003,11 +108256,8 @@ self: { aeson base bytestring containers file-embed hspec megaparsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; - benchmarkHaskellDepends = [ - aeson base containers criterion text time unordered-containers - vector - ]; - homepage = "https://github.com/vmchale/htoml-megaparsec"; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://hub.darcs.net/vmchale/htoml-megaparsec"; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -111126,6 +108376,8 @@ self: { pname = "http-api-data"; version = "0.3.7.1"; sha256 = "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc"; + revision = "1"; + editedCabalFile = "0g57k71bssf81yba6xf9fcxlys8m5ax5kvrs4gvckahf5ihdxds6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base bytestring containers hashable @@ -111384,8 +108636,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.3.2"; - sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3"; + version = "2.2.4"; + sha256 = "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -111540,6 +108792,7 @@ self: { homepage = "https://github.com/owensmurray/http-grammar"; description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-kinder" = callPackage @@ -111628,26 +108881,6 @@ self: { }) {}; "http-media" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "http-media"; - version = "0.6.4"; - sha256 = "1ly93k3d6kilma8gv6y1vf4d3lz4xg5xwi5p8x10w9al13sjqxpg"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck - test-framework test-framework-quickcheck2 - ]; - homepage = "https://github.com/zmthy/http-media"; - description = "Processing HTTP Content-Type and Accept headers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-media_0_7_1_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , QuickCheck, test-framework, test-framework-quickcheck2 , utf8-string @@ -111666,7 +108899,6 @@ self: { homepage = "https://github.com/zmthy/http-media"; description = "Processing HTTP Content-Type and Accept headers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-monad" = callPackage @@ -111723,6 +108955,7 @@ self: { homepage = "https://github.com/nfjinjing/http-pony-serve-wai"; description = "Serve a WAI application with http-pony"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-pony-transformer-case-insensitive" = callPackage @@ -111829,6 +109062,7 @@ self: { homepage = "https://github.com/sannsyn/http-response-decoder"; description = "Declarative DSL for parsing an HTTP response"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-reverse-proxy" = callPackage @@ -111858,6 +109092,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-reverse-proxy_0_5_0" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, containers + , data-default-class, hspec, http-client, http-conduit, http-types + , lifted-base, monad-control, network, resourcet, streaming-commons + , text, transformers, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.5.0"; + sha256 = "10j58i0xkbf84ypk5q8pxz2a85kk24s4xqhkprr6j12d4hx1zl6i"; + libraryHaskellDepends = [ + async base blaze-builder bytestring case-insensitive conduit + conduit-extra containers data-default-class http-client http-types + lifted-base monad-control network resourcet streaming-commons text + transformers wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types lifted-base network resourcet + streaming-commons transformers wai warp + ]; + homepage = "https://github.com/fpco/http-reverse-proxy"; + description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -111899,10 +109161,10 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.5.3"; - sha256 = "1qz55rxzd98d00qdp5hp60i5cc8f0hfir6dhq15z2jzj5bsz9nna"; + version = "0.8.5.5"; + sha256 = "1g2ygxyfq2x923df5q83wkrwhy2631r33zvffgj3fn0zwr024hhf"; revision = "1"; - editedCabalFile = "0ki3gv5lhs69hj17ng4asyqaw4wcjjpwqda79az9wkizxyvbc0ay"; + editedCabalFile = "0mgj62khq2abq53y03qww66k74pxhnid8yiqrlhggj9cjv7m2my5"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring @@ -112268,7 +109530,6 @@ self: { homepage = "https://github.com/mitsuji/huckleberry#readme"; description = "Haskell IOT on Intel Edison and other Linux computers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "huff" = callPackage @@ -112302,6 +109563,7 @@ self: { libraryHaskellDepends = [ base containers fingertree ]; description = "Pure Haskell implementation of the Huffman encoding algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hugs2yc" = callPackage @@ -112359,6 +109621,7 @@ self: { homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for parsing text entered by humans"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "human-readable-duration" = callPackage @@ -112385,6 +109648,7 @@ self: { homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for converting values to human-friendly text"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hums" = callPackage @@ -112440,21 +109704,20 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.6.0.0"; - sha256 = "0nw906gq8jzn6kr7iq40qna3r3q1s0dvfyxz84xfp5452g56a1ah"; + version = "0.7.1.1"; + sha256 = "1b9c4v82fzrl88bg13q36smicndi0l7bp73mxniavbnsmccb22yy"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "hunit-dejafu_0_7_1_1" = callPackage + "hunit-dejafu_1_0_0_0" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.7.1.1"; - sha256 = "1b9c4v82fzrl88bg13q36smicndi0l7bp73mxniavbnsmccb22yy"; + version = "1.0.0.0"; + sha256 = "1xsfv8pdkmyplggzk0k17j1y10kbjrvb86izsnc9k2w0lmd1j6ji"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -112609,16 +109872,15 @@ self: { "hup" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, doctest - , filepath, Glob, hspec, hspec-wai, http-client, http-client-tls - , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar - , temporary, text, transformers, wai, wai-extra, zlib + , filepath, Glob, hspec, hspec-core, hspec-wai, http-client + , http-client-tls, http-types, mtl, QuickCheck, shelly, simple + , split, tagsoup, tar, temporary, text, transformers, wai + , wai-extra, zlib }: mkDerivation { pname = "hup"; - version = "0.2.0.0"; - sha256 = "1blq502m6nsgshzkjdm3j694zcm5qd52rnacj7md27ram8cxkldd"; - revision = "1"; - editedCabalFile = "14fhz0s4ybnscqiz6m7ixfrkgbdkybj0mrbq70ync6dgpsb3nmm9"; + version = "0.3.0.0"; + sha256 = "1aby486naf17d3sp0mmhhpm9rvy3x85574zap6fjnkjvrr07b9iz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112630,12 +109892,14 @@ self: { transformers ]; testHaskellDepends = [ - base bytestring doctest filepath Glob hspec hspec-wai http-client - http-types QuickCheck simple temporary transformers wai wai-extra + base bytestring doctest filepath Glob hspec hspec-core hspec-wai + http-client http-types QuickCheck simple temporary transformers wai + wai-extra ]; homepage = "https://github.com/phlummox/hup"; description = "Upload packages or documentation to a hackage server"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hurdle" = callPackage @@ -112797,29 +110061,6 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess - , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector - }: - mkDerivation { - pname = "hw-balancedparens"; - version = "0.1.0.2"; - sha256 = "1s14dkwvm0ya75z6jqbhy3d8vyfh7dw33d3k9c3xgzwzvznbhq02"; - libraryHaskellDepends = [ - base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple - vector - ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector - ]; - benchmarkHaskellDepends = [ - base criterion hw-bits hw-prim vector - ]; - homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; - description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-balancedparens_0_2_0_1" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector }: @@ -112840,30 +110081,9 @@ self: { homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; 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 { - pname = "hw-bits"; - version = "0.5.0.3"; - sha256 = "1xkzxfz25ah7p4zybdm0c1081kkca7515jh1d7vjysxs34w8h1yn"; - libraryHaskellDepends = [ - base bytestring hw-int hw-prim hw-string-parse safe vector - ]; - testHaskellDepends = [ - base bytestring hspec hw-prim QuickCheck vector - ]; - benchmarkHaskellDepends = [ base criterion hw-prim vector ]; - homepage = "http://github.com/haskell-works/hw-bits#readme"; - description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-bits_0_7_0_2" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-int , hw-prim, hw-string-parse, QuickCheck, safe, vector }: @@ -112881,7 +110101,6 @@ self: { homepage = "http://github.com/haskell-works/hw-bits#readme"; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-conduit" = callPackage @@ -112936,25 +110155,6 @@ self: { }) {}; "hw-excess" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base - , QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-excess"; - version = "0.1.0.1"; - sha256 = "0q6mrmlii351iji1b0c4j7sck74zgs1hxfyj8cd3k5a6q8j3nkb1"; - libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe vector - ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-excess#readme"; - description = "Excess"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-excess_0_2_0_0" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base , QuickCheck, safe, storable-record, vector }: @@ -112971,7 +110171,6 @@ self: { homepage = "http://github.com/haskell-works/hw-excess#readme"; description = "Excess"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hedgehog" = callPackage @@ -113128,8 +110327,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.1.3"; - sha256 = "006lkyjwjsn1npznzv9ysqsap2f7w3gsxn8rimlpv0manvk8h5bg"; + version = "2.3.0"; + sha256 = "0nrymgfp2kgfhizi5niaa08n56b1zsypy1vk9in9i0k39kxfkd3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113147,7 +110346,6 @@ self: { homepage = "https://github.com/haskell-works/hw-kafka-client"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "hw-kafka-conduit" = callPackage @@ -113175,7 +110373,6 @@ self: { homepage = "https://github.com/haskell-works/hw-kafka-conduit"; description = "Conduit bindings for hw-kafka-client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-mquery" = callPackage @@ -113230,19 +110427,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: - mkDerivation { - pname = "hw-prim"; - version = "0.4.0.5"; - sha256 = "1d2fs0w2bccxiw66m3brdbg0ynzb8kr8avj1rzid7g7v65nhpn5v"; - libraryHaskellDepends = [ base bytestring vector ]; - testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { pname = "hw-prim"; @@ -113253,7 +110437,6 @@ self: { homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -113275,29 +110458,9 @@ self: { homepage = "https://github.com/githubuser/hw-prim-bits#readme"; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect" = callPackage - ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim - , hw-rankselect-base, QuickCheck, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.8.0.2"; - sha256 = "0b9ki066c5nypy81dqyj91ghj00p1y5glhg1jpf267q6r0mjkwcm"; - libraryHaskellDepends = [ - base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector - ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-rankselect#readme"; - description = "Rank-select"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-rankselect_0_10_0_3" = 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 @@ -113327,7 +110490,6 @@ self: { homepage = "http://github.com/haskell-works/hw-rankselect#readme"; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect-base" = callPackage @@ -113435,7 +110597,6 @@ self: { homepage = "http://github.com/haskell-works/hw-xml#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -113478,6 +110639,7 @@ self: { homepage = "http://github.com/aycanirican/hweblib"; description = "Haskell Web Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hworker" = callPackage @@ -113698,6 +110860,7 @@ self: { homepage = "https://github.com/UweSchmidt/hxt"; description = "Cache for HXT XML Documents and other binary data"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-charproperties" = callPackage @@ -113942,6 +111105,7 @@ self: { homepage = "http://github.com/DamienCassou/HYahtzee"; description = "A Yahtzee game implementation in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyakko" = callPackage @@ -114458,6 +111622,7 @@ self: { homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyperloglogplus" = callPackage @@ -114743,6 +111908,7 @@ self: { homepage = "https://github.com/ibotty/iban"; description = "Validate and generate IBANs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ibus-hs" = callPackage @@ -114786,6 +111952,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Package for handling icon fonts in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iconv" = callPackage @@ -114814,7 +111981,7 @@ self: { homepage = "https://github.com/adinapoli/iconv-typed#readme"; description = "Type safe iconv wrapper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend" = callPackage @@ -114939,6 +112106,7 @@ self: { homepage = "http://ideas.cs.uu.nl/www/"; description = "Feedback services for intelligent tutoring systems"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ideas-math" = callPackage @@ -115019,6 +112187,7 @@ self: { ]; description = "Numeric identifiers for values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "idiii" = callPackage @@ -115056,6 +112225,7 @@ self: { libraryHaskellDepends = [ base punycode stringprep text ]; description = "Implements IDNA (RFC 3490)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "idna2008" = callPackage @@ -115092,65 +112262,20 @@ self: { }) {}; "idris" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal - , ansi-wl-pprint, array, async, base, base64-bytestring, binary - , blaze-html, blaze-markup, bytestring, cheapskate, code-page - , containers, deepseq, directory, filepath, fingertree, fsnotify - , gmp, haskeline, ieee754, libffi, mtl, network - , optparse-applicative, parsers, pretty, process, regex-tdfa, safe - , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size - , text, time, transformers, transformers-compat, trifecta, uniplate - , unix, unordered-containers, utf8-string, vector - , vector-binary-instances, zip-archive - }: - mkDerivation { - pname = "idris"; - version = "1.0"; - sha256 = "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h"; - configureFlags = [ "-fcurses" "-f-execonly" "-fffi" "-fgmp" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async - base base64-bytestring binary blaze-html blaze-markup bytestring - cheapskate code-page containers deepseq directory filepath - fingertree fsnotify haskeline ieee754 libffi mtl network - optparse-applicative parsers pretty process regex-tdfa safe split - terminal-size text time transformers transformers-compat trifecta - uniplate unix unordered-containers utf8-string vector - vector-binary-instances zip-archive - ]; - librarySystemDepends = [ gmp ]; - executableHaskellDepends = [ - base directory filepath haskeline transformers - ]; - testHaskellDepends = [ - base bytestring containers directory filepath haskeline - optparse-applicative process tagged tasty tasty-golden tasty-rerun - time transformers - ]; - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gmp;}; - - "idris_1_1_1" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary , blaze-html, blaze-markup, bytestring, Cabal, cheapskate , code-page, containers, deepseq, directory, filepath, fingertree - , fsnotify, gmp, haskeline, ieee754, libffi, mtl, network - , optparse-applicative, parsers, pretty, process, regex-tdfa, safe + , fsnotify, gmp, haskeline, ieee754, libffi, megaparsec, mtl + , network, optparse-applicative, pretty, process, regex-tdfa, safe , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size - , text, time, transformers, transformers-compat, trifecta, uniplate - , unix, unordered-containers, utf8-string, vector - , vector-binary-instances, zip-archive + , text, time, transformers, uniplate, unix, unordered-containers + , utf8-string, vector, vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "1.1.1"; - sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp"; + version = "1.2.0"; + sha256 = "0bim5lmr1wh3sc5nj5axy8xa2qq8rajp13x363mb9kkrnfy5wbxk"; configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -115160,11 +112285,11 @@ self: { aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async base base64-bytestring binary blaze-html blaze-markup bytestring cheapskate code-page containers deepseq directory filepath - fingertree fsnotify haskeline ieee754 libffi mtl network - optparse-applicative parsers pretty process regex-tdfa safe split - terminal-size text time transformers transformers-compat trifecta - uniplate unix unordered-containers utf8-string vector - vector-binary-instances zip-archive + fingertree fsnotify haskeline ieee754 libffi megaparsec mtl network + optparse-applicative pretty process regex-tdfa safe split + terminal-size text time transformers uniplate unix + unordered-containers utf8-string vector vector-binary-instances + zip-archive ]; librarySystemDepends = [ gmp ]; executableHaskellDepends = [ @@ -115178,7 +112303,6 @@ self: { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -115338,6 +112462,7 @@ self: { homepage = "https://github.com/olynch/ige"; description = "An keyboard-driven interactive graph editor"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ige-mac-integration" = callPackage @@ -115425,8 +112550,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.9.0.1"; - sha256 = "1xfp0pzxsfcz8h4f27fqvbc6pprwz45cgq5sa393z3wqy17ni4lq"; + version = "0.9.0.2"; + sha256 = "0pa366b4vn5hc9ymd4g1pr4dsffvk80x9c8yq4d1pf4jngjfayql"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -115457,8 +112582,8 @@ self: { }: mkDerivation { pname = "ihaskell-aeson"; - version = "0.3.0.0"; - sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7"; + version = "0.3.0.1"; + sha256 = "1ds13a2j2bdr86gcb6vr8dfsb9fjia670lzwwqk4hsvyjgsbd2d7"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring here ihaskell text ]; @@ -115485,8 +112610,8 @@ self: { ({ mkDerivation, base, blaze-html, blaze-markup, ihaskell }: mkDerivation { pname = "ihaskell-blaze"; - version = "0.3.0.0"; - sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b"; + version = "0.3.0.1"; + sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7"; libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; @@ -115500,8 +112625,8 @@ self: { }: mkDerivation { pname = "ihaskell-charts"; - version = "0.3.0.0"; - sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3"; + version = "0.3.0.1"; + sha256 = "1m7jxl1pxl0hcfa24xgjcwj4k50an8phm2lkpr4493yr1x2isk35"; libraryHaskellDepends = [ base bytestring Chart Chart-cairo data-default-class directory ihaskell @@ -115518,8 +112643,8 @@ self: { }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.3.1.0"; - sha256 = "18q7m6xrshn1ixn0j75bdvpgvjq63sic3dfjzcz9zk73zmvpj4qz"; + version = "0.3.1.1"; + sha256 = "1c6a469ymfcjmf4larh1sh6qzaxgq260r55vzx78irh036k5h0lc"; libraryHaskellDepends = [ active base bytestring diagrams diagrams-cairo diagrams-lib directory ihaskell text @@ -115543,12 +112668,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-gnuplot" = callPackage + ({ mkDerivation, base, bytestring, gnuplot, ihaskell }: + mkDerivation { + pname = "ihaskell-gnuplot"; + version = "0.1.0.1"; + sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6"; + libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell display instance for Gnuplot (from gnuplot package)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-hatex" = callPackage ({ mkDerivation, base, HaTeX, ihaskell, text }: mkDerivation { pname = "ihaskell-hatex"; - version = "0.2.1.0"; - sha256 = "098mbabwsl5i5dnvdy732ivrpzyb5njpr4483zss22axdni9p68i"; + version = "0.2.1.1"; + sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8"; libraryHaskellDepends = [ base HaTeX ihaskell text ]; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for hatex"; @@ -115580,8 +112718,8 @@ self: { }: mkDerivation { pname = "ihaskell-juicypixels"; - version = "0.3.0.0"; - sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y"; + version = "1.1.0.1"; + sha256 = "1fjngq27572rlri9m6674ddbgqh5ygl5dagma3z50m1l8n0g7z6s"; libraryHaskellDepends = [ base bytestring directory ihaskell JuicyPixels ]; @@ -115597,8 +112735,8 @@ self: { }: mkDerivation { pname = "ihaskell-magic"; - version = "0.3.0.0"; - sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl"; + version = "0.3.0.1"; + sha256 = "02zqlvnl73qkbx1yx7fc9dwcg3k7fk9jr9iqn22l38wsk01nm7c2"; libraryHaskellDepends = [ base base64-bytestring bytestring ihaskell ipython-kernel magic text utf8-string @@ -115627,12 +112765,12 @@ self: { }) {}; "ihaskell-plot" = callPackage - ({ mkDerivation, base, bytestring, ihaskell, plot }: + ({ mkDerivation, base, bytestring, hmatrix, ihaskell, plot }: mkDerivation { pname = "ihaskell-plot"; - version = "0.3.0.0"; - sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1"; - libraryHaskellDepends = [ base bytestring ihaskell plot ]; + version = "0.3.0.1"; + sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y"; + libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ]; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; @@ -115664,8 +112802,8 @@ self: { }: mkDerivation { pname = "ihaskell-widgets"; - version = "0.2.3.1"; - sha256 = "0ay3wpv8ayyxvky3cpyzmwpbgkxc76avr119nb632a7nig74rzvp"; + version = "0.2.3.2"; + sha256 = "18kp3s534k241ld1s0ds5hln47pc863dfs3i6r9w67adnf6qhff8"; libraryHaskellDepends = [ aeson base containers ihaskell ipython-kernel scientific singletons text unix unordered-containers vector vinyl @@ -115852,8 +112990,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.4"; - sha256 = "021ya9pkf8q1nk805ck5hhm06q9lnp22d78hr0nz112xbxm5rqkw"; + version = "0.3.0.5"; + sha256 = "1wkm6agp0gsqg8lqfqp7sm0aq64426lpfw56nmnzvfk1hkq2gwmp"; libraryHaskellDepends = [ attoparsec base bytestring connection containers derive either exceptions hslogger list-t network pipes random rolling-queue stm @@ -115931,44 +113069,94 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "imm" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base - , blaze-html, blaze-markup, bytestring, case-insensitive - , chunked-data, comonad, conduit, conduit-combinators, connection - , containers, directory, dyre, fast-logger, filepath, free - , hashable, HaskellNet, HaskellNet-SSL, http-client - , http-client-tls, http-types, mime-mail, mono-traversable - , monoid-subclasses, network, opml-conduit, optparse-applicative - , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text - , time, timerep, tls, transformers, uri-bytestring, xml - , xml-conduit, xml-types + "imj-animation" = callPackage + ({ mkDerivation, base, imj-base, imj-prelude, mtl }: + mkDerivation { + pname = "imj-animation"; + version = "0.1.0.2"; + sha256 = "1v0rji1b45n309wn4ld5fs60rri8gn4xg0wz319f2mcqqrih6ir4"; + libraryHaskellDepends = [ base imj-base imj-prelude mtl ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-animation/README.md"; + description = "Animation Framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-base" = callPackage + ({ mkDerivation, ansi-terminal, base, imj-prelude, mtl, primitive + , random, terminal-size, text, time, vector, vector-algorithms }: mkDerivation { - pname = "imm"; - version = "1.2.0.0"; - sha256 = "1bpcsahzvf4qa1pzga84wqflk259wcqd41r3rfxk2w3rzdlns999"; - revision = "1"; - editedCabalFile = "1yk1vih0fr53wrq5ksjwi21ba51r6qxhvyzz30iycdbv3zm53pmw"; + pname = "imj-base"; + version = "0.1.0.2"; + sha256 = "1b42xqzbgr47r2rkhy9299p68z9imgx19xc1d5rvfc3qyg8ciph2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup - bytestring case-insensitive chunked-data comonad conduit - conduit-combinators connection containers directory dyre - fast-logger filepath free hashable HaskellNet HaskellNet-SSL - http-client http-client-tls http-types mime-mail mono-traversable - monoid-subclasses network opml-conduit optparse-applicative rainbow - rainbox rss-conduit safe-exceptions tagged text time timerep tls - transformers uri-bytestring xml xml-conduit xml-types + ansi-terminal base imj-prelude mtl primitive random terminal-size + text time vector vector-algorithms ]; - executableHaskellDepends = [ base free ]; - homepage = "https://github.com/k0ral/imm"; - description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + executableHaskellDepends = [ + ansi-terminal base imj-prelude mtl text time + ]; + testHaskellDepends = [ + ansi-terminal base imj-prelude mtl text time + ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-base/README.md"; + description = "Game engine with geometry, easing, animated text, delta rendering"; + license = stdenv.lib.licenses.bsd3; }) {}; - "imm_1_2_1_0" = callPackage + "imj-game-hamazed" = callPackage + ({ mkDerivation, base, containers, imj-animation, imj-base + , imj-prelude, matrix, mtl, terminal-size, text, vector + }: + mkDerivation { + pname = "imj-game-hamazed"; + version = "0.1.0.2"; + sha256 = "0s0a2c1pfp5mwfmh1fjbq83ws68d8k5r526b7qmq36p4n78hx22g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers imj-animation imj-base imj-prelude matrix mtl + terminal-size text vector + ]; + executableHaskellDepends = [ base imj-prelude ]; + testHaskellDepends = [ base imj-base mtl text ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-game-hamazed//README.md"; + description = "A game with flying numbers and 8-bit color animations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-measure-stdout" = callPackage + ({ mkDerivation, base, imj-prelude, optparse-applicative }: + mkDerivation { + pname = "imj-measure-stdout"; + version = "0.1.0.2"; + sha256 = "15s7dd241z9lzm0nb46yr0y7rjryy6jydwfgigcsalv5my4p2j6x"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base imj-prelude optparse-applicative + ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-measure-stdout/README.md"; + description = "An application to determine the maximum capacity of stdout buffer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-prelude" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "imj-prelude"; + version = "0.1.0.2"; + sha256 = "1nv3fxps3i4znibv98qygxdl22dzri5zkw6hjaqajb4nlnh4bd0v"; + libraryHaskellDepends = [ base mtl text ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-prelude/README.md"; + description = "Prelude library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imm" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base , blaze-html, blaze-markup, bytestring, case-insensitive , chunked-data, comonad, conduit, conduit-combinators, connection @@ -116153,6 +113341,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "importify" = callPackage + ({ mkDerivation, aeson, aeson-pretty, autoexporter, base + , bytestring, Cabal, containers, filepath, fmt, foldl, hashable + , haskell-names, haskell-src-exts, hse-cpp, hspec, log-warper + , microlens-platform, optparse-applicative, path, path-io + , pretty-simple, syb, template-haskell, text, text-format, turtle + , universum, unordered-containers, yaml + }: + mkDerivation { + pname = "importify"; + version = "1.0.1"; + sha256 = "1snm75p3p3nvjclqis6qglb17gr0pm2dw0i980jpzrqm3n3kciy3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty autoexporter base bytestring Cabal containers + filepath fmt foldl hashable haskell-names haskell-src-exts hse-cpp + log-warper microlens-platform path path-io pretty-simple syb + template-haskell text text-format turtle universum + unordered-containers yaml + ]; + executableHaskellDepends = [ + base log-warper optparse-applicative path path-io text universum + ]; + testHaskellDepends = [ + base filepath hspec log-warper microlens-platform path path-io + universum unordered-containers + ]; + homepage = "https://github.com/serokell/importify"; + description = "Tool for haskell imports refactoring"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "imports" = callPackage ({ mkDerivation, base, directory, filepath, mtl }: mkDerivation { @@ -116224,6 +113446,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "imprint" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, hspec }: + mkDerivation { + pname = "imprint"; + version = "0.0.1.0"; + sha256 = "0f56zy6ay6wvcvqfplvc3gckngxngxm9r62h1w36lxm74xy8544v"; + libraryHaskellDepends = [ base binary bytestring constraints ]; + testHaskellDepends = [ base binary constraints hspec ]; + homepage = "https://github.com/mrkkrp/imprint"; + description = "Serialization of arbitrary Haskell expressions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "improve" = callPackage ({ mkDerivation, base, mtl, yices }: mkDerivation { @@ -116504,8 +113739,8 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: mkDerivation { pname = "indents"; - version = "0.4.0.0"; - sha256 = "15flb4wb5d2pwzqqnh5szzd82nr9gxrc89b2qpzi5m2dxbwd6y4l"; + version = "0.4.0.1"; + sha256 = "0zv8mzn6r14fjgm2llg3babzgdfdkb97r2avj34lfjzmql4yrkql"; libraryHaskellDepends = [ base mtl parsec ]; testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; homepage = "http://github.com/jaspervdj/indents"; @@ -116739,25 +113974,6 @@ self: { }) {}; "inflections" = callPackage - ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec - , megaparsec, QuickCheck, text, unordered-containers - }: - mkDerivation { - pname = "inflections"; - version = "0.3.0.0"; - sha256 = "1w96i4rnsxxzrjjvqzjs7dqbs4h4nrdw84cxvizb4bq19y0cp483"; - libraryHaskellDepends = [ - base exceptions megaparsec text unordered-containers - ]; - testHaskellDepends = [ - base hspec hspec-megaparsec megaparsec QuickCheck text - ]; - homepage = "https://github.com/stackbuilders/inflections-hs"; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_4_0_0" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , hspec-megaparsec, megaparsec, QuickCheck, text , unordered-containers @@ -116775,7 +113991,6 @@ self: { homepage = "https://github.com/stackbuilders/inflections-hs"; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -116801,8 +114016,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.2.2.1"; - sha256 = "1dsrj11vcf7jn1xwhjz7jz6fnpxc3k614na0hy5xxfnhib0mvm8r"; + version = "1.2.2.2"; + sha256 = "18aijaz7lv64zqkpydmny8nga48fg5lsbmphlk7b92hcfbp8vw4f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116932,7 +114147,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-c" = callPackage + "inline-c_0_5_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, gsl, gslcblas , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq @@ -116958,9 +114173,10 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl; gslcblas = null;}; - "inline-c_0_6_0_5" = callPackage + "inline-c" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck , raw-strings-qq, regex-posix, template-haskell, transformers @@ -116984,10 +114200,9 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl; gslcblas = null;}; - "inline-c-cpp" = callPackage + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { pname = "inline-c-cpp"; @@ -116997,9 +114212,10 @@ self: { testHaskellDepends = [ base ]; description = "Lets you embed C++ code into Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-c-cpp_0_2_1_0" = callPackage + "inline-c-cpp" = callPackage ({ mkDerivation, base, hspec, inline-c, safe-exceptions , template-haskell }: @@ -117013,7 +114229,6 @@ self: { testHaskellDepends = [ base hspec inline-c safe-exceptions ]; description = "Lets you embed C++ code into Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-c-win32" = callPackage @@ -117033,40 +114248,14 @@ self: { }) {}; "inline-java" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, containers - , directory, distributed-closure, filepath, ghc-heap-view, hspec - , inline-c, jni, jvm, language-java, process, singletons, syb - , template-haskell, temporary, text, thread-local-storage, vector - }: - mkDerivation { - pname = "inline-java"; - version = "0.6.5"; - sha256 = "1pqai3jblcz52z76hwshzzajpnb5c62bs0i1b87hk8f8s0isask9"; - revision = "1"; - editedCabalFile = "1va62gdb22sjq5z3ydl9nbcdy1x8935q3zsdn9dibp6af1v45f5b"; - libraryHaskellDepends = [ - base binary bytestring Cabal containers directory - distributed-closure filepath ghc-heap-view inline-c jni jvm - language-java process singletons syb template-haskell temporary - text thread-local-storage vector - ]; - testHaskellDepends = [ - base bytestring hspec jni jvm singletons text - ]; - homepage = "http://github.com/tweag/inline-java#readme"; - description = "Java interop via inline Java code in Haskell modules"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "inline-java_0_7_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc , hspec, jni, jvm, language-java, mtl, process, template-haskell , temporary, text }: mkDerivation { pname = "inline-java"; - version = "0.7.0"; - sha256 = "12lzh63wg0nk1lcn9627mbyf251ijlcc65iasmmnwljkxg0qrkf7"; + version = "0.7.2"; + sha256 = "0hfjgkv8shi3zhjx7jkcwqyglrh5hrc11zf58ykhwxjhzhj4f05b"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -117075,7 +114264,6 @@ self: { homepage = "http://github.com/tweag/inline-java#readme"; description = "Java interop via inline Java code in Haskell modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-r" = callPackage @@ -117112,7 +114300,6 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -117367,6 +114554,7 @@ self: { homepage = "https://github.com/spinda/instapaper-sender#readme"; description = "Basic HTTP gateway to save articles to Instapaper"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "instinct" = callPackage @@ -117411,14 +114599,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "integer-gmp_1_0_0_1" = callPackage + "integer-gmp_1_0_1_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.0.1"; - sha256 = "08f1qcp57aj5mjy26dl3bi3lcg0p8ylm0qw4c6zbc1vhgnmxl4gg"; + version = "1.0.1.0"; + sha256 = "1xrdqksharn0jg8m1d7zm8nhbsq3abw2k25kzw0z7m0zm14n1nlw"; revision = "1"; - editedCabalFile = "1mfl651b2v82qhm5h279mjhq4ilzf6x1yydi3npa10ja6isifvb1"; + editedCabalFile = "02xp5ldq3xxx1qdxg7gbs2zcqpf1dxbdrvrzizxnjwhpiqxcigy3"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -117576,6 +114764,7 @@ self: { ]; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intern" = callPackage @@ -117621,8 +114810,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.23"; - sha256 = "17247yscz7z1axhml2f5m4i4sxgyydpvcidk75ng350dk6z1wd4x"; + version = "0.1.24"; + sha256 = "022ad802z5h55az357047sf6fngp08by7ms71r2kiqkzbccldqgv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -117764,7 +114953,6 @@ self: { homepage = "https://sealgram.com/git/haskell/interruptible/"; description = "Monad transformers that can be run and resumed later, conserving their context"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interspersed" = callPackage @@ -117836,7 +115024,6 @@ self: { homepage = "http://mbays.freeshell.org/intricacy"; description = "A game of competitive puzzle-design"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "intrinsic-superclasses" = callPackage @@ -117845,8 +115032,8 @@ self: { }: mkDerivation { pname = "intrinsic-superclasses"; - version = "0.1.0.0"; - sha256 = "0vvkh65fdm6sgx3m5irk6l96krg99f14h3z45lz19z6xj57627y5"; + version = "0.2.0.0"; + sha256 = "0bx8igqwpyhs1q8rhyxhc5389nx49ynfq08bis30x9gdq209dqih"; libraryHaskellDepends = [ base containers haskell-src-meta mtl template-haskell ]; @@ -117856,23 +115043,22 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe - , text, transformers, unordered-containers, writer-cps-mtl + ({ 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.0.1"; sha256 = "0yc163r255w7df0hjly30bh5dqgx38f1z5lk3x3i7jh93j97cpn0"; libraryHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable mtl safe text transformers unordered-containers - writer-cps-mtl + base binary bytestring containers deepseq dlist extra hashable mtl + safe text transformers unordered-containers writer-cps-mtl ]; testHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable lens mtl QuickCheck safe text transformers - unordered-containers writer-cps-mtl + base binary bytestring containers deepseq dlist extra hashable lens + mtl QuickCheck safe text transformers unordered-containers + writer-cps-mtl ]; homepage = "https://github.com/minad/intro#readme"; description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; @@ -117970,8 +115156,8 @@ self: { }: mkDerivation { pname = "invariant"; - version = "0.4.3"; - sha256 = "17nfm5w6hp4ajg7gslvdvzj4nkds8zk8yp1zi6pi6lax71613rz0"; + version = "0.5"; + sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell @@ -118160,32 +115346,6 @@ self: { }) {}; "io-streams" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , deepseq, directory, filepath, HUnit, mtl, network, primitive - , process, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , zlib, zlib-bindings - }: - mkDerivation { - pname = "io-streams"; - version = "1.4.1.0"; - sha256 = "0d6m7hq6l3zabqm2kga9qs1742vh5rnhfsa76svpkyn32z8n1i1w"; - configureFlags = [ "-fnointeractivetests" ]; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder network primitive - process text time transformers vector zlib-bindings - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder deepseq directory - filepath HUnit mtl network primitive process QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time transformers vector zlib zlib-bindings - ]; - description = "Simple, composable, and easy-to-use stream I/O"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-streams_1_5_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit @@ -118209,7 +115369,6 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage @@ -118318,6 +115477,7 @@ self: { homepage = "http://cs-syd.eu"; description = "A class of strings that can be involved in IO"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iothread" = callPackage @@ -118354,8 +115514,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.1.0"; - sha256 = "0a5dc019jmkx77kk3jmgvk79ffigam38fanjwajaqsxy5ysp5xyf"; + version = "1.1.1"; + sha256 = "150gbl7589w1a1imqn8qh5g9ar68bkkx0ifiab5zf0gvxgkiz4jd"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -118569,8 +115729,8 @@ self: { }: mkDerivation { pname = "ipython-kernel"; - version = "0.9.0.0"; - sha256 = "04byvmf4n55sdanw2lg5hicp2h7ivn2620wybd8i43hgcckx1ach"; + version = "0.9.0.1"; + sha256 = "0nzl5zcl03cdp0l6idscp648n64qjnhvfyj2j47fiiy1fkz133s7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -118585,7 +115745,6 @@ self: { homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -118618,25 +115777,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit - , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text - , time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "0.4.4.4"; - sha256 = "0y858xsjl16vlb9ifvw7akw727zmg06i5ald78r8828c8piqa259"; - libraryHaskellDepends = [ - base bytestring conduit connection irc-conduit irc-ctcp - network-conduit-tls old-locale stm stm-conduit text time tls - transformers x509 x509-store x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_0_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-conduit @@ -118655,7 +115795,6 @@ self: { homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -118844,6 +115983,7 @@ self: { homepage = "https://github.com/stepcut/ircbot"; description = "A library for writing IRC bots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ircbouncer" = callPackage @@ -118868,6 +116008,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "iri" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , contravariant, 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 + }: + mkDerivation { + pname = "iri"; + version = "0.2"; + sha256 = "0rldjjfdrg5sv96aig5y4yb13633yy3dcxq659i2drmipyll8iw0"; + libraryHaskellDepends = [ + attoparsec base base-prelude bug bytestring contravariant ip + profunctors ptr punycode semigroups template-haskell text + text-builder th-lift th-lift-instances unordered-containers vector + vector-builder + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/iri"; + description = "RFC-based International Resource Identifier library"; + license = stdenv.lib.licenses.mit; + }) {}; + "iridium" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , extra, foldl, http-conduit, lifted-base, monad-control @@ -118942,6 +116108,7 @@ self: { homepage = "https://github.com/argiopetech/irt"; description = "Item Response Theory functions for use in computerized adaptive testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "is" = callPackage @@ -118950,10 +116117,11 @@ self: { pname = "is"; version = "0.4"; sha256 = "0bg7irvyzmlay3xkwsqn08waiylpllyvpkj3n3vwib6iwizqnqkz"; - libraryHaskellDepends = [ base template-haskell ]; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isdicom" = callPackage @@ -118974,6 +116142,7 @@ self: { homepage = "https://github.com/tonymorris/isdicom"; description = "An executable and library to determine if a file is a DICOM file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isevaluated" = callPackage @@ -118999,7 +116168,6 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "islink" = callPackage @@ -119147,6 +116315,7 @@ self: { homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md"; description = "Isotopic masses and relative abundances"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ispositive" = callPackage @@ -119204,6 +116373,7 @@ self: { ]; description = "A brick Widget for selectable summary of many elements on a terminal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iter-stats" = callPackage @@ -119716,6 +116886,7 @@ self: { homepage = "https://github.com/schell/ixshader#readme"; description = "A shallow embedding of the OpenGL Shading Language in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iyql" = callPackage @@ -119788,7 +116959,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -120248,6 +117418,7 @@ self: { homepage = "https://github.com/erikd/jenga"; description = "Generate a cabal freeze file from a stack.yaml"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jenkinsPlugins2nix" = callPackage @@ -120272,7 +117443,6 @@ self: { homepage = "https://github.com/Fuuzetsu/jenkinsPlugins2nix#readme"; description = "Generate nix for Jenkins plugins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jespresso" = callPackage @@ -120385,42 +117555,22 @@ self: { }) {}; "jni" = callPackage - ({ mkDerivation, base, bytestring, choice, containers, cpphs - , inline-c, jdk, singletons, thread-local-storage - }: - mkDerivation { - pname = "jni"; - version = "0.3.1"; - sha256 = "00acvi2yz2f61xqbck4k2zi87s7zx99z551zwi4llmaqlnz16ipd"; - libraryHaskellDepends = [ - base bytestring choice containers inline-c singletons - thread-local-storage - ]; - librarySystemDepends = [ jdk ]; - libraryToolDepends = [ cpphs ]; - homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; - description = "Complete JNI raw bindings"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) jdk;}; - - "jni_0_4_0" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, containers - , cpphs, deepseq, inline-c, jdk, singletons, thread-local-storage + , cpphs, deepseq, inline-c, jdk, singletons }: mkDerivation { pname = "jni"; - version = "0.4.0"; - sha256 = "19nmhygwxb9cpw39bcl6wjhvfzsl1yqiz2127r531hwmlmhfwzw7"; + version = "0.5.1"; + sha256 = "0lrgj5dxhn7amzjw7gsqxg0gh91nxh1j4vmb4j2f5r8y3m8nwq4a"; libraryHaskellDepends = [ base bytestring choice constraints containers deepseq inline-c - singletons thread-local-storage + singletons ]; librarySystemDepends = [ jdk ]; libraryToolDepends = [ cpphs ]; homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) jdk;}; "jobqueue" = callPackage @@ -120557,15 +117707,17 @@ self: { "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit - , memory, mtl, QuickCheck, text, time, unordered-containers, vector + , memory, mtl, QuickCheck, text, time, transformers + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "jose-jwt"; - version = "0.7.7"; - sha256 = "07mq4w4gvak8gahxdx3rwykwqqisxma8faxi4k0xfk6jcpai0snl"; + version = "0.7.8"; + sha256 = "0azkqllqc35hp2d2q50cwk472amhf0q5fkqs04a4kpnj50z6kqfk"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite - either memory mtl text time unordered-containers vector + either memory mtl text time transformers transformers-compat + unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring cryptonite doctest either hspec HUnit memory @@ -120862,6 +118014,7 @@ self: { homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-ast" = callPackage @@ -120896,6 +118049,7 @@ self: { homepage = "https://github.com/sannsyn/json-ast-json-encoder"; description = "Encoders of JSON AST"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-ast-quickcheck" = callPackage @@ -120944,7 +118098,6 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-b" = callPackage @@ -121004,7 +118157,6 @@ self: { homepage = "https://github.com/nikita-volkov/json-bytes-builder"; description = "Direct-to-bytes JSON Builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-encoder" = callPackage @@ -121023,6 +118175,7 @@ self: { homepage = "https://github.com/sannsyn/json-encoder"; description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-enumerator" = callPackage @@ -121068,8 +118221,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "0.0.2"; - sha256 = "0ka8g2d3hn8z122k8r7gxs8m72s4ys46j6s2yc2ys045r1fhzlc1"; + version = "0.0.6"; + sha256 = "1mmxwhdrvxx5y0s8d7lxggjd396g3ga69zj6c2s020kdakhplnam"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -121250,6 +118403,7 @@ self: { homepage = "https://github.com/xenog/json-rpc"; description = "Fully-featured JSON-RPC 2.0 library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-client" = callPackage @@ -121262,8 +118416,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "1"; - editedCabalFile = "14dx9a1cb6813vgxp86f9w7fcx5cw8xr0af2wsz3fcfzh7if5paq"; + revision = "2"; + editedCabalFile = "0d070nv5kyplqpch98cfbcd5nxa24q3hrfjzpwkkvngqn6j0g6pi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121287,8 +118441,8 @@ self: { }: mkDerivation { pname = "json-rpc-generic"; - version = "0.2.1.2"; - sha256 = "1nhd3k7ji5fqdqbc23072ayzylwz987a458jc11skil9nwl5yswl"; + version = "0.2.1.3"; + sha256 = "105v0x610hb8vnbbmfm7myn15vblxkcvcryhgx363wgg0qqyakna"; libraryHaskellDepends = [ aeson aeson-generic-compat base bytestring containers dlist scientific text transformers unordered-containers vector @@ -121310,8 +118464,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "1"; - editedCabalFile = "0r0lshhf40l5a88axrzwp28r3bfa013z4m34n7rh50b19dqik8jw"; + revision = "2"; + editedCabalFile = "1avwnzq355m14wbv76zqjp789nr3kgnk130m8m69r5icgmlal2w6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121336,8 +118490,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; - revision = "9"; - editedCabalFile = "0g7hyapnlzid4ix7nrw3rxgn1vcd63hb34blyj5ldmzwz76qqp0b"; + revision = "11"; + editedCabalFile = "0jnlgkr1dikkcy4ln942c14lmpj49287b74dqcc5rd6sgxcm7xq2"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -121364,6 +118518,7 @@ self: { ]; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-state" = callPackage @@ -121462,6 +118617,7 @@ self: { homepage = "https://github.com/autotaker/json-tracer#readme"; description = "A polymorphic, type-safe, json-structured tracing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-types" = callPackage @@ -121552,6 +118708,7 @@ self: { homepage = "https://github.com/mackeyrms/jsonextfilter#readme"; description = "Filter select values in JSON objects to unix programs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsonresume" = callPackage @@ -121622,6 +118779,7 @@ self: { homepage = "https://github.com/garetht/jsons-to-schema/README.md"; description = "JSON to JSON Schema"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsonschema-gen" = callPackage @@ -121756,8 +118914,8 @@ self: { }: mkDerivation { pname = "judy"; - version = "0.3.0"; - sha256 = "17fblav2npg47kn2dq82lcpf299igd91pi0ynffklf5hr8dw70zl"; + version = "0.4.0"; + sha256 = "115991jvp9gg9iy3n8p8y0y39x236v17g5xqchmlfsja1nx9hbzc"; libraryHaskellDepends = [ base bytestring ghc-prim ]; librarySystemDepends = [ Judy ]; testHaskellDepends = [ base hspec QuickCheck ]; @@ -121773,8 +118931,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.3"; - sha256 = "0czb1vb1nwn1wzx52vpvnpki2kfwwb775wg512rn46snm5wibvzv"; + version = "0.1.0.4"; + sha256 = "1nf30901jv226n7cpnbkqdh51gpmkzri79m271afzsgya3cs9gi5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121794,8 +118952,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.3"; - sha256 = "0fpzbijv73drgk79rf8qyr2w4kfvxbpysbi9y9v2qx5na9y3krci"; + version = "0.3.1"; + sha256 = "0dg54vbn9cxcskyc92grz39zp863ki6da8kwdz0nfkfm5xzsxlrs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121882,34 +119040,14 @@ self: { }) {}; "jvm" = callPackage - ({ mkDerivation, base, bytestring, choice, criterion - , distributed-closure, hspec, jni, singletons, template-haskell - , text, vector - }: - mkDerivation { - pname = "jvm"; - version = "0.2.2"; - sha256 = "1xfi63qw8lz82b1mjji3bxacpl9q0kf86h7dcbjgiw2bqq65xcak"; - libraryHaskellDepends = [ - base bytestring choice distributed-closure jni singletons - template-haskell text vector - ]; - testHaskellDepends = [ base bytestring hspec text ]; - benchmarkHaskellDepends = [ base criterion jni ]; - homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; - description = "Call JVM methods from Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "jvm_0_3_0" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, criterion , deepseq, distributed-closure, exceptions, hspec, jni, singletons , text, vector }: mkDerivation { pname = "jvm"; - version = "0.3.0"; - sha256 = "1fjaanz7h3z5py71kq880wc140jp48khs18chx3gzwas22cpw9ap"; + version = "0.4.1"; + sha256 = "1mwhp5a4ykwcwr7h3j6803fy558q93cdkazqhck9dg67cgx7iyjr"; libraryHaskellDepends = [ base bytestring choice constraints distributed-closure exceptions jni singletons text vector @@ -121921,7 +119059,6 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; description = "Call JVM methods from Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-binary" = callPackage @@ -121944,6 +119081,7 @@ self: { homepage = "https://github.com/ucla-pls/jvm-binary#readme"; description = "A library for reading Java class-files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-parser" = callPackage @@ -121968,8 +119106,8 @@ self: { }: mkDerivation { pname = "jvm-streaming"; - version = "0.2"; - sha256 = "1frhdh8issnc806901xhkiz0z593z5m7ldajr1d88did37hfyl92"; + version = "0.2.2"; + sha256 = "1s0bla6yhw1ic637h2ss8f3aihc26ca5bndhsi5g02fn0gzw644m"; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm singletons streaming ]; @@ -121979,24 +119117,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "jvm-streaming_0_2_1" = callPackage - ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni - , jvm, singletons, streaming - }: - mkDerivation { - pname = "jvm-streaming"; - version = "0.2.1"; - sha256 = "06n660fa5xbmw20064gyjp2sx3mvqs1cx12s77w7wn1cfk0ckair"; - libraryHaskellDepends = [ - base distributed-closure inline-java jni jvm singletons streaming - ]; - testHaskellDepends = [ base hspec inline-java jvm streaming ]; - homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; - description = "Expose Java iterators as streams from the streaming package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "jwt" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite , data-default, doctest, http-types, HUnit, lens, lens-aeson @@ -122276,7 +119396,6 @@ self: { homepage = "https://github.com/fosskers/nanq"; description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kansas-comet" = callPackage @@ -122443,42 +119562,6 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.5.1.0"; - sha256 = "1jcvjia4r6x2fwsyq0f038y63fr673r2jh4gm1xfn6qxis7im68n"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_5_2_0" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -122512,7 +119595,6 @@ self: { homepage = "https://github.com/Soostone/katip"; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-elasticsearch" = callPackage @@ -122682,7 +119764,6 @@ self: { homepage = "http://github.com/asakamirai/kazura-queue"; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -122771,6 +119852,7 @@ self: { homepage = "https://github.com/giogadi/kdt"; description = "Fast and flexible k-d trees for various types of point queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keenser" = callPackage @@ -123178,6 +120260,7 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kevin" = callPackage @@ -123402,20 +120485,21 @@ self: { }) {}; "kicad-data" = callPackage - ({ mkDerivation, base, ieee754, lens-family, parsec, parsec-numbers - , pretty-compact, QuickCheck, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, base, charsetdetect, encoding, HUnit, ieee754 + , lens-family, parsec, pretty-compact, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "kicad-data"; - version = "0.4.0"; - sha256 = "098yfgrf9wiib8agx6frdgd766lyzkqyifx9lbj4ssyrgp03qnm5"; + version = "0.5.0"; + sha256 = "0nbzprp6j1d6l507h9s9c82y130w5b0jqlmc3dxd1ns2q5qf8cin"; libraryHaskellDepends = [ - base ieee754 lens-family parsec parsec-numbers pretty-compact + base ieee754 lens-family parsec pretty-compact ]; testHaskellDepends = [ - base ieee754 lens-family parsec parsec-numbers pretty-compact - QuickCheck test-framework test-framework-quickcheck2 + base charsetdetect encoding HUnit ieee754 lens-family parsec + pretty-compact QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 ]; homepage = "http://github.com/kasbah/haskell-kicad-data"; description = "Parser and writer for KiCad files"; @@ -123561,6 +120645,7 @@ self: { homepage = "http://github.com/alpmestan/kmeans-vector"; description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kmp-dfa" = callPackage @@ -123574,6 +120659,7 @@ self: { homepage = "https://github.com/paolino/kmp-dfa"; description = "KMP algorithm implementation, based on Deterministic Finite State Automata"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "knead" = callPackage @@ -123749,23 +120835,6 @@ self: { }) {}; "kraken" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, mtl - }: - mkDerivation { - pname = "kraken"; - version = "0.0.3"; - sha256 = "178y3d9gxfv03as4p3f5hdf4csnc3dfkpabwbyc38m0m8p2y20a0"; - revision = "2"; - editedCabalFile = "0w8w1frkx54ldyhxp09ddm2y1l7q72xfl1p6py7y6ywxnq23lr4h"; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls mtl - ]; - description = "Kraken.io API client"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kraken_0_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, mtl }: @@ -123778,7 +120847,6 @@ self: { ]; description = "Kraken.io API client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "krapsh" = callPackage @@ -123908,7 +120976,6 @@ self: { homepage = "https://github.com/bitonic/kyotocabinet"; description = "Mid level bindings to Kyoto Cabinet"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) kyotocabinet;}; "l-bfgs-b" = callPackage @@ -124059,8 +121126,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "0.4.6"; - sha256 = "162nlb96l7mzyr449lw15c3l8ljx9821bnijlzcq47vyrjlh2ym5"; + version = "0.4.7"; + sha256 = "026w7wmz71g9796mx6mdn3s1nxrds631kacn423zdvchridm0398"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -124376,8 +121443,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1.0.1"; - sha256 = "1nmkqs62f4xdzcqh24953svvd8j3n8gjc95ljmk1jx0hxhspdkzw"; + version = "5.1.0.2"; + sha256 = "1vr4f92zsjdr2j1zxb2v1hmyrb4lvq32c08jgind7apkmvqjgm19"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -124962,25 +122029,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.6.1"; - sha256 = "1s1pz8lxnc3fbs84a4spayzrww1avkn7jszmazn90r740jfxrji3"; - libraryHaskellDepends = [ - array base bytestring containers directory filepath pretty process - syb - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://visq.github.io/language-c/"; - description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "language-c_0_7_0" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb @@ -125001,7 +122049,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c_0_7_1" = callPackage + "language-c" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb }: @@ -125018,7 +122066,6 @@ self: { homepage = "http://visq.github.io/language-c/"; description = "Analysis and generation of C code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-c-comments" = callPackage @@ -125078,6 +122125,7 @@ self: { homepage = "https://github.com/mainland/language-c-quote"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-cil" = callPackage @@ -125146,6 +122194,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-docker" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, free + , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck + , split, template-haskell, text, th-lift, th-lift-instances + , transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "language-docker"; + version = "1.0.0"; + sha256 = "023gahxcy27rg03fyk87h4yirba2c23qv4fww9fwzi4f4m8inf81"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath free Glob mtl parsec + pretty split template-haskell text th-lift th-lift-instances + transformers unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath free Glob hspec HUnit mtl + parsec pretty process QuickCheck split template-haskell text + th-lift th-lift-instances transformers unordered-containers yaml + ]; + homepage = "https://github.com/hadolint/language-docker#readme"; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "language-docker_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, free + , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck + , semigroups, split, template-haskell, text, th-lift + , th-lift-instances, time, transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "language-docker"; + version = "2.0.1"; + sha256 = "0xd7r6npr7kzdh3pxcidvqff3lrww6dqyyksg58chnb57d87b0sc"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath free Glob mtl parsec + pretty semigroups split template-haskell text th-lift + th-lift-instances time transformers unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath free Glob hspec HUnit mtl + parsec pretty process QuickCheck semigroups split template-haskell + text th-lift th-lift-instances time transformers + unordered-containers yaml + ]; + homepage = "https://github.com/hadolint/language-docker#readme"; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -125178,6 +122278,7 @@ self: { homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dot" = callPackage @@ -125373,6 +122474,7 @@ self: { homepage = "https://github.com/beijaflor-io/haskell-language-hcl#readme"; description = "HCL parsers and pretty-printers for the Haskell programming language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-java" = callPackage @@ -125530,7 +122632,6 @@ self: { homepage = "http://github.com/mitchellwrosen/language-lua2"; description = "Lua parser and pretty printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-mixal" = callPackage @@ -125671,77 +122772,32 @@ self: { "language-puppet" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec - , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec - , memory, mtl, operational, optparse-applicative, parallel-io - , parsec, pcre-utils, process, random, regex-pcre-builtin + , cryptonite, directory, exceptions, filecache, filepath + , formatting, Glob, hashable, hruby, hslogger, hspec + , hspec-megaparsec, http-api-data, http-client, HUnit, lens + , lens-aeson, megaparsec, memory, mtl, neat-interpolation + , operational, optparse-applicative, parallel-io, parsec + , pcre-utils, process, protolude, random, regex-pcre-builtin , scientific, semigroups, servant, servant-client, split, stm , strict-base-types, temporary, text, time, transformers, unix , unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.3.8.1"; - sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv"; - revision = "1"; - editedCabalFile = "1v6vd8mfa4rk7l952d9lysv38w0prvrlhiacfqpxwx8fxj0m5kxc"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory either exceptions - filecache formatting hashable hruby hslogger hspec http-api-data - http-client lens lens-aeson megaparsec memory mtl operational - parsec pcre-utils process random regex-pcre-builtin scientific - semigroups servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_12_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, formatting, Glob - , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data - , http-client, HUnit, lens, lens-aeson, megaparsec, memory, mtl - , operational, optparse-applicative, parallel-io, parsec - , pcre-utils, process, random, regex-pcre-builtin, scientific - , semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.12.1"; - sha256 = "1nznlw81qnnrvfpwrliyz88f1i6wmsg8kksjnwk5zv69q9nxg3z1"; + version = "1.3.13"; + sha256 = "1qngbjpyxd7m4jawc40095v84a8bgk4xk7an9lb1yzp739nvcln1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring case-insensitive containers cryptonite directory exceptions - filecache formatting hashable hruby hslogger hspec http-api-data - http-client lens lens-aeson megaparsec memory mtl operational - parsec pcre-utils process random regex-pcre-builtin scientific - semigroups servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml + 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 semigroups 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 @@ -125751,13 +122807,14 @@ self: { ]; testHaskellDepends = [ ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector + megaparsec mtl neat-interpolation protolude scientific + strict-base-types temporary text transformers unix + unordered-containers vector ]; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -125936,6 +122993,7 @@ self: { homepage = "https://github.com/abhinav/language-thrift#readme"; description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-typescript" = callPackage @@ -125972,6 +123030,62 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lapack-carray" = callPackage + ({ mkDerivation, base, carray, lapack-ffi, netlib-carray + , netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-carray"; + version = "0.0"; + sha256 = "1903wa7hv6mi8zrz99fjlbwk4dvn2q2sshf7nazlyg9dz9gg861l"; + libraryHaskellDepends = [ + base carray lapack-ffi netlib-carray netlib-ffi storable-complex + transformers + ]; + homepage = "http://hub.darcs.net/thielema/lapack-carray/"; + description = "Auto-generated interface to Fortran LAPACK via CArrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lapack-ffi" = callPackage + ({ mkDerivation, base, liblapack, netlib-ffi }: + mkDerivation { + pname = "lapack-ffi"; + version = "0.0"; + sha256 = "1r2625li76ky8gxl07vzqh38xzrjazzf3fxzhhbl2nkjcx9bmv83"; + libraryHaskellDepends = [ base netlib-ffi ]; + libraryPkgconfigDepends = [ liblapack ]; + homepage = "http://hub.darcs.net/thielema/lapack-ffi/"; + description = "Auto-generated interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) liblapack;}; + + "lapack-ffi-tools" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers + , explicit-exception, filepath, non-empty, optparse-applicative + , parsec, pathtype, transformers, unordered-containers, utility-ht + , vector + }: + mkDerivation { + pname = "lapack-ffi-tools"; + version = "0.0.0.1"; + sha256 = "091799j96gc1g9dq6hr3swpq4w4s0p8i5256308lwrqls1hlggs8"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring cassava containers explicit-exception filepath + non-empty optparse-applicative parsec pathtype transformers + unordered-containers utility-ht vector + ]; + homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/"; + description = "Generator for Haskell interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; }) {}; "large-hashable" = callPackage @@ -126169,30 +123283,6 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, QuickCheck - , semigroups, tagged, tasty, tasty-quickcheck, transformers - , universe-base, universe-reverse-instances, unordered-containers - , void - }: - mkDerivation { - pname = "lattices"; - version = "1.5.0"; - sha256 = "07sxli1xix9gi8smk6crgx4ijs7mjq6g95ci423r0fsh6i1zpqy6"; - revision = "1"; - editedCabalFile = "04l5x09f48vdkljzl79g2cybbm5wdxa0bf4xvlwdkcbky9h0qvan"; - libraryHaskellDepends = [ - base containers deepseq hashable semigroups tagged universe-base - universe-reverse-instances unordered-containers void - ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck transformers - ]; - homepage = "http://github.com/phadej/lattices/"; - description = "Fine-grained library for constructing and manipulating lattices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lattices_1_7" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty , tasty-quickcheck, transformers, universe-base @@ -126215,7 +123305,6 @@ self: { homepage = "http://github.com/phadej/lattices/"; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "launchpad-control" = callPackage @@ -126370,6 +123459,7 @@ self: { ]; description = "Identifiers for not-yet-computed values"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lazy-hash-cache" = callPackage @@ -126388,6 +123478,7 @@ self: { ]; description = "Storing computed values for re-use when the same program runs again"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lazy-io" = callPackage @@ -126411,6 +123502,7 @@ self: { libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lazy-search" = callPackage @@ -126664,14 +123756,13 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.6.7"; - sha256 = "1aia20p6r9b4xncv5r7y1a2zff37ky0v0m3fd5idlg3sshsd02kv"; + version = "0.7.0"; + sha256 = "1mz6fwh3rbwkfx514imh044v1ng7065sd5bivcd94xw0cb530p3f"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; homepage = "https://github.com/rudymatela/leancheck#readme"; description = "Cholesterol-free property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "leankit-api" = callPackage @@ -126702,19 +123793,6 @@ self: { }) {}; "leapseconds-announced" = callPackage - ({ mkDerivation, base, QuickCheck, time }: - mkDerivation { - pname = "leapseconds-announced"; - version = "2017"; - sha256 = "1avx8wm98nrv04cfkv4npy1fwr42nnp7i8njl3dg31ybrwlwknvz"; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ base QuickCheck time ]; - homepage = "https://github.com/bjornbm/leapseconds-announced"; - description = "Leap seconds announced at library release time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leapseconds-announced_2017_1_0_1" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "leapseconds-announced"; @@ -126725,7 +123803,6 @@ self: { homepage = "https://github.com/bjornbm/leapseconds-announced"; description = "Leap seconds announced at library release time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn" = callPackage @@ -127113,21 +124190,6 @@ self: { }) {}; "lens-family" = callPackage - ({ mkDerivation, base, containers, lens-family-core, mtl - , transformers - }: - mkDerivation { - pname = "lens-family"; - version = "1.2.1"; - sha256 = "1dwsrli94i8vs1wzfbxbxh49qhn8jn9hzmxwgd3dqqx07yx8x0s1"; - libraryHaskellDepends = [ - base containers lens-family-core mtl transformers - ]; - description = "Lens Families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-family_1_2_2" = callPackage ({ mkDerivation, base, containers, lens-family-core, mtl , transformers }: @@ -127140,21 +124202,9 @@ self: { ]; description = "Lens Families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-family-core" = callPackage - ({ mkDerivation, base, containers, transformers }: - mkDerivation { - pname = "lens-family-core"; - version = "1.2.1"; - sha256 = "190r3n25m8x24nd6xjbbk9x0qhs1mw22xlpsbf3cdp3cda3vkqwm"; - libraryHaskellDepends = [ base containers transformers ]; - description = "Haskell 98 Lens Families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-family-core_1_2_2" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "lens-family-core"; @@ -127163,7 +124213,6 @@ self: { libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 98 Lens Families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-family-th" = callPackage @@ -127172,6 +124221,8 @@ self: { pname = "lens-family-th"; version = "0.5.0.1"; sha256 = "00rpx75hh8p2991m36jp1cb91m048xjn8f02kj2zqsfwfhimfdzs"; + revision = "1"; + editedCabalFile = "190jxqskd61irc97zb95h08zlkszlhpik4zmb7y4vk7x06zz00m6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec lens-family template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; @@ -127207,6 +124258,7 @@ self: { homepage = "https://github.com/andrewthad/lens-prelude"; description = "Alternate prelude that exports lens combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-properties" = callPackage @@ -127390,8 +124442,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.9.0"; - sha256 = "14ygg1f8f2rpwvgjii3g8k6q87iy20i78n10ia2gggn6yhkdl0s4"; + version = "1.0.9.1"; + sha256 = "10a0y0n62n8indkhapscws3lj95riaxxdq04bcfah8ljvqy1b61r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127424,6 +124476,7 @@ self: { ]; description = "Van Laarhoven lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -127480,7 +124533,6 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage @@ -127570,6 +124622,7 @@ self: { homepage = "https://github.com/ci-fst/lfst"; description = "L-Fuzzy Set Theory implementation in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lgtk" = callPackage @@ -127710,24 +124763,6 @@ self: { }) {}; "lhs2tex" = callPackage - ({ mkDerivation, base, directory, filepath, mtl, process - , regex-compat - }: - mkDerivation { - pname = "lhs2tex"; - version = "1.19"; - sha256 = "03mhhkrqjjqmmh18im8di1cl6wqv30lsib5hv73f0wsnv5bhbbi4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath mtl process regex-compat - ]; - homepage = "http://www.andres-loeh.de/lhs2tex/"; - description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = "GPL"; - }) {}; - - "lhs2tex_1_20" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, mtl, process , regex-compat }: @@ -127746,7 +124781,6 @@ self: { homepage = "https://github.com/kosmikus/lhs2tex"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lhslatex" = callPackage @@ -127896,7 +124930,6 @@ self: { homepage = "http://maartenfaddegon.nl"; description = "Store and manipulate data in a graph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libhbb" = callPackage @@ -128118,6 +125151,7 @@ self: { homepage = "http://github.com/vimus/libmpd-haskell#readme"; description = "An MPD client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libnotify" = callPackage @@ -128242,6 +125276,8 @@ self: { pname = "librato"; version = "0.2.0.1"; sha256 = "1l0q8kx0v563glplz5blg5scnvwf1aak04w08abxkrbfdjq6a8z4"; + revision = "1"; + editedCabalFile = "06md1545pfywdd3ggm6ss9lk8fzph1psl9jip3gp0qsxmv3diyix"; libraryHaskellDepends = [ aeson attoparsec base bytestring either http-client http-conduit http-types mtl resourcet text unordered-containers uri-templater @@ -128258,13 +125294,15 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.4.0.1"; - sha256 = "0ki2xw3m0iq4n25ylv8am26j8s517v1l6b6avca6ymgn5qxq79kp"; + version = "0.4.0.2"; + sha256 = "1i86l8kw2501na1xy6q6nc1xqna5a55ks0bk36nhxhi0hqlr5vdh"; + revision = "1"; + editedCabalFile = "1hc8j8ki9nc10cqwiz0xhg5x9l6yqfmlfd47aximwk56n8sqp0nn"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class dns memory random text uri-bytestring url ]; - homepage = "https://rel4.seek-together.space/projects/libravatar/"; + homepage = "https://hub.darcs.net/fr33domlover/libravatar"; description = "Use Libravatar, the decentralized avatar delivery service"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -128301,7 +125339,6 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libssh2;}; "libssh2-conduit" = callPackage @@ -128320,7 +125357,6 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libstackexchange" = callPackage @@ -128407,7 +125443,6 @@ self: { homepage = "http://redmine.iportnov.ru/projects/libvirt-hs"; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -128549,10 +125584,8 @@ self: { }: mkDerivation { pname = "lift-generics"; - version = "0.1.1"; - sha256 = "1jrh74a1c95cd70xr371fslqsjar8jb8mnlmapjb1dvg8722rkq7"; - revision = "1"; - editedCabalFile = "03vpmdgarz41zx1q51a4bx3x3qfvs7wfnqym8xiv4i9sxdr82yy8"; + version = "0.1.2"; + sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell ]; @@ -128571,8 +125604,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.9.3"; - sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp"; + version = "0.9.3.2"; + sha256 = "0c8y6m1kpkviq2zi1d2889hbzh7k46rly4mvmfkrzam45fqggrcj"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -128624,6 +125657,7 @@ self: { homepage = "https://github.com/parsonsmat/lifted-protolude"; description = "A sensible set of defaults for writing lifted custom Preludes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-threads" = callPackage @@ -128876,30 +125910,6 @@ self: { }) {}; "line" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types - , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text - , time, transformers, wai - }: - mkDerivation { - pname = "line"; - version = "3.1.0"; - sha256 = "0s5cp8si8iabbm53jsicy158xym6jpxllykfwjsn1c13kydq40by"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring cryptohash-sha256 - http-conduit http-types scotty text time transformers wai - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring cryptohash-sha256 hspec - hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty - text time transformers - ]; - homepage = "https://github.com/noraesae/line"; - description = "Haskell SDK for the LINE API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "line_4_0_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text @@ -128921,7 +125931,6 @@ self: { homepage = "https://github.com/utatti/line"; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "line-break" = callPackage @@ -128997,26 +126006,6 @@ self: { }) {}; "linear-accelerate" = callPackage - ({ mkDerivation, accelerate, base, Cabal, cabal-doctest - , distributive, doctest, lens, linear - }: - mkDerivation { - pname = "linear-accelerate"; - version = "0.4.1"; - sha256 = "1hhmn446ggm66r3aibg8dyc923lw68fmkb1y8q37jsw13s1lkdlp"; - revision = "1"; - editedCabalFile = "18bll3ay0d1586jhfnzw93glv6f4bvz57va46jc2wm2hdfbnvy6d"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - accelerate base distributive lens linear - ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/ekmett/linear-accelerate/"; - description = "Lifting linear vector spaces into Accelerate"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "linear-accelerate_0_5_0_1" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear }: @@ -129032,7 +126021,6 @@ self: { homepage = "http://github.com/ekmett/linear-accelerate/"; description = "Lifting linear vector spaces into Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-algebra-cblas" = callPackage @@ -129122,6 +126110,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "linear-socket" = callPackage + ({ mkDerivation, base, bytestring, hlint, hspec, network + , tasty-hspec + }: + mkDerivation { + pname = "linear-socket"; + version = "0.3.3.2"; + sha256 = "1a3ddpay2wyl5bwlnysx037ca0x0bh93ingxl6c2wlxab351zm4h"; + isLibrary = true; + isExecutable = true; + 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 ({ mkDerivation, base, random }: mkDerivation { @@ -129166,7 +126172,6 @@ self: { homepage = "https://github.com/leftaroundabout/linearmap-family"; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan" = callPackage @@ -129181,6 +126186,7 @@ self: { homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan-hoopl" = callPackage @@ -129422,7 +126428,6 @@ self: { homepage = "http://github.com/bgamari/linux-evdev"; description = "Bindings to Linux evdev input device interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-file-extents" = callPackage @@ -129437,7 +126442,6 @@ self: { homepage = "https://github.com/redneb/linux-file-extents"; description = "Retrieve file fragmentation information under Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-inotify" = callPackage @@ -129449,7 +126453,6 @@ self: { libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-kmod" = callPackage @@ -129476,7 +126479,6 @@ self: { homepage = "https://github.com/tensor5/linux-mount"; description = "Mount and unmount filesystems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-namespaces" = callPackage @@ -129489,7 +126491,6 @@ self: { homepage = "https://github.com/redneb/hs-linux-namespaces"; description = "Create new or enter an existing linux namespaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-perf" = callPackage @@ -129689,8 +126690,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.7.0.5"; - sha256 = "081z90vcqrmfjc3jna419a8ziif2rcrag4ba4h902lrjh5hpvpaj"; + version = "0.7.0.6"; + sha256 = "1sbvnj2as93dywh43zcsb23hr1mqlia5gr2sw08ynqh48dcx181p"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -129719,17 +126720,16 @@ self: { ({ mkDerivation, aeson, array, base, bifunctors, binary, bytestring , Cabal, cereal, cmdargs, containers, data-default, deepseq, Diff , directory, exceptions, filepath, fingertree, ghc, ghc-boot - , ghc-paths, ghc-prim, hashable, hint, hpc, hscolour - , liquid-fixpoint, located-base, mtl, optparse-applicative, parsec - , pretty, process, QuickCheck, stm, syb, tagged, tasty - , tasty-ant-xml, tasty-hunit, tasty-rerun, template-haskell - , temporary, text, text-format, th-lift, time, transformers - , unordered-containers, vector, z3 + , ghc-paths, ghc-prim, hashable, hpc, hscolour, liquid-fixpoint + , located-base, mtl, optparse-applicative, parsec, pretty, process + , QuickCheck, stm, syb, tagged, tasty, tasty-ant-xml, tasty-hunit + , tasty-rerun, template-haskell, temporary, text, text-format + , th-lift, time, transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.2.0"; - sha256 = "17fm1jn00wns6nkwvxm96j85jwiiaqmw3s7w4ilkslzgr9wslp8f"; + version = "0.8.2.2"; + sha256 = "0rq0fs5ydwiqi2f3pn9q4d1agbmz0z46ws2q5w8y7lrsb2mr4zf3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -129742,8 +126742,8 @@ self: { transformers unordered-containers vector ]; executableHaskellDepends = [ - base cmdargs deepseq ghc ghc-boot hint hpc liquid-fixpoint - located-base pretty process time + base cmdargs deepseq ghc ghc-boot hpc liquid-fixpoint located-base + pretty process time ]; testHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot @@ -129755,7 +126755,6 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -129814,8 +126813,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "list-fusion-probe"; - version = "0.1.0.6"; - sha256 = "1cd6pbaliavasjl76bz86swa5zdymh84grs3cx01hspbc1a190kn"; + version = "0.1.0.7"; + sha256 = "0j1sp6sskjhqwczvx08dvddhrbgzxk2f98vm1b07jdz842yldzr5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "testing list fusion for success"; @@ -129869,6 +126868,7 @@ self: { homepage = "https://github.com/yamadapc/list-prompt.git"; description = "A simple list prompt UI for the terminal"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-remote-forwards" = callPackage @@ -129895,6 +126895,7 @@ self: { ]; description = "List all remote forwards for mail accounts stored in a SQL database"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t" = callPackage @@ -130045,6 +127046,7 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/list-tries/"; description = "Tries and Patricia tries: finite sets and maps for list keys"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-zip-def" = callPackage @@ -130075,6 +127077,7 @@ self: { homepage = "https://github.com/ocharles/listenbrainz-client"; description = "A client library to the ListenBrainz project"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "listlike-instances" = callPackage @@ -130488,34 +127491,6 @@ self: { }) {}; "llvm-hs" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , containers, exceptions, llvm-config, llvm-hs-pure, mtl - , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, transformers, transformers-compat - , utf8-string - }: - mkDerivation { - pname = "llvm-hs"; - version = "4.2.0"; - sha256 = "12rclc9l85yqh1h0y7m6m65fpb81crzafmkcwq90vl7i5bf1bv1j"; - setupHaskellDepends = [ base Cabal containers ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers exceptions llvm-hs-pure - mtl template-haskell transformers transformers-compat utf8-string - ]; - libraryToolDepends = [ llvm-config ]; - testHaskellDepends = [ - base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck - tasty tasty-hunit tasty-quickcheck temporary transformers - transformers-compat - ]; - homepage = "http://github.com/llvm-hs/llvm-hs/"; - description = "General purpose LLVM bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {llvm-config = null;}; - - "llvm-hs_5_1_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , containers, exceptions, llvm-config, llvm-hs-pure, mtl , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -130523,8 +127498,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "5.1.0"; - sha256 = "1l6r409zviis70qd3w8ysycy479q0sqjd85kd6z8b0ngjvq1y5ik"; + version = "5.1.3"; + sha256 = "0swpc431w16g9yip5w67kd77ilc6yqqk526h7sl5n4sn7xlc9nnc"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -130541,48 +127516,48 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; - "llvm-hs-pure" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, mtl - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, transformers-compat + "llvm-hs-pretty" = callPackage + ({ mkDerivation, array, base, bytestring, directory, filepath + , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden + , tasty-hspec, tasty-hunit, text, transformers, wl-pprint-text }: mkDerivation { - pname = "llvm-hs-pure"; - version = "4.1.0.0"; - sha256 = "1gfj977jxr78m3wixajzc0c50qqp5786dn3dgy1anq43hrjal2l7"; + pname = "llvm-hs-pretty"; + version = "0.1.0.0"; + sha256 = "1p16vhxx7w1hdb130c9mls45rwyq8hix1grnwdj92rbrqbjwk7l3"; libraryHaskellDepends = [ - attoparsec base bytestring containers mtl template-haskell - transformers transformers-compat + array base bytestring llvm-hs-pure text wl-pprint-text ]; testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers - transformers-compat + base directory filepath llvm-hs llvm-hs-pure mtl pretty-show tasty + tasty-golden tasty-hspec tasty-hunit text transformers ]; - homepage = "http://github.com/llvm-hs/llvm-hs/"; - description = "Pure Haskell LLVM functionality (no FFI)"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/llvm-hs/llvm-hs-pretty"; + description = "Pretty printer for LLVM IR"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "llvm-hs-pure_5_1_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, mtl - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers + "llvm-hs-pure" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, fail + , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, transformers, unordered-containers }: mkDerivation { pname = "llvm-hs-pure"; - version = "5.1.0"; - sha256 = "0m4ahrh2d0h9vfky9852y99g1xwsi7s7qr3xxnbgnw8zci7966f5"; + version = "5.1.2"; + sha256 = "0m6r8l37151y5a7ad5bbb1xw5f18y4hm91ildmz10wnsmhx9kl64"; libraryHaskellDepends = [ - attoparsec base bytestring containers mtl template-haskell - transformers + attoparsec base bytestring containers fail mtl template-haskell + transformers unordered-containers ]; testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers + base bytestring containers hspec mtl tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-ht" = callPackage @@ -130618,6 +127593,7 @@ self: { ]; description = "Generate Pkg-Config configuration file for LLVM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-pretty" = callPackage @@ -130717,7 +127693,6 @@ self: { homepage = "http://github.com/dmbarbour/haskell-lmdb"; description = "Lightning MDB bindings"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lmdb;}; "lmdb-high-level" = callPackage @@ -130741,7 +127716,6 @@ self: { homepage = "https://github.com/andrewthad/lmdb-high-level"; description = "Higher level API for working with LMDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lmdb-simple" = callPackage @@ -130758,7 +127732,7 @@ self: { homepage = "https://github.com/verement/lmdb-simple#readme"; description = "Simple API for LMDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lmonad" = callPackage @@ -130813,16 +127787,18 @@ self: { homepage = "https://github.com/SumAll/haskell-load-balancing"; description = "Client-side load balancing utilities"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "load-env" = callPackage - ({ mkDerivation, base, directory, hspec, HUnit, parsec }: + ({ mkDerivation, base, directory, hspec, parsec }: mkDerivation { pname = "load-env"; - version = "0.1.1"; - sha256 = "05pxxplp96pcnzk61xcckxnxljl3hjl13ckn4xrr93zmlw49rqwg"; + version = "0.1.2"; + sha256 = "1d5xms4q969w1ry3j3qv4gz82sc9j9qhw7nyc25rbn66gznxlb06"; libraryHaskellDepends = [ base directory parsec ]; - testHaskellDepends = [ base directory hspec HUnit parsec ]; + testHaskellDepends = [ base directory hspec parsec ]; + homepage = "https://github.com/pbrisbin/load-env#readme"; description = "Load environment variables from a file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -130839,25 +127815,24 @@ self: { }) {}; "loc" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }: + ({ mkDerivation, base, containers, doctest, hedgehog }: mkDerivation { pname = "loc"; - version = "0.1.3.1"; - sha256 = "0irwsh3ib9rb1h6chs060vzr7bhczqb3qxrizxvsqiymgd1yjjgx"; + version = "0.1.3.2"; + sha256 = "1p8df8jyddma3mk54azgiqf6adlq0l4g00cjffdvx8bk30xnrank"; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers doctest hedgehog loc-test ]; + testHaskellDepends = [ base containers doctest hedgehog ]; homepage = "https://github.com/chris-martin/loc"; description = "Types representing line and column positions and ranges in text files"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.1"; - sha256 = "0z2d1fi77msbgzipz87q32z5fmfb6aj923j2wh1565qbjaf7qjxx"; + version = "0.1.3.2"; + sha256 = "06yccmyxk7cvkxjra28ardxc61h6h59w0rw08d27llppfjh5bn01"; libraryHaskellDepends = [ base containers hedgehog loc ]; homepage = "https://github.com/chris-martin/loc"; description = "Test-related utilities related to the /loc/ package"; @@ -130948,6 +127923,7 @@ self: { homepage = "https://github.com/MailOnline/located-monad-logger#readme"; description = "Location-aware logging without Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locators" = callPackage @@ -131019,6 +127995,7 @@ self: { homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locked-poll" = callPackage @@ -131112,31 +128089,6 @@ self: { }) {}; "log-domain" = callPackage - ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal - , comonad, deepseq, distributive, doctest, generic-deriving - , hashable, safecopy, semigroupoids, semigroups, simple-reflect - , vector - }: - mkDerivation { - pname = "log-domain"; - version = "0.11.2"; - sha256 = "0cywq1zv57p30419hdg6s7srd14g6r2kixnk8gmj72h0rx7fc2cd"; - revision = "1"; - editedCabalFile = "0frl4vwwlkfvz73pkiay4qh1vm576z4kj2gsbbq1za6b6pya4qhw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq distributive hashable - safecopy semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base doctest generic-deriving semigroups simple-reflect - ]; - homepage = "http://github.com/ekmett/log-domain/"; - description = "Log-domain arithmetic"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "log-domain_0_12" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving , hashable, semigroupoids, semigroups, simple-reflect, vector @@ -131156,7 +128108,6 @@ self: { homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-effect" = callPackage @@ -131247,36 +128198,67 @@ self: { "log-warper" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers - , data-default, deepseq, directory, dlist, errors, exceptions - , extra, filepath, fmt, formatting, hashable, hspec, HUnit, lens - , markdown-unlit, mmorph, monad-control, monad-loops, mtl, network - , QuickCheck, text, text-format, time, transformers - , transformers-base, universum, unix, unordered-containers, vector - , yaml + , data-default, deepseq, directory, filepath, fmt, hspec, HUnit + , markdown-unlit, microlens-mtl, microlens-platform, mmorph + , monad-control, monad-loops, mtl, QuickCheck, text, time + , transformers, transformers-base, universum, unix + , unordered-containers, vector, yaml }: mkDerivation { pname = "log-warper"; - version = "1.7.2"; - sha256 = "1qf1686wbad3hr908spd1g5q7n00dg3z8ql4aradkl4lb965dn02"; + version = "1.8.3"; + sha256 = "1awblvxh6cncwlqacxb1wq4s77x79ncrz6dl81wgrbjjifwpf0xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base containers deepseq directory dlist errors - exceptions extra filepath fmt formatting hashable lens mmorph - monad-control monad-loops mtl network text text-format time + aeson ansi-terminal base containers deepseq directory filepath fmt + microlens-platform mmorph monad-control monad-loops mtl text time transformers transformers-base universum unix unordered-containers vector yaml ]; executableHaskellDepends = [ - base exceptions markdown-unlit text universum yaml + base markdown-unlit mtl text universum yaml ]; testHaskellDepends = [ - async base data-default directory filepath hspec HUnit lens - QuickCheck universum unordered-containers + async base data-default directory filepath hspec HUnit + microlens-mtl QuickCheck universum unordered-containers ]; homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; + }) {}; + + "log-warper_1_8_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, containers + , data-default, deepseq, directory, filepath, fmt, hspec + , hspec-discover, HUnit, markdown-unlit, microlens, microlens-mtl + , microlens-platform, mmorph, monad-control, monad-loops, mtl + , QuickCheck, text, time, transformers, transformers-base + , universum, unix, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "log-warper"; + version = "1.8.5"; + sha256 = "11yai7siw1jkyk5v1kprkv7j13npwkp16za366ihqf5lg6hhw63l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base containers deepseq directory filepath fmt + microlens-platform mmorph monad-control monad-loops mtl text time + transformers transformers-base universum unix unordered-containers + vector yaml + ]; + executableHaskellDepends = [ + base markdown-unlit microlens mtl text universum yaml + ]; + testHaskellDepends = [ + async base data-default directory filepath hspec HUnit + microlens-mtl QuickCheck universum unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/serokell/log-warper"; + description = "Flexible, configurable, monadic and pretty logging"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -131579,12 +128561,13 @@ self: { ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { pname = "logict-state"; - version = "0.1.0.2"; - sha256 = "1b2iqz1andmgibb30s1x32ak0vac7zy4gw7jihm2hhlpyycah5bp"; + version = "0.1.0.4"; + sha256 = "0mkwggh97c3x96v7a4y7i4scdvr38d49an3617i9zgj328xkr6w9"; libraryHaskellDepends = [ base logict mtl transformers ]; homepage = "https://github.com/atzedijkstra/logict-state"; description = "Library for logic programming based on haskell package logict"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logplex-parse" = callPackage @@ -132348,7 +129331,6 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "ltl" = callPackage @@ -132380,6 +129362,7 @@ self: { homepage = "https://github.com/GaloisInc/lua-bc"; description = "Lua bytecode parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lua-bytecode" = callPackage @@ -132434,6 +129417,7 @@ self: { ]; description = "Helpers for Haskell integration with Lua"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lub" = callPackage @@ -132517,6 +129501,7 @@ self: { homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucienne" = callPackage @@ -132755,8 +129740,8 @@ self: { }: mkDerivation { pname = "lxd-client"; - version = "0.1.0.4"; - sha256 = "188n9qc7c4755wmp6w50x7rzkdrf8f31d7alxcp0qg28qvhq94hx"; + version = "0.1.0.5"; + sha256 = "1981q1b71xgmxlis2hydhzhcwcspyrwnllg3fdrajv7m9z1zlryc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132795,7 +129780,6 @@ self: { homepage = "https://github.com/hverr/haskell-lxd-client-config#readme"; description = "Read the configuration file of the standard LXD client"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lye" = callPackage @@ -132893,28 +129877,6 @@ self: { }) {}; "lzma-conduit" = callPackage - ({ mkDerivation, base, base-compat, bindings-DSL, bytestring - , conduit, HUnit, lzma, QuickCheck, resourcet, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "lzma-conduit"; - version = "1.1.3.3"; - sha256 = "19bdjgr394cji254y2qp1ibdiyqlys2vf0g1v9psi4cqcdlhdk0p"; - libraryHaskellDepends = [ - base bindings-DSL bytestring conduit resourcet transformers - ]; - librarySystemDepends = [ lzma ]; - testHaskellDepends = [ - base base-compat bytestring conduit HUnit QuickCheck resourcet - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://github.com/alphaHeavy/lzma-conduit"; - description = "Conduit interface for lzma/xz compression"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) lzma;}; - - "lzma-conduit_1_2_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers @@ -133203,6 +130165,7 @@ self: { homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-zlib" = callPackage @@ -133304,22 +130267,22 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude - , containers, criterion, directory, file-embed, hspec - , hspec-megaparsec, http-client, http-client-tls, megaparsec + ({ mkDerivation, ansi-wl-pprint, base, binary, Cabal + , composition-prelude, containers, criterion, directory, file-embed + , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec , MonadRandom, mtl, optparse-applicative, process, random-shuffle , recursion-schemes, recursion-schemes-ext, tar, template-haskell , text, th-lift-instances, titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.1.2.0"; - sha256 = "1g7gm0mmsvfyqf86qilp2p4kbfzpfp4gkcdpd5gc1673g3lxsr5v"; + version = "4.0.0.0"; + sha256 = "1dg13q8sq6ha5hpjx16cm1ny32kjd7l9mwdmi0x756yh675835xi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ - ansi-wl-pprint base composition-prelude containers directory + ansi-wl-pprint base binary composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl optparse-applicative random-shuffle recursion-schemes recursion-schemes-ext tar template-haskell text th-lift-instances @@ -133365,23 +130328,23 @@ self: { "magicbane" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude - , conduit, conduit-combinators, data-default, data-has, either - , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data - , http-client, http-client-tls, http-conduit, http-date - , http-link-header, http-media, http-types, lifted-async - , mime-types, monad-control, monad-logger, monad-metrics, mtl - , network, network-uri, raw-strings-qq, refined, servant - , servant-server, split, string-conversions, text, transformers - , unordered-containers, wai, wai-cli, wai-middleware-metrics + , conduit, conduit-combinators, data-default, data-has, ekg-core + , ekg-wai, envy, errors, fast-logger, http-api-data, http-client + , http-client-tls, http-conduit, http-date, http-link-header + , http-media, http-types, lifted-async, mime-types, monad-control + , monad-logger, monad-metrics, mtl, network, network-uri + , raw-strings-qq, refined, servant, servant-server, split + , string-conversions, text, transformers, unordered-containers, wai + , wai-cli, wai-middleware-metrics }: mkDerivation { pname = "magicbane"; - version = "0.1.3"; - sha256 = "164zljyc0wvisj8xb6q5j0xlhjhxw7068jl9s9y4rkd3x637j3as"; + version = "0.1.4"; + sha256 = "1zfj188iw6g0ym88p69wrf5avbipjxvijklphki5bj3rc7h8cyx0"; libraryHaskellDepends = [ aeson aeson-qq attoparsec base classy-prelude conduit - conduit-combinators data-default data-has either ekg-core ekg-wai - envy errors fast-logger http-api-data http-client http-client-tls + conduit-combinators data-default data-has ekg-core ekg-wai envy + errors fast-logger http-api-data http-client http-client-tls http-conduit http-date http-link-header http-media http-types lifted-async mime-types monad-control monad-logger monad-metrics mtl network network-uri raw-strings-qq refined servant @@ -133391,6 +130354,7 @@ self: { homepage = "https://github.com/myfreeweb/magicbane#readme"; description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "magico" = callPackage @@ -133490,6 +130454,7 @@ self: { ]; description = "Count mailboxes in a SQL database"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mailchimp" = callPackage @@ -133630,6 +130595,7 @@ self: { libraryHaskellDepends = [ base mono-traversable ]; description = "Make a MonoFoldable type into an ordinary Foldable type"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "make-package" = callPackage @@ -133668,22 +130634,6 @@ self: { }) {}; "makefile" = callPackage - ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text - }: - mkDerivation { - pname = "makefile"; - version = "1.0.0.4"; - sha256 = "17g8syj2l2fr2f22flcngxsnpprl4hbfqpanql1k55a0z19sjr5k"; - libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ - attoparsec base doctest Glob QuickCheck text - ]; - homepage = "http://github.com/nmattia/mask"; - description = "Simple Makefile parser and generator"; - license = stdenv.lib.licenses.mit; - }) {}; - - "makefile_1_1_0_0" = callPackage ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, text }: @@ -134222,7 +131172,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifolds" = callPackage @@ -134250,7 +131199,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifolds-core" = callPackage @@ -134263,7 +131211,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-exts" = callPackage @@ -134279,6 +131226,7 @@ self: { homepage = "http://github.com/elsen-trading/map-extensions#readme"; description = "Extensions to Data.Map"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-syntax" = callPackage @@ -134407,8 +131355,8 @@ self: { }: mkDerivation { pname = "markdown-unlit"; - version = "0.4.0"; - sha256 = "1kj2bffl7ndd8ygwwa3r1mbpwbxbfhyfgnbla8k8g9i6ffp0qrbw"; + version = "0.4.1"; + sha256 = "00q9igbplavnrjhg0fjfdg30pnmw9gsrnsk9l3hhp5dmi1lxhf3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; @@ -134422,6 +131370,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "markdown-unlit_0_5_0" = callPackage + ({ mkDerivation, base, base-compat, directory, hspec, QuickCheck + , silently, stringbuilder, temporary + }: + mkDerivation { + pname = "markdown-unlit"; + version = "0.5.0"; + sha256 = "1gy79vr85vcp13rdjh0hz7zv6daqqffww4j0cqn2lpjjh9xhsbg7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base base-compat ]; + executableHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ + base base-compat directory hspec QuickCheck silently stringbuilder + temporary + ]; + homepage = "https://github.com/sol/markdown-unlit#readme"; + description = "Literate Haskell support for Markdown"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "markdown2svg" = callPackage ({ mkDerivation, base, binary-file, Cabal, directory, filepath , markdown-pap, monads-tf, papillon, png-file, yjsvg @@ -134495,26 +131465,6 @@ self: { }) {}; "markup" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad - , lucid, mmorph, monad-control, monad-logger, mtl, path-extra - , resourcet, text, transformers-base, urlpath - }: - mkDerivation { - pname = "markup"; - version = "3.1.0"; - sha256 = "0g8dg03r7i4r71bg834kf1cgh0igmb74334skkydlq9q911hclf7"; - revision = "1"; - editedCabalFile = "1ax30n6qyy7kjcz2qyd6idaif1hxxz4n37p6lpfn5bnvg585ddmg"; - libraryHaskellDepends = [ - base blaze-html blaze-markup clay comonad lucid mmorph - monad-control monad-logger mtl path-extra resourcet text - transformers-base urlpath - ]; - description = "Abstraction for HTML-embedded content"; - license = stdenv.lib.licenses.mit; - }) {}; - - "markup_4_0_3" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad , lucid, mmorph, monad-control, monad-logger, mtl, path-extra , resourcet, text, transformers-base, urlpath @@ -134669,6 +131619,7 @@ self: { homepage = "https://marvin.readthedocs.io"; description = "A framework for modular, portable chat bots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "marvin-interpolate" = callPackage @@ -134962,28 +131913,6 @@ self: { }) {eng = null; mat = null; mx = null;}; "matplotlib" = callPackage - ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath - , process, random, raw-strings-qq, split, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit, temporary - }: - mkDerivation { - pname = "matplotlib"; - version = "0.5.0"; - sha256 = "0mfmrgh7axyv6ybkks3n5na2cg3jfhbfjbrv4p2dhwzyf9hc076z"; - libraryHaskellDepends = [ - aeson base bytestring containers filepath process split temporary - ]; - testHaskellDepends = [ - ad base bytestring process random raw-strings-qq split tasty - tasty-expected-failure tasty-golden tasty-hunit temporary - ]; - homepage = "https://github.com/abarbu/matplotlib-haskell"; - description = "Bindings to Matplotlib; a Python plotting library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "matplotlib_0_6_0" = callPackage ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq , filepath, process, random, raw-strings-qq, split, tasty , tasty-expected-failure, tasty-golden, tasty-hunit, temporary @@ -135270,7 +132199,6 @@ self: { homepage = "https://github.com/george-steel/maxent-learner"; description = "GUI for maxent-learner-hw"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "maximal-cliques" = callPackage @@ -135454,6 +132382,7 @@ self: { homepage = "http://interfaces.org.uk/mcm"; description = "Manages the contents of files and directories"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mcmaster-gloss-examples" = callPackage @@ -135733,6 +132662,7 @@ self: { homepage = "https://github.com/sheyll/mediabus"; description = "Multimedia streaming on top of Conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mediabus-fdk-aac" = callPackage @@ -135800,6 +132730,7 @@ self: { homepage = "https://github.com/sheyll/mediabus-rtp"; description = "Receive and Send RTP Packets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "median-stream" = callPackage @@ -135813,6 +132744,7 @@ self: { homepage = "https://github.com/caneroj1/median-stream#readme"; 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 @@ -135898,35 +132830,14 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude-conduit - , conduit-extra, directory, filepath, http-conduit, optparse-simple - , tar-conduit, temporary, typed-process, yaml - }: - mkDerivation { - pname = "mega-sdist"; - version = "0.3.0.2"; - sha256 = "0zxillzaiq6ygiili8par8apm1pxh6lv9gk2f2a5nl8nv7n0sv7h"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring classy-prelude-conduit conduit-extra directory - filepath http-conduit optparse-simple tar-conduit temporary - typed-process yaml - ]; - homepage = "https://github.com/snoyberg/mega-sdist"; - description = "Handles uploading to Hackage from mega repos"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mega-sdist_0_3_0_4" = callPackage ({ mkDerivation, base, bytestring, classy-prelude-conduit , conduit-extra, directory, filepath, http-conduit, optparse-simple , tar-conduit, temporary, text, typed-process, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.3.0.4"; - sha256 = "1qf7lhk2063lpkg2bm7x7sxxxf87laxjwsr4rw46hvjj2m8frh41"; + version = "0.3.0.6"; + sha256 = "0cgak9hp1j9ybcpbqjs56pq7h9wn0my46mlx6nqv3fvidwdp5vl7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135937,33 +132848,9 @@ self: { homepage = "https://github.com/snoyberg/mega-sdist#readme"; description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, hspec, hspec-expectations, mtl, QuickCheck - , scientific, text, transformers, weigh - }: - mkDerivation { - pname = "megaparsec"; - version = "5.3.1"; - sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8"; - libraryHaskellDepends = [ - base bytestring containers deepseq exceptions mtl QuickCheck - scientific text transformers - ]; - testHaskellDepends = [ - base bytestring containers exceptions hspec hspec-expectations mtl - QuickCheck scientific text transformers - ]; - benchmarkHaskellDepends = [ base criterion deepseq weigh ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "megaparsec_6_2_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -135971,8 +132858,34 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "6.2.0"; - sha256 = "1kyn7fcyckbjngpyxd2d4mny95sy71rk2s22yrkwyjgkza0fvslg"; + version = "6.3.0"; + sha256 = "15bhghiszm18acn1igmq6vgdlcvsvsx4dlkl2vg2ghy5qgyrqxsv"; + revision = "1"; + editedCabalFile = "0glp2vgbkgzaci5maa01fnpcp79kk32iskvkhm19p5612zjr87ad"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec hspec-expectations mtl QuickCheck + scientific text transformers + ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "megaparsec_6_4_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, hspec, hspec-expectations, mtl + , parser-combinators, QuickCheck, scientific, text, transformers + , weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "6.4.0"; + sha256 = "0h9azhs0dfrc359vrbd1jljrg3yfdbwd4p62cxqkn7mnh8913jpd"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -136140,6 +133053,7 @@ self: { ]; description = "Conduit library for memcache procotol"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memcache-haskell" = callPackage @@ -136167,6 +133081,7 @@ self: { ]; description = "Memcache procotol library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memcached" = callPackage @@ -136337,18 +133252,19 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Generate human memorable strings from binary data"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memory" = callPackage - ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "memory"; - version = "0.14.8"; - sha256 = "093jin2yckha0wccswwxqaak2di7fz2v2rid03h1q0pjm4q9vmyk"; + version = "0.14.11"; + sha256 = "0k6x58r3if8zbsgip8nr7lb77xf468qxlwqnmah8p313rxfg0k37"; libraryHaskellDepends = [ - base bytestring deepseq foundation ghc-prim + base basement bytestring deepseq foundation ghc-prim ]; testHaskellDepends = [ base foundation tasty tasty-hunit tasty-quickcheck @@ -136358,24 +133274,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "memory_0_14_9" = callPackage - ({ mkDerivation, base, basement, bytestring, deepseq, ghc-prim - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "memory"; - version = "0.14.9"; - sha256 = "1v8fjw0dgnyw6jhrpzfyxf63ky1lyrfapb8x28lj25q2xw6zx8s5"; - libraryHaskellDepends = [ - base basement bytestring deepseq ghc-prim - ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/vincenthz/hs-memory"; - description = "memory and related abstraction stuff"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -136483,6 +133381,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "merkle-tree" = callPackage + ({ mkDerivation, base, bytestring, cereal, cryptonite, memory + , protolude, QuickCheck, random, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "merkle-tree"; + version = "0.1.0"; + sha256 = "0k9ifkl8ywp0svn83rlczrq2s1aamwri2vx25cs42f64bgxr7ics"; + revision = "1"; + editedCabalFile = "1ibsr79qmzykn2i7p8zvzp8v79lsr54gc3zdqmfgk2cjx1x8k6dz"; + libraryHaskellDepends = [ + base bytestring cereal cryptonite memory protolude random + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite memory protolude QuickCheck + random tasty tasty-quickcheck + ]; + homepage = "https://github.com/adjoint-io/merkle-tree#readme"; + description = "An implementation of a Merkle Tree and merkle tree proofs"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mersenne-random" = callPackage ({ mkDerivation, base, old-time }: mkDerivation { @@ -136688,7 +133608,6 @@ self: { ]; description = "High-performance application metric tracking"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "metricsd-client" = callPackage @@ -137034,6 +133953,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "microsoft-translator" = callPackage + ({ mkDerivation, base, bytestring, http-api-data, http-client + , http-client-tls, http-media, mtl, safe, servant, servant-client + , text, time, xml + }: + mkDerivation { + pname = "microsoft-translator"; + version = "0.1.1"; + sha256 = "12f5ki7i7cd8b6dzkg5q8chk1vnlr0izm3r62b371xf8hpmxn0av"; + libraryHaskellDepends = [ + base bytestring http-api-data http-client http-client-tls + http-media mtl safe servant servant-client text time xml + ]; + homepage = "https://github.com/BlackBrane/microsoft-translator"; + description = "Bindings to the Microsoft Translator API"; + license = stdenv.lib.licenses.mit; + }) {}; + "microspec" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -137144,7 +134081,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Handling of MIDI messages and files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-alsa" = callPackage @@ -137159,7 +134095,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -137180,7 +134116,6 @@ self: { homepage = "http://hub.darcs.net/thielema/midi-music-box"; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-simple" = callPackage @@ -137220,7 +134155,6 @@ self: { homepage = "http://github.com/mtolly/midi-util"; description = "Utility functions for processing MIDI files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-utils" = callPackage @@ -137242,17 +134176,19 @@ self: { }) {}; "midimory" = callPackage - ({ mkDerivation, alsa-core, alsa-seq, base, containers, random - , transformers, wx, wxcore + ({ mkDerivation, alsa-core, alsa-seq, array, base, containers + , optparse-applicative, random, transformers, utility-ht, wx + , wxcore }: mkDerivation { pname = "midimory"; - version = "0.0.0.3"; - sha256 = "0jnzj3br3pb9ld1ha96kxk4zsxc38gc3njxmqb7nj8155b7r7x96"; + version = "0.0.2.1"; + sha256 = "07p0f7a0nm7h8li8rl6adrszrz7hhzn19mfy0vgkw8axdaira66r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - alsa-core alsa-seq base containers random transformers wx wxcore + alsa-core alsa-seq array base containers optparse-applicative + random transformers utility-ht wx wxcore ]; homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; @@ -137364,6 +134300,7 @@ self: { homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mikrokosmos" = callPackage @@ -137478,26 +134415,6 @@ self: { }) {}; "mime-mail-ses" = callPackage - ({ mkDerivation, base, base64-bytestring, byteable, bytestring - , conduit, cryptohash, http-client, http-conduit, http-types - , mime-mail, old-locale, text, time, transformers, xml-conduit - , xml-types - }: - mkDerivation { - pname = "mime-mail-ses"; - version = "0.3.2.3"; - sha256 = "0k2dgw3alnfjj4byr30d687b27hmwh4pacm0jwh15prcdhw7gy83"; - libraryHaskellDepends = [ - base base64-bytestring byteable bytestring conduit cryptohash - http-client http-conduit http-types mime-mail old-locale text time - transformers xml-conduit xml-types - ]; - homepage = "http://github.com/snoyberg/mime-mail"; - description = "Send mime-mail messages via Amazon SES"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-mail-ses_0_4_0_0" = callPackage ({ mkDerivation, base, base64-bytestring, byteable, bytestring , conduit, cryptohash, http-client, http-conduit, http-types , mime-mail, old-locale, text, time, transformers, xml-conduit @@ -137515,7 +134432,6 @@ self: { homepage = "http://github.com/snoyberg/mime-mail"; description = "Send mime-mail messages via Amazon SES"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-string" = callPackage @@ -137532,7 +134448,6 @@ self: { ]; description = "MIME implementation for String's"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-types" = callPackage @@ -137913,17 +134828,21 @@ self: { }) {}; "mios" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, vector }: + ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }: mkDerivation { pname = "mios"; - version = "1.4.0"; - sha256 = "0b9wmhw6dria5j9a8jk85gdnlz7bqgx2b4ziw8y8bwj9k3yr3j1w"; + version = "1.6.0"; + sha256 = "1pwcv24csffb734q4z4amjlgv8kkzncz8bjhn4s3wji021ndj1b7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring ghc-prim vector ]; - executableHaskellDepends = [ base bytestring ghc-prim vector ]; + libraryHaskellDepends = [ + base bytestring ghc-prim primitive vector + ]; + executableHaskellDepends = [ + base bytestring ghc-prim primitive vector + ]; homepage = "https://github.com/shnarazk/mios"; - description = "A Minisat-based SAT solver in Haskell"; + description = "A Minisat-based CDCL SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -137970,25 +134889,6 @@ self: { }) {}; "miso" = callPackage - ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers - , lucid, servant, servant-lucid, text, vector - }: - mkDerivation { - pname = "miso"; - version = "0.4.0.0"; - sha256 = "1pfmmc14fsydv6km45sc5w0mgqnsww7l053qh0vrqmzb88zp8h7b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base BoundedChan bytestring containers lucid servant - servant-lucid text vector - ]; - homepage = "http://github.com/dmjio/miso"; - description = "A tasty Haskell front-end framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "miso_0_10_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector @@ -138006,6 +134906,26 @@ self: { homepage = "http://github.com/dmjio/miso"; description = "A tasty Haskell front-end framework"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "miso_0_11_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector + }: + mkDerivation { + pname = "miso"; + version = "0.11.0.0"; + sha256 = "1hca50w1h3xby1mkbgv65miha7zg899c5ygvfqs4i49gjzq3hd61"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector + ]; + homepage = "http://github.com/dmjio/miso"; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138071,8 +134991,8 @@ self: { }: mkDerivation { pname = "mixed-types-num"; - version = "0.2.0.1"; - sha256 = "05jy5rym4a2y80pg00csyrfpd3bdv98s1kdv3s18nqfrhsyz84wa"; + version = "0.3.1.4"; + sha256 = "0061in4wv9hs5d8bvq5ycv8x176z3fz8fcfymwghmbjybbmgzzy4"; libraryHaskellDepends = [ base convertible hspec hspec-smallcheck QuickCheck smallcheck template-haskell @@ -138083,25 +135003,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mixed-types-num_0_3_1_3" = callPackage - ({ mkDerivation, base, convertible, hspec, hspec-smallcheck - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.3.1.3"; - sha256 = "0945zl9g1lpvpgqmaqm168zx6l1zydw9waivh7nm4alfr8awys60"; - libraryHaskellDepends = [ - base convertible hspec hspec-smallcheck QuickCheck smallcheck - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; - homepage = "https://github.com/michalkonecny/mixed-types-num"; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { @@ -138202,19 +135103,54 @@ self: { }) {}; "mmark" = callPackage - ({ mkDerivation, aeson, base, containers, criterion - , data-default-class, deepseq, email-validate, foldl, hspec - , hspec-megaparsec, lucid, megaparsec, modern-uri, mtl - , parser-combinators, QuickCheck, text, weigh, yaml + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, data-default-class, deepseq, dlist, email-validate + , foldl, hashable, hspec, 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.1.1"; - sha256 = "06i95kjr7vhab5g6m8rypm31yxqk9lim5117n100cc19vk85fyqp"; + version = "0.0.4.0"; + sha256 = "05dslarsdfcp2im9w80ks52wzqcqq8ma23b69wdl8nyfbkmaj5ch"; + revision = "1"; + editedCabalFile = "1syr3bynam607wj4nkz9cijkdkz9szpk3x9pnxm76mv0sxk7iq2f"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers data-default-class deepseq email-validate - foldl lucid megaparsec modern-uri mtl parser-combinators text yaml + aeson base case-insensitive containers data-default-class deepseq + dlist email-validate foldl hashable html-entity-map lucid + megaparsec microlens microlens-th modern-uri mtl parser-combinators + text text-metrics unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + homepage = "https://github.com/mrkkrp/mmark"; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mmark_0_0_4_3" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, data-default-class, deepseq, dlist, email-validate + , foldl, hashable, hspec, 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.4.3"; + sha256 = "0xl88vry05050i1pxmakb625x98wmq90h4jz44h0nc7jrqzvqxa0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers data-default-class deepseq + dlist email-validate foldl hashable html-entity-map lucid + megaparsec microlens microlens-th modern-uri mtl parser-combinators + text text-metrics unordered-containers yaml ]; testHaskellDepends = [ aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri @@ -138229,15 +135165,15 @@ self: { "mmark-ext" = callPackage ({ mkDerivation, base, data-default-class, foldl, hspec, lucid - , mmark, modern-uri, text + , microlens, mmark, modern-uri, text }: mkDerivation { pname = "mmark-ext"; - version = "0.0.1.0"; - sha256 = "0psjpz22brhav2qpp3vwiai0hnp9i0rlhmpilqll8c467sk4lysl"; + version = "0.0.1.2"; + sha256 = "0f698yvlcbvq627advl832nlzl975jx462zg7pd8h43chdbj5qar"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base data-default-class foldl lucid mmark modern-uri text + base data-default-class foldl lucid microlens mmark modern-uri text ]; testHaskellDepends = [ base data-default-class hspec lucid mmark text @@ -138245,25 +135181,9 @@ self: { homepage = "https://github.com/mrkkrp/mmark-ext"; description = "Commonly useful extensions for MMark markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmorph" = callPackage - ({ mkDerivation, base, mtl, transformers, transformers-compat }: - mkDerivation { - pname = "mmorph"; - version = "1.0.9"; - sha256 = "0qs5alhy719a14lrs7rnh2qsn1146czg68gvgylf4m5jh4w7vwp1"; - revision = "1"; - editedCabalFile = "1xxf78qi08qsis2q785s0ra29wjxnxw8pyns0dsqp4a6cybd3mjd"; - libraryHaskellDepends = [ - base mtl transformers transformers-compat - ]; - description = "Monad morphisms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmorph_1_1_0" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -138276,7 +135196,6 @@ self: { ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmtf" = callPackage @@ -138388,33 +135307,14 @@ self: { }) {}; "model" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, ListLike - , pretty, tasty, tasty-hunit, transformers - }: - mkDerivation { - pname = "model"; - version = "0.3"; - sha256 = "1hifwd7caxmbvi6n87w6x8mb42x0q3wqzkjfwxsz6g416c1f56jl"; - libraryHaskellDepends = [ - base containers deepseq ListLike pretty transformers - ]; - testHaskellDepends = [ - base containers ghc-prim pretty tasty tasty-hunit - ]; - homepage = "http://github.com/tittoassini/model"; - description = "Derive a model of a data type using Generics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "model_0_4_2" = callPackage ({ mkDerivation, base, containers, convertible, deepseq, doctest , either, filemanip, ghc-prim, pretty, tasty, tasty-hunit , tasty-quickcheck, transformers }: mkDerivation { pname = "model"; - version = "0.4.2"; - sha256 = "0ynv6fwns4ix0nhz8b3aqsw6q9avn7n60spakhpa30lya9asinjb"; + version = "0.4.4"; + sha256 = "1mmv1m78ychgqp0mblm56fszfmnxap3jwvxviy0h06s6wl2adq24"; libraryHaskellDepends = [ base containers convertible deepseq either pretty transformers ]; @@ -138425,7 +135325,6 @@ self: { homepage = "http://github.com/tittoassini/model"; description = "Derive a model of a data type using Generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modelicaparser" = callPackage @@ -138453,8 +135352,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.1.1.1"; - sha256 = "1nh0h1libpiw7lkh66almgh2r0gfa5mb9fancqy039rpyqkkfv1w"; + version = "0.1.2.1"; + sha256 = "10y3ppcd4d987khk9jxaa0clkjssmvip2kpq63z8xcigvdiil91h"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec profunctors QuickCheck template-haskell text @@ -138468,6 +135367,32 @@ self: { homepage = "https://github.com/mrkkrp/modern-uri"; description = "Modern library for working with URIs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "modern-uri_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-megaparsec + , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged + , template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.2.0.0"; + sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z"; + 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 + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + homepage = "https://github.com/mrkkrp/modern-uri"; + description = "Modern library for working with URIs"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138721,7 +135646,6 @@ self: { ]; description = "A glorified string replacement tool"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mollie-api-haskell" = callPackage @@ -138745,16 +135669,16 @@ self: { }) {}; "monad-abort-fd" = callPackage - ({ mkDerivation, base, monad-control, mtl, transformers - , transformers-abort, transformers-base + ({ mkDerivation, base, mtl, transformers, transformers-abort + , transformers-base, transformers-compat }: mkDerivation { pname = "monad-abort-fd"; - version = "0.5"; - sha256 = "1yyqbs2zq6rkz0rk36k1c4p7d4f2r6jkf1pzg3a0wbjdqk01ayb7"; + version = "0.6"; + sha256 = "0a9ykj8cp817qlzvz7l5502zmwhiqa5236xvnsf93x38h34xwx5m"; libraryHaskellDepends = [ - base monad-control mtl transformers transformers-abort - transformers-base + base mtl transformers transformers-abort transformers-base + transformers-compat ]; homepage = "https://github.com/mvv/monad-abort-fd"; description = "A better error monad transformer"; @@ -138830,6 +135754,7 @@ self: { homepage = "https://github.com/strake/monad-classes.hs"; description = "more flexible mtl"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-classes-logging" = callPackage @@ -138849,6 +135774,7 @@ self: { homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme"; description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-codec" = callPackage @@ -138979,6 +135905,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-finally" = callPackage + ({ mkDerivation, base, monad-abort-fd, monad-control, transformers + , transformers-abort, transformers-base, transformers-compat + }: + mkDerivation { + pname = "monad-finally"; + version = "0.1.0.1"; + sha256 = "0qam9qsm3cqk2r9x4jhmgg6c9kshf3aja765x0apgc0j9rk8zpyq"; + libraryHaskellDepends = [ + base monad-abort-fd monad-control transformers transformers-abort + transformers-base transformers-compat + ]; + homepage = "https://github.com/mvv/monad-finally"; + description = "Guard monadic computations with cleanup actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-fork" = callPackage ({ mkDerivation, base, monad-control }: mkDerivation { @@ -139029,8 +135972,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; - revision = "6"; - editedCabalFile = "0xnh69yfpgz1i43x2695gyrxar1582m02cwrzmvfymzvvqbkcwld"; + revision = "7"; + editedCabalFile = "19qsjwcdg39is6ipwl6hgr42c7gyc7p1cs5f8isxy90hb4xjghrh"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -139073,22 +136016,6 @@ self: { }) {}; "monad-journal" = callPackage - ({ mkDerivation, base, either, monad-control, mtl, transformers - , transformers-base - }: - mkDerivation { - pname = "monad-journal"; - version = "0.7.2"; - sha256 = "024xqvbbhfg5miy86nm3bvjplkqv3mds0qa89ia9hhcrpmvadcbj"; - libraryHaskellDepends = [ - base either monad-control mtl transformers transformers-base - ]; - homepage = "http://github.com/phaazon/monad-journal"; - description = "Pure logger typeclass and monad transformer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-journal_0_8_1" = callPackage ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base }: @@ -139102,7 +136029,6 @@ self: { homepage = "http://github.com/phaazon/monad-journal"; description = "Pure logger typeclass and monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-levels" = callPackage @@ -139165,17 +136091,17 @@ self: { , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans , template-haskell, text, transformers, transformers-base - , transformers-compat + , transformers-compat, unliftio-core }: mkDerivation { pname = "monad-logger"; - version = "0.3.25.1"; - sha256 = "0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920"; + version = "0.3.26"; + sha256 = "0p7mdiv0n4wizcam2lw143szs584yzs0bq9lfrn90pgvz0q7k1ia"; libraryHaskellDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans template-haskell text transformers transformers-base - transformers-compat + transformers-compat unliftio-core ]; homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; @@ -139318,23 +136244,6 @@ self: { }) {}; "monad-metrics" = callPackage - ({ mkDerivation, base, clock, containers, ekg-core, microlens, mtl - , text, transformers - }: - mkDerivation { - pname = "monad-metrics"; - version = "0.1.0.2"; - sha256 = "0xi2hjyv5icjq1z2xvlw655xhjmrn9s4z1wji3rw0870xcx5ykm6"; - libraryHaskellDepends = [ - base clock containers ekg-core microlens mtl text transformers - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/sellerlabs/monad-metrics#readme"; - description = "A convenient wrapper around EKG metrics"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-metrics_0_2_1_0" = callPackage ({ mkDerivation, base, clock, ekg-core, exceptions, hashable , microlens, mtl, text, transformers, unordered-containers }: @@ -139350,7 +136259,6 @@ self: { homepage = "https://github.com/sellerlabs/monad-metrics#readme"; description = "A convenient wrapper around EKG metrics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-mock" = callPackage @@ -139642,7 +136550,6 @@ self: { homepage = "http://github.com/joeyadams/hs-monad-statevar"; description = "Concise, overloaded accessors for IORef, STRef, TVar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-ste" = callPackage @@ -139716,8 +136623,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-task"; - version = "0.1.0"; - sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8"; + version = "0.2.0"; + sha256 = "02qp31w0zgms07b13km3aiina4iqbzxkiajab3b0czmc17xv4kx4"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://github.com/ninegua/monad-task"; description = "A monad transformer that turns event processing into co-routine programming"; @@ -139801,24 +136708,6 @@ self: { }) {}; "monad-unlift-ref" = callPackage - ({ mkDerivation, base, constraints, exceptions, monad-control - , monad-unlift, mtl, mutable-containers, resourcet, stm - , transformers, transformers-base - }: - mkDerivation { - pname = "monad-unlift-ref"; - version = "0.2.0"; - sha256 = "1qac8ijilndn4pcdf142f1vpqqaqrnh7zmq0jh86bpnwhhrwqym9"; - libraryHaskellDepends = [ - base constraints exceptions monad-control monad-unlift mtl - mutable-containers resourcet stm transformers transformers-base - ]; - homepage = "https://github.com/fpco/monad-unlift"; - description = "Typeclasses for representing monad transformer unlifting"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-unlift-ref_0_2_1" = callPackage ({ mkDerivation, base, constraints, exceptions, monad-control , monad-unlift, mtl, mutable-containers, resourcet, stm , transformers, transformers-base @@ -139834,15 +136723,14 @@ self: { homepage = "https://github.com/fpco/monad-unlift"; description = "Typeclasses for representing monad transformer unlifting"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-var" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "monad-var"; - version = "0.1.1.1"; - sha256 = "1j9ydl29a4cqhkackcpzlp7amiwk0ifvyxdcmi2vka7m1d98jc6z"; + version = "0.1.2.0"; + sha256 = "1nj10lhijwvim7js2vl9b9qq7x55dx7bk6q4jmvpz99c2vqfhyy5"; libraryHaskellDepends = [ base stm transformers ]; homepage = "https://github.com/effectfully/monad-var#readme"; description = "Generic operations over variables"; @@ -139858,6 +136746,7 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Wrap functions such as catch around different monads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadIO" = callPackage @@ -140218,8 +137107,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.3.0"; - sha256 = "024w6183nnaq30r9jnfiy5pjv422mnnkawqdgzgzafngi7sad322"; + version = "2.3.0.1"; + sha256 = "1snr144yk05p5l9ck5gfs4zawg2l8fd8slmzxsrd29w2x6pk7iqv"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -140314,7 +137203,6 @@ self: { ]; description = "A system state collecting library and application"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mono-foldable" = callPackage @@ -140338,8 +137226,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.4.0"; - sha256 = "0qwmzjf25gradzajr4f9zw3a48m4hw26qvqnb134daqkyxpkzf13"; + version = "1.0.7.0"; + sha256 = "0jfcw8xfizsva1w4h7546fryzqc1gnl1w3ki42nl41s1fdqfxibq"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -140349,7 +137237,7 @@ self: { text transformers unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; }) {}; @@ -140453,7 +137341,6 @@ self: { homepage = "https://github.com/Shimuuar/monoid-statistics"; description = "Monoids for calculation of statistics of sample"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-subclasses" = callPackage @@ -140678,6 +137565,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "more-containers" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "more-containers"; + version = "0.1.0.5"; + sha256 = "1q1fs56a61ryild0zp43ash5mm83162v5v61x29vmc3hv1h79bnm"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/mtth/more-containers#readme"; + description = "A few more collections"; + license = stdenv.lib.licenses.mit; + }) {}; + "more-extensible-effects" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -140748,7 +137648,6 @@ self: { executableHaskellDepends = [ base ]; description = "A simple database migrator for PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "morte" = callPackage @@ -140760,8 +137659,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.6.11"; - sha256 = "10zwdf82hxjgxh7zs7wlnvyzjpaqalwj7rlg454jjlml59ifzvmw"; + version = "1.6.13"; + sha256 = "03vjkp3ngbdhv5ib7jwdwx23bklm32m3gmvq63r2cxagydl1267m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -140892,20 +137791,22 @@ self: { }) {}; "movie-monad" = callPackage - ({ mkDerivation, base, gi-gdk, gi-gdkx11, gi-glib, gi-gobject - , gi-gst, gi-gstvideo, gi-gtk, gi-xlib, haskell-gi-base, MissingH - , process, text + ({ mkDerivation, base, filepath, gi-gdk, gi-gdkpixbuf, gi-glib + , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi + , haskell-gi-base, MissingH, network-uri, process, system-fileio + , system-filepath, text, time }: mkDerivation { pname = "movie-monad"; - version = "0.0.1.0"; - sha256 = "02sj8x49lw80nhzlwsnddj7r9w6xfv1vks4rpgds89pmkr4b5bvn"; + version = "0.0.4.0"; + sha256 = "0wdnf8gm3h7ykdmnwc7jw1y0rs27izzh1kz2gkgi3g2dyllh7sq3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base gi-gdk gi-gdkx11 gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk - gi-xlib haskell-gi-base MissingH process text + base filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gst + gi-gstvideo gi-gtk haskell-gi haskell-gi-base MissingH network-uri + process system-fileio system-filepath text time ]; homepage = "https://github.com/lettier/movie-monad"; description = "Plays videos using GStreamer and GTK+"; @@ -141129,6 +138030,7 @@ self: { homepage = "https://github.com/lpeterse/haskell-mqtt"; description = "An MQTT protocol implementation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mqtt-hs" = callPackage @@ -141146,6 +138048,7 @@ self: { homepage = "http://github.com/k00mi/mqtt-hs"; description = "A MQTT client library"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mrifk" = callPackage @@ -141159,6 +138062,7 @@ self: { executableHaskellDepends = [ array base containers mtl ]; description = "Decompiles Glulx files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mrm" = callPackage @@ -141451,6 +138355,7 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Higher order versions of MTL classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-prelude_1_0_3" = callPackage @@ -141655,15 +138560,33 @@ self: { }) {}; "mulang" = callPackage - ({ mkDerivation, aeson, base, bytestring, haskell-src, hspec }: + ({ 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 + }: mkDerivation { pname = "mulang"; - version = "0.1.0.0"; - sha256 = "1pxdrbpy7n0aimrbm4x2vn98v9va76pyr5hw06361d6fhnfq5wjx"; - libraryHaskellDepends = [ aeson base bytestring haskell-src ]; - testHaskellDepends = [ aeson base bytestring haskell-src hspec ]; - description = "The Mu Language, a non-computable extended Lambda Calculus"; - license = stdenv.lib.licenses.mit; + version = "3.6.1"; + sha256 = "0phpy2dickbam17n6ppq10qlfjxmhf1c7jb67qjk7672rxyrqfzb"; + 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 + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + aeson base bytestring neat-interpolation process text + ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ + aeson base bytestring hspec neat-interpolation text + ]; + testToolDepends = [ alex happy ]; + description = "An intermediate language designed to perform advanced code analysis"; + license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -141714,6 +138637,7 @@ self: { homepage = "https://github.com/chris-martin/multi-instance#readme"; description = "Typeclasses augmented with a phantom type parameter"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multi-trie" = callPackage @@ -141787,6 +138711,7 @@ self: { homepage = "xy30.com"; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multifocal" = callPackage @@ -141909,6 +138834,7 @@ self: { homepage = "https://github.com/SupraSummus/haskell-multipath"; description = "Parser and builder for unix-path-like objects"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multiplate" = callPackage @@ -141966,7 +138892,6 @@ self: { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic programming for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multirec-alt-deriver" = callPackage @@ -142053,7 +138978,6 @@ self: { homepage = "https://github.com/lspitzner/multistate"; 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 @@ -142224,6 +139148,7 @@ self: { homepage = "https://github.com/elaye/mushu#README.md"; description = "Minimalist MPD client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "music-articulation" = callPackage @@ -142450,6 +139375,7 @@ self: { ]; description = "Utility for developing the Music Suite"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "musicbrainz-email" = callPackage @@ -142522,36 +139448,6 @@ self: { }) {}; "mustache" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , cmdargs, containers, directory, either, filepath, hspec, lens - , mtl, parsec, process, scientific, tar, template-haskell - , temporary, text, th-lift, unordered-containers, vector, wreq - , yaml, zlib - }: - mkDerivation { - pname = "mustache"; - version = "2.2.3"; - sha256 = "1gy21h97ckjy7lkncm7zyn7bfcpyj488cc7cqy65qapryr9sa5aj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory either filepath mtl - parsec scientific template-haskell text th-lift - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs filepath text yaml - ]; - testHaskellDepends = [ - aeson base base-unicode-symbols bytestring directory filepath hspec - lens process tar temporary text unordered-containers wreq yaml zlib - ]; - homepage = "https://github.com/JustusAdam/mustache"; - description = "A mustache template parser library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mustache_2_3_0" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, lens , mtl, parsec, process, scientific, tar, template-haskell @@ -142579,7 +139475,6 @@ self: { homepage = "https://github.com/JustusAdam/mustache"; description = "A mustache template parser library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mustache-haskell" = callPackage @@ -142695,6 +139590,7 @@ self: { homepage = "https://github.com/chris-martin/haskell-libraries"; description = "A trivial lock based on MVar"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mvc" = callPackage @@ -142889,18 +139785,20 @@ self: { "myanimelist-export" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit - , conduit-extra, containers, directory, http-client + , conduit-extra, containers, directory, exceptions, http-client , http-client-tls, network-uri, tagstream-conduit, text, yaml }: mkDerivation { pname = "myanimelist-export"; - version = "0.1.0.1"; - sha256 = "0hmrkw0qyvknsny5vcq5s1mnjmmadn2x8l3gs07qxh58ncw3y4k2"; + version = "0.2.0.0"; + sha256 = "1d9fqna5qavp1lzpsg8yg816m3smybdsx25gafqr9wc2555rj1gg"; + revision = "1"; + editedCabalFile = "1ni5bmhfra2rlxlv55iah865shyibz7bwl2zz6161v4s35bs68dj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring conduit containers http-client network-uri - tagstream-conduit text + async base bytestring conduit containers exceptions http-client + network-uri tagstream-conduit text ]; executableHaskellDepends = [ aeson base bytestring conduit conduit-extra directory http-client @@ -142909,6 +139807,7 @@ self: { homepage = "https://github.com/mat8913/myanimelist-export#readme"; description = "Export from MyAnimeList"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mybitcoin-sci" = callPackage @@ -142922,6 +139821,7 @@ self: { ]; description = "Binding to mybitcoin.com's Shopping Cart Interface."; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "myo" = callPackage @@ -143022,30 +139922,6 @@ self: { }) {}; "mysql-haskell" = callPackage - ({ mkDerivation, base, binary, binary-ieee754, binary-parsers - , blaze-textual, bytestring, bytestring-lexing, cryptonite - , io-streams, memory, monad-loops, network, scientific, tasty - , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams - , word24 - }: - mkDerivation { - pname = "mysql-haskell"; - version = "0.8.0.0"; - sha256 = "1r7c7svpbdqr4i64zhjlw5wbd2f9c04hixh500bcv839p0iwgrsz"; - libraryHaskellDepends = [ - base binary binary-ieee754 binary-parsers blaze-textual bytestring - bytestring-lexing cryptonite io-streams memory monad-loops network - scientific tcp-streams text time tls vector wire-streams word24 - ]; - testHaskellDepends = [ - base bytestring io-streams tasty tasty-hunit text time vector - ]; - homepage = "https://github.com/winterland1989/mysql-haskell"; - description = "pure haskell MySQL driver"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mysql-haskell_0_8_3_0" = callPackage ({ mkDerivation, base, binary, binary-ieee754, binary-parsers , blaze-textual, bytestring, bytestring-lexing, cryptonite , io-streams, memory, monad-loops, network, scientific, tasty @@ -143086,27 +139962,10 @@ self: { homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme"; description = "Adds a interface like mysql-simple to mysql-haskell"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "mysql-haskell-openssl" = callPackage - ({ mkDerivation, base, HsOpenSSL, io-streams, mysql-haskell - , network, tcp-streams, tcp-streams-openssl, wire-streams - }: - mkDerivation { - pname = "mysql-haskell-openssl"; - version = "0.8.0.0"; - sha256 = "05mn4zzjk9g5csy4yk2qdc2brl5h879ajh7pq98dl67f6jlg6gb5"; - libraryHaskellDepends = [ - base HsOpenSSL io-streams mysql-haskell network tcp-streams - tcp-streams-openssl wire-streams - ]; - homepage = "https://github.com/winterland1989/mysql-haskell"; - description = "TLS support for mysql-haskell package using openssl"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mysql-haskell-openssl_0_8_3_0" = callPackage + "mysql-haskell-openssl" = callPackage ({ mkDerivation, base, binary, HsOpenSSL, mysql-haskell , tcp-streams, tcp-streams-openssl, wire-streams }: @@ -143233,6 +140092,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "n-ary-functor" = callPackage + ({ mkDerivation, base, doctest, doctest-discover }: + mkDerivation { + pname = "n-ary-functor"; + version = "0.1.0.0"; + sha256 = "1v1ki6mfgj7jhj7w94w15sisd57akwlb0c2s3bczvj47f7f8p7vi"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest doctest-discover ]; + homepage = "https://github.com/gelisam/n-ary-functor"; + description = "An n-ary version of Functor"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "n-m" = callPackage ({ mkDerivation, base, HSH, mtl, process }: mkDerivation { @@ -143353,6 +140225,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nakadi-client_0_4_0_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , classy-prelude, conduit, conduit-combinators, conduit-extra + , containers, hashable, http-client, http-client-tls, http-conduit + , http-types, iso8601-time, lens, lens-aeson, monad-logger, mtl + , random, resourcet, retry, safe-exceptions, say, scientific, split + , stm, tasty, tasty-hunit, template-haskell, text, time + , transformers, unordered-containers, uuid, vector, wai, warp + }: + mkDerivation { + pname = "nakadi-client"; + version = "0.4.0.0"; + sha256 = "0aixamqvlm7as8cfgp8b36smh139kwp5qny51dgzsczg6sr7gdk0"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring conduit conduit-combinators + conduit-extra containers hashable http-client http-client-tls + http-conduit http-types iso8601-time lens monad-logger mtl + resourcet retry safe-exceptions scientific split template-haskell + text time transformers unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson aeson-casing async base bytestring classy-prelude conduit + conduit-combinators conduit-extra containers hashable http-client + http-client-tls http-conduit http-types iso8601-time lens + lens-aeson monad-logger mtl random resourcet retry safe-exceptions + say scientific split stm tasty tasty-hunit template-haskell text + time transformers unordered-containers uuid vector wai warp + ]; + homepage = "https://github.com/mtesseract/nakadi-haskell#readme"; + description = "Client library for the Nakadi Event Broker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "namecoin-update" = callPackage ({ mkDerivation, aeson, attoparsec, base, lens, text, wreq }: mkDerivation { @@ -143365,6 +140271,7 @@ self: { executableHaskellDepends = [ base text ]; description = "Tool to keep namecoin names updated and well"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "named-formlet" = callPackage @@ -143789,7 +140696,17 @@ self: { ]; description = "Haskell API for NATS messaging system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "natural-induction" = callPackage + ({ mkDerivation, base, peano }: + mkDerivation { + pname = "natural-induction"; + version = "0.2.0.0"; + sha256 = "1brkmvkwpgqsxra210h8fkb9bpvawmbdwwvvhsd58kzmkd599alr"; + libraryHaskellDepends = [ base peano ]; + description = "Induction over natural numbers"; + license = stdenv.lib.licenses.bsd3; }) {}; "natural-number" = callPackage @@ -144143,6 +141060,7 @@ self: { homepage = "http://github.com/nfjinjing/nemesis"; description = "a task management tool for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nemesis-titan" = callPackage @@ -144352,6 +141270,7 @@ self: { homepage = "http://netclock.slab.org/"; description = "Netclock protocol"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netcore" = callPackage @@ -144417,6 +141336,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "netlib-carray" = callPackage + ({ mkDerivation, base, carray, storable-complex, transformers }: + mkDerivation { + pname = "netlib-carray"; + version = "0.0"; + sha256 = "173hphdy4qv3zx6qigjf2zj38gzlmp94xjcyc8jlwln221s35l0r"; + libraryHaskellDepends = [ + base carray storable-complex transformers + ]; + homepage = "http://hub.darcs.net/thielema/netlib-carray/"; + description = "Helper modules for CArray wrappers to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "netlib-ffi" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "netlib-ffi"; + version = "0.0"; + sha256 = "0i04gahmv9171ndw5nkcawkfn3vbfgagnxhl1xpy0a45bfs0n9xc"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://hub.darcs.net/thielema/netlib-ffi/"; + description = "Helper modules for FFI to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "netlines" = callPackage ({ mkDerivation, base, bytestring, contstuff, enumerator, HTF , random, text, time @@ -144453,7 +141398,6 @@ self: { homepage = "https://github.com/Ongy/netlink-hs"; description = "Netlink communication for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "netlist" = callPackage @@ -144517,6 +141461,7 @@ self: { homepage = "https://github.com/hvr/netrc"; description = "Parser for .netrc files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netspec" = callPackage @@ -144657,17 +141602,23 @@ self: { }) {}; "netwire-input-glfw" = callPackage - ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, GLFW-b, mtl, netwire, netwire-input, OpenGL, stm + , transformers }: mkDerivation { pname = "netwire-input-glfw"; - version = "0.0.6"; - sha256 = "01nxv6bkwhafk5dg85lg5ggcvqlhv2kiwnm75zbscp002pwmq2fx"; + version = "0.0.7"; + sha256 = "1rsvhwxrr00qpff7adwiwci5fl6hbv8r8mvxhkq3az235w9pll8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers GLFW-b mtl netwire-input stm ]; + executableHaskellDepends = [ + array base bytestring containers directory filepath GLFW-b mtl + netwire netwire-input OpenGL transformers + ]; homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; @@ -144841,7 +141792,29 @@ self: { homepage = "https://github.com/markhibberd/network-api-support"; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "network-arbitrary" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , test-invariant + }: + mkDerivation { + pname = "network-arbitrary"; + version = "0.3.0.0"; + sha256 = "13mr3gxgc4g1ij0fj8xwn1md0hi9l1gpka06y072ffh8ib7qg98c"; + libraryHaskellDepends = [ + base bytestring http-media http-types network-uri QuickCheck + ]; + testHaskellDepends = [ + base bytestring case-insensitive hspec http-media http-types + network-uri QuickCheck test-invariant + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/alunduil/network-arbitrary"; + description = "Arbitrary Instances for Network Types"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ alunduil ]; }) {}; "network-attoparsec" = callPackage @@ -145023,22 +141996,26 @@ self: { }) {}; "network-dns" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, containers - , data-textual, hashable, network-ip, parsers, tagged, text-latin1 - , text-printer + ({ mkDerivation, base, bytestring, containers, data-serializer + , data-textual, hashable, network-ip, parsers, posix-socket + , text-latin1, text-printer, type-hint }: mkDerivation { pname = "network-dns"; - version = "1.0.0.1"; - sha256 = "0gg1g1gnbi6dzw5anz3dam2gh09q948d3k7q84agkswa64c0azn8"; + version = "1.1.0.1"; + sha256 = "0q709qfhph93k8yni6047yr2zhswmc3cvizyyk63vmh3h2dwfmgs"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base binary bytestring cereal containers data-textual hashable - network-ip parsers tagged text-latin1 text-printer + base bytestring containers data-serializer data-textual hashable + network-ip parsers text-latin1 text-printer type-hint + ]; + executableHaskellDepends = [ + base data-serializer data-textual network-ip posix-socket ]; homepage = "https://github.com/mvv/network-dns"; description = "Domain Name System data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-enumerator" = callPackage @@ -145097,8 +142074,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-info"; - version = "0.2.0.8"; - sha256 = "0xndvg776241fgjmynxfpy81f1csjmh8dg33yf0c8m71ychz3pzc"; + version = "0.2.0.9"; + sha256 = "0rmajccwhkf0p4inb8jjj0dzsksgn663w90km00xvf4mq3pkjab3"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; @@ -145207,6 +142184,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-msgpack-rpc_0_0_4" = callPackage + ({ mkDerivation, async, base, binary, binary-conduit, bytestring + , conduit, conduit-extra, data-default-class + , data-default-instances-base, data-msgpack, data-msgpack-types + , exceptions, hspec, MissingH, monad-control, mtl, network, tagged + , text + }: + mkDerivation { + pname = "network-msgpack-rpc"; + version = "0.0.4"; + sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra + data-default-class data-default-instances-base data-msgpack + data-msgpack-types exceptions MissingH monad-control mtl network + tagged text + ]; + testHaskellDepends = [ async base bytestring hspec mtl network ]; + homepage = "http://msgpack.org/"; + description = "A MessagePack-RPC Implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-multicast" = callPackage ({ mkDerivation, base, network }: mkDerivation { @@ -145265,7 +142266,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-rpca" = callPackage @@ -145427,24 +142427,6 @@ self: { }) {}; "network-transport" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hashable - , transformers - }: - mkDerivation { - pname = "network-transport"; - version = "0.4.4.0"; - sha256 = "1n3ywsmbcsh35h5dcyxr50nfgxh5qq6i9wgskn9dc79vpjdvq4cf"; - revision = "1"; - editedCabalFile = "1gq1qnx3n59kci6imk2rf1dahvsq9ifsnb50fh98h9b7yhczj4ag"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable transformers - ]; - homepage = "http://haskell-distributed.github.com"; - description = "Network abstraction layer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport_0_5_2" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable , transformers }: @@ -145458,7 +142440,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Network abstraction layer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-amqp" = callPackage @@ -145488,20 +142469,6 @@ self: { }) {}; "network-transport-composed" = callPackage - ({ mkDerivation, base, bytestring, network-transport }: - mkDerivation { - pname = "network-transport-composed"; - version = "0.2.0.1"; - sha256 = "0kvj85yx7mvj1rjgv90cb9sfm9f4dqi8mahcp2bqxsn2w4n9wpwn"; - revision = "1"; - editedCabalFile = "1fwn9wix1k2kccs1dqp4z2ym98bskdkhjff9in7d6myaz93f23gw"; - libraryHaskellDepends = [ base bytestring network-transport ]; - homepage = "http://haskell-distributed.github.com"; - description = "Compose network transports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport-composed_0_2_1" = callPackage ({ mkDerivation, base, bytestring, network-transport }: mkDerivation { pname = "network-transport-composed"; @@ -145511,7 +142478,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Compose network transports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-inmemory" = callPackage @@ -145536,25 +142502,6 @@ self: { }) {}; "network-transport-tcp" = callPackage - ({ mkDerivation, base, bytestring, containers, data-accessor - , network, network-transport, network-transport-tests - }: - mkDerivation { - pname = "network-transport-tcp"; - version = "0.5.1"; - sha256 = "1svvxkxknlzdgc4xcr7lvq1xvy8ki3mwysfkk6y3w8gq11yxdhy4"; - libraryHaskellDepends = [ - base bytestring containers data-accessor network network-transport - ]; - testHaskellDepends = [ - base network network-transport network-transport-tests - ]; - homepage = "http://haskell-distributed.github.com"; - description = "TCP instantiation of Network.Transport"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport-tcp_0_6_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , network, network-transport, network-transport-tests }: @@ -145571,7 +142518,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-tests" = callPackage @@ -145623,7 +142569,6 @@ self: { homepage = "https://github.com/tweag/network-transport-zeromq"; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-uri" = callPackage @@ -145661,20 +142606,23 @@ self: { }) {}; "network-uri-json" = callPackage - ({ mkDerivation, aeson, base, hspec, network-uri, QuickCheck - , test-invariant, text + ({ mkDerivation, aeson, base, hspec, hspec-discover + , network-arbitrary, network-uri, QuickCheck, test-invariant, text }: mkDerivation { pname = "network-uri-json"; - version = "0.1.0.0"; - sha256 = "0q4h37zf8n56s7jjd5nalk8q6q5hh5d612p7w9agjqwjhl26p782"; + version = "0.1.2.0"; + sha256 = "0prk3qb1d9f6hgxyqgapyci5kqqnqlfnbxlqn5xw4l2nxsgsvh48"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ - aeson base hspec network-uri QuickCheck test-invariant text + aeson base hspec network-arbitrary network-uri QuickCheck + test-invariant text ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/alunduil/network-uri-json"; description = "FromJSON and ToJSON Instances for Network.URI"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ alunduil ]; }) {}; "network-uri-static" = callPackage @@ -145691,6 +142639,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-voicetext" = callPackage + ({ mkDerivation, base, bytestring, exceptions, http-client-tls + , http-conduit, http-types, resourcet, transformers, utf8-string + }: + mkDerivation { + pname = "network-voicetext"; + version = "0.0.0.1"; + sha256 = "0fhmrif3liw61f17kl6208m4bhvdy57h9cpzdnv0af0rjnxgr7ki"; + libraryHaskellDepends = [ + base bytestring exceptions http-client-tls http-conduit http-types + resourcet transformers utf8-string + ]; + homepage = "https://github.com/zaneli/network-voicetext"; + description = "VoiceText Web API wrapper"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-wai-router" = callPackage ({ mkDerivation, base, wai }: mkDerivation { @@ -145726,13 +142692,14 @@ self: { pname = "networked-game"; version = "0.1.0.1"; sha256 = "12sy97cgqrsmqywh0cznp8wbsw8z2yahlfalsjy32qarcz44banz"; - revision = "2"; - editedCabalFile = "0bnf9c2f176f0sgxa7h78ikd6hn3rxz0xz31sjm0yzx1r7gaxzrw"; + revision = "4"; + editedCabalFile = "1rcqsw6f6b1a7sfk38hvil0278cxsq071jwwvfcsi6qhy6kb4jh0"; libraryHaskellDepends = [ base binary bytestring containers network time transformers ]; description = "Networked-game support library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neural" = callPackage @@ -145911,13 +142878,15 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, hspec, HUnit, transformers }: + ({ mkDerivation, base, hspec, hspec-discover, HUnit, transformers + }: mkDerivation { pname = "newtype-generics"; version = "0.5.1"; sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec HUnit ]; + testToolDepends = [ hspec-discover ]; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146102,6 +143071,7 @@ self: { homepage = "https://github.com/mikeplus64/nice-html#readme"; description = "A fast and nice HTML templating library with distinct compilation/rendering phases"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nicify" = callPackage @@ -146239,8 +143209,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.0"; - sha256 = "0qvf83kai3fa2s5xf6az2j1gxhiannvw569fnd2lylhcmjffl3j5"; + version = "1.0.1"; + sha256 = "04wknx8yy4s7b3qx5rg26znrfl0932nvrcx17zcfiggrh4lcw33x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146250,6 +143220,7 @@ self: { homepage = "https://github.com/awakesecurity/nix-deploy#readme"; description = "Deploy Nix-built software to a NixOS machine"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-derivation" = callPackage @@ -146281,8 +143252,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.0"; - sha256 = "1dds8r7ld64zl6hba8z3dij1kiacg6xqxlv85nhm2lf6lm9257i8"; + version = "1.0.1"; + sha256 = "0xk8ggng32czhy4wxgzw7g28xj18jcbncmfshviqlw17rccrm2fx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146292,6 +143263,7 @@ self: { homepage = "https://github.com/Gabriel439/nix-diff"; description = "Explain why two Nix derivations differ"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-eval" = callPackage @@ -146308,23 +143280,21 @@ self: { homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-paths" = callPackage - ({ mkDerivation, base, nix, process }: + ({ mkDerivation, base, nix, nix-hash, process }: mkDerivation { pname = "nix-paths"; - version = "1.0.0.1"; - sha256 = "05gkx79p532zciqjrsq16231pmzb5rixxip9j0vdc85a5h2a4bbl"; - revision = "1"; - editedCabalFile = "17l6x5azdiklwmiwkk05zxg50gqgdq9n5a1nyfywy05b6h7m33il"; + version = "1.0.1"; + sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb"; libraryHaskellDepends = [ base process ]; - libraryToolDepends = [ nix ]; + libraryToolDepends = [ nix nix-hash ]; homepage = "https://github.com/peti/nix-paths"; description = "Knowledge of Nix's installation directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) nix;}; + }) {inherit (pkgs) nix; nix-hash = null;}; "nixfromnpm" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring @@ -146552,6 +143522,7 @@ self: { homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib"; description = "Parse and compare nofib runs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nofib-analyze" = callPackage @@ -146773,6 +143744,7 @@ self: { testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "non-negative" = callPackage @@ -146790,14 +143762,15 @@ self: { "nonce" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text - , transformers + , transformers, unliftio, unliftio-core }: mkDerivation { pname = "nonce"; - version = "1.0.4"; - sha256 = "1xkf107sbcm3pvm6r4xk4719sccaq2kzja6nf8bky9m7vpiilrji"; + version = "1.0.5"; + sha256 = "15gbgfmby1mlk95c1q7qd38yc5xr4z7l58b3y59aixlsp4qspind"; libraryHaskellDepends = [ base base64-bytestring bytestring entropy text transformers + unliftio unliftio-core ]; homepage = "https://github.com/prowdsponsor/nonce"; description = "Generate cryptographic nonces"; @@ -146837,6 +143810,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonlinear-optimization" = callPackage @@ -147071,6 +144045,7 @@ self: { homepage = "https://github.com/NICTA/notzero"; description = "A data type for representing numeric values, except zero"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "np-extras" = callPackage @@ -147121,23 +144096,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nsis" = callPackage - ({ mkDerivation, base, directory, process, transformers, uniplate + "nqe" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , containers, exceptions, hspec, lifted-async, lifted-base + , monad-control, stm, stm-conduit, text, transformers-base }: mkDerivation { - pname = "nsis"; - version = "0.3.1"; - sha256 = "14jwy2sysps1h0sav8zcgpd3i1kppps9l9m1fq782b7jv0qy4iyp"; - libraryHaskellDepends = [ base transformers uniplate ]; - testHaskellDepends = [ - base directory process transformers uniplate + pname = "nqe"; + version = "0.1.0.0"; + sha256 = "1cg9f0bjf8sar3scln73ij0av4jwwv8ki44fdh1dbhcy1c9fn5d4"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra containers lifted-async + lifted-base monad-control stm transformers-base ]; - homepage = "https://github.com/ndmitchell/nsis#readme"; - description = "DSL for producing Windows Installer using NSIS"; - license = stdenv.lib.licenses.bsd3; + testHaskellDepends = [ + async base bytestring conduit conduit-extra exceptions hspec stm + stm-conduit text + ]; + homepage = "https://github.com/xenog/nqe#readme"; + description = "Concurrency library in the style of Erlang/OTP"; + license = stdenv.lib.licenses.publicDomain; }) {}; - "nsis_0_3_2" = callPackage + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: mkDerivation { @@ -147151,7 +144132,6 @@ self: { homepage = "https://github.com/ndmitchell/nsis#readme"; description = "DSL for producing Windows Installer using NSIS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nth-prime" = callPackage @@ -147513,6 +144493,7 @@ self: { homepage = "https://github.com/nikita-volkov/numeric-qq"; description = "Quasi-quoters for numbers of different bases"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numeric-quest" = callPackage @@ -147572,31 +144553,13 @@ self: { }) {}; "numhask" = callPackage - ({ mkDerivation, adjunctions, base, distributive, doctest - , protolude, QuickCheck, tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "numhask"; - version = "0.0.9"; - sha256 = "16ss7lqwvmsgwgrj1smvdr5zzj33svi1mj1k5lhik1mm6dhd1c9x"; - libraryHaskellDepends = [ - adjunctions base distributive protolude QuickCheck vector - ]; - testHaskellDepends = [ base doctest tasty tasty-quickcheck ]; - homepage = "https://github.com/tonyday567/numhask"; - description = "A numeric prelude"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "numhask_0_1_3" = callPackage ({ mkDerivation, base, doctest, protolude, QuickCheck, tasty , tasty-quickcheck }: mkDerivation { pname = "numhask"; - version = "0.1.3"; - sha256 = "1jycpcdidhc8zh64j67pb87drggmwdmja5klwm1wbdcvnsw4nzm6"; + version = "0.1.4.0"; + sha256 = "1324d4fqsjidrq3i0n869a5xq1w1nl2q2lpcf7bpb5a7wgmsfmgj"; libraryHaskellDepends = [ base protolude QuickCheck tasty tasty-quickcheck ]; @@ -147629,40 +144592,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask-range" = callPackage - ({ mkDerivation, base, containers, foldl, formatting, lens, linear - , numhask, protolude, QuickCheck, tasty, tasty-quickcheck + "numhask-histogram" = callPackage + ({ mkDerivation, base, containers, doctest, foldl, HUnit, numhask + , numhask-range, protolude, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, tdigest }: mkDerivation { - pname = "numhask-range"; - version = "0.0.4"; - sha256 = "06crxqgsryw7iixjm0rcsq49xgzirx6qm74iw6bx85a48f1snzqx"; + pname = "numhask-histogram"; + version = "0.0.0.1"; + sha256 = "1a7kd8va59rzsfsxin5m785ihpka3al53kfv16cz9p7kw9bjpanf"; libraryHaskellDepends = [ - base containers foldl formatting lens linear numhask protolude - QuickCheck + base containers foldl numhask numhask-range protolude tdigest ]; - testHaskellDepends = [ base numhask tasty tasty-quickcheck ]; - homepage = "https://github.com/tonyday567/numhask-range"; - description = "Numbers that are range representations"; + testHaskellDepends = [ + base doctest HUnit protolude QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask-histogram#readme"; + description = "See readme.md"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask-range_0_1_2" = callPackage + "numhask-range" = callPackage ({ mkDerivation, adjunctions, base, distributive, doctest, numhask - , protolude, QuickCheck, semigroupoids, tasty, tasty-quickcheck + , protolude, QuickCheck, semigroupoids, tasty }: mkDerivation { pname = "numhask-range"; - version = "0.1.2"; - sha256 = "0rz2h4glfrc0h26f5idfv7966b95fm96bai1iwzkz0f3xmfvy8a0"; + version = "0.1.3.0"; + sha256 = "1h42p48ridvvaxzjjh17pfjmfw9sjlzlmippi952m7jf1rfjxjpi"; libraryHaskellDepends = [ adjunctions base distributive numhask protolude QuickCheck semigroupoids ]; - testHaskellDepends = [ - base doctest numhask tasty tasty-quickcheck - ]; + testHaskellDepends = [ base doctest numhask tasty ]; homepage = "https://github.com/tonyday567/numhask-range#readme"; description = "Numbers that are range representations"; license = stdenv.lib.licenses.bsd3; @@ -147737,7 +144700,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "nvim-hs" = callPackage + "nvim-hs_0_2_4" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal , cereal-conduit, conduit, conduit-extra, containers, data-default , deepseq, directory, dyre, exceptions, filepath, foreign-store @@ -147774,6 +144737,46 @@ self: { homepage = "https://github.com/neovimhaskell/nvim-hs"; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nvim-hs" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal + , cereal-conduit, conduit, conduit-extra, containers, data-default + , deepseq, directory, dyre, exceptions, filepath, foreign-store + , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec + , messagepack, monad-control, mtl, network, optparse-applicative + , process, QuickCheck, resourcet, setenv, stm, streaming-commons + , template-haskell, text, time, time-locale-compat, transformers + , transformers-base, utf8-string, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "0.2.5"; + sha256 = "1qiypd9cn80zjk38p572rbyfsrlff6a2qwvfj7ck3jdj5vv1dq2b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring cereal cereal-conduit conduit + conduit-extra containers data-default deepseq directory dyre + exceptions filepath foreign-store hslogger lifted-base megaparsec + messagepack monad-control mtl network optparse-applicative process + resourcet setenv stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base utf8-string void + ]; + executableHaskellDepends = [ base data-default ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring cereal cereal-conduit conduit + conduit-extra containers data-default directory dyre exceptions + filepath foreign-store hslogger hspec hspec-discover HUnit + lifted-base megaparsec messagepack mtl network optparse-applicative + process QuickCheck resourcet setenv stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base utf8-string + ]; + homepage = "https://github.com/neovimhaskell/nvim-hs"; + description = "Haskell plugin backend for neovim"; + license = stdenv.lib.licenses.asl20; }) {}; "nvim-hs-contrib" = callPackage @@ -147821,8 +144824,8 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.8.0.1"; - sha256 = "0nvxsmi5xr7n4ifizqd76bn7990yq5dysn0xk2pvyvd1ddazsrz1"; + version = "0.8.0.2"; + sha256 = "05px0bxqqxph5ancvklg1fmp6p7c15vghzrwq8alsfjg7lvrd933"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -147908,6 +144911,7 @@ self: { homepage = "https://github.com/jdreaver/oanda-rest-api#readme"; description = "Client to the OANDA REST API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "oauth10a" = callPackage @@ -148064,19 +145068,16 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, either, exceptions, free - , hashable, monad-skeleton, mtl, profunctors, template-haskell - , transformers, transformers-compat, unordered-containers, void - , witherable + ({ mkDerivation, base, containers, exceptions, free, hashable + , monad-skeleton, mtl, profunctors, template-haskell, transformers + , transformers-compat, unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "1.1.1"; - sha256 = "0d36v2w8f9g68zh2cdf8hnkzdafv0z6np895ak610n8bkxvqxlbs"; - revision = "1"; - editedCabalFile = "0p1w5zabfqqksyxxv880f6d27rl2vx9101vvflkxwhyfw0az6zin"; + version = "1.1.2"; + sha256 = "0i36r3ygwpzb57ga0jjkp9rzikpsp15l777dclp7yi1zvqz2ikrg"; libraryHaskellDepends = [ - base containers either exceptions free hashable monad-skeleton mtl + base containers exceptions free hashable monad-skeleton mtl profunctors template-haskell transformers transformers-compat unordered-containers void witherable ]; @@ -148097,31 +145098,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "octane" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers - , data-default-class, file-embed, http-client, http-client-tls - , overloaded-records, rattletrap, text + "ocaml-export" = callPackage + ({ mkDerivation, aeson, base, bytestring, constraints, containers + , directory, file-embed, filepath, formatting, hspec + , hspec-golden-aeson, mtl, process, QuickCheck + , quickcheck-arbitrary-adt, servant, servant-server, split + , template-haskell, text, time, typelits-witnesses, wai, wai-extra + , warp, wl-pprint-text }: mkDerivation { - pname = "octane"; - version = "0.20.2"; - sha256 = "09z69sl782i7ky4dr9aw1ikjaqpwsp0b92x3m2pqlzg4bdfz7s7z"; - isLibrary = true; - isExecutable = true; + pname = "ocaml-export"; + version = "0.3.0.0"; + sha256 = "1hxi2dij5qgpa0njvvgda0zvz5xjl16jba3aw8y0ma5bqvhl7hp4"; libraryHaskellDepends = [ - aeson base bimap binary bytestring containers data-default-class - file-embed overloaded-records rattletrap text + aeson base bytestring containers directory file-embed filepath + formatting hspec-golden-aeson mtl QuickCheck + quickcheck-arbitrary-adt servant servant-server split + template-haskell text time typelits-witnesses wl-pprint-text ]; - executableHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls + testHaskellDepends = [ + aeson base bytestring constraints containers directory filepath + hspec hspec-golden-aeson process QuickCheck + quickcheck-arbitrary-adt servant servant-server template-haskell + text time typelits-witnesses wai wai-extra warp ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; + homepage = "https://github.com/plow-technologies/ocaml-export#readme"; + description = "Convert Haskell types in OCaml types"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "octane_0_20_3" = callPackage + "ochintin-daicho" = callPackage + ({ mkDerivation, base, bookkeeping, doctest, Glob, text }: + mkDerivation { + pname = "ochintin-daicho"; + version = "0.1.0.1"; + sha256 = "1s2n0k8ix4lc9x07s2qhgiiln6xyfswkkz14ri6jm1k9k3hr946l"; + libraryHaskellDepends = [ base bookkeeping text ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme"; + description = "A module to manage payroll books for Japanese companies"; + license = stdenv.lib.licenses.mit; + }) {}; + + "octane" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text @@ -148289,13 +145309,13 @@ self: { }: mkDerivation { pname = "ogmarkup"; - version = "3.1.0"; - sha256 = "0za23qz85r9xmw57gxi84x2zy8ddxwcdphawyfzkmxqny9kplx1r"; + version = "4.0"; + sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k"; libraryHaskellDepends = [ base megaparsec mtl ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec shakespeare text ]; - homepage = "http://github.com/ogma-project/ogmarkup"; + homepage = "https://nest.pijul.com/lthms/ogmarkup"; description = "A lightweight markup language for story writers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -148626,8 +145646,8 @@ self: { }: mkDerivation { pname = "one-liner"; - version = "0.9.1"; - sha256 = "18jys0qvywd7il4yzyf2yb22md7apzhxvnzr067d90srqdva7cpf"; + version = "0.9.2"; + sha256 = "1my7ykfbfgx8z4qcklqxacycs5hl736fqh5s22cdm19nhfqmcc5b"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim profunctors tagged transformers @@ -148722,6 +145742,7 @@ self: { homepage = "https://github.com/paolino/onpartitions"; description = "partition lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "onu-course" = callPackage @@ -148749,33 +145770,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, dotenv - , hspec, hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, semigroups, text - , time, time-locale-compat, transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.5.4.0"; - sha256 = "0dyvaci8dpd5rnr40ib1al2mw2ivza02wbsdz1m5qc7hn30374yv"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant dotenv hspec hspec-discover - multiset postgresql-simple product-profunctors profunctors - QuickCheck semigroups text time transformers - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -148800,7 +145794,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -148850,28 +145843,6 @@ self: { }) {}; "opaleye-trans" = callPackage - ({ mkDerivation, base, mtl, opaleye, postgresql-simple - , product-profunctors, transformers, transformers-base - }: - mkDerivation { - pname = "opaleye-trans"; - version = "0.3.7"; - sha256 = "17yfa0kgd3v8dlz77nlgplyi23f622f46z9q2xyswnrrf5w2c4z0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base mtl opaleye postgresql-simple product-profunctors transformers - transformers-base - ]; - executableHaskellDepends = [ - base opaleye postgresql-simple product-profunctors - ]; - homepage = "https://github.com/WraithM/opaleye-trans"; - description = "A monad transformer for Opaleye"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye-trans_0_4_2" = callPackage ({ mkDerivation, base, exceptions, mtl, opaleye, postgresql-simple , product-profunctors, transformers }: @@ -148891,7 +145862,6 @@ self: { homepage = "https://github.com/WraithM/opaleye-trans"; description = "A monad transformer for Opaleye"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-browser" = callPackage @@ -149026,13 +145996,12 @@ self: { ({ mkDerivation, aeson, base, data-default, text, time }: mkDerivation { pname = "opench-meteo"; - version = "0.1.1.0"; - sha256 = "02v5nxdwkfmyda2x6dw64i7bwgaxq8d7ibbxx4rya3ddairs4y29"; + version = "0.2.0.2"; + sha256 = "0xj9v7xl11j6p4kk5dz64kqpmyc5d68sldakiaby0j8qvyw7sf9r"; libraryHaskellDepends = [ aeson base data-default text time ]; homepage = "https://github.com/hansroland/opench"; description = "A Haskell implementation of the Swiss Meteo Net data API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opencog-atomspace" = callPackage @@ -149059,8 +146028,8 @@ self: { }: mkDerivation { pname = "opencv"; - version = "0.0.2.0"; - sha256 = "1v3a97qrqxssl56bwip98ifkism9lzjhmizbgxbdhn8dbrmn8jgg"; + version = "0.0.2.1"; + sha256 = "1bwl3csl2bsgz32i7s59hb25hxj05vn9g3fa8xix9klz8kyrzam1"; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++" ]; @@ -149093,8 +146062,8 @@ self: { }: mkDerivation { pname = "opencv-extra"; - version = "0.2.0.0"; - sha256 = "0qdcikwr3shxjx3sdsnawwbg0h6pc1pn29cxq15hpjbv37yg2fc1"; + version = "0.2.0.1"; + sha256 = "0l4bphpsc9nv6kjvbyjqx0345mq4ryigi93ak64vv0bwp84xk5xz"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bindings-DSL bytestring containers inline-c inline-c-cpp @@ -149788,36 +146757,6 @@ self: { }) {}; "opml-conduit" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, conduit - , conduit-combinators, containers, data-default, hlint, lens-simple - , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck - , quickcheck-instances, resourcet, safe-exceptions, semigroups - , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep - , uri-bytestring, xml-conduit, xml-types - }: - mkDerivation { - pname = "opml-conduit"; - version = "0.6.0.3"; - sha256 = "1flzv6v1mds7w9v3ap3g7gfwlvq54z0j1w7g2b07d17x334lyhgb"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base case-insensitive conduit conduit-combinators containers - lens-simple mono-traversable monoid-subclasses safe-exceptions - semigroups text time timerep uri-bytestring xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators containers data-default - hlint lens-simple mono-traversable mtl parsers QuickCheck - quickcheck-instances resourcet semigroups tasty tasty-hunit - tasty-quickcheck text time uri-bytestring xml-conduit - ]; - homepage = "https://github.com/k0ral/opml-conduit"; - description = "Streaming parser/renderer for the OPML 2.0 format."; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "opml-conduit_0_6_0_4" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, hlint, lens-simple , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck @@ -149844,7 +146783,6 @@ self: { homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opn" = callPackage @@ -149853,8 +146791,8 @@ self: { }: mkDerivation { pname = "opn"; - version = "0.1.2"; - sha256 = "0x53kvcpbd9fh00zs8wdkb3xsl8hf1bsqgl83ci17di1jyg3m4ch"; + version = "0.1.3"; + sha256 = "17ysp1xzqbcr58ibzwf88bim58yyc309kf71jw66gn0brp0b0w1h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149954,6 +146892,7 @@ self: { homepage = "https://github.com/tonymorris/optional"; description = "Using type-classes for optional function arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optional-args" = callPackage @@ -149998,23 +146937,6 @@ self: { }) {}; "optparse-applicative" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck - , transformers, transformers-compat - }: - mkDerivation { - pname = "optparse-applicative"; - version = "0.13.2.0"; - sha256 = "18kcjldpzay3k3309rvb9vqrp5b1gqp0hgymynqx7x2kgv7cz0sw"; - libraryHaskellDepends = [ - ansi-wl-pprint base process transformers transformers-compat - ]; - testHaskellDepends = [ base QuickCheck ]; - homepage = "https://github.com/pcapriotti/optparse-applicative"; - description = "Utilities and combinators for parsing command line options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-applicative_0_14_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, process , QuickCheck, transformers, transformers-compat }: @@ -150029,7 +146951,6 @@ self: { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-applicative-simple" = callPackage @@ -150038,10 +146959,10 @@ self: { }: mkDerivation { pname = "optparse-applicative-simple"; - version = "1.0.1"; - sha256 = "05zr4wcqln1vq2v1vaq4bfjiz5b7fmmjmzbnm6drplr5scsy9igm"; + version = "1.0.2"; + sha256 = "0kn740shja07mpaj9hy5blw1bcgy6ncpfyz3rqy3cglh2fzswsk2"; libraryHaskellDepends = [ - attoparsec base-prelude optparse-applicative text + attoparsec attoparsec-data base-prelude optparse-applicative text ]; testHaskellDepends = [ attoparsec-data rerebase ]; homepage = "https://github.com/nikita-volkov/optparse-applicative-simple"; @@ -150063,22 +146984,6 @@ self: { }) {}; "optparse-generic" = callPackage - ({ mkDerivation, base, bytestring, Only, optparse-applicative - , semigroups, system-filepath, text, time, transformers, void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.2.2"; - sha256 = "110jil2n945x30d8wgdrgs7di310z9hdnzhw5c1zq2jfh3b54ygz"; - libraryHaskellDepends = [ - base bytestring Only optparse-applicative semigroups - system-filepath text time transformers void - ]; - description = "Auto-generate a command-line parser for your datatype"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-generic_1_2_3" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , semigroups, system-filepath, text, time, transformers, void }: @@ -150092,7 +146997,6 @@ self: { ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-helper" = callPackage @@ -150105,26 +147009,10 @@ self: { homepage = "https://github.com/pharpend/optparse-helper"; description = "Helper functions for optparse-applicative"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-simple" = callPackage - ({ mkDerivation, base, bytestring, directory, either, gitrev - , optparse-applicative, template-haskell, transformers - }: - mkDerivation { - pname = "optparse-simple"; - version = "0.0.4"; - sha256 = "1md24dlz6949rqv6y2x9d5r07lrqw42c21kdy09nk5y8r3mq43x0"; - libraryHaskellDepends = [ - base either gitrev optparse-applicative template-haskell - transformers - ]; - testHaskellDepends = [ base bytestring directory ]; - description = "Simple interface to optparse-applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-simple_0_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, gitrev , optparse-applicative, template-haskell, transformers }: @@ -150139,7 +147027,6 @@ self: { homepage = "https://github.com/fpco/optparse-simple#readme"; description = "Simple interface to optparse-applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-text" = callPackage @@ -150755,6 +147642,7 @@ self: { homepage = "https://github.com/trskop/overloaded-records"; description = "Overloaded Records based on current GHC proposal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "overture" = callPackage @@ -150819,6 +147707,7 @@ self: { ]; description = "Utilities for working with cabal packages and your package database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "package-vt" = callPackage @@ -150837,27 +147726,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "packdeps" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, split, tar, text, time - }: + "packcheck" = callPackage + ({ mkDerivation, base }: mkDerivation { - pname = "packdeps"; - version = "0.4.3"; - sha256 = "0sqiy737czdv8n1mr6xx6rgpb5li9im0n1zl5v6pz38mp5mbvm58"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers directory filepath split tar text - time - ]; - executableHaskellDepends = [ base Cabal ]; - homepage = "http://packdeps.haskellers.com/"; - description = "Check your cabal packages for lagging dependencies"; + pname = "packcheck"; + version = "0.1.0"; + sha256 = "03asx4j9bj2fka6ydgc8qh3j8kzk7mdi7420rcj7n5g4ma4hhhb3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/harendra-kumar/packcheck"; + description = "Universal build and CI testing for Haskell packages"; license = stdenv.lib.licenses.bsd3; }) {}; - "packdeps_0_4_4" = callPackage + "packdeps" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, optparse-applicative, process, semigroups, split, tar , text, time @@ -150878,7 +147761,6 @@ self: { homepage = "http://packdeps.haskellers.com/"; description = "Check your cabal packages for lagging dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packed-dawg" = callPackage @@ -151016,6 +147898,7 @@ self: { homepage = "https://github.com/hvr/packunused"; description = "Tool for detecting redundant Cabal package dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pacman-memcache" = callPackage @@ -151143,6 +148026,7 @@ self: { homepage = "https://pagure.io/pagure-hook-receiver"; description = "Receive hooks from pagure and do things with them"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "paint" = callPackage @@ -151222,57 +148106,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , Cabal, cmark, containers, criterion, data-default, deepseq, Diff - , directory, doctemplates, executable-path, extensible-exceptions - , filemanip, filepath, ghc-prim, haddock-library, hslua, HTTP - , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl - , network, network-uri, old-time, pandoc-types, parsec, process - , QuickCheck, random, scientific, SHA, skylighting, syb, tagsoup - , temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, texmath, text, time, unix - , unordered-containers, vector, xml, yaml, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "1.19.2.4"; - sha256 = "0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson array base base64-bytestring binary blaze-html blaze-markup - bytestring cmark containers data-default deepseq directory - doctemplates extensible-exceptions filemanip filepath ghc-prim - haddock-library hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-time pandoc-types parsec - process random scientific SHA skylighting syb tagsoup temporary - texmath text time unordered-containers vector xml yaml zip-archive - zlib - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory extensible-exceptions - filepath HTTP network network-uri pandoc-types skylighting texmath - text unix yaml - ]; - testHaskellDepends = [ - ansi-terminal base bytestring containers Diff directory - executable-path filepath HUnit pandoc-types process QuickCheck - skylighting syb test-framework test-framework-hunit - test-framework-quickcheck2 text zip-archive - ]; - benchmarkHaskellDepends = [ base criterion syb ]; - doCheck = false; - homepage = "http://pandoc.org"; - description = "Conversion between markup formats"; - license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -151287,10 +148120,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.0.3"; - sha256 = "1vmk5kcys400gwbddxwsnh5lhv4n8jvi9nnhad1pf1hzva3y056q"; - revision = "1"; - editedCabalFile = "1fzvy28900577aca4sb8g36h4n50ifvmbhayppm02a755rfzqzdl"; + version = "2.0.6"; + sha256 = "1vhj6splykksb1mkxv5cs0361nj12qn23a3y1i8j5dc637lkdwpj"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -151308,9 +148139,59 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring containers Diff directory executable-path filepath - hslua pandoc-types process QuickCheck tasty tasty-golden - tasty-hunit tasty-quickcheck temporary text zip-archive + base base64-bytestring bytestring containers Diff directory + executable-path filepath hslua pandoc-types process QuickCheck + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion text time + ]; + doCheck = false; + homepage = "http://pandoc.org"; + description = "Conversion between markup formats"; + license = "GPL"; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + + "pandoc_2_1" = 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, 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, split, syb, tagsoup + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, temporary + , texmath, text, time, unix, unordered-containers, vector, xml + , yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.1"; + sha256 = "192ab8b8376fr7aj60zlk5jbb18r0kh1kmrznr9n6w8m7b5zmfy2"; + 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 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 + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + executable-path filepath hslua pandoc-types process QuickCheck + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time + xml zip-archive ]; benchmarkHaskellDepends = [ base bytestring containers criterion text time @@ -151332,46 +148213,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.10.5.1"; - sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9"; - revision = "1"; - editedCabalFile = "0w8r8z34m934cbja0qkhna04aac97k9i899l4c59cd0ym21148cz"; - 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 containers directory - filepath mtl pandoc pandoc-types process syb temporary text vector - yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath mtl pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_12_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.12.1"; - sha256 = "1b62bzvdmxb6dlpfawvvimaa0pd8nq9l3mbnwgzw3xzj1idv44kz"; + version = "0.12.2.5"; + sha256 = "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -151395,7 +148238,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -151418,13 +148260,14 @@ self: { "pandoc-crossref" = callPackage ({ mkDerivation, base, containers, data-accessor , data-accessor-template, data-accessor-transformers, data-default - , directory, filepath, hspec, mtl, pandoc, pandoc-types - , roman-numerals, syb, template-haskell, text, utility-ht + , deepseq, directory, filepath, hspec, mtl, open-browser + , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb + , template-haskell, temporary, text, utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.7.0"; - sha256 = "1nh9yi2p7i8ms45rfd5859639f8rh5vxnvdqrdi399rmnp74vj9k"; + version = "0.3.0.0"; + sha256 = "0fgds8i9fwxmfprbp4giv7qi4gzx373p07smfm7arpbimv239d6n"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -151436,9 +148279,9 @@ self: { ]; executableHaskellDepends = [ base containers data-accessor data-accessor-template - data-accessor-transformers data-default directory filepath mtl - pandoc pandoc-types roman-numerals syb template-haskell text - utility-ht + data-accessor-transformers data-default deepseq directory filepath + mtl open-browser optparse-applicative pandoc pandoc-types + roman-numerals syb template-haskell temporary text utility-ht ]; testHaskellDepends = [ base containers data-accessor data-accessor-template @@ -151448,7 +148291,7 @@ self: { ]; homepage = "https://github.com/lierdakil/pandoc-crossref#readme"; description = "Pandoc filter for cross-references"; - license = stdenv.lib.licenses.gpl2; + license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -151466,6 +148309,33 @@ self: { homepage = "https://github.com/baig/pandoc-csv2table-filter"; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pandoc-emphasize-code" = callPackage + ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types + , process, tasty, tasty-discover, tasty-hspec, tasty-hunit, text + , unordered-containers + }: + mkDerivation { + pname = "pandoc-emphasize-code"; + version = "0.2.2"; + sha256 = "05vf3fli3glq013c9w9bbjggndfwhjb1rqxqspxyfh8pi14sbj9v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath hashable lucid mtl pandoc-types process text + unordered-containers + ]; + executableHaskellDepends = [ base pandoc-types ]; + testHaskellDepends = [ + base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit + unordered-containers + ]; + homepage = "https://github.com/owickstrom/pandoc-emphasize-code"; + description = "A Pandoc filter for emphasizing code in fenced blocks"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-filter-graphviz" = callPackage @@ -151507,6 +148377,7 @@ self: { homepage = "https://github.com/steindani/pandoc-include"; description = "Include other Markdown files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-include-code" = callPackage @@ -151515,8 +148386,8 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "1.2.0.1"; - sha256 = "1qcmhdx47grgjydq0dzcz6iss247p0y8432bpw908ygr222gkqhp"; + version = "1.2.0.2"; + sha256 = "0mnk6ld2d1bka2wmz9718k8rfdbzhp4ym3axn4js4m0ka51w50h9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151641,29 +148512,6 @@ self: { }) {}; "pandoc-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.17.0.5"; - sha256 = "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8"; - revision = "4"; - editedCabalFile = "1ljvzl41ikfwwdh253mwpqjr7c4vf1ib01sxvp66ahi7vpxshm7n"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim QuickCheck syb - ]; - testHaskellDepends = [ - aeson base bytestring containers HUnit QuickCheck string-qq syb - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-types_1_17_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -151685,7 +148533,6 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -151958,6 +148805,7 @@ self: { homepage = "https://github.com/data61/papa-export"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-implement" = callPackage @@ -151980,6 +148828,7 @@ self: { homepage = "https://github.com/data61/papa"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-include" = callPackage @@ -151997,6 +148846,7 @@ self: { homepage = "https://github.com/data61/papa-include"; description = "Third party libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-lens" = callPackage @@ -152052,6 +148902,7 @@ self: { homepage = "https://github.com/data61/papa-prelude"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-core" = callPackage @@ -152069,6 +148920,7 @@ self: { homepage = "https://github.com/data61/papa-prelude-core"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-lens" = callPackage @@ -152104,6 +148956,7 @@ self: { homepage = "https://github.com/data61/papa-prelude-semigroupoids"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-semigroups" = callPackage @@ -152121,6 +148974,7 @@ self: { homepage = "https://github.com/data61/papa-prelude-semigroups"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-semigroupoids" = callPackage @@ -152210,30 +149064,10 @@ self: { executableHaskellDepends = [ base bytestring containers ]; description = "A passphrase generator"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papillon" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, monads-tf - , template-haskell, transformers - }: - mkDerivation { - pname = "papillon"; - version = "0.1.0.4"; - sha256 = "0g2kanpy8jqi6kmhwk0xy5bjpafnc21cgzp49xxw5zgmpn14amis"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring monads-tf template-haskell transformers - ]; - executableHaskellDepends = [ - base directory filepath monads-tf template-haskell transformers - ]; - homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; - description = "packrat parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "papillon_0_1_0_5" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, monads-tf , template-haskell, transformers }: @@ -152252,7 +149086,6 @@ self: { homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; description = "packrat parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pappy" = callPackage @@ -152406,14 +149239,13 @@ self: { ({ mkDerivation, base, data-diverse, hspec, transformers }: mkDerivation { pname = "parameterized"; - version = "0.4.0.0"; - sha256 = "0jv0ff4frpds69a6bljyh2jzm0yj7hjd923xss136xsrb4dka700"; + version = "0.5.0.0"; + sha256 = "0iik6wx6i52sqgiah9xb70cv4p29yi2fr0q6ri4c9wviqrrw8syp"; libraryHaskellDepends = [ base data-diverse transformers ]; testHaskellDepends = [ base data-diverse hspec transformers ]; homepage = "https://github.com/louispan/parameterized#readme"; description = "Parameterized/indexed monoids and monads using only a single parameter type variable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parameterized-data" = callPackage @@ -152428,6 +149260,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parameterized-utils" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, hashable + , hashtables, lens, mtl, QuickCheck, tasty, tasty-ant-xml + , tasty-hunit, tasty-quickcheck, template-haskell, text + , th-abstraction, vector + }: + mkDerivation { + pname = "parameterized-utils"; + version = "1.0.0"; + sha256 = "0x1h38j61rwk6biz6nfqx252q1qy4wjrm7g4yv2bb9rddn131vaw"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim hashable hashtables lens mtl + template-haskell text th-abstraction vector + ]; + testHaskellDepends = [ + base ghc-prim hashable hashtables lens mtl QuickCheck tasty + tasty-ant-xml tasty-hunit tasty-quickcheck + ]; + description = "Classes and data structures for working with data-kind indexed types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "paramtree" = callPackage ({ mkDerivation, base, bytestring, containers, tasty, tasty-golden , tasty-hunit, temporary @@ -152575,7 +149429,6 @@ self: { libraryHaskellDepends = [ array base ]; description = "Simply interfacing the parallel port on linux"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "parse-dimacs" = callPackage @@ -152874,27 +149727,14 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "0.1.0"; - sha256 = "18swiwkw5as3xqxqjw46rl07sgjsz5533ki9q3rngfciyzzdj1qv"; + version = "0.4.0"; + sha256 = "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mrkkrp/parser-combinators"; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; }) {}; - "parser-combinators_0_2_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "parser-combinators"; - version = "0.2.0"; - sha256 = "1gz3kh56471924y12vvmrc5w4bx85a53qrp2j8fp33nn78bvx8v8"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mrkkrp/parser-combinators"; - description = "Lightweight package providing commonly useful parser combinators"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -152950,23 +149790,21 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal - , cabal-doctest, charset, containers, directory, doctest, filepath - , mtl, parsec, QuickCheck, quickcheck-instances, scientific - , semigroups, text, transformers, unordered-containers + ({ mkDerivation, attoparsec, base, base-orphans, bytestring + , charset, containers, mtl, parsec, QuickCheck + , quickcheck-instances, scientific, semigroups, text, transformers + , unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.7"; - sha256 = "032dgh0ydy4cbvnjhgp0krnqnvlibphvm30gvmqvpxk9l4pmn435"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.12.8"; + sha256 = "1j3bh008klx5nqpp9566k783c2msjsv5ia2w2jdx6frzspyhmfjs"; libraryHaskellDepends = [ attoparsec base base-orphans charset containers mtl parsec scientific semigroups text transformers unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers directory doctest filepath - parsec QuickCheck quickcheck-instances + attoparsec base bytestring parsec QuickCheck quickcheck-instances ]; homepage = "http://github.com/ekmett/parsers/"; description = "Parsing combinators"; @@ -153038,7 +149876,6 @@ self: { homepage = "https://github.com/paf31/partial"; description = "A nullary type class for partial functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-handler" = callPackage @@ -153097,6 +149934,7 @@ self: { homepage = "https://github.com/mtesseract/haskell-partial-order"; description = "Provides typeclass suitable for types admitting a partial order"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup" = callPackage @@ -153192,6 +150030,52 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "passman-cli" = callPackage + ({ mkDerivation, base, conduit, contravariant, haskeline + , optparse-applicative, passman-core, resourcet, text, X11, yaml + }: + mkDerivation { + pname = "passman-cli"; + version = "0.2.0.0"; + sha256 = "0l0cbhngg2dxsy95a24x1g19cpnmngcgdkxklzjymmcnqmxp7jd8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base conduit contravariant haskeline optparse-applicative + passman-core resourcet text X11 yaml + ]; + homepage = "https://github.com/PasswordManager/passman-cli#readme"; + description = "Deterministic password generator command line interface"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 + , unix-compat, yaml + }: + mkDerivation { + pname = "passman-core"; + version = "0.2.0.0"; + sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7"; + 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 + ]; + testHaskellDepends = [ + async base conduit filepath QuickCheck quickcheck-unicode + template-haskell temporary text yaml + ]; + homepage = "https://github.com/PasswordManager/passman-core#readme"; + description = "Deterministic password generator core"; + license = stdenv.lib.licenses.gpl3; + broken = true; + }) {}; + "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -153256,8 +150140,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.5.2.2"; - sha256 = "01g74kw9qszz4781srqsjvf4vxf0rvb4q8yy5nbx3zyp4lwggv3j"; + version = "0.6.0.0"; + sha256 = "0pf5baidncam2c2xjm5w4kd48210ng36xsj7wr81v2pwdxp18r7h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153269,6 +150153,7 @@ self: { homepage = "http://github.com/jaspervdj/patat"; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -153333,22 +150218,6 @@ self: { }) {}; "path" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, hashable, hspec, mtl, template-haskell - }: - mkDerivation { - pname = "path"; - version = "0.5.13"; - sha256 = "0lbx7swpav3fv2820mfy8p5lis4iivkasq67qf89hj9j2qz30s0r"; - libraryHaskellDepends = [ - aeson base deepseq exceptions filepath hashable template-haskell - ]; - testHaskellDepends = [ aeson base bytestring filepath hspec mtl ]; - description = "Support for well-typed paths"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path_0_6_1" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , filepath, genvalidity, genvalidity-property, hashable, hspec, mtl , QuickCheck, template-haskell, validity @@ -153366,7 +150235,6 @@ self: { ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-extra" = callPackage @@ -153381,26 +150249,6 @@ self: { }) {}; "path-io" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, filepath - , hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; - version = "1.2.2"; - sha256 = "0ipy07jb1d34jisy8khwx1j2p2s4lm2z8dy5siywi1a206fmy9bj"; - revision = "1"; - editedCabalFile = "1r73clpws32ql3wnh6gp9dn4knzxgcgl6j7ihdkmq6ai21bznw6m"; - libraryHaskellDepends = [ - base containers directory exceptions filepath path temporary time - transformers unix-compat - ]; - testHaskellDepends = [ base exceptions hspec path unix-compat ]; - homepage = "https://github.com/mrkkrp/path-io"; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-io_1_3_3" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: @@ -153418,7 +150266,6 @@ self: { homepage = "https://github.com/mrkkrp/path-io"; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -153440,12 +150287,14 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.0.2"; - sha256 = "0m1rmzyjsiwb1k1rpj7mwjmbg6y9rmbv69bxqm0pbc6ylkh678ja"; + version = "0.0.1.0"; + sha256 = "0z7k6wj4p9192blrxnnmq79km4f6sm8lagp01vznc1gmy1p0w4cg"; + revision = "1"; + editedCabalFile = "1m04dyqqamh9lkkmcbf2dg7ivd5kb2dxqh9b844lr7mk5qganar6"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; - homepage = "https://github.com/chris-martin/path-text-utf8#readme"; + homepage = "https://github.com/chris-martin/path-text-utf8"; description = "Read and write UTF-8 text files"; license = stdenv.lib.licenses.asl20; }) {}; @@ -153964,6 +150813,7 @@ self: { homepage = "https://github.com/NCrashed/pdf-slave#readme"; description = "Tool to generate PDF from haskintex templates and YAML input"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-slave-server" = callPackage @@ -154140,7 +150990,6 @@ self: { homepage = "https://github.com/asr/pdfname#readme"; description = "Name a PDF file using information from the pdfinfo command"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdfsplit" = callPackage @@ -154254,6 +151103,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pedersen-commitment" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, memory + , mtl, protolude, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "pedersen-commitment"; + version = "0.1.0"; + sha256 = "10flwinxxs1vg2giqqyazcgxrykqsj6m0kgd62b8f4wzmygws4r1"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory mtl protolude text + ]; + testHaskellDepends = [ + base bytestring containers cryptonite memory mtl protolude + QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/adjoint-io/pedersen-commitment#readme"; + description = "An implementation of Pedersen commitment schemes"; + license = stdenv.lib.licenses.asl20; + }) {}; + "peg" = callPackage ({ mkDerivation, base, containers, filepath, haskeline, logict, mtl , parsec @@ -154511,30 +151381,6 @@ self: { }) {}; "perf" = callPackage - ({ mkDerivation, base, chart-unit, containers, foldl, formatting - , mwc-probability, optparse-generic, protolude, rdtsc, tdigest - , text, time, vector - }: - mkDerivation { - pname = "perf"; - version = "0.1.2"; - sha256 = "0ym5dy1zxbiaxf0jpwsf9ivf90lf5zhxznwvf4xynqvqkw602cmz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers foldl protolude rdtsc tdigest time - ]; - executableHaskellDepends = [ - base chart-unit foldl formatting mwc-probability optparse-generic - protolude tdigest text vector - ]; - homepage = "https://github.com/tonyday567/perf"; - description = "low-level performance statistics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "perf_0_3_0" = callPackage ({ mkDerivation, base, containers, doctest, foldl, formatting , numhask, optparse-generic, protolude, rdtsc, tdigest, text, time , vector @@ -154558,6 +151404,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perf_0_3_1_0" = callPackage + ({ mkDerivation, base, containers, doctest, foldl, formatting + , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest + , text, time, vector + }: + mkDerivation { + pname = "perf"; + version = "0.3.1.0"; + sha256 = "1pr735gflp91ljfrlpba6il1l4zm260whdp4hc205jff0r0gv44c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foldl numhask protolude rdtsc tdigest time + ]; + executableHaskellDepends = [ + base formatting numhask optparse-generic protolude scientific text + vector + ]; + testHaskellDepends = [ base doctest protolude ]; + homepage = "https://github.com/tonyday567/perf#readme"; + description = "low-level performance statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "perfect-hash-generator" = callPackage ({ mkDerivation, base, containers, data-ordlist, directory , filepath, hashable, HUnit, optparse-applicative, random @@ -154585,6 +151456,7 @@ self: { homepage = "https://github.com/kostmo/perfect-hash-generator#readme"; description = "Perfect minimal hashing implementation in native Haskell"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "perfecthash" = callPackage @@ -154707,24 +151579,6 @@ self: { }) {}; "persistable-record" = callPackage - ({ mkDerivation, array, base, containers, dlist, names-th - , quickcheck-simple, template-haskell, th-data-compat, transformers - }: - mkDerivation { - pname = "persistable-record"; - version = "0.5.1.1"; - sha256 = "0n0ycgssq9aslbb024a59c3hgxbgwmd7cz8hz03ac07xdl7z9sc0"; - libraryHaskellDepends = [ - array base containers dlist names-th template-haskell - th-data-compat transformers - ]; - testHaskellDepends = [ base quickcheck-simple ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Binding between SQL database values and haskell records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistable-record_0_6_0_0" = callPackage ({ mkDerivation, array, base, containers, dlist, names-th , product-isomorphic, quickcheck-simple, template-haskell , th-data-compat, transformers @@ -154741,7 +151595,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Binding between SQL database values and haskell records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistable-types-HDBC-pg" = callPackage @@ -154795,6 +151648,41 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_7_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data + , lifted-base, monad-control, monad-logger, mtl, old-locale + , path-pieces, resource-pool, resourcet, scientific, silently + , tagged, template-haskell, text, time, transformers + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.7.3"; + sha256 = "16by2ip2gljz1xsyp6j3k04jab0l0as9ynfwxdsbbcv4qd8l1sxk"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers exceptions fast-logger + haskell-src-meta http-api-data lifted-base monad-control + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific silently tagged template-haskell text time transformers + transformers-base unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data lifted-base + monad-control monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -154979,33 +151867,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.0.0"; - sha256 = "19iy0whg8h59ahqrkdfilhs8rpbldk8ffa4sv3b9wvwl3ivb9cg4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers io-streams monad-control - monad-logger mysql-haskell network persistent resource-pool - resourcet text time tls transformers - ]; - executableHaskellDepends = [ - base monad-logger persistent persistent-template transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "A pure haskell backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql-haskell_0_3_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , io-streams, monad-control, monad-logger, mysql-haskell, network - , persistent, persistent-template, resource-pool, resourcet, text - , time, tls, transformers - }: - mkDerivation { - pname = "persistent-mysql-haskell"; - version = "0.3.5"; - sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n"; + version = "0.3.6"; + sha256 = "1a829hrbsa54qikbnafv7vk7shzyg0697nvj43md19p172mkwj93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155064,8 +151927,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.6.2"; - sha256 = "0140cki5c5aj21qg2cvqm5a511l6n4zbx3vb94hpfr1bs9nmfjam"; + version = "2.6.2.2"; + sha256 = "057x064kvmnj1z0a726wphzdqf49ms0pxjq3bmp3h36kqg4zcwm9"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -155115,8 +151978,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "2.5.2"; - sha256 = "04rbszmdykk3ks5qpfbvw6gpgqic6lqyyw49rjf3g4p1yhlmd9kv"; + version = "2.5.2.2"; + sha256 = "1mkdc3s39h0zqzf86zzwyfxfpc4fasrhpfdypkj8mkljbh7v1i1l"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring hedis http-api-data monad-control mtl path-pieces persistent scientific text time @@ -155129,7 +151992,7 @@ self: { ]; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-refs" = callPackage @@ -155178,8 +152041,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.6.3"; - sha256 = "0wgj8v6wkqvj60klmxlmhgmbl6yp3i425v95p8s45wm96phpzn9l"; + version = "2.6.4"; + sha256 = "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155198,35 +152061,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-sqlite_2_6_3_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, microlens-th, monad-control, monad-logger, old-locale - , persistent, persistent-template, resource-pool, resourcet - , temporary, text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.6.3.1"; - sha256 = "0rxzib6ck69kx0m2kd4h6rpqh45alq6rv9ivzla39162jrdj4557"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers microlens-th monad-control - monad-logger old-locale persistent resource-pool resourcet text - time transformers unordered-containers - ]; - executableHaskellDepends = [ base monad-logger ]; - testHaskellDepends = [ - base hspec persistent persistent-template temporary text time - transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -155446,8 +152280,8 @@ self: { ({ mkDerivation, base, bytestring, HTTP }: mkDerivation { pname = "pg-harness-client"; - version = "0.4.0"; - sha256 = "0ifkrsgnihpn8g0g45yr7gap25dcxhrzlsnzriqajxb3sfk9xwpc"; + version = "0.5.0"; + sha256 = "0bqvrhkiwmqqp6w82d9xz7s31yjv2i0c3md0pc4fgvyr4gj2r2ki"; libraryHaskellDepends = [ base bytestring HTTP ]; homepage = "https://github.com/BardurArantsson/pg-harness"; description = "Client library for pg-harness-server"; @@ -155460,8 +152294,8 @@ self: { }: mkDerivation { pname = "pg-harness-server"; - version = "0.4.0"; - sha256 = "0cfyjczs29qksh8kiyq256wv26yvw4ph7p0cvz5hnfjfjpj6r963"; + version = "0.5.0"; + sha256 = "1h14lbjygvdsq0g5yp0c3jnkayrzscw9dsllz0s4jzfg9hzskwa1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -155509,8 +152343,8 @@ self: { }: mkDerivation { pname = "pg-store"; - version = "0.4.3"; - sha256 = "1qqy79yqhwjw094p8i4qanmjwlvym7lndnqiw10mgp0xn63rznid"; + version = "0.5.0"; + sha256 = "0f81jqs5k6gb2rnpqhawc5g2z3dziksjxrncjc844xlq3ybmr5an"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring hashable haskell-src-meta mtl postgresql-libpq scientific tagged @@ -155560,8 +152394,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "7"; - editedCabalFile = "1blwncbg1r8is1jq2qbxqnsnr4k0n7qqws7xyh6xfyxpz4pr843g"; + revision = "9"; + editedCabalFile = "1r1sjcnaawwklr8lx98zf79qmd9cxkmj83kahdn71q4rvfxm29fv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155688,6 +152522,7 @@ self: { homepage = "https://github.com/quickdudley/phaser"; description = "Incremental multiple pass parser library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "phash" = callPackage @@ -155747,7 +152582,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Deprecated - ghci debug viewer with simple editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "phoityne-vscode" = callPackage @@ -155758,8 +152592,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.18.0"; - sha256 = "1y9qrl1sskfyqdh7n6n467rjsf3zh969f072v3hrlrmlrd7y7vq0"; + version = "0.0.20.0"; + sha256 = "1k9vh2xyk2nwck1g86lxvbrab7ap5p8p9vhh7pj98a56wkvxmv7y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155768,7 +152602,7 @@ self: { mtl parsec process resourcet safe split text transformers ]; homepage = "https://github.com/phoityne/phoityne-vscode"; - description = "ghci debug viewer on Visual Studio Code"; + description = "Haskell Debug Adapter for Visual Studio Code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -155783,6 +152617,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Phonenumber Metadata - NOTE: this is now deprecated!"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "phone-numbers" = callPackage @@ -155855,8 +152690,8 @@ self: { }: mkDerivation { pname = "photoname"; - version = "3.2"; - sha256 = "1ygwhs79jrv5h1l407w41vfs96nd3kn2bl248j8bc1fh67kf6kka"; + version = "3.3"; + sha256 = "1fcl0m5hm6xvnzvn8v0l69vr7yh2q58six62147mwf4nlzny61gd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155868,7 +152703,7 @@ self: { ]; homepage = "http://hub.darcs.net/dino/photoname"; description = "Rename photo image files based on EXIF shoot date"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -156128,6 +152963,7 @@ self: { executableHaskellDepends = [ base matrix transformers xml ]; description = "Converts a svg image to tikz code"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pid1" = callPackage @@ -156186,7 +153022,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/piki/"; description = "Yet another text-to-html converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinboard" = callPackage @@ -156254,6 +153089,7 @@ self: { homepage = "http://www.github.com/massysett/pinchot"; description = "Write grammars, not parsers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ping-parser-attoparsec" = callPackage @@ -156332,29 +153168,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, semigroups, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.6"; - sha256 = "0nwap7bjwv6q0jis1j452r1zgfl4pfdip4lzs047r8zh75cvc5h8"; - libraryHaskellDepends = [ - base exceptions mmorph mtl semigroups transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_7" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, transformers, void @@ -156375,7 +153188,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -156572,21 +153384,6 @@ self: { }) {}; "pipes-category" = callPackage - ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras - , transformers - }: - mkDerivation { - pname = "pipes-category"; - version = "0.2.0.1"; - sha256 = "0yb6mlgccqz859fqcvlskhakqm3m0qjlgd1s1nnmn49h7g54d84x"; - libraryHaskellDepends = [ base lens mtl pipes pipes-extras ]; - testHaskellDepends = [ base hspec pipes transformers ]; - homepage = "https://github.com/louispan/pipes-category#readme"; - description = "Allows instances for Category, Arrow and ArrowChoice for Pipes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-category_0_3_0_0" = callPackage ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras , transformers }: @@ -156599,7 +153396,6 @@ self: { homepage = "https://github.com/louispan/pipes-category#readme"; description = "Allows instances for Category, Arrow and ArrowChoice for Pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-cellular" = callPackage @@ -156861,29 +153657,6 @@ self: { }) {}; "pipes-fluid" = callPackage - ({ mkDerivation, async, base, constraints, hspec, lens - , lifted-async, mmorph, monad-control, mtl, pipes - , pipes-concurrency, pipes-misc, semigroups, stm, these - , transformers, transformers-base - }: - mkDerivation { - pname = "pipes-fluid"; - version = "0.5.0.3"; - sha256 = "0f9b1fkdi0g09g3fk1zbcmyymiv6sp3g25ax9xmgjblr2qzg0bhd"; - libraryHaskellDepends = [ - base constraints lens lifted-async monad-control pipes semigroups - stm these transformers transformers-base - ]; - testHaskellDepends = [ - async base constraints hspec lens lifted-async mmorph monad-control - mtl pipes pipes-concurrency pipes-misc stm transformers - ]; - homepage = "https://github.com/louispan/pipes-fluid#readme"; - description = "Reactively combines Producers so that a value is yielded as soon as possible"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-fluid_0_6_0_0" = callPackage ({ mkDerivation, async, base, constraints, hspec, lens , lifted-async, mmorph, monad-control, mtl, pipes , pipes-concurrency, pipes-misc, semigroups, stm, these @@ -156904,7 +153677,6 @@ self: { homepage = "https://github.com/louispan/pipes-fluid#readme"; 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 @@ -157008,8 +153780,8 @@ self: { }: mkDerivation { pname = "pipes-key-value-csv"; - version = "0.4.0.2"; - sha256 = "0v7gqic7d4prdgwjkncnx1fzk38nxwfij9pnpnp7d8n0kwdcnbix"; + version = "0.4.0.3"; + sha256 = "02wdna1kjjz0pkap3pfvzl336aapjv6ylmg5qwa6hr07d7sfbh3l"; libraryHaskellDepends = [ base bifunctors containers data-default-class lens mtl pipes pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text @@ -157064,27 +153836,6 @@ self: { }) {}; "pipes-misc" = callPackage - ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl - , pipes, pipes-category, pipes-concurrency, semigroups, stm - , transformers - }: - mkDerivation { - pname = "pipes-misc"; - version = "0.3.0.0"; - sha256 = "1yb1y039kq70kpg82kcklaalxsp2fjpfmjiwlvn483cw695lw80x"; - libraryHaskellDepends = [ - base clock Decimal lens mmorph mtl pipes pipes-category - pipes-concurrency semigroups stm transformers - ]; - testHaskellDepends = [ - base hspec lens mmorph pipes pipes-concurrency stm transformers - ]; - homepage = "https://github.com/louispan/pipes-misc#readme"; - description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-misc_0_4_0_1" = callPackage ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl , pipes, pipes-category, pipes-concurrency, semigroups, stm , transformers @@ -157103,7 +153854,6 @@ self: { homepage = "https://github.com/louispan/pipes-misc#readme"; description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-mongodb" = callPackage @@ -157250,17 +154000,6 @@ self: { }) {}; "pipes-random" = callPackage - ({ mkDerivation, base, mwc-random, pipes, vector }: - mkDerivation { - pname = "pipes-random"; - version = "1.0.0.3"; - sha256 = "14qinfky4mcd3xs6lm6fmfw1k5inkiry8mn6m6q4hq7pwick773j"; - libraryHaskellDepends = [ base mwc-random pipes vector ]; - description = "Producers for handling randomness"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-random_1_0_0_4" = callPackage ({ mkDerivation, base, mwc-random, pipes, vector }: mkDerivation { pname = "pipes-random"; @@ -157270,7 +154009,6 @@ self: { homepage = "https://github.com/fosskers/pipes-random"; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-rt" = callPackage @@ -157299,6 +154037,8 @@ self: { pname = "pipes-s3"; version = "0.3.0.3"; sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa"; + revision = "1"; + editedCabalFile = "1hm2wwz8qz67hpwp5gfpp1rnz864z8pnn4ii5n35phhy9vg67dlz"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -157314,22 +154054,6 @@ self: { }) {}; "pipes-safe" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; - version = "2.2.5"; - sha256 = "0z560n3cfidp6d6my29vdkwqnga24pd0d6wp9kcmpp2kg3kcyhh2"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes transformers - transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-safe_2_2_6" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, mtl , pipes, primitive, transformers, transformers-base }: @@ -157343,7 +154067,6 @@ self: { ]; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-shell" = callPackage @@ -157407,8 +154130,8 @@ self: { }: mkDerivation { pname = "pipes-transduce"; - version = "0.4"; - sha256 = "0krcjw7bry726bgkjfsv72wq6z930jz8n5yj5dzfh51n5ps8qkcq"; + version = "0.4.1"; + sha256 = "10lf6fnnq1zf9v04l00f1nd4s6qq6a0pcdl72vxczmj6rn3c0kgq"; libraryHaskellDepends = [ base bifunctors bytestring conceit foldl free microlens pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse @@ -157419,6 +154142,7 @@ self: { ]; description = "Interfacing pipes with foldl folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-vector" = callPackage @@ -157490,6 +154214,7 @@ self: { homepage = "https://github.com/peddie/pipes-zeromq4"; description = "Pipes integration for ZeroMQ messaging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-zlib" = callPackage @@ -157501,6 +154226,8 @@ self: { pname = "pipes-zlib"; version = "0.4.4.1"; sha256 = "1sdxhb3000k57ck1mbasdwaxmkmw2bbh2m1ry3fvpgsilq91xb4g"; + revision = "1"; + editedCabalFile = "1vjvbww9b0892p1r1vz3biim3r5zaxkg8ks8w9cj2nc6i0bs7qy1"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -157656,6 +154383,7 @@ self: { homepage = "https://github.com/fcomb/pkcs10-hs#readme"; description = "PKCS#10 library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkcs7" = callPackage @@ -157669,6 +154397,7 @@ self: { homepage = "https://github.com/kisom/pkcs7"; description = "PKCS #7 padding in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkggraph" = callPackage @@ -157740,6 +154469,7 @@ self: { ]; description = "Applicative/Arrow for resource estimation and progress tracking"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plan-b" = callPackage @@ -157949,8 +154679,8 @@ self: { }: mkDerivation { pname = "plot"; - version = "0.2.3.8"; - sha256 = "1in77bvn77wyg9b8vixxd2m5vfnz90in89j3f31v9zbz7fxh2l4m"; + version = "0.2.3.9"; + sha256 = "1cyg4znyn0w0rll5ghc68rjknyfncfykl15i1984dg0hf1j6q566"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; @@ -157986,6 +154716,7 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk3" = callPackage @@ -158000,7 +154731,6 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-lab" = callPackage @@ -158076,19 +154806,24 @@ self: { }) {}; "ploton" = callPackage - ({ mkDerivation, base, hspec, optparse-applicative, process }: + ({ mkDerivation, base, hspec, optparse-applicative, process, split + , transformers + }: mkDerivation { pname = "ploton"; - version = "1.0.0.0"; - sha256 = "1x2ypljgknyya3pwg2y323va1hl396qm30lfy982sa6p0d0m8hfg"; + version = "1.1.1.0"; + sha256 = "1gxzfhzylk7i5cjnzgn4jicvbrv67w2v6fwb2x067q9c2g0b0npy"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base optparse-applicative process ]; + libraryHaskellDepends = [ + base optparse-applicative process split transformers + ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/ishiy1993/ploton#readme"; description = "A useful cli tool to draw figures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plots" = callPackage @@ -158145,6 +154880,7 @@ self: { homepage = "http://hub.darcs.net/stepcut/plugins"; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plugins-auto" = callPackage @@ -158410,6 +155146,7 @@ self: { ]; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointfree-fancy" = callPackage @@ -158699,6 +155436,7 @@ self: { ]; description = "Wrap together data and it's constraints"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polydata-core" = callPackage @@ -158711,6 +155449,7 @@ self: { homepage = "https://github.com/clintonmead/polydata-core#readme"; description = "Core data definitions for the \"polydata\" package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polymap" = callPackage @@ -158854,9 +155593,10 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "polyvariadic"; - version = "0.3.0.1"; - sha256 = "0bnwcpk5bgp784d68427vbcdvyavqpj87khwr5gdyxr58apih2z6"; + version = "0.3.0.3"; + sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1"; libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/fgaz/polyvariadic"; description = "Creation and application of polyvariadic functions"; license = stdenv.lib.licenses.bsd3; @@ -158869,8 +155609,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.0.0.1"; - sha256 = "1k2p59qq9yqndk8p3igxrbiqq7i6f80krynnvja7nx4bjlpcm19w"; + version = "0.0.0.2"; + sha256 = "1lsiwpyg5bl5si5ral8lin4hbgbczbf8b4jwd8v1nh2s9293rpb9"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -158878,11 +155618,12 @@ self: { base ChasingBottoms containers doctest Glob lattices tasty tasty-hspec tasty-quickcheck ]; - benchmarkHaskellDepends = [ base criterion deepseq random vector ]; + benchmarkHaskellDepends = [ + base criterion deepseq lattices random vector + ]; homepage = "https://github.com/sgraf812/pomaps#readme"; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pomodoro" = callPackage @@ -158926,6 +155667,7 @@ self: { homepage = "https://github.com/kqr/pomohoro#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ponder" = callPackage @@ -159018,6 +155760,7 @@ self: { homepage = "https://github.com/pontarius/pontarius-xmpp/"; description = "An XMPP client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pontarius-xpmn" = callPackage @@ -159219,7 +155962,6 @@ self: { homepage = "http://code.haskell.org/portaudio"; description = "Haskell bindings for the PortAudio library"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -159304,7 +156046,6 @@ self: { homepage = "https://github.com/xtendo-org/positron#readme"; description = "Experiment"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "posix-acl" = callPackage @@ -159361,25 +156102,6 @@ self: { }) {}; "posix-paths" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, doctest - , filepath, HUnit, process, QuickCheck, unix - }: - mkDerivation { - pname = "posix-paths"; - version = "0.2.1.1"; - sha256 = "0pr414vnf441zsgb00qgyqx6abr8i6fzgqjwwb2b52v4lhp37xfz"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring doctest HUnit QuickCheck unix - ]; - benchmarkHaskellDepends = [ - base bytestring criterion directory filepath process unix - ]; - description = "POSIX filepath/directory functionality"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "posix-paths_0_2_1_3" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, doctest , filepath, HUnit, process, QuickCheck, unix }: @@ -159396,7 +156118,6 @@ self: { ]; description = "POSIX filepath/directory functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "posix-pty" = callPackage @@ -159425,20 +156146,36 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; description = "POSIX Realtime functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "posix-socket" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, data-flags + , network-ip, transformers-base, unix + }: + mkDerivation { + pname = "posix-socket"; + version = "0.2"; + sha256 = "0ivgvpdjwiwniw7xbmlab7myhy5a631liq4864plhkrkm3hcp44y"; + libraryHaskellDepends = [ + base bytestring data-default-class data-flags network-ip + transformers-base unix + ]; + homepage = "https://github.com/mvv/posix-socket"; + description = "Bindings to the POSIX socket API"; + license = stdenv.lib.licenses.bsd3; }) {}; "posix-timer" = callPackage ({ mkDerivation, base, transformers-base, unix }: mkDerivation { pname = "posix-timer"; - version = "0.3"; - sha256 = "0z4j98pb46gzhi5i5pvxxm7an7am5i757p43cp2jv8pirx33k8zd"; + version = "0.3.0.1"; + sha256 = "01s9hd23xcgdnryi72vj635435ccryv98a911l0zipxmvq4d8ri8"; libraryHaskellDepends = [ base transformers-base unix ]; homepage = "https://github.com/mvv/posix-timer"; description = "Bindings to POSIX clock and timer functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "posix-waitpid" = callPackage @@ -159557,6 +156294,7 @@ self: { homepage = "https://github.com/diogob/postgres-websockets#readme"; description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-binary" = callPackage @@ -159588,6 +156326,7 @@ self: { homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-config" = callPackage @@ -159758,8 +156497,8 @@ self: { }: mkDerivation { pname = "postgresql-schema"; - version = "0.1.13"; - sha256 = "03f4hfdp632wyhygh72c6k8xwpqy2ijv51zkx3d176pb1429l0fi"; + version = "0.1.14"; + sha256 = "0wnmhh8pzs9hzsmqkvr89jbdbbd1j87fnly2c80rsd7wr5qcrpkk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159772,6 +156511,7 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple" = callPackage @@ -159816,6 +156556,7 @@ self: { ]; description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-migration" = callPackage @@ -159843,26 +156584,6 @@ self: { }) {}; "postgresql-simple-opts" = callPackage - ({ mkDerivation, base, bytestring, data-default, either, hspec - , optparse-applicative, optparse-generic, postgresql-simple - }: - mkDerivation { - pname = "postgresql-simple-opts"; - version = "0.2.0.2"; - sha256 = "0jwhlafbpkg75rc2b4hv8pg1d2q200h70lwn0acilikf55r3vlj1"; - libraryHaskellDepends = [ - base bytestring data-default either optparse-applicative - optparse-generic postgresql-simple - ]; - testHaskellDepends = [ - base bytestring hspec optparse-applicative postgresql-simple - ]; - homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme"; - description = "An optparse-applicative parser for postgresql-simple's connection options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple-opts_0_3_0_0" = callPackage ({ mkDerivation, base, bytestring, data-default, either , generic-deriving, hspec, optparse-applicative, optparse-generic , postgresql-simple, split, uri-bytestring @@ -159889,21 +156610,22 @@ self: { "postgresql-simple-queue" = callPackage ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec , hspec-discover, hspec-expectations-lifted, hspec-pg-transact - , monad-control, pg-transact, postgresql-simple, random, text, time - , transformers + , monad-control, pg-transact, postgresql-simple, random, split, stm + , text, time, transformers }: mkDerivation { pname = "postgresql-simple-queue"; - version = "0.5.1.1"; - sha256 = "05bzpfawf5pllmlqhsypp69rjrhady9vdql0khi9k75kk4ndl9r3"; + version = "1.0.1"; + sha256 = "0gss9s2splrvwgxhkjpqvx0cg9kx9dqpw4aq2wbh8l879v2nj2rk"; libraryHaskellDepends = [ aeson base bytestring exceptions monad-control pg-transact - postgresql-simple random text time transformers + postgresql-simple random stm text time transformers ]; testHaskellDepends = [ - aeson async base bytestring hspec hspec-discover - hspec-expectations-lifted hspec-pg-transact pg-transact - postgresql-simple + aeson async base bytestring exceptions hspec hspec-discover + hspec-expectations-lifted hspec-pg-transact monad-control + pg-transact postgresql-simple random split stm text time + transformers ]; homepage = "https://github.com/jfischoff/postgresql-queue#readme"; description = "A PostgreSQL backed queue"; @@ -159977,6 +156699,7 @@ self: { homepage = "https://github.com/nikita-volkov/postgresql-syntax"; description = "PostgreSQL SQL syntax utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {pg_query = null;}; "postgresql-transactional" = callPackage @@ -160159,7 +156882,6 @@ self: { homepage = "https://github.com/apiengine/postmark"; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmark-streams" = callPackage @@ -160176,7 +156898,6 @@ self: { ]; description = "Send email via Postmark using io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmaster" = callPackage @@ -160213,6 +156934,68 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , directory, foldl, hashable, potoki-core, profunctors, QuickCheck + , quickcheck-instances, random, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, unagi-chan, unordered-containers, vector + }: + mkDerivation { + pname = "potoki"; + version = "0.6.4"; + sha256 = "1w05m47cl9x7riy27jzaxkwpaigs09bfikpqaqa6ghvx20mgx4vl"; + libraryHaskellDepends = [ + attoparsec base base-prelude bug bytestring directory foldl + hashable potoki-core profunctors text unagi-chan + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances random rerebase tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/potoki"; + description = "Simple streaming in IO"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "potoki-cereal" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, cereal, potoki + , potoki-core, text + }: + mkDerivation { + pname = "potoki-cereal"; + version = "0.1"; + sha256 = "04qfs8j2kgvavacpz7x9zdza0yfl4yw56g0bca28wh7q837y073y"; + libraryHaskellDepends = [ + base base-prelude bytestring cereal potoki potoki-core text + ]; + homepage = "https://github.com/nikita-volkov/potoki-cereal"; + description = "Streaming serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "potoki-core" = callPackage + ({ mkDerivation, base, deque, profunctors, QuickCheck + , quickcheck-instances, rerebase, stm, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "potoki-core"; + version = "1.2"; + sha256 = "06d9hs15r6gr5yj9rcpw4klj3lxfjdd09nc0zwvmg1h3klqrqfxy"; + libraryHaskellDepends = [ base deque profunctors stm ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/potoki-core"; + description = "Low-level components of \"potoki\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "potrace" = callPackage ({ mkDerivation, base, bindings-potrace, bytestring, containers , data-default, JuicyPixels, vector @@ -160256,7 +157039,6 @@ self: { homepage = "https://github.com/ppelleti/powermate"; description = "bindings for Griffin PowerMate USB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "powerpc" = callPackage @@ -160330,7 +157112,6 @@ self: { homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A high performance in memory and LevelDB backend for powerqueue"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; "powerqueue-sqs" = callPackage @@ -160483,20 +157264,20 @@ self: { "preamble" = callPackage ({ mkDerivation, aeson, base, basic-prelude, exceptions - , fast-logger, lens, monad-control, monad-logger, MonadRandom, mtl - , network, resourcet, safe, shakers, template-haskell, text - , text-manipulate, time, transformers-base, unordered-containers - , uuid + , fast-logger, lens, lifted-base, monad-control, monad-logger + , MonadRandom, mtl, network, resourcet, safe, shakers + , template-haskell, text, text-manipulate, time, transformers-base + , unordered-containers, uuid }: mkDerivation { pname = "preamble"; - version = "0.0.56"; - sha256 = "0bwn4ixhgfrbjf12ahvw2hnkvx4p3818775wxnqfh72r50q54c0l"; + version = "0.0.58"; + sha256 = "02nqrryi2mjp4zcail23rh0ysqnc8i97wzn77bq7ksimqwzynabq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base basic-prelude exceptions fast-logger lens monad-control - monad-logger MonadRandom mtl network resourcet safe + 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 unordered-containers uuid ]; @@ -160629,6 +157410,7 @@ self: { homepage = "http://www.github.com/massysett/prednote"; description = "Evaluate and display trees of predicates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prednote-test" = callPackage @@ -161064,8 +157846,8 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.6.13"; - sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm"; + version = "1.6.15"; + sha256 = "16ik7dhagyr3is5dmkihw109l4d0500vi55z46p8lhigmfwqpn2n"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -161079,6 +157861,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pretty-show_1_6_16" = callPackage + ({ mkDerivation, array, base, filepath, ghc-prim, happy + , haskell-lexer, pretty + }: + mkDerivation { + pname = "pretty-show"; + version = "1.6.16"; + sha256 = "0l03mhbdnf0sj6kw2s3cf2xhfbl0809jr9fhj7cmpkhjpxv89vnv"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base filepath ghc-prim haskell-lexer pretty + ]; + libraryToolDepends = [ happy ]; + executableHaskellDepends = [ base ]; + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived `Show` instances and generic inspection of values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-simple" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , criterion, doctest, Glob, mtl, parsec, text, transformers @@ -161262,7 +158066,6 @@ self: { homepage = "http://github.com/quchen/prettyprinter"; description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-vty" = callPackage @@ -161480,6 +158283,7 @@ self: { homepage = "https://github.com/andrewthad/pringletons"; description = "Classes and data structures complementing the singletons library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "print-debugger" = callPackage @@ -161510,6 +158314,7 @@ self: { homepage = "https://github.com/m0rphism/printcess/"; description = "Pretty printing with indentation, mixfix operators, and automatic line breaks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "printf-mauke" = callPackage @@ -161598,18 +158403,19 @@ self: { executableHaskellDepends = [ base directory shelly text ]; description = "Upload a package to the public or private hackage, building its docs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "privileged-concurrency" = callPackage - ({ mkDerivation, base, contravariant, lifted-base, monad-control - , stm, transformers-base + ({ mkDerivation, base, contravariant, lifted-base, stm, unliftio + , unliftio-core }: mkDerivation { pname = "privileged-concurrency"; - version = "0.6.1"; - sha256 = "0dky434kdnb84a4wxlx3jcg1f7c7g4xh0llfiqv48wpk7lwkaic2"; + version = "0.7.0"; + sha256 = "0yapp7imds78rqb59rdr8bx82c6iifabf3x59n937srxiws55dik"; libraryHaskellDepends = [ - base contravariant lifted-base monad-control stm transformers-base + base contravariant lifted-base stm unliftio unliftio-core ]; description = "Provides privilege separated versions of the concurrency primitives"; license = stdenv.lib.licenses.bsd3; @@ -161669,6 +158475,7 @@ self: { homepage = "http://github.com/alpmestan/probable"; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proc" = callPackage @@ -161854,8 +158661,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.9.1.2"; - sha256 = "0kjq8bylhab6zhszf9vfnvzjkzfkh3bcgkkys7f13f6mrdp02bjz"; + version = "0.9.2.1"; + sha256 = "1p1nfb09sg9krwm7k6j8y5ggbc28yddlkf2yifs06iqfkcmbsbm6"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -161872,6 +158679,7 @@ self: { ]; description = "Streaming interface to system processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "processing" = callPackage @@ -162011,6 +158819,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -162105,8 +158914,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.3.0"; - sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2"; + version = "0.4.4.0"; + sha256 = "08pnybyr6l39h7lxvgxi014wb7cf6i8qfygx4xkfzkj9p23mp3h9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -162162,15 +158971,16 @@ self: { }) {}; "progress-meter" = callPackage - ({ mkDerivation, async, base, containers, stm }: + ({ mkDerivation, ansi-terminal, async, base, stm }: mkDerivation { pname = "progress-meter"; - version = "0.1.0"; - sha256 = "0xbrs2ydi64vllwz55b100ggwdcixi2p8zxlbxg7hg7s6ki244xf"; - libraryHaskellDepends = [ async base containers stm ]; + version = "1.0.0.1"; + sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6"; + libraryHaskellDepends = [ ansi-terminal async base stm ]; homepage = "https://github.com/esoeylemez/progress-meter"; description = "Live diagnostics for concurrent activity"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress-reporting" = callPackage @@ -162359,6 +159169,7 @@ self: { homepage = "https://github.com/roman/Haskell-projectile#readme"; description = "Go to README.md"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "projection" = callPackage @@ -162484,8 +159295,8 @@ self: { }: mkDerivation { pname = "prometheus-client"; - version = "0.2.0"; - sha256 = "15iqacx6gygd5xp17i1c7sd0mvndqfxqvjjs17hndxiqjgxvlr1z"; + version = "0.3.0"; + sha256 = "0nyh90ixf4g54q8qy315fv310rn0sw6rypkj37876isdhq5w8a2z"; libraryHaskellDepends = [ atomic-primops base bytestring clock containers mtl stm transformers utf8-string @@ -162528,14 +159339,15 @@ self: { homepage = "https://github.com/ocharles/prometheus-effect"; description = "Instrument applications with metrics and publish/push to Prometheus"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-metrics-ghc" = callPackage ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "0.2.0"; - sha256 = "0j3lk2khnqbf9l3lri4n7fn0riinwakp911l05h2qywjcj0v5vm0"; + version = "0.3.0"; + sha256 = "0cgcgzd7f39fhi0hxwjawif55a3i5mnnv7afxrrbk7gnhqb589nx"; libraryHaskellDepends = [ base prometheus-client utf8-string ]; testHaskellDepends = [ base doctest prometheus-client ]; homepage = "https://github.com/fimad/prometheus-haskell"; @@ -162608,8 +159420,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.1.0"; - sha256 = "0bl1kb24s2bs7li096s4iwvd2wj188lb2y3cfymhgsyqj8c2fbzp"; + version = "5.2.0"; + sha256 = "06h1q1kx2ifbfpicb0ivp4x8pv1fn15x0v5wn1dygnbf862h9brh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162719,28 +159531,9 @@ self: { executableHaskellDepends = [ base bytestring filepath ]; description = "Simple audio library for Windows, Linux, OSX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libpulseaudio;}; "proto-lens" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, lens-family, parsec, pretty, text - , transformers, void - }: - mkDerivation { - pname = "proto-lens"; - version = "0.2.1.0"; - sha256 = "1nibz7cqlwj0vp350km80df10330s2hqvhwr36liiqc92ghphvzg"; - libraryHaskellDepends = [ - attoparsec base bytestring containers data-default-class - lens-family parsec pretty text transformers void - ]; - homepage = "https://github.com/google/proto-lens"; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens_0_2_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, lens-family, parsec, pretty, text , transformers, void @@ -162756,7 +159549,6 @@ self: { homepage = "https://github.com/google/proto-lens"; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage @@ -162776,30 +159568,6 @@ self: { }) {}; "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.7"; - sha256 = "0c00ipxpyqizzgd3fg0hfqs1bqypah90zysjb0c4pl5hhaqi9bak"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ - base data-default-class lens-family proto-lens proto-lens-protoc - transformers - ]; - testHaskellDepends = [ - base HUnit lens-family lens-family-core proto-lens - proto-lens-protoc test-framework test-framework-hunit - ]; - homepage = "https://github.com/google/proto-lens"; - description = "Utilities functions to proto-lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-combinators_0_1_0_8" = callPackage ({ mkDerivation, base, Cabal, data-default-class, HUnit , lens-family, lens-family-core, proto-lens, proto-lens-protoc , test-framework, test-framework-hunit, transformers @@ -162824,22 +159592,6 @@ self: { }) {}; "proto-lens-descriptors" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , lens-family, lens-labels, proto-lens, text - }: - mkDerivation { - pname = "proto-lens-descriptors"; - version = "0.2.1.0"; - sha256 = "1qaprwdxck8h06wha6hp94kia5m247bc73973rz870c7hk2pdh6s"; - libraryHaskellDepends = [ - base bytestring containers data-default-class lens-family - lens-labels proto-lens text - ]; - description = "Protocol buffers for describing the definitions of messages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-descriptors_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text }: @@ -162853,7 +159605,6 @@ self: { ]; description = "Protocol buffers for describing the definitions of messages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-optparse" = callPackage @@ -162871,20 +159622,6 @@ self: { }) {}; "proto-lens-protobuf-types" = callPackage - ({ mkDerivation, base, Cabal, proto-lens-protoc }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.2.1.0"; - sha256 = "1x548hpl7yaqx9y2hdw5p8fc6lmxihlv2wam2x7c03zjkibb04y9"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ proto-lens-protoc ]; - homepage = "https://github.com/google/proto-lens"; - description = "Basic protocol buffer message types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-protobuf-types_0_2_2_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, text }: @@ -162903,31 +159640,6 @@ self: { }) {}; "proto-lens-protoc" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers - , data-default-class, directory, filepath, haskell-src-exts - , lens-family, lens-labels, process, proto-lens - , proto-lens-descriptors, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.2.1.0"; - sha256 = "0ywjn4px6sj82h53yzx466gsa42cgfg47w5vzvxfbdzqk4bskfdd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers data-default-class directory - filepath haskell-src-exts lens-family lens-labels process - proto-lens proto-lens-descriptors text - ]; - executableHaskellDepends = [ - base bytestring containers data-default-class filepath - haskell-src-exts lens-family proto-lens proto-lens-descriptors text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-protoc_0_2_2_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts , lens-family, lens-labels, process, proto-lens @@ -162950,7 +159662,6 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protobuf" = callPackage @@ -162973,6 +159684,7 @@ self: { homepage = "https://github.com/alphaHeavy/protobuf"; description = "Google Protocol Buffers via GHC.Generics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protobuf-native" = callPackage @@ -163032,8 +159744,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.5"; - sha256 = "1dcyv89z3869zd43wkby7xrzb1gz1iy2jrdr7yk45q2d1i63ssh4"; + version = "2.4.6"; + sha256 = "19709wgz0vcc01hjiyxdf71v9dsz9v910l1328dixpkpjh6iqxls"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -163047,8 +159759,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.5"; - sha256 = "0rz1v9iab012sc2m45yvmag94xg64gjrw0pqddp8gvw67i5lfan3"; + version = "2.4.6"; + sha256 = "1jxjahr10wfsywv4g17i6a1x775zrmmahqjd8lqzggy5axisvx79"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -163094,24 +159806,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protolude" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , ghc-prim, mtl, safe, stm, text, transformers + "protocol-radius" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, cryptonite + , dlist, memory, template-haskell, text, transformers }: mkDerivation { - pname = "protolude"; - version = "0.1.10"; - sha256 = "19f7w4n1k3xb3y00b10rxr781yxivl7byh7hrnfk5mzh32jrcchn"; + pname = "protocol-radius"; + version = "0.0.1.0"; + sha256 = "1ygn7kd6rdmgb4hy4iby0l9m1hm6w0linhjipgv7vczd8b0mw35f"; libraryHaskellDepends = [ - async base bytestring containers deepseq ghc-prim mtl safe stm text - transformers + base bytestring cereal containers cryptonite dlist memory + template-haskell text transformers ]; - homepage = "https://github.com/sdiehl/protolude"; - description = "A sensible set of defaults for writing custom Preludes"; - license = stdenv.lib.licenses.mit; + description = "parser and printer for radius protocol packet"; + license = stdenv.lib.licenses.bsd3; }) {}; - "protolude_0_2" = callPackage + "protocol-radius-test" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers + , protocol-radius, QuickCheck, quickcheck-simple, transformers + }: + mkDerivation { + pname = "protocol-radius-test"; + version = "0.0.1.0"; + sha256 = "185d85d9gfylcg575rvr43p4p8wzh0mi9frvkm2cn3liwwarmk5m"; + libraryHaskellDepends = [ + base bytestring cereal containers protocol-radius QuickCheck + quickcheck-simple transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "testsuit of protocol-radius haskell package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text , transformers @@ -163127,7 +159855,6 @@ self: { homepage = "https://github.com/sdiehl/protolude"; description = "A small prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protolude-lifted" = callPackage @@ -163224,6 +159951,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proxy-mapping" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proxy-mapping"; + version = "0.1.0.1"; + sha256 = "12lwn64znci7l5l7sa3g7hm0rmnjvykci7k65mz5c2zdwx3zgvdd"; + libraryHaskellDepends = [ base ]; + description = "Mapping of Proxy Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "psc-ide" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , edit-distance, either, filepath, fsnotify, hspec, http-client @@ -163426,8 +160165,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20170508"; - sha256 = "0nb9ykmzwhm0lrn22g26rv19vxb2b4aifm98x2zk7rs8w6ha4vv4"; + version = "0.20170802"; + sha256 = "0a2cfvf7ahaic62jn80sazmraqny20mcfsr6j8bji9fcgxjj150w"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -163436,14 +160175,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20170802" = callPackage + "publicsuffix_0_20171229" = callPackage ({ mkDerivation, base, criterion, filepath, hspec, random , template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20170802"; - sha256 = "0a2cfvf7ahaic62jn80sazmraqny20mcfsr6j8bji9fcgxjj150w"; + version = "0.20171229"; + sha256 = "03qvd0a13r4b45rz2wbf7kad17v0x3f6mrcv2slhyh0x4a1ca2s0"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -163471,6 +160210,7 @@ self: { homepage = "https://github.com/litherum/publicsuffixlist"; description = "Is a given string a domain suffix?"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffixlistcreate" = callPackage @@ -163592,6 +160332,7 @@ self: { homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-DrIFT" = callPackage @@ -163648,6 +160389,7 @@ self: { ]; description = "Portable Haskell/POSIX layer for Pugs"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-hsregex" = callPackage @@ -163700,7 +160442,6 @@ self: { executableHaskellDepends = [ base ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage @@ -163777,6 +160518,7 @@ self: { homepage = "https://github.com/bosu/pure-cdb"; description = "Another pure-haskell CDB (Constant Database) implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pure-fft" = callPackage @@ -163950,8 +160692,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.11.1.1"; - sha256 = "023j88q724l38zqry6v916na1hlqhcinb5pw3cqssmql0cf32ajh"; + version = "0.11.1.2"; + sha256 = "1ihm5x42aa0qda5k96i7m43cx3j8ywcxgm13y7dasll697zwl04w"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -163997,7 +160739,6 @@ self: { homepage = "https://github.com/soupi/pursuit-client"; description = "A cli client for pursuit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "push-notify" = callPackage @@ -164122,6 +160863,7 @@ self: { ]; description = "Datatypes used by the Pushbullet APIs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-haskell" = callPackage @@ -164144,45 +160886,23 @@ self: { "pusher-http-haskell" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptohash, hashable, hspec, http-client, http-types, QuickCheck - , text, time, transformers, unordered-containers + , cryptonite, hashable, hspec, http-client, http-types, memory + , QuickCheck, scientific, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.2.0.1"; - sha256 = "0cm2g49vpsfq92dik89vahkcjz8a17ihx973mhpg70cx3plpz8g8"; + version = "1.5.1.0"; + sha256 = "1mnigsf10jxqsvjr1vbizxjrf97w3cx54xy850mj3b8i34929bmh"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptohash hashable - http-client http-types text time transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types QuickCheck text - transformers unordered-containers - ]; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_1_5_0_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , containers, cryptonite, hashable, hspec, HTTP, http-client - , http-types, memory, network-uri, QuickCheck, scientific, text - , time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "1.5.0.1"; - sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring containers cryptonite - hashable HTTP http-client http-types memory text time transformers + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-types memory text time transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec HTTP - http-client http-types memory network-uri QuickCheck scientific - text time transformers unordered-containers vector + aeson base base16-bytestring bytestring cryptonite hspec + http-client http-types QuickCheck scientific text time transformers + unordered-containers vector ]; homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; @@ -164220,8 +160940,8 @@ self: { }: mkDerivation { pname = "pushme"; - version = "2.0.2"; - sha256 = "12gd31fbsm3adxmcwkikx4zwq5a7snv8mc0jd73crqfy46spm6zw"; + version = "2.1.1"; + sha256 = "1adgdbnifilzpxgkzdv0wxd475s7kl0ib8qqpd8ifx1cnm1zggjw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164231,7 +160951,7 @@ self: { system-fileio system-filepath temporary text text-format time transformers unix unordered-containers yaml ]; - homepage = "https://github.com/jwiegley/pushme"; + homepage = "https://github.com/jwiegley/pushme#readme"; description = "Tool to synchronize directories with rsync, zfs or git-annex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -164500,6 +161220,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "q4c12-twofinger" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest, lens + , semigroupoids, streams, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "q4c12-twofinger"; + version = "0.1"; + sha256 = "01rj89w3q0k24f0w179yl3pssixhlrh83nni5wm2hambz8ls0aqr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base deepseq semigroupoids streams ]; + testHaskellDepends = [ + base doctest lens streams tasty tasty-quickcheck + ]; + homepage = "https://github.com/quasicomputational/mega/tree/master/packages/twofinger"; + description = "Efficient alternating finger trees"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "qc-oi-testgenerator" = callPackage ({ mkDerivation, base, fclabels, QuickCheck, template-haskell }: mkDerivation { @@ -164623,7 +161361,19 @@ self: { homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; description = "Implementation of interpolated multiline strings"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "qq-literals" = callPackage + ({ mkDerivation, base, network-uri, template-haskell }: + mkDerivation { + pname = "qq-literals"; + version = "0.1.0.0"; + sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base network-uri template-haskell ]; + homepage = "https://github.com/hdgarrood/qq-literals"; + description = "Compile-time checked literal values via QuasiQuoters"; + license = stdenv.lib.licenses.mit; }) {}; "qr-imager" = callPackage @@ -164852,15 +161602,16 @@ self: { }) {}; "quantification" = callPackage - ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text - , vector + ({ mkDerivation, aeson, base, containers, ghc-prim, hashable + , path-pieces, text, unordered-containers, vector }: mkDerivation { pname = "quantification"; - version = "0.2"; - sha256 = "13mvhhg7j47ff741zrbnr11f5x2bv4gqdz02g2h8rr116shb31ia"; + version = "0.3"; + sha256 = "0hljd4m55254kmcrp3iar8ya7ky5a73vk3vrmgandmb15fsp2wvy"; libraryHaskellDepends = [ - aeson base ghc-prim hashable path-pieces text vector + aeson base containers ghc-prim hashable path-pieces text + unordered-containers vector ]; homepage = "https://github.com/andrewthad/quantification#readme"; description = "Rage against the quantification"; @@ -164968,6 +161719,86 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "queryparser" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , fixed-list, hashable, mtl, parsec, predicate-class, pretty + , QuickCheck, semigroups, text, unordered-containers, yaml + }: + mkDerivation { + pname = "queryparser"; + version = "0.1.0.0"; + sha256 = "0ixx2ff7b3m7i8yp23x8nx0bpq92r387ddqag1i0026hljwpqchr"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty QuickCheck semigroups text + unordered-containers yaml + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Analysis and parsing library for SQL queries"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {predicate-class = null;}; + + "queryparser-hive" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, fixed-list + , hashable, mtl, parsec, predicate-class, pretty, queryparser + , QuickCheck, regex-tdfa, semigroups, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "queryparser-hive"; + version = "0.1.0.0"; + sha256 = "1lh8vj0wbgpsliq8dcfp6cibd0ka3gf8j0b132b1dy9hz8q3k99s"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty queryparser QuickCheck regex-tdfa semigroups + text unordered-containers yaml + ]; + description = "Parsing for Hive SQL queries"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {predicate-class = null;}; + + "queryparser-presto" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, fixed-list + , hashable, mtl, parsec, predicate-class, pretty, queryparser + , QuickCheck, regex-tdfa, semigroups, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "queryparser-presto"; + version = "0.1.0.0"; + sha256 = "10yh0j7xxmyxpfkixk8wjfl0sbb6y51kylvc6jnl3wclcyw31jvf"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty queryparser QuickCheck regex-tdfa semigroups + text unordered-containers yaml + ]; + description = "Parsing for Presto SQL queries"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {predicate-class = null;}; + + "queryparser-vertica" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, fixed-list + , hashable, mtl, parsec, predicate-class, pretty, queryparser + , QuickCheck, regex-tdfa, semigroups, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "queryparser-vertica"; + version = "0.1.0.0"; + sha256 = "04g4ciqjkphyim0wjy3mn74fd8in38wkf3hyqsd0968syxdx6ykx"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty queryparser QuickCheck regex-tdfa semigroups + text unordered-containers yaml + ]; + description = "Parsing for Vertica SQL queries"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {predicate-class = null;}; + "querystring-pickle" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework , test-framework-quickcheck2, text @@ -165001,6 +161832,7 @@ self: { homepage = "https://github.com/yamadapc/haskell-questioner.git"; description = "A package for prompting values from the command-line"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "queue" = callPackage @@ -165118,6 +161950,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-arbitrary-adt_0_3_1_0" = callPackage + ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell + , transformers + }: + mkDerivation { + pname = "quickcheck-arbitrary-adt"; + version = "0.3.1.0"; + sha256 = "1fa5gb111m740q399l7wbr9n03ws9rasq48jhnx7dvvd6qh2wjjw"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base hspec lens QuickCheck template-haskell transformers + ]; + homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme"; + description = "Generic typeclasses for generating arbitrary ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-assertions" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { @@ -165132,15 +161982,17 @@ self: { }) {}; "quickcheck-classes" = callPackage - ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck }: + ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck + , transformers, vector + }: mkDerivation { pname = "quickcheck-classes"; - version = "0.1"; - sha256 = "0fjr4fagl9wblw6998675pljhgwr554kxfahpjfk46kiknghqic1"; + version = "0.3.1"; + sha256 = "0xcjm55aprds4x1jlrj3izgwxpqv8z19sbiqfn8lvx6b8yc61f7f"; libraryHaskellDepends = [ - aeson base prim-array primitive QuickCheck + aeson base prim-array primitive QuickCheck transformers ]; - testHaskellDepends = [ aeson base primitive QuickCheck ]; + testHaskellDepends = [ aeson base primitive QuickCheck vector ]; homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; @@ -165158,26 +162010,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, bytestring, containers, hashable - , old-time, QuickCheck, scientific, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.12"; - sha256 = "1wwvkzpams7i0j7nk5qj8vvhj8x5zcbgbgrpczszgvshva4bkmfx"; - revision = "2"; - editedCabalFile = "1v1r7gidkjc2v4dw1id57raqnjqv4rc10pa2l6xhhg0dzrnw28a3"; - libraryHaskellDepends = [ - array base bytestring containers hashable old-time QuickCheck - scientific text time unordered-containers vector - ]; - homepage = "https://github.com/aslatter/qc-instances"; - description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_16" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck , scientific, tagged, text, time, transformers, transformers-compat @@ -165201,7 +162033,6 @@ self: { homepage = "https://github.com/phadej/qc-instances"; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -165384,8 +162215,8 @@ self: { }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.2.0"; - sha256 = "19d8n0dx3qw1ln7g1klyl6dd43gpldiczml7cy9cygi70rcrzhwr"; + version = "0.3.0"; + sha256 = "0rcfc6yk5x99jk2zppfnzkkhc3k2wkvz6jh1h80l0zdpdhbd191a"; libraryHaskellDepends = [ ansi-wl-pprint async base containers lifted-async lifted-base monad-control mtl QuickCheck quickcheck-with-counterexamples random @@ -165542,6 +162373,7 @@ self: { homepage = "https://github.com/nick8325/quickspec"; description = "Equational laws for free!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickterm" = callPackage @@ -165632,6 +162464,7 @@ self: { homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; description = "An embedded, scalable functional programming language for quantum computing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quipper-rendering" = callPackage @@ -165778,6 +162611,7 @@ self: { ]; description = "Extra instances for Quiver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-interleave" = callPackage @@ -165864,30 +162698,6 @@ self: { }) {}; "raaz" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, criterion - , deepseq, hspec, HUnit, mtl, pretty, QuickCheck, transformers - , vector - }: - mkDerivation { - pname = "raaz"; - version = "0.1.1"; - sha256 = "19v7pkkyd03alwkdwz6mqjisja6mzmyal9lmmbqk6nhkd6hi1071"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring deepseq mtl vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec HUnit QuickCheck transformers vector - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion pretty - ]; - homepage = "http://github.com/raaz-crypto/raaz"; - description = "The raaz cryptographic library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "raaz_0_2_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, criterion , deepseq, hspec, hspec-discover, HUnit, optparse-applicative , pretty, QuickCheck, transformers, vector @@ -165910,7 +162720,6 @@ self: { homepage = "http://github.com/raaz-crypto/raaz"; description = "The raaz cryptographic library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rabocsv2qif" = callPackage @@ -165959,6 +162768,7 @@ self: { homepage = "https://github.com/NICTA/radian"; description = "Isomorphisms for measurements that use radians"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium" = callPackage @@ -165976,6 +162786,7 @@ self: { homepage = "https://github.com/klangner/radium"; description = "Chemistry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium-formula-parser" = callPackage @@ -166001,8 +162812,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.4.0.0"; - sha256 = "0bdixglg4yy5n6chw0n5mpk563dbkhh7iyzrmp9q2vpzxxvvdi06"; + version = "0.5.0.1"; + sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -166026,6 +162837,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "radixtree" = callPackage + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , microlens, mtl, parsers, QuasiText, smallcheck, store, tasty + , tasty-smallcheck, text, vector + }: + mkDerivation { + pname = "radixtree"; + version = "0.4.0.0"; + sha256 = "074s2gbprpq9qvipj8hayh906pdy1jfayph82hzamnwvz4199gmj"; + libraryHaskellDepends = [ + base containers deepseq microlens mtl parsers store text vector + ]; + testHaskellDepends = [ + attoparsec base smallcheck tasty tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base criterion deepseq QuasiText text vector + ]; + homepage = "https://gitlab.com/transportengineering/radixtree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rados-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, criterion , hspec, HUnit, mtl, rados, transformers, uuid @@ -166096,20 +162929,22 @@ self: { }) {}; "rails-session" = callPackage - ({ mkDerivation, base, base-compat, base64-bytestring, bytestring - , cryptonite, filepath, http-types, pbkdf, ruby-marshal - , string-conv, tasty, tasty-hspec, transformers, vector + ({ mkDerivation, base, base-compat, base16-bytestring + , base64-bytestring, bytestring, containers, cryptonite, filepath + , http-types, pbkdf, ruby-marshal, semigroups, string-conv, tasty + , tasty-hspec, transformers, vector }: mkDerivation { pname = "rails-session"; - version = "0.1.1.0"; - sha256 = "1y4822g316wx04nsjc3pai1zmgy5c961jwqjc7c3c6glcvscd6qx"; + version = "0.1.2.0"; + sha256 = "0r1jiy7x7497zk1gvg1zbpqx2vh2i0j9x7gzscgx6gylkjkkppir"; libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring cryptonite http-types - pbkdf ruby-marshal string-conv vector + base base-compat base16-bytestring base64-bytestring bytestring + containers cryptonite http-types pbkdf ruby-marshal string-conv + vector ]; testHaskellDepends = [ - base bytestring filepath ruby-marshal tasty tasty-hspec + base bytestring filepath ruby-marshal semigroups tasty tasty-hspec transformers vector ]; homepage = "http://github.com/iconnect/rails-session#readme"; @@ -166245,8 +163080,8 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.0.3"; - sha256 = "1l09lw0cr32vizzad7rgmwgfz7yy535n4fawikdr8lm8yzs0nr6d"; + version = "0.1.0.4"; + sha256 = "0nxnw5b0qhjzb0zwak74x84f081p1giyzbvpinhx527ph4j96aqf"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types @@ -166260,7 +163095,6 @@ self: { homepage = "https://github.com/matsubara0507/rakuten#readme"; description = "The Rakuten API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ralist" = callPackage @@ -166399,6 +163233,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "random-class" = callPackage + ({ mkDerivation, base, primitive, transformers, util }: + mkDerivation { + pname = "random-class"; + version = "0.2.0.2"; + sha256 = "11nda6dgi0f3b3bzy2wahdsadf382c06xrz1dx2gnq89ym7k7qbp"; + libraryHaskellDepends = [ base primitive transformers util ]; + description = "Class of random value generation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "random-derive" = callPackage ({ mkDerivation, base, random, template-haskell }: mkDerivation { @@ -166736,23 +163581,6 @@ self: { }) {}; "rank1dynamic" = callPackage - ({ mkDerivation, base, binary, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "rank1dynamic"; - version = "0.3.3.0"; - sha256 = "02wg4fw6p6cwy4mg07klzdmgs7m5zn9p7vj3j20frwsw8zldscna"; - libraryHaskellDepends = [ base binary ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - homepage = "http://haskell-distributed.github.com"; - description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rank1dynamic_0_4_0" = callPackage ({ mkDerivation, base, binary, HUnit, test-framework , test-framework-hunit }: @@ -166767,19 +163595,18 @@ self: { homepage = "http://haskell-distributed.github.com"; 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 ({ mkDerivation, base, doctest, template-haskell, transformers }: mkDerivation { pname = "rank2classes"; - version = "0.2.1.1"; - sha256 = "0h28979zg3ac642m3i01f1brbhh73ri909zlh3is4kx8h6qbkr5b"; + version = "1.0.1"; + sha256 = "1m48d5paxagx0916miiya09f8myfv7i4swjbi2yymh80xdjq5wxh"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/blamario/grampa/tree/master/rank2classes"; - description = "a mirror image of some standard type classes, with methods of rank 2 types"; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -166804,14 +163631,15 @@ self: { }: mkDerivation { pname = "rapid-term"; - version = "0.1.2"; - sha256 = "0q65c8rjqvikpfghpmmsb69d9qmx5bha36qs4iwbsh6iq08xiw18"; + version = "0.1.2.1"; + sha256 = "0pyqsj07g2am9n84232cpy20r6w54mah01x9kl7rczab0yvfplbc"; libraryHaskellDepends = [ base clock kan-extensions process transformers unix ]; homepage = "https://github.com/esoeylemez/rapid-term"; description = "External terminal support for rapid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa" = callPackage @@ -167079,12 +163907,12 @@ self: { }) {}; "rate-limit" = callPackage - ({ mkDerivation, base, stm, time-units }: + ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.2.0"; - sha256 = "0djjs18ca41z1mx7a6j2cbaryq895qa7wjhyqpzl38l9d2a54p7f"; - libraryHaskellDepends = [ base stm time-units ]; + version = "1.4.0"; + sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb"; + libraryHaskellDepends = [ base stm time time-units ]; homepage = "http://github.com/acw/rate-limit"; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -167097,8 +163925,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "0.3.7"; - sha256 = "0jwmlnxnaaldi1gr988gdy82y3ylvmi9ylnrsas8rg6pwyj76v9c"; + version = "0.3.8"; + sha256 = "1zd5dc21y60yjzbwgr8vf099y0rqmdirn1mq6s03jpiyar33lv3b"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -167115,8 +163943,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "0.2.0"; - sha256 = "04arqf5925dzr5wdgzlxzxglxzlnn72jhn2gibbbllk2xq8w4517"; + version = "0.3.2"; + sha256 = "1f38xivw19ic002idr936859rwmz2g9nmhbwxvsf4fw3lm31qwpa"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -167125,23 +163953,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ratel-wai_0_3_1" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "0.3.1"; - sha256 = "13p5ny1x752l9xqiyxdxvjfjqggsb0g9hpqqcmdr828lvr9qxi6s"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - homepage = "https://github.com/tfausak/ratel-wai#readme"; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rating-systems" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -167167,29 +163978,6 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, bimap, binary - , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hspec, template-haskell, temporary, text, vector - }: - mkDerivation { - pname = "rattletrap"; - version = "2.5.0"; - sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing base bimap binary binary-bits bytestring - containers data-binary-ieee754 template-haskell text vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring filepath hspec temporary ]; - homepage = "https://github.com/tfausak/rattletrap#readme"; - description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rattletrap_3_1_0" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, filepath, hspec , http-client, http-client-tls, template-haskell, temporary, text @@ -167197,8 +163985,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "3.1.0"; - sha256 = "1yv24p76w6zz91qjx5xhrcp7r72lqijfh32gzyjavvs6p1rnq61w"; + version = "3.1.2"; + sha256 = "0b0f5lkh8m96qg3m8wgnhpamqjndspa6ysf0lq013qbk9nvlvla8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167219,6 +164007,37 @@ self: { homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; + }) {}; + + "rattletrap_4_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, containers, filepath, http-client, http-client-tls + , HUnit, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "4.0.1"; + sha256 = "01dvidlby3k6i7nnh0az3xmmdpvrx594jy6zq6ccf14cjb0m95kv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls HUnit template-haskell + temporary text transformers + ]; + homepage = "https://github.com/tfausak/rattletrap#readme"; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -167713,7 +164532,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana" = callPackage @@ -167769,7 +164587,7 @@ self: { homepage = "https://github.com/mr/reactive-banana-gi-gtk"; description = "Simple reactive programming with GTK GObject Introspection"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-sdl" = callPackage @@ -167836,7 +164654,7 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-fieldtrip" = callPackage @@ -167914,7 +164732,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana and JACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-midyim" = callPackage @@ -167934,7 +164751,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -168217,8 +165033,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.0.8.1"; - sha256 = "111wslzm76qrabpdbsnpb3sydbd3vc71d3mf088klkgbb0k2arxp"; + version = "1.1.1"; + sha256 = "0rhfpdh8hmna02pbiljkiy623sdy1nqk60azr43cdx5q9aw1b3jy"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -168230,7 +165046,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_2_1" = callPackage + "rebase_1_2_2" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -168239,8 +165055,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.2.1"; - sha256 = "12qnx9psnq9ici4k58mwlf3g976gyhy53csllihxji71hsfjsaj3"; + version = "1.2.2"; + sha256 = "11p4wg2xissj4xzw80dww2srj2ylgw3wlnapykizy2fwjl1az9k4"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -168761,7 +165577,7 @@ self: { ]; description = "A reimplementation of the Reactive library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reexport-crypto-random" = callPackage @@ -168868,29 +165684,6 @@ self: { }) {}; "references" = callPackage - ({ mkDerivation, array, base, containers, directory, either - , filepath, HUnit, instance-control, lens, mtl, template-haskell - , text, transformers, uniplate - }: - mkDerivation { - pname = "references"; - version = "0.3.3.0"; - sha256 = "186x1j6yg2fh4a96b68jq7kwx2s1kxdbl4yi4izfgvxwimpzcr8w"; - libraryHaskellDepends = [ - array base containers directory either filepath instance-control - mtl template-haskell text transformers uniplate - ]; - testHaskellDepends = [ - array base containers directory either filepath HUnit - instance-control lens mtl template-haskell text transformers - uniplate - ]; - homepage = "https://github.com/lazac/references"; - description = "Selectors for reading and updating data"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "references_0_3_3_1" = callPackage ({ mkDerivation, array, base, containers, directory, either , filepath, HUnit, instance-control, lens, mtl, template-haskell , text, transformers, uniplate @@ -168911,7 +165704,6 @@ self: { homepage = "https://github.com/lazac/references"; description = "Selectors for reading and updating data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refh" = callPackage @@ -168995,10 +165787,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.4.0"; - sha256 = "173b8ysrghrw2fvdsqf6ybik9f24kw4ji1h8w4wj5kspbi12s36n"; - revision = "2"; - editedCabalFile = "14nrr41ndyfbdgpsi69xl9hmz5m6lank4cjbzxblvh3k0chg13z8"; + version = "0.4.0.1"; + sha256 = "1v4wwy2qc1gb914w5nqjvf7gibdw9yakmhdg260yjxbv1fkg8gyc"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -169302,6 +166092,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reformat" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "reformat"; + version = "0.1.0.1"; + sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am"; + libraryHaskellDepends = [ base parsec ]; + homepage = "https://github.com/Qinka/reformat"; + description = "The parser and render to parsec and render the string"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "refresht" = callPackage ({ mkDerivation, base, data-default, exceptions, lens, mtl }: mkDerivation { @@ -169359,6 +166162,7 @@ self: { homepage = "https://github.com/ConferHealth/refurb#readme"; description = "Tools for maintaining a database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex" = callPackage @@ -169380,6 +166184,7 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -169553,6 +166358,7 @@ self: { homepage = "http://regex.uk"; description = "Tutorial, tests and example programs for regex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-genex" = callPackage @@ -169839,6 +166645,7 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-xmlschema" = callPackage @@ -170147,6 +166954,7 @@ self: { homepage = "https://github.com/jwiegley/rehoo"; description = "Rebuild default.hoo from many .hoo files in the current directory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rei" = callPackage @@ -170165,6 +166973,7 @@ self: { homepage = "https://github.com/kerkomen/rei"; description = "Process lists easily"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reified-records" = callPackage @@ -170277,29 +167086,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, quickcheck-simple, sql-words - , template-haskell, text, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.9.5.0"; - sha256 = "17skrxqh3cpjkjjvbnhdlagfymdp0i3y2c5d92pg0krhc2dfida0"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - sql-words template-haskell text th-reify-compat time - time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers quickcheck-simple transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_11_0_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -170320,30 +167106,9 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage - ({ mkDerivation, base, containers, convertible, dlist, HDBC - , HDBC-session, names-th, persistable-record, relational-query - , relational-schemas, template-haskell, th-data-compat - , transformers - }: - mkDerivation { - pname = "relational-query-HDBC"; - version = "0.6.4.1"; - sha256 = "0bnksx9sq99hknj67wgg25yjbnkfdlaswhr2n6ndrrjpvkrx2lsi"; - libraryHaskellDepends = [ - base containers convertible dlist HDBC HDBC-session names-th - persistable-record relational-query relational-schemas - template-haskell th-data-compat transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "HDBC instance of relational-query and typed query interface for HDBC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query-HDBC_0_6_6_1" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic , relational-query, relational-schemas, sql-words, template-haskell @@ -170362,28 +167127,9 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "HDBC instance of relational-query and typed query interface for HDBC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-record" = callPackage - ({ mkDerivation, base, persistable-record - , persistable-types-HDBC-pg, relational-query - , relational-query-HDBC - }: - mkDerivation { - pname = "relational-record"; - version = "0.1.8.0"; - sha256 = "0yzzlzvcl9d2krjvampargmmm5zvqq4i4fs3a16amb6kf8x5k60f"; - libraryHaskellDepends = [ - base persistable-record persistable-types-HDBC-pg relational-query - relational-query-HDBC - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Meta package of Relational Record"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-record_0_2_1_2" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, product-isomorphic, relational-query , relational-query-HDBC @@ -170399,7 +167145,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Meta package of Relational Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-record-examples" = callPackage @@ -170409,8 +167154,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.4.1.0"; - sha256 = "121qd6l167mm90wfzf9x4hvxflkzjq3m7k11ijaii89rb61496wj"; + version = "0.5.0.0"; + sha256 = "0p49sb8ssvhbhmq4wicj7b46q53vibw686rr3xfy6iz82j64mklb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170423,26 +167168,9 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage - ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; - version = "0.1.4.1"; - sha256 = "1szxxh3m11rfndw7rsbsks4iagk61r5w0l6s4k2zh7xhzcfrhs83"; - libraryHaskellDepends = [ - base bytestring containers relational-query template-haskell time - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "RDBMSs' schema templates for relational-query"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-schemas_0_1_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query , template-haskell, time }: @@ -170456,7 +167184,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "RDBMSs' schema templates for relational-query"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relative-date" = callPackage @@ -170808,7 +167535,6 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-array" = callPackage @@ -170850,8 +167576,8 @@ self: { }: mkDerivation { pname = "repa-convert"; - version = "4.2.3.1"; - sha256 = "19b5z4al37vkxqnyn9a80ij3lj9vfr8fl06j15fkqc3nrkya7i48"; + version = "4.2.3.2"; + sha256 = "10fx1sa85na4xs31c5b3w4dih3xp4kzy68whpg91227ic5ah17ag"; libraryHaskellDepends = [ base bytestring double-conversion primitive repa-scalar text vector ]; @@ -170885,6 +167611,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Low-level parallel operators on bulk random-accessble arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-examples" = callPackage @@ -170906,7 +167633,6 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-fftw" = callPackage @@ -170965,7 +167691,6 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-linear-algebra" = callPackage @@ -171004,8 +167729,8 @@ self: { }: mkDerivation { pname = "repa-scalar"; - version = "4.2.3.1"; - sha256 = "1xwk583hvyssalc2y2n1a2pkmz2k2qsaawnghbh1d3n2ma6ncbfc"; + version = "4.2.3.2"; + sha256 = "1w5q7b38zy08s13nllwjisxx6mxx9pnqhh3v5ydi1b32hrkyfk7c"; libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; @@ -171145,21 +167870,6 @@ self: { }) {}; "repline" = callPackage - ({ mkDerivation, base, containers, haskeline, mtl, process }: - mkDerivation { - pname = "repline"; - version = "0.1.6.0"; - sha256 = "0nraj30fpws1gdac9s0bhz74j7jdvhkwi1232r2iabczrp701y31"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers haskeline mtl process ]; - executableHaskellDepends = [ base containers mtl process ]; - homepage = "https://github.com/sdiehl/repline"; - description = "Haskeline wrapper for GHCi-like REPL interfaces"; - license = stdenv.lib.licenses.mit; - }) {}; - - "repline_0_1_7_0" = callPackage ({ mkDerivation, base, containers, haskeline, mtl, process }: mkDerivation { pname = "repline"; @@ -171169,7 +167879,6 @@ self: { homepage = "https://github.com/sdiehl/repline"; description = "Haskeline wrapper for GHCi-like REPL interfaces"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repo-based-blog" = callPackage @@ -171284,16 +167993,16 @@ self: { }) {}; "reprinter" = callPackage - ({ mkDerivation, base, bytestring, mtl, syb, syz, transformers - , uniplate + ({ mkDerivation, base, mtl, syb, syz, text, transformers, uniplate }: mkDerivation { pname = "reprinter"; - version = "0.1.0.0"; - sha256 = "0l2vz9h5y9p10kqlg2fm5fvkg5vmrs4d8kyz8ami978ic9fv6fig"; + version = "0.2.0.0"; + sha256 = "1b3hdz7qq9qk7pbx0ny4ziagjm9hi9wfi9rl0aq0b8p70zzyjiq1"; libraryHaskellDepends = [ - base bytestring mtl syb syz transformers uniplate + base mtl syb syz text transformers uniplate ]; + homepage = "https://github.com/camfort/reprinter#readme"; description = "Scrap Your Reprinter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -171310,40 +168019,10 @@ self: { homepage = "https://github.com/agrafix/reproject#readme"; description = "Define and combine \"materialized\" projections"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "req" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, data-default-class - , hspec, hspec-core, http-api-data, http-client, http-client-tls - , http-types, mtl, QuickCheck, text, time, transformers - , unordered-containers - }: - mkDerivation { - pname = "req"; - version = "0.2.0"; - sha256 = "1g7b431hq6cqmckq3hlnf56qn1a9zbpid19c7vw6vh0y5xi5ckp6"; - revision = "3"; - editedCabalFile = "1lqspa275mq04chvz6pvjkrlxkd9gscaxy2rcsj5wy0123x1azxp"; - 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 mtl text time transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types mtl - QuickCheck text time unordered-containers - ]; - doCheck = false; - homepage = "https://github.com/mrkkrp/req"; - description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req_1_0_0" = callPackage + "req" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, data-default-class , hspec, hspec-core, http-api-data, http-client, http-client-tls @@ -171370,36 +168049,9 @@ self: { homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "req-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , http-client, req, resourcet, temporary, transformers, weigh - }: - mkDerivation { - pname = "req-conduit"; - version = "0.1.0"; - sha256 = "0ix4bj3gqjnq0dqxqlvm0x8js48p288hprfjn2d8afavan98b6k8"; - revision = "2"; - editedCabalFile = "0yx6858chc3kxx26lakr7gwqq8kdx32z05s51jyk4ii1a6kcyv6w"; - libraryHaskellDepends = [ - base bytestring conduit http-client req resourcet transformers - ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra hspec req resourcet temporary - transformers - ]; - benchmarkHaskellDepends = [ - base bytestring conduit conduit-extra req resourcet temporary weigh - ]; - homepage = "https://github.com/mrkkrp/req-conduit"; - description = "Conduit helpers for the req HTTP client library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "req-conduit_1_0_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh }: @@ -171458,20 +168110,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.0.3"; - sha256 = "1gpz8acmw08klgar2lvaff6g6a2y6jnmh1lkh3rdzsqgrmr2wlv3"; - libraryHaskellDepends = [ rebase ]; - homepage = "https://github.com/nikita-volkov/rerebase"; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rerebase_1_2" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; - version = "1.2"; - sha256 = "1plmy1fcvkx621cnn6dg6k61nkzsg9wrb9vf0jhc2s1vd4yfn3kw"; + version = "1.2.1"; + sha256 = "02j119pabivn2x23mvvmzlkypxwi31p7s2fpakavhqfs6bmbnb2a"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -171502,6 +168142,7 @@ self: { homepage = "http://github.com/agrafix/Spock"; description = "abstract implementation of typed and untyped web routing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reserve" = callPackage @@ -171525,6 +168166,7 @@ self: { ]; description = "Reserve reloads web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resin" = callPackage @@ -171610,6 +168252,7 @@ self: { homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-effect" = callPackage @@ -171718,15 +168361,15 @@ self: { "resourcet" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat + , transformers-compat, unliftio-core }: mkDerivation { pname = "resourcet"; - version = "1.1.9"; - sha256 = "1x9f2qz57agl3xljp1wi0ab51p13czrpf6qjp3506rl9dg99j6as"; + version = "1.1.10"; + sha256 = "1hhw9w85nj8i2azzj5sxixffdvciq96b0jhl0zz24038bij66cyl"; libraryHaskellDepends = [ base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat + transformers transformers-base transformers-compat unliftio-core ]; testHaskellDepends = [ base hspec lifted-base transformers ]; homepage = "http://github.com/snoyberg/conduit"; @@ -171775,8 +168418,8 @@ self: { pname = "rest-client"; version = "0.5.1.1"; sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x"; - revision = "1"; - editedCabalFile = "1q7ad9lhlszbmdv5r9zzqj9c3rh9x5hlrl4dyb4wb0xf0v3bj3kx"; + revision = "2"; + editedCabalFile = "0issr73rbnyaqfgx4c0wsy9sq948sqrkima2cr2sb1lkf8n4ihr8"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -171885,25 +168528,6 @@ self: { }) {}; "rest-snap" = callPackage - ({ mkDerivation, base, base-compat, bytestring, case-insensitive - , rest-core, safe, snap-core, unordered-containers, uri-encode - , utf8-string - }: - mkDerivation { - pname = "rest-snap"; - version = "0.2.0.1"; - sha256 = "1m82qhrkawcabm0ra7cralbag8p54jnf9cfq0idc1ah852w5gzr4"; - revision = "1"; - editedCabalFile = "0y39l49ywl1cx0hdr37sgacm31q7sdh4y81qk5115sy68wgxn1gw"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive rest-core safe - snap-core unordered-containers uri-encode utf8-string - ]; - description = "Rest driver for Snap"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rest-snap_0_3_0_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , rest-core, safe, snap-core, unordered-containers, uri-encode , utf8-string @@ -171918,7 +168542,6 @@ self: { ]; description = "Rest driver for Snap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-stringmap" = callPackage @@ -171967,8 +168590,8 @@ self: { pname = "rest-wai"; version = "0.2.0.1"; sha256 = "00hd7i28p5diy00m18yi6f2jp5cxbvb9s2fv24phakjsp2vmw81q"; - revision = "1"; - editedCabalFile = "1j2n7bypgjajwsaahvp50cdwrl7y0nbv67bd3kfdq03yvz5s1py3"; + revision = "2"; + editedCabalFile = "1n3sd3vszi0ifw098jf2yan8xcnrxckr22jssl61k0vn74573hw3"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -172100,6 +168723,7 @@ self: { homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rethinkdb-client-driver" = callPackage @@ -172174,8 +168798,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.4.3"; - sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390"; + version = "0.7.5.1"; + sha256 = "116fjfxdyqrk3079hqcil0dv7r2fw6x64pjwfxhckpxqavxza7sk"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -172362,8 +168986,8 @@ self: { }: mkDerivation { pname = "rfc"; - version = "0.0.0.3"; - sha256 = "0068sckjcgcacjlj7xp0z02q60qghkji9l4frjagjsxxsskkksvc"; + version = "0.0.0.4"; + sha256 = "1zsbgq8f2a0sr575lkz6r5n0vq8jyn32q1sjxkw7d1zqkmzx1f0b"; libraryHaskellDepends = [ aeson aeson-diff async base blaze-html classy-prelude containers data-default exceptions hedis http-api-data http-client-tls @@ -172428,13 +169052,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rgb-color-model" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rgb-color-model"; + version = "0.2.0.0"; + sha256 = "0vhqw2hylv0228g48b4q81fs0pjgmv68rzlasnz39g6yqddws97c"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/joegesualdo/rgb-color-model"; + description = "Haskell types for working with RGB colors"; + license = stdenv.lib.licenses.mit; + }) {}; + "rhine" = callPackage ({ mkDerivation, base, containers, dunai, free, time, transformers }: mkDerivation { pname = "rhine"; - version = "0.3.0.0"; - sha256 = "0isah99dzklp8igmapygwy39la03brjvvz2sqw4l3fbja6arpw3l"; + version = "0.4.0.0"; + sha256 = "18fav38bd2ysk8y5s24xxc6v381mag3g2lqpb9qayvcfj2zndx1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172450,13 +169086,15 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.3.0.0"; - sha256 = "048f9azvkd1jqak3514h9b8jsrqxnig0xpxqhan7hy4bryfnfhdb"; + version = "0.4.0.0"; + sha256 = "1sidp1f3is889g0kgdcbzpjrqndrvwvq6k713daqlkzarg9wngnj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; executableHaskellDepends = [ base ]; + description = "Wrapper to run reactive programs written in Rhine with Gloss as backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rhythm-game-tutorial" = callPackage @@ -172491,8 +169129,8 @@ self: { }: mkDerivation { pname = "riak"; - version = "1.1.2.1"; - sha256 = "090cvjskm7s2r2999x56ddi1iq4dcib6axqsym6v9xaii60r7qg7"; + version = "1.1.2.3"; + sha256 = "1s1ivg8l2k7mg3qd5hvgdbqp7mhczfkrwcmsnybh1yq276hhj15n"; libraryHaskellDepends = [ aeson async attoparsec base bifunctors binary blaze-builder bytestring containers data-default-class deepseq @@ -172510,7 +169148,6 @@ self: { homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riak-protobuf" = callPackage @@ -172519,12 +169156,12 @@ self: { }: mkDerivation { pname = "riak-protobuf"; - version = "0.22.0.0"; - sha256 = "06b9b9xv9y5kjrzkbycmzq9xyqxynk45qvl000ccrgwpjql7dd9j"; + version = "0.23.0.0"; + sha256 = "0cyarnp2yqlj98zdbd51krpz3ls75vcl8am6h4wf98b6vdmx1jsx"; libraryHaskellDepends = [ array base parsec protocol-buffers protocol-buffers-descriptor ]; - homepage = "http://github.com/markhibberd/riak-haskell-client"; + homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; }) {}; @@ -172535,8 +169172,8 @@ self: { }: mkDerivation { pname = "riak-protobuf-lens"; - version = "0.22.0.0"; - sha256 = "1skb7yinin9brd55g4kwywrqhln7g32pharad3pfwjjp3xyz7qx1"; + version = "0.23.0.0"; + sha256 = "0i01p6ix5304hd9alahq5bpmcf1rzc9k2qqy6n7c002fmnwsw2zw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172639,6 +169276,7 @@ self: { homepage = "https://github.com/tel/riemann-hs"; description = "A Riemann client for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riff" = callPackage @@ -172674,7 +169312,24 @@ self: { homepage = "http://github.com/bgamari/ring-buffer"; description = "A concurrent, mutable ring-buffer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rio" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, microlens, mtl, text, time + , typed-process, unix, unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.0.0.0"; + sha256 = "168v27a9m98qcychn4rwrb67sfqs4s1brg79q1fqanpjjqslh8id"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl text time typed-process unix unliftio + unordered-containers vector + ]; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; }) {}; "riot" = callPackage @@ -172768,6 +169423,7 @@ self: { homepage = "https://github.com/cocreature/riscv-isa#readme"; description = "Haskell representation of the RISC-V instruction set architecture"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rison" = callPackage @@ -172908,6 +169564,7 @@ self: { homepage = "https://github.com/grwlf/rl"; description = "Collection of Reinforcement Learning algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rlglue" = callPackage @@ -173018,17 +169675,6 @@ self: { }) {}; "rng-utils" = callPackage - ({ mkDerivation, base, bytestring, mwc-random, vector }: - mkDerivation { - pname = "rng-utils"; - version = "0.2.1"; - sha256 = "11yy6v0dbdf0cn823vlyd90zc5q5aw0zjzylpz5s9c94wsd4pjfa"; - libraryHaskellDepends = [ base bytestring mwc-random vector ]; - description = "RNG within an MVar for convenient concurrent use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rng-utils_0_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, random , tasty, tasty-hedgehog }: @@ -173044,7 +169690,6 @@ self: { homepage = "https://bitbucket.org/soostone/rng-utils"; description = "RNG within an IORef for convenient concurrent use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rob" = callPackage @@ -173067,6 +169712,7 @@ self: { homepage = "https://github.com/gianlucaguarini/rob#readme"; description = "Simple projects generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "robin" = callPackage @@ -173161,16 +169807,17 @@ self: { }) {}; "rocksdb-haskell" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default, filepath - , hspec, hspec-expectations, process, QuickCheck, resourcet - , rocksdb, temporary, transformers + ({ mkDerivation, base, binary, bytestring, data-default, directory + , filepath, hspec, hspec-expectations, process, QuickCheck + , resourcet, rocksdb, temporary, transformers }: mkDerivation { pname = "rocksdb-haskell"; - version = "1.0.0"; - sha256 = "0raipwawmah4h9ryja65b881dcj4yadrhh4c4718fdr0n89wgnzd"; + version = "1.0.1"; + sha256 = "1zsdxnmi2nyg54ic7xszdw7pz4c8ja18nmcaawhjwg2h7y9pqh5q"; libraryHaskellDepends = [ - base binary bytestring data-default filepath resourcet transformers + base binary bytestring data-default directory filepath resourcet + transformers ]; librarySystemDepends = [ rocksdb ]; testHaskellDepends = [ @@ -173180,7 +169827,6 @@ self: { homepage = "http://github.com/serokell/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -173271,15 +169917,15 @@ self: { "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit - , monad-control, network, resourcet, text, vector + , lifted-base, monad-control, network, resourcet, text, vector }: mkDerivation { pname = "rollbar"; - version = "1.0.0"; - sha256 = "01rljwfb7cgw544pk6iwmxlxzid51q7ig8f5y8v9i75vskqkip7j"; + version = "1.1.0"; + sha256 = "0cad0920zs938la1p35a3pabi9il1yavnpswpvifb3qhhq8j81md"; libraryHaskellDepends = [ - aeson base basic-prelude http-conduit monad-control network - resourcet text vector + aeson base basic-prelude http-conduit lifted-base monad-control + network resourcet text vector ]; homepage = "https://github.com/azara/rollbar-haskell"; description = "error tracking through rollbar.com"; @@ -173396,38 +170042,10 @@ self: { ]; description = "Query the namecoin blockchain"; license = stdenv.lib.licenses.gpl3; - }) {}; - - "rose-trees" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, hashable - , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups - , sets, tasty, tasty-quickcheck, unordered-containers, witherable - }: - mkDerivation { - pname = "rose-trees"; - version = "0.0.4.3"; - sha256 = "09p4sna1payzrz6sx8gszr0bcz7ga5qxx81512pid4wmgsr81ldx"; - libraryHaskellDepends = [ - base containers deepseq hashable mtl QuickCheck - quickcheck-instances semigroupoids semigroups sets - unordered-containers witherable - ]; - testHaskellDepends = [ - base containers deepseq hashable QuickCheck quickcheck-instances - semigroupoids semigroups sets tasty tasty-quickcheck - unordered-containers witherable - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq hashable mtl QuickCheck - quickcheck-instances semigroupoids semigroups sets - unordered-containers witherable - ]; - description = "A collection of rose tree structures"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rose-trees_0_0_4_4" = callPackage + "rose-trees" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hashable , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups , sets, tasty, tasty-quickcheck, unordered-containers, witherable @@ -173534,6 +170152,7 @@ self: { homepage = "https://github.com/RoboticsHS/rosmsg#readme"; description = "ROS message parser, render, TH"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rosmsg-bin" = callPackage @@ -173574,6 +170193,7 @@ self: { homepage = "https://github.com/RoboticsHS/rospkg#readme"; description = "ROS package system information"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rosso" = callPackage @@ -173619,6 +170239,7 @@ self: { homepage = "http://github.com/Soostone/rotating-log"; description = "Size-limited, concurrent, automatically-rotating log writer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundRobin" = callPackage @@ -173908,7 +170529,6 @@ self: { homepage = "https://github.com/lovasko/rset"; description = "Range set"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rspp" = callPackage @@ -173938,36 +170558,10 @@ self: { homepage = "https://github.com/basvandijk/rss"; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; - }) {}; - - "rss-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , containers, data-default, hlint, lens-simple, mono-traversable - , QuickCheck, quickcheck-instances, resourcet, safe - , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time - , timerep, uri-bytestring, xml-conduit, xml-types - }: - mkDerivation { - pname = "rss-conduit"; - version = "0.3.1.2"; - sha256 = "19a2x5xkfbkzz36l47v4m0fd7qp0pn3r4r77jaca0a3m7k74rxf1"; - libraryHaskellDepends = [ - base conduit conduit-combinators containers lens-simple - mono-traversable safe safe-exceptions text time timerep - uri-bytestring xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators data-default hlint - lens-simple mono-traversable QuickCheck quickcheck-instances - resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text - time uri-bytestring 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_2_0" = callPackage + "rss-conduit" = callPackage ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring , conduit, conduit-combinators, containers, data-default , dublincore-xml-conduit, hlint, lens-simple, mono-traversable @@ -173978,8 +170572,8 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.4.2.0"; - sha256 = "1fgaf15i2fbr1v2kd0s80zkbafsl50sv4b48my0nvs8vqhha5n7y"; + version = "0.4.2.1"; + sha256 = "04jpc3zrm9sh1ncqz2n0qr7wgabgpi56vsj24rppqiwrx31jrxdq"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons @@ -174097,7 +170691,7 @@ self: { homepage = "https://gitlab.com/formaltech/rtnetlink-hs"; description = "Manipulate network devices, addresses, and routes on Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtorrent-rpc" = callPackage @@ -174177,7 +170771,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -174197,6 +170791,7 @@ self: { homepage = "https://github.com/filib/ruby-marshal"; description = "Parse a subset of Ruby objects serialised with Marshal.dump."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruby-qq" = callPackage @@ -174335,6 +170930,7 @@ self: { homepage = "https://github.com/jwiegley/runmany"; description = "Run multiple commands, interleaving output and errors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "runmemo" = callPackage @@ -174474,6 +171070,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe_0_3_16" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "safe"; + version = "0.3.16"; + sha256 = "0xar4gh32izxl2a102xpgjrhppin7hqa837pv3fswmlj51cfb2k8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + homepage = "https://github.com/ndmitchell/safe#readme"; + description = "Library of safe (exception free) functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-access" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -174606,19 +171216,20 @@ self: { "safe-money" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal - , constraints, deepseq, hashable, store, tasty, tasty-hunit - , tasty-quickcheck + , constraints, deepseq, hashable, serialise, store, tasty + , tasty-hunit, tasty-quickcheck, text, xmlbf }: mkDerivation { pname = "safe-money"; - version = "0.3"; - sha256 = "0whd73vlkxzfr9rb9xfimxms56xzm0f1ninny16b4w6fg91ccqp5"; + version = "0.4.1"; + sha256 = "1ql02j1xb3m35y7axi3hsig894jzwzsm4l28ssms2m70lmbwv0qb"; libraryHaskellDepends = [ - aeson base binary cereal constraints deepseq hashable store + aeson base binary cereal constraints deepseq hashable serialise + store text xmlbf ]; testHaskellDepends = [ aeson base binary bytestring cereal constraints deepseq hashable - store tasty tasty-hunit tasty-quickcheck + serialise store tasty tasty-hunit tasty-quickcheck text xmlbf ]; homepage = "https://github.com/k0001/safe-money"; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; @@ -174700,6 +171311,7 @@ self: { homepage = "http://github.com/aelve/safecopy-migrate"; description = "Making SafeCopy migrations easier"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safecopy-store" = callPackage @@ -174710,8 +171322,8 @@ self: { }: mkDerivation { pname = "safecopy-store"; - version = "0.9.5"; - sha256 = "177v32sn3bxk3a4f4lg9vh4yc1lgylzrwzs0n6k4jrs8jxlz74iw"; + version = "0.9.6"; + sha256 = "1x82j4zw26pp38bcx4rnmz7ikpz8nf9mc4pkpcg9c9x76p8kxsfa"; libraryHaskellDepends = [ array base bytestring containers old-time store store-core template-haskell text time vector @@ -174903,7 +171515,6 @@ self: { ]; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsodium;}; "saltine-quickcheck" = callPackage @@ -174931,8 +171542,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "0.0.9"; - sha256 = "0x16rdrm8i2jwbi1zd7zj43r3h7jb9fzb33b5nbwkwfh397sm11h"; + version = "0.0.10"; + sha256 = "0d31pza3i06bs95ngspkabqrlfqjqmarmfjbpqir2xd1bz3xybjr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/tfausak/salve#readme"; @@ -175437,8 +172048,8 @@ self: { }: mkDerivation { pname = "savage"; - version = "1.0.2"; - sha256 = "0fs4nbcmxcq62jmfa5ds52c3qra9dypac7grppsgxcbva7jfpw7l"; + version = "1.0.3"; + sha256 = "1pxh2qa3ryfx8xrp3mk69d1x97yyngma32p18wxccvl5zvwbkz9c"; libraryHaskellDepends = [ base bytestring containers exceptions mmorph monad-control mtl primitive random resourcet text time transformers transformers-base @@ -175560,7 +172171,6 @@ self: { homepage = "http://github.com/LeventErkok/sbvPlugin"; description = "Formally prove properties of Haskell programs using SBV/SMT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sc3-rdu" = callPackage @@ -175611,7 +172221,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "scalendar" = callPackage + "scalendar_1_1_1" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: mkDerivation { pname = "scalendar"; @@ -175626,6 +172236,24 @@ self: { homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System"; 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; + }) {}; + + "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 + ]; + homepage = "https://github.com/stackbuilders/scalendar"; + description = "A library for handling calendars and resource availability over time"; + license = stdenv.lib.licenses.mit; }) {}; "scalp-webhooks" = callPackage @@ -175771,7 +172399,6 @@ self: { homepage = "https://github.com/redelmann/scat"; description = "Generates unique passwords for various websites from a single password"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scc" = callPackage @@ -175838,6 +172465,7 @@ self: { ]; description = "A Haskell library for writing SCGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedevr" = callPackage @@ -175875,6 +172503,7 @@ self: { ]; description = "Find the ideal lesson layout"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedyield" = callPackage @@ -175903,31 +172532,6 @@ self: { }) {}; "schematic" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core - , hspec-discover, hspec-smallcheck, HUnit, lens, regex-compat - , scientific, singletons, smallcheck, smallcheck-series, tagged - , text, unordered-containers, validationt, vector, vinyl - }: - mkDerivation { - pname = "schematic"; - version = "0.1.6.0"; - sha256 = "1pk75lrcw187nv3qf2xddi2v3pkmrq6vy6frv5piaaw12qzflfah"; - libraryHaskellDepends = [ - aeson base bytestring regex-compat scientific singletons smallcheck - smallcheck-series tagged text unordered-containers validationt - vector vinyl - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-core hspec-discover - hspec-smallcheck HUnit lens regex-compat singletons smallcheck - smallcheck-series tagged text unordered-containers validationt - vinyl - ]; - description = "JSON-biased spec and validation tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "schematic_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific @@ -175953,7 +172557,6 @@ self: { homepage = "http://github.com/typeable/schematic"; description = "JSON-biased spec and validation tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scholdoc" = callPackage @@ -176140,8 +172743,8 @@ self: { pname = "scientific"; version = "0.3.5.2"; sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w"; - revision = "1"; - editedCabalFile = "1gnz52yrd9bnq4qvd4v9kd00clx0sfbh64phafdq5g2hbk9yrg0v"; + revision = "2"; + editedCabalFile = "0wsrd213480p3pqrd6i650fr092yv7dhla7a85p8154pn5gvbr0a"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive text @@ -176414,6 +173017,7 @@ self: { homepage = "https://github.com/potomak/scotty-format#readme"; description = "Response format helper for the Scotty web framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-hastache" = callPackage @@ -176465,6 +173069,7 @@ self: { homepage = "https://github.com/taphu/scotty-resource"; description = "A Better way of modeling web resources"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-rest" = callPackage @@ -176494,7 +173099,6 @@ self: { homepage = "http://github.com/ehamberg/scotty-rest"; description = "Webmachine-style REST library for scotty"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-session" = callPackage @@ -176660,6 +173264,7 @@ self: { homepage = "https://joeyh.name/code/scroll/"; description = "scroll(6), a roguelike game"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scrypt" = callPackage @@ -176764,6 +173369,7 @@ self: { homepage = "https://github.com/davnils/sde-solver"; description = "Distributed SDE solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdf2p1-parser" = callPackage @@ -176785,26 +173391,6 @@ self: { }) {}; "sdl2" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.2.0"; - sha256 = "1164g29vb77kn5xdl71fsv95kf1h59gq8jhszyj3jrckv3x86fjs"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_3_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 , StateVar, text, transformers, vector }: @@ -176822,7 +173408,6 @@ self: { libraryPkgconfigDepends = [ SDL2 ]; 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 @@ -176938,26 +173523,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2_mixer;}; - "sdl2-ttf" = callPackage - ({ mkDerivation, base, linear, SDL2, sdl2, SDL2_ttf, transformers + "sdl2-mixer_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, lifted-base + , monad-control, sdl2, SDL2_mixer, template-haskell, vector }: mkDerivation { - pname = "sdl2-ttf"; - version = "1.0.0"; - sha256 = "07z57y44hsfa7nbh7jl9c2yska98vddi906kjmbf1qlj15g1b6rl"; - revision = "1"; - editedCabalFile = "0170h5gk6l20lb5c56sfd6xjgmaan0x8hgj3qlinqfh75qxx3kyp"; + pname = "sdl2-mixer"; + version = "1.1.0"; + sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base sdl2 transformers ]; - librarySystemDepends = [ SDL2 SDL2_ttf ]; - executableHaskellDepends = [ base linear sdl2 ]; - description = "Binding to libSDL2-ttf"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; + libraryHaskellDepends = [ + base bytestring data-default-class lifted-base monad-control sdl2 + template-haskell vector + ]; + librarySystemDepends = [ SDL2_mixer ]; + libraryPkgconfigDepends = [ SDL2_mixer ]; + description = "Bindings to SDL2_mixer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2_mixer;}; - "sdl2-ttf_2_0_2" = callPackage + "sdl2-ttf" = callPackage ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf , template-haskell, text, transformers }: @@ -176973,7 +173560,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 @@ -176998,8 +173585,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.9"; - sha256 = "0mabbapd1hvf26j1z3mfgpf8qyq7ccvsda57wkscsc6rkw2jaxqd"; + version = "0.1.0.10"; + sha256 = "1cjp05sk558vcwasbi15j6qzpa9icfqcyjsvz3a4b2fb59z6gv6z"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random @@ -177115,23 +173702,9 @@ self: { homepage = "http://github.com/ekmett/search/"; description = "Infinite search in finite time with Hilbert's epsilon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "search-algorithms" = callPackage - ({ mkDerivation, base, containers, doctest, hspec }: - mkDerivation { - pname = "search-algorithms"; - version = "0.2.0"; - sha256 = "1kw8352akwy9646nvr39a3q33hbg2a0dmnlywfcrxnawm9r930vk"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers doctest hspec ]; - homepage = "https://github.com/devonhollowood/search-algorithms#readme"; - description = "Common graph search algorithms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "search-algorithms_0_3_0" = callPackage ({ mkDerivation, base, containers, doctest, hspec }: mkDerivation { pname = "search-algorithms"; @@ -177142,7 +173715,6 @@ self: { homepage = "https://github.com/devonhollowood/search-algorithms#readme"; description = "Common graph search algorithms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sec" = callPackage @@ -177377,8 +173949,8 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.1.11.1"; - sha256 = "0vml5lmhabzps8la9h361bpsj29yq0n7azhvrpdkdmyjvw28svrs"; + version = "0.1.11.2"; + sha256 = "0ahh54sz40d4gcfgx6fb0cy1447b3qlk9kir89wk3brzfaglyyn9"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -177396,6 +173968,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.0"; sha256 = "0smx2hvpdxjcw58zchwmzcqz4xr5m1idv5y5rrj20df190r4l3l2"; + revision = "1"; + editedCabalFile = "0icxqqb4n1qbfpjlngs3lypnvjanwqrw3l8298my7b1wzj3iyw2m"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -177430,7 +174004,6 @@ self: { homepage = "http://nonempty.org/software/haskell-select"; description = "Wrap the select(2) POSIX function"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "selections" = callPackage @@ -177606,8 +174179,8 @@ self: { pname = "semigroupoids"; version = "5.2.1"; sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; - revision = "2"; - editedCabalFile = "049j2jl6f5mxqnavi1aadx37j4bk5xksvkxsl43hp4rg7n53p11z"; + revision = "3"; + editedCabalFile = "0wzcnpz8pyjk823vqnq5s8krsb8i6cw573hcschpd9x5ynq4li70"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -177841,34 +174414,14 @@ self: { }) {}; "sensu-run" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, http-client - , http-types, lens, network, optparse-applicative, process - , temporary, text, time, unix, vector, wreq - }: - mkDerivation { - pname = "sensu-run"; - version = "0.2.0"; - sha256 = "066pi6smcvffs7gsl1l45r2dshkw570p6h4s4nwsp5skf6k3568r"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring filepath http-client http-types lens network - optparse-applicative process temporary text time unix vector wreq - ]; - homepage = "https://github.com/maoe/sensu-run#readme"; - description = "A tool to send command execution results to Sensu"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sensu-run_0_4_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process , temporary, text, time, unix, unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.4.0.2"; - sha256 = "1hsl9p9gzbjlalnrlbia7bvi2rs159d3h5mv5zzi81c20y5ybkjk"; + version = "0.4.0.3"; + sha256 = "05gl6dannlfx49f24lhspyygq8j37wmsyp8nrlcpcsqbrbd3k82g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177879,7 +174432,6 @@ self: { homepage = "https://github.com/maoe/sensu-run#readme"; description = "A tool to send command execution results to Sensu"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sentence-jp" = callPackage @@ -177948,6 +174500,7 @@ self: { homepage = "https://github.com/qfpl/separated"; description = "A data type with elements separated by values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqaid" = callPackage @@ -178257,6 +174810,7 @@ self: { ]; description = "Instances for Serialize of cereal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serialport" = callPackage @@ -178397,18 +174951,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_12" = callPackage + "servant_0_12_1" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat , bytestring, Cabal, cabal-doctest, case-insensitive, directory - , doctest, filemanip, filepath, hspec, http-api-data, http-media - , http-types, mmorph, mtl, natural-transformation, network-uri - , QuickCheck, quickcheck-instances, string-conversions, tagged - , text, url, vault + , doctest, filemanip, filepath, hspec, hspec-discover + , http-api-data, http-media, http-types, mmorph, mtl + , natural-transformation, network-uri, QuickCheck + , quickcheck-instances, string-conversions, tagged, text, url + , vault }: mkDerivation { pname = "servant"; - version = "0.12"; - sha256 = "0h8xjidjjq1bzp4grcndpybp3migka5qzgyx1sxpps28gndmbz89"; + version = "0.12.1"; + sha256 = "1aknvflz1zlvnmg9ik8zbnbckcy3ai89h7an2rbfm7ygqhmnh0rh"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -178421,6 +174976,7 @@ self: { doctest filemanip filepath hspec QuickCheck quickcheck-instances string-conversions text url ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; @@ -178456,8 +175012,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.5.2.0"; - sha256 = "1pgj44hi9akj7irrbzr6f96pih7g9pb35jrhnwx4483rgj4ywa17"; + version = "0.6.0.0"; + sha256 = "0ylwd5dawhgfwhmzndc2950zkwg3xm2zv9az4a4pb9pxnpmb4z7n"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -178489,9 +175045,10 @@ self: { "servant-auth-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-types, jose, QuickCheck, servant, servant-auth - , servant-auth-server, servant-client, servant-client-core - , servant-server, text, time, transformers, wai, warp + , hspec-discover, http-client, http-types, jose, QuickCheck + , servant, servant-auth, servant-auth-server, servant-client + , servant-client-core, servant-server, text, time, transformers + , wai, warp }: mkDerivation { pname = "servant-auth-client"; @@ -178506,6 +175063,7 @@ self: { servant servant-auth servant-auth-server servant-client servant-server time transformers wai warp ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; @@ -178541,7 +175099,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_6_0" = callPackage + "servant-auth-cookie_0_6_0_1" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , cereal, cereal-time, cookie, criterion, cryptonite, data-default , deepseq, exceptions, hspec, http-api-data, http-types, memory @@ -178550,8 +175108,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.6.0"; - sha256 = "04pyy8534hnwwa5z423d6p5j2d5mzwbgls2q11hcma35nkz8y0xw"; + version = "0.6.0.1"; + sha256 = "0fbzcqav3cgnjvbfw0yrqlp36c8fk3ab3ff0am5cwvic8db1kqhb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178573,9 +175131,9 @@ self: { }) {}; "servant-auth-docs" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec, lens - , QuickCheck, servant, servant-auth, servant-docs, template-haskell - , text + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-docs, template-haskell, text }: mkDerivation { pname = "servant-auth-docs"; @@ -178589,10 +175147,10 @@ self: { base doctest hspec lens QuickCheck servant servant-auth servant-docs template-haskell text ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-hmac" = callPackage @@ -178634,10 +175192,11 @@ 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, http-api-data - , http-client, http-types, jose, lens, lens-aeson, markdown-unlit - , monad-time, mtl, QuickCheck, servant-auth, servant-server, tagged - , text, time, transformers, unordered-containers, wai, warp, wreq + , 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-auth + , servant-server, tagged, text, time, transformers + , unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; @@ -178661,15 +175220,15 @@ self: { jose lens lens-aeson mtl QuickCheck servant-server time wai warp wreq ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-swagger" = callPackage - ({ mkDerivation, base, hspec, lens, QuickCheck, servant - , servant-auth, servant-swagger, swagger2, text + ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck + , servant, servant-auth, servant-swagger, swagger2, text }: mkDerivation { pname = "servant-auth-swagger"; @@ -178682,10 +175241,10 @@ self: { base hspec lens QuickCheck servant servant-auth servant-swagger swagger2 text ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -178695,8 +175254,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.5.0.0"; - sha256 = "1ivlc7ivn4rn2appxyv2cgn4s812s82d3a8q9ykfy1yhpjygk9hp"; + version = "0.5.1.0"; + sha256 = "113pjs52nvi94bfx1ys4lanyvzkrlmb1p2y8sxhhb4bal917xki1"; libraryHaskellDepends = [ aeson-injector base bytestring containers http-api-data mtl pwstore-fast servant servant-auth-token-api servant-server text @@ -178705,6 +175264,7 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-acid" = callPackage @@ -178716,8 +175276,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.0.0"; - sha256 = "1hvslg23l43k6wz6z84xcm3sv0lxgnvcsrx7z8493zyav9lnlx6h"; + version = "0.5.1.0"; + sha256 = "1kxmgdj7bz2bbs6n9kfp28y9a9cvc2xk8345jnd4ks0iw43xjwr3"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -178736,8 +175296,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.2.2"; - sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv"; + version = "0.5.1.0"; + sha256 = "0kn25ldc774zx8r5hnrd7ibdm4g3769f99g8vl99x0miplpz0v0a"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -178745,6 +175305,7 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token-api#readme"; description = "Servant based API for token based authorisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-leveldb" = callPackage @@ -178756,8 +175317,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.5.0.0"; - sha256 = "1v1h9jpc9ypdd6sfcb9w4lhv2ldsnlcpmmsghbdky50vqmq1y8qj"; + version = "0.5.1.0"; + sha256 = "0bkprvi9zwc599ynkabjsk1m9wpbvfpmhzjx6rqj92m1nki62264"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens leveldb-haskell monad-control mtl resourcet safe @@ -178779,8 +175340,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.6.0.0"; - sha256 = "18y9g9pfzbhv35pfcr4973h320p8ify8nf4vllcdv83whfm48bc1"; + version = "0.6.1.0"; + sha256 = "1ni74vk121ncfkdjksf15g6686c2acbg22dn1srzwyngx5iwjcnc"; libraryHaskellDepends = [ aeson-injector base bytestring containers monad-control mtl persistent persistent-template servant-auth-token @@ -178802,8 +175363,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-rocksdb"; - version = "0.5.0.0"; - sha256 = "0cr8qgkv89sps6ykv0v1bng2xk4g7r00fjnmgjp58kpc18pvg4vl"; + version = "0.5.1.0"; + sha256 = "1xbnqv3b64r1xnzra2pdysjg5r9kxwxaya5rfrcgl8fz1b4n4hbb"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens monad-control mtl resourcet rocksdb-haskell safe @@ -178832,24 +175393,6 @@ self: { }) {}; "servant-cassava" = callPackage - ({ mkDerivation, base, base-compat, bytestring, cassava, http-media - , servant, vector - }: - mkDerivation { - pname = "servant-cassava"; - version = "0.9"; - sha256 = "08g1yjrfx2q79r0ldjnxr05437bg889virfy52i3s66d5h69d9q3"; - revision = "2"; - editedCabalFile = "1whcfyncvnjsf3iarpzk60q2f1srail41mjgf31hg6xahhjgqg3m"; - libraryHaskellDepends = [ - base base-compat bytestring cassava http-media servant vector - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Servant CSV content-type for cassava"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-cassava_0_10" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media , servant, servant-server, vector, wai, warp }: @@ -178867,7 +175410,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant CSV content-type for cassava"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-checked-exceptions" = callPackage @@ -178939,15 +175481,18 @@ self: { "servant-client_0_12_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , containers, deepseq, exceptions, generics-sop, hspec - , http-api-data, http-client, http-client-tls, http-media - , http-types, HUnit, monad-control, mtl, network, QuickCheck - , semigroupoids, servant, servant-client-core, servant-server, text - , transformers, transformers-base, transformers-compat, wai, warp + , hspec-discover, http-api-data, http-client, http-client-tls + , http-media, http-types, HUnit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, text, transformers, transformers-base + , transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; version = "0.12.0.1"; sha256 = "12apsxsxqxc9xxcpn6l4y69x3q22407gni3ixxa7c0afcr5jnani"; + revision = "1"; + editedCabalFile = "1gwzjxlml8fyhn0acs6pyy1sp34dv2zxsm7pcp8kxck6h1n9x9yq"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl @@ -178960,6 +175505,7 @@ self: { network QuickCheck servant servant-client-core servant-server text transformers transformers-compat wai warp ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -178969,19 +175515,22 @@ self: { "servant-client-core" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring, bytestring , containers, deepseq, exceptions, generics-sop, hspec - , http-api-data, http-media, http-types, mtl, network-uri - , QuickCheck, safe, servant, text + , hspec-discover, http-api-data, http-media, http-types, mtl + , network-uri, QuickCheck, safe, servant, text }: mkDerivation { pname = "servant-client-core"; version = "0.12"; sha256 = "0wb36sgirhyfqa32zjs6gz3fwzcim6qvhb6w6a3anpi2nlfaq355"; + revision = "1"; + editedCabalFile = "0sfj0sj66f4wi2r4g9hr6p0010jc8l2h05mi23r0217ncwh8y3xm"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions generics-sop http-api-data http-media http-types mtl network-uri safe servant text ]; testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Core functionality and class for client function generation for servant APIs"; license = stdenv.lib.licenses.bsd3; @@ -179083,8 +175632,8 @@ self: { "servant-docs_0_11_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, hspec - , http-media, http-types, lens, servant, string-conversions, text - , unordered-containers + , hspec-discover, http-media, http-types, lens, servant + , string-conversions, text, unordered-containers }: mkDerivation { pname = "servant-docs"; @@ -179103,6 +175652,7 @@ self: { testHaskellDepends = [ aeson base hspec lens servant string-conversions ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; @@ -179207,6 +175757,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-exceptions" = callPackage + ({ mkDerivation, aeson, base, exceptions, http-media, http-types + , mtl, servant, servant-server, text, wai, warp + }: + mkDerivation { + pname = "servant-exceptions"; + version = "0.1.0"; + sha256 = "0dkwggl7d8drnd2msk3cniyi7ia58d7cwi1hb0zcqgc0p9br7lbn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base exceptions http-media http-types mtl servant + servant-server text wai + ]; + executableHaskellDepends = [ + aeson base exceptions http-types servant-server text warp + ]; + homepage = "https://github.com/ch1bo/servant-exceptions#readme"; + description = "Extensible exceptions for servant APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-foreign" = callPackage ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { @@ -179220,26 +175792,33 @@ self: { }) {}; "servant-foreign_0_10_2" = callPackage - ({ mkDerivation, base, hspec, http-types, lens, servant, text }: + ({ mkDerivation, base, hspec, hspec-discover, http-types, lens + , servant, text + }: mkDerivation { pname = "servant-foreign"; version = "0.10.2"; sha256 = "16r42df628jsw9khv5kjwb702ajwmxg4kya19acm10660c0gxygs"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-generic" = callPackage - ({ mkDerivation, base, servant, servant-server, text, warp }: + ({ mkDerivation, base, network-uri, servant, servant-server, text + , warp + }: mkDerivation { pname = "servant-generic"; - version = "0.1.0.0"; - sha256 = "03gh879j9qdm666lvl2j2xiqyrgclfg2k4f1l4lslby5y81r4lv6"; + version = "0.1.0.1"; + sha256 = "1zgw5j3wx4fyb9nhifslzsbfla3iagkvix86vb1x3d9fyz117wif"; libraryHaskellDepends = [ base servant servant-server ]; - testHaskellDepends = [ base servant servant-server text warp ]; + testHaskellDepends = [ + base network-uri servant servant-server text warp + ]; description = "Specify Servant APIs with records"; license = stdenv.lib.licenses.mit; }) {}; @@ -179266,29 +175845,29 @@ self: { homepage = "http://github.com/finlay/servant-github#readme"; description = "Bindings to GitHub API using servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-github-webhook" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, github, http-types, memory, servant, servant-server - , string-conversions, text, transformers, wai, warp + , string-conversions, text, wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.3.1.0"; - sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq"; + version = "0.3.2.1"; + sha256 = "1yy5hnnj64wgafn60cj4ywwkwpzl506g0fsm9fcsyz4dr7irhpyf"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite github http-types memory servant servant-server string-conversions text - transformers wai + wai ]; testHaskellDepends = [ - aeson base bytestring servant-server transformers wai warp + aeson base bytestring servant-server wai warp ]; homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -179327,6 +175906,8 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; + revision = "1"; + editedCabalFile = "07jib9s2kg6srr1dj3l1bz0sp3fyikkvv7z0v2a62zl1c9z9xapx"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; @@ -179361,9 +175942,9 @@ self: { "servant-js" = callPackage ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, servant-server, stm, text, transformers - , warp + , hspec-discover, hspec-expectations, language-ecmascript, lens + , QuickCheck, servant, servant-foreign, servant-server, stm, text + , transformers, warp }: mkDerivation { pname = "servant-js"; @@ -179382,6 +175963,7 @@ self: { base base-compat hspec hspec-expectations language-ecmascript lens QuickCheck servant text ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -179394,8 +175976,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.0.1"; - sha256 = "1bv6chggrpil6332nal8blnchnn6ahiblcf5q7syray7wkkmgpjk"; + version = "0.1.0.2"; + sha256 = "0dwm9aia14hr2gblcak7vyh7jgs1mnfwqq131rxyygf9d11wpx41"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -179427,6 +176009,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-match" = callPackage + ({ mkDerivation, base, bytestring, hspec, http-types, network-uri + , servant, text, utf8-string + }: + mkDerivation { + pname = "servant-match"; + version = "0.1.1"; + sha256 = "1jh817sflbkqmv38rpd20jfz5nbpyxz1n0gqx7446n745jnc2ga0"; + libraryHaskellDepends = [ + base bytestring http-types network-uri servant text utf8-string + ]; + testHaskellDepends = [ base hspec network-uri servant text ]; + homepage = "https://github.com/cocreature/servant-match#readme"; + description = "Standalone implementation of servant’s dispatching mechanism"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-matrix-param" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , hspec, http-client, http-types, servant, servant-aeson-specs @@ -179450,13 +176050,15 @@ self: { "servant-mock" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion - , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server - , transformers, wai, warp + , hspec, hspec-discover, hspec-wai, http-types, QuickCheck, servant + , servant-server, transformers, wai, warp }: mkDerivation { pname = "servant-mock"; version = "0.8.3"; sha256 = "0fwkygv4rx98qys8apj7aby4xhssgzqdgsxmb6vh4ky71vjq0q5m"; + revision = "1"; + editedCabalFile = "11aaf3gj0j0c3sjcv55rx9184ryavv9nr8smpadrd8ldy43bfq33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179470,9 +176072,11 @@ self: { aeson base bytestring-conversion hspec hspec-wai QuickCheck servant servant-server wai ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-multipart" = callPackage @@ -179549,7 +176153,6 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pool" = callPackage @@ -179585,6 +176188,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-proto-lens" = callPackage + ({ mkDerivation, async, base, bytestring, data-default-class + , http-client, http-media, HUnit, lens, proto-lens + , proto-lens-protobuf-types, servant, servant-client + , servant-server, test-framework, test-framework-hunit, warp + }: + mkDerivation { + pname = "servant-proto-lens"; + version = "0.1.0.1"; + sha256 = "1sa3vkr4vd6lvclscb4ki7ph17pdvq8ka22gmymz0yr760nx398a"; + libraryHaskellDepends = [ + base bytestring http-media proto-lens servant + ]; + testHaskellDepends = [ + async base data-default-class http-client HUnit lens proto-lens + proto-lens-protobuf-types servant-client servant-server + test-framework test-framework-hunit warp + ]; + homepage = "https://github.com/plredmond/servant-proto-lens"; + description = "Servant Content-Type for proto-lens protobuf modules"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-purescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge @@ -179593,8 +176220,8 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.8.0.1"; - sha256 = "12azs60ki6g002p5cz54cg84xr4kwhdf9z1r8bmx99xyvcpxynn5"; + version = "0.9.0.2"; + sha256 = "1axj4rar4ncy20xiwa231hc67vpz6yi2vzddq8m6nswmdg6kja7p"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -179609,31 +176236,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-purescript_0_9_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, http-types, lens, mainland-pretty, purescript-bridge - , servant, servant-foreign, servant-server, servant-subscriber - , text - }: - mkDerivation { - pname = "servant-purescript"; - version = "0.9.0.1"; - sha256 = "11jpgqk1nmwjihghxbfv05fsb6n351822ryh6w08wdz3alsv4zk6"; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath http-types lens - mainland-pretty purescript-bridge servant servant-foreign - servant-server servant-subscriber text - ]; - testHaskellDepends = [ - aeson base containers lens mainland-pretty purescript-bridge - servant servant-foreign servant-subscriber text - ]; - homepage = "https://github.com/eskimor/servant-purescript#readme"; - description = "Generate PureScript accessor functions for you servant API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-pushbullet-client" = callPackage ({ mkDerivation, aeson, base, http-api-data, http-client , http-client-tls, microlens, microlens-th, pushbullet-types @@ -179651,6 +176253,7 @@ self: { ]; description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-py" = callPackage @@ -179683,17 +176286,17 @@ self: { }) {}; "servant-quickcheck" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring + ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring , case-insensitive, clock, data-default-class, hspec, hspec-core - , http-client, http-media, http-types, mtl, pretty, process - , QuickCheck, quickcheck-io, servant, servant-client - , servant-server, split, string-conversions, temporary, text, time - , transformers, warp + , hspec-discover, http-client, http-media, http-types, mtl, pretty + , process, QuickCheck, quickcheck-io, servant, servant-blaze + , servant-client, servant-server, split, string-conversions + , temporary, text, time, transformers, warp }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.3.1"; - sha256 = "0ylpw1px56y08h6kl1dbn7xwwwv0abzk7llfs3dkjb9xmhh990ks"; + version = "0.0.5.0"; + sha256 = "1867dcdm87gzq9gzz02rc9h6vcwpi24lxcxyij0aazgvfgsya6m6"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -179701,13 +176304,13 @@ self: { split string-conversions temporary text time warp ]; testHaskellDepends = [ - aeson base base-compat bytestring hspec hspec-core http-client - QuickCheck quickcheck-io servant servant-client servant-server - transformers warp + aeson base base-compat blaze-html bytestring hspec hspec-core + http-client QuickCheck quickcheck-io servant servant-blaze + servant-client servant-server transformers warp ]; + testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-rawm" = callPackage @@ -179741,7 +176344,6 @@ self: { homepage = "https://github.com/cdepillabout/servant-rawm"; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-response" = callPackage @@ -179780,20 +176382,6 @@ self: { }) {}; "servant-ruby" = callPackage - ({ mkDerivation, base, casing, doctest, lens, servant-foreign, text - }: - mkDerivation { - pname = "servant-ruby"; - version = "0.2.1.0"; - sha256 = "1qc9m8v2zj6zihkq1wx52fwq666q0cgg4fmnrfw431sa3a8rmf4h"; - libraryHaskellDepends = [ base casing lens servant-foreign text ]; - testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/joneshf/servant-ruby#readme"; - description = "Generate a Ruby client from a Servant API with Net::HTTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-ruby_0_5_0_0" = callPackage ({ mkDerivation, base, casing, doctest, lens, QuickCheck , servant-foreign, text }: @@ -179806,7 +176394,6 @@ self: { homepage = "https://github.com/joneshf/servant-ruby#readme"; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -179833,11 +176420,12 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, Cabal, cabal-doctest, containers , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-wai, http-api-data, http-types, monad-control, mtl, network - , network-uri, parsec, QuickCheck, resourcet, safe, servant - , should-not-typecheck, split, string-conversions, system-filepath - , tagged, temporary, text, transformers, transformers-base - , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + , hspec-discover, hspec-wai, http-api-data, http-types + , monad-control, mtl, network, network-uri, parsec, QuickCheck + , resourcet, safe, servant, should-not-typecheck, split + , string-conversions, system-filepath, tagged, temporary, text + , transformers, transformers-base, transformers-compat, wai + , wai-app-static, wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; @@ -179861,6 +176449,7 @@ self: { should-not-typecheck string-conversions temporary text transformers transformers-compat wai wai-extra warp ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -179870,16 +176459,19 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, Cabal, cabal-doctest, containers , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-wai, http-api-data, http-types, monad-control, mtl, network - , network-uri, parsec, QuickCheck, resourcet, safe, servant - , should-not-typecheck, split, string-conversions, system-filepath - , tagged, temporary, text, transformers, transformers-base - , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + , hspec-discover, hspec-wai, http-api-data, http-types + , monad-control, mtl, network, network-uri, parsec, QuickCheck + , resourcet, safe, servant, should-not-typecheck, split + , string-conversions, system-filepath, tagged, temporary, text + , transformers, transformers-base, transformers-compat, wai + , wai-app-static, wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; version = "0.12"; sha256 = "1iiwk4d945z4xkxm3hn4d9ybi04n1ig4niip7vk3xp0wzikk7wk5"; + revision = "1"; + editedCabalFile = "1b0vqzbaaz3bqzdh640rss5xsyl0s5q42xccfdmzmpn559w3p81r"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -179898,6 +176490,7 @@ self: { should-not-typecheck string-conversions temporary text transformers transformers-compat wai wai-extra warp ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -179940,8 +176533,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.8.0.1"; - sha256 = "06n9zvz18hwizi5iqldlhgwr1m83fg5l3dzlaarl2rgvr1dnkh2i"; + version = "0.8.1"; + sha256 = "0l85gs987g6z3r6pqrf79279l1jmxq3pl8xjz62ps0p3ww1rp296"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179952,7 +176545,7 @@ self: { ]; executableHaskellDepends = [ aeson base bytestring either errors heist lens map-syntax servant - snap snap-core snap-server text transformers + snap snap-core snap-cors snap-server text transformers ]; testHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers @@ -179996,35 +176589,6 @@ self: { }) {}; "servant-subscriber" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder - , bytestring, case-insensitive, containers, directory, filepath - , http-types, lens, lifted-base, monad-control, monad-logger - , network-uri, purescript-bridge, servant, servant-foreign - , servant-server, stm, text, time, transformers, wai - , wai-websockets, warp, websockets - }: - mkDerivation { - pname = "servant-subscriber"; - version = "0.6.0.0"; - sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q"; - revision = "1"; - editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base blaze-builder bytestring - case-insensitive containers directory filepath http-types lens - lifted-base monad-control monad-logger network-uri servant - servant-foreign servant-server stm text time transformers wai - wai-websockets warp websockets - ]; - executableHaskellDepends = [ base purescript-bridge ]; - homepage = "http://github.com/eskimor/servant-subscriber#readme"; - description = "When REST is not enough ..."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-subscriber_0_6_0_1" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath , http-types, lens, lifted-base, monad-control, monad-logger @@ -180049,7 +176613,6 @@ self: { homepage = "http://github.com/eskimor/servant-subscriber#readme"; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger" = callPackage @@ -180159,6 +176722,7 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Types and definitions of servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-zeppelin-client" = callPackage @@ -180231,6 +176795,7 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "server-generic" = callPackage @@ -180250,6 +176815,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "serverless-haskell" = callPackage + ({ mkDerivation, aeson, aeson-casing, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, hspec + , hspec-discover, lens, raw-strings-qq, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.1.0"; + sha256 = "0xml0rjsrxmh4mf8vl1z596s86whafklb7h741b1f98bqxj8l24q"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring lens text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring hspec hspec-discover lens raw-strings-qq text time unix + unordered-containers + ]; + homepage = "https://github.com/seek-oss/serverless-haskell#readme"; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -180467,7 +177056,6 @@ self: { ]; description = "Send HTML formatted emails using Amazon's SES REST API with blaze"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html-snaplet" = callPackage @@ -180542,6 +177130,7 @@ self: { homepage = "https://github.com/Ferdinand-vW/sessiontypes-distributed#readme"; description = "Session types distributed"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "set-cover" = callPackage @@ -180681,6 +177270,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setop" = callPackage + ({ mkDerivation, base, containers, doctest, hlint, hspec + , optparse-applicative, protolude, text + }: + mkDerivation { + pname = "setop"; + version = "0.1.0.1"; + sha256 = "0rgx5dn9xj9mpbb0rickncb9xd93sgqsz0s058zqyg08pjafrp31"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers protolude ]; + executableHaskellDepends = [ + base optparse-applicative protolude text + ]; + testHaskellDepends = [ + base containers doctest hlint hspec protolude + ]; + homepage = "https://github.com/fmind/setop"; + description = "Perform set operations on files"; + license = stdenv.lib.licenses.mit; + }) {}; + "setops" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -180866,7 +177477,6 @@ self: { homepage = "http://patch-tag.com/r/shahn/sfml-audio"; description = "minimal bindings to the audio module of sfml"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -181076,39 +177686,6 @@ self: { }) {}; "shake" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, hashable, js-flot, js-jquery, primitive, process - , QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "shake"; - version = "0.15.11"; - sha256 = "1fxi4vl6fffq0h84rxd9cqik58mj8jk7gmspm9vkjmp97j1hslh5"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery 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 - ]; - testHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery process QuickCheck random time transformers unix - unordered-containers utf8-string - ]; - homepage = "http://shakebuild.com"; - description = "Build system library, like Make, but more accurate dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shake_0_16" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory , extra, filepath, hashable, js-flot, js-jquery, primitive, process , QuickCheck, random, time, transformers, unix @@ -181139,7 +177716,6 @@ self: { homepage = "http://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-cabal-build" = callPackage @@ -181177,25 +177753,6 @@ self: { }) {}; "shake-language-c" = callPackage - ({ mkDerivation, base, data-default-class, directory, doctest - , fclabels, hspec, process, shake, split, unordered-containers - }: - mkDerivation { - pname = "shake-language-c"; - version = "0.10.1"; - sha256 = "0802chyihjbj5k2z0rdmzqbip7slfyabr56mdixq1m54yxs48ina"; - libraryHaskellDepends = [ - base data-default-class fclabels process shake split - unordered-containers - ]; - testHaskellDepends = [ base directory doctest hspec shake ]; - doCheck = false; - homepage = "https://github.com/samplecount/shake-language-c"; - description = "Utilities for cross-compiling with Shake"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "shake-language-c_0_11_0" = callPackage ({ mkDerivation, base, data-default-class, directory, doctest , fclabels, hspec, process, shake, split, unordered-containers }: @@ -181212,7 +177769,6 @@ self: { homepage = "https://github.com/samplecount/shake-language-c"; description = "Utilities for cross-compiling with Shake"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-minify" = callPackage @@ -181240,6 +177796,7 @@ self: { homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Rule"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-path" = callPackage @@ -181252,6 +177809,7 @@ self: { homepage = "http://cs-syd.eu"; description = "path alternatives to shake functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-persist" = callPackage @@ -181305,16 +177863,16 @@ self: { "shakers" = callPackage ({ mkDerivation, base, basic-prelude, deepseq, directory - , regex-compat, shake + , lifted-base, regex-compat, shake }: mkDerivation { pname = "shakers"; - version = "0.0.36"; - sha256 = "1l2dn9s1pijh84l0difw7sb2b3id49p64fn235lj5qybww60ijhw"; + version = "0.0.38"; + sha256 = "08wnf9cv4qsrnx2m3l1nfh74q6i14ng2js4h7gj3z5dv1ki3xwm9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base basic-prelude deepseq directory regex-compat shake + base basic-prelude deepseq directory lifted-base regex-compat shake ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; @@ -181324,32 +177882,6 @@ self: { }) {}; "shakespeare" = 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.14"; - sha256 = "0j5zx8ka7d7scvb9shm7k3376qzl3k4kpim9aqqfs6n86901zpl4"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - homepage = "http://www.yesodweb.com/book/shakespearean-templates"; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_14_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, time, transformers @@ -181372,7 +177904,6 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -181567,7 +178098,6 @@ self: { homepage = "https://github.com/nh2/shared-memory"; description = "POSIX shared memory"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sharedio" = callPackage @@ -181654,7 +178184,6 @@ self: { homepage = "https://github.com/psibi/shell-conduit"; description = "Write shell scripts with Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shell-escape" = callPackage @@ -181751,6 +178280,7 @@ self: { homepage = "https://github.com/valderman/shellmate"; description = "Extra functionality for shellmate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelltestrunner" = callPackage @@ -181786,38 +178316,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.6.8.3"; - sha256 = "11w47a1kd19f08d1m4hg8hmx18lyxbj3n027dcbl0ns549n77bkq"; - 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 hspec HUnit lifted-async lifted-base monad-control mtl - process system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - homepage = "https://github.com/yesodweb/Shelly.hs"; - description = "shell-like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shelly_1_6_8_7" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , enclosed-exceptions, exceptions, hspec, 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.6.8.7"; - sha256 = "10i9n4mmrfn6v02i320f4g3wak7yyjgijaj5kf9m2qpvw6wf95mj"; + version = "1.7.0"; + sha256 = "0jscygg381hzb4mjknrwsfw0q3j4sf1w4qrz1mf4k38794axx21q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181853,6 +178353,7 @@ self: { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shelly features that require extra dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shentong" = callPackage @@ -181997,6 +178498,7 @@ self: { homepage = "https://oss.xkcd.com/"; description = "A haskell API binding for shopify.com"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shortcircuit" = callPackage @@ -182187,10 +178689,11 @@ self: { }: mkDerivation { pname = "shuffle"; - version = "0.1.3.3"; - sha256 = "0ngva3p3838xay3zz442n99ilhk5d9majg342x6y7hs796lqbrrd"; + version = "0.1.4.0"; + sha256 = "1xqppg8yi6rqfnd7j7qrw1j7qqnp3hhzrcdv6d2hzmrhfzgrnmic"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal uuagc uuagc-cabal ]; libraryHaskellDepends = [ array base Cabal containers directory filepath network network-uri process uhc-util uuagc uuagc-cabal uulib @@ -182199,6 +178702,7 @@ self: { homepage = "https://github.com/UU-ComputerScience/shuffle"; description = "Shuffle tool for UHC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shunya-library" = callPackage @@ -182236,7 +178740,6 @@ self: { ]; description = "An interface to the Silicon Labs Si5351 clock chip"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sibe" = callPackage @@ -182263,6 +178766,7 @@ self: { homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -182362,6 +178866,7 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "signal" = callPackage @@ -182427,8 +178932,8 @@ self: { }: mkDerivation { pname = "silvi"; - version = "0.0.3"; - sha256 = "1brvx8acfvpcw402b3676ydi6r95js6bhaasll59bm1khhl8d90b"; + version = "0.0.4"; + sha256 = "18dc13g0w3y0v8s44vif2w302inbha57cz9ijjzr3s4maq6czw1a"; libraryHaskellDepends = [ base bytestring chronos http-types ip quantification savage text ]; @@ -182651,6 +179156,7 @@ self: { homepage = "https://github.com/TerrorJack/simple-download#readme"; description = "A simple wrapper of http-conduit for file download"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-effects" = callPackage @@ -183006,10 +179512,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.25"; - sha256 = "0k99j9xfcf83c55jmn202hdinhjaa4yn3dal4rvjk2w2rlhqirha"; - revision = "1"; - editedCabalFile = "1axghvn2iz0gzlc0ics4q8abl15ggwvcwcmly5cxhmc32hqv8y5c"; + version = "0.2.26"; + sha256 = "0z2r971bjy9wwv9rhnzh0ldd0z9zvqwyrq9yhz7m4lnf0k0wqq6z"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -183094,6 +179598,7 @@ self: { homepage = "http://jakewheat.github.io/simple-sql-parser/latest"; description = "A parser for SQL queries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-stacked-vm" = callPackage @@ -183139,6 +179644,7 @@ self: { ]; description = "Simple, pure, file-system-free reading of tar files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-templates" = callPackage @@ -183209,6 +179715,7 @@ self: { homepage = "https://github.com/DanielWaterworth/simple-zipper"; description = "Zippers made slightly easier"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simpleargs" = callPackage @@ -183222,6 +179729,22 @@ self: { homepage = "http://malde.org/~ketil/simpleargs"; description = "Provides a more flexible getArgs function with better error reporting"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "simpleconfig" = callPackage + ({ mkDerivation, base, containers, generic-deriving, lens, text }: + mkDerivation { + pname = "simpleconfig"; + version = "0.0.8"; + sha256 = "0xxnirw7px97gssi2i823hsri168jy2rjwkhnkh6c80p997icdjf"; + libraryHaskellDepends = [ base containers lens ]; + testHaskellDepends = [ + base containers generic-deriving lens text + ]; + homepage = "https://github.com/koterpillar/simpleconfig#readme"; + description = "Short description of your package"; + license = stdenv.lib.licenses.bsd3; }) {}; "simpleirc" = callPackage @@ -183255,6 +179778,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simplemesh" = callPackage + ({ mkDerivation, base, linear }: + mkDerivation { + pname = "simplemesh"; + version = "0.1.0.0"; + sha256 = "1cq8h96kr1qnxqma7if3pmxcw05nrirpnw703r4cba75xwgwlqcl"; + libraryHaskellDepends = [ base linear ]; + homepage = "https://github.com/jonascarpay/simplemesh#readme"; + description = "Generators for primitive meshes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simplenote" = callPackage ({ mkDerivation, base, bytestring, curl, dataenc, download-curl , HTTP, json, time, utf8-string @@ -183308,14 +179843,13 @@ self: { ({ mkDerivation, base, bytestring, libssh2, mtl }: mkDerivation { pname = "simplessh"; - version = "0.2.0.5"; - sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq"; + version = "0.2.0.6"; + sha256 = "1w67k70740dyrrp1k2xz5vbj6qm2smrq9g867z81dphwscqaknm3"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libssh2 ]; - homepage = "http://hub.darcs.net/thoferon/simplessh"; + homepage = "https://github.com/thoferon/simplessh"; description = "Simple wrapper around libssh2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libssh2;}; "simplest-sqlite" = callPackage @@ -183466,6 +180000,7 @@ self: { homepage = "https://github.com/amiddelk/singleton-dict#readme"; description = "Typelevel balanced search trees via a singletonized Data.Map"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-nats" = callPackage @@ -183480,26 +180015,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl - , process, syb, tasty, tasty-golden, template-haskell, th-desugar - }: + "singleton-typelits" = callPackage + ({ mkDerivation, base }: mkDerivation { - pname = "singletons"; - version = "2.2"; - sha256 = "1bwcsp1x8bivmvkv8a724lsnwyjharhb0x0hl0isp3jgigh0dg9k"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-desugar - ]; - testHaskellDepends = [ - base Cabal directory filepath process tasty tasty-golden - ]; - homepage = "http://www.github.com/goldfirere/singletons"; - description = "A framework for generating singleton types"; + pname = "singleton-typelits"; + version = "0.0.0.0"; + sha256 = "00f2nvs4avl3kxijcl7wb17ip1mcnb4fzqq5ckcz0a247qvv4yig"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mniip/singleton-typelits"; + description = "Singletons and induction over GHC TypeLits"; license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_3_1" = callPackage + "singletons" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, text , th-desugar @@ -183517,6 +180045,27 @@ self: { homepage = "http://www.github.com/goldfirere/singletons"; description = "A framework for generating singleton types"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "singletons_2_4_1" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc-boot-th + , mtl, process, syb, tasty, tasty-golden, template-haskell, text + , th-desugar, transformers + }: + mkDerivation { + pname = "singletons"; + version = "2.4.1"; + sha256 = "1kzrl9njvkbvxylk9jg61vy3ksmxmzymci5hdp0ilpsah4620yjx"; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl syb template-haskell text + th-desugar transformers + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-golden + ]; + homepage = "http://www.github.com/goldfirere/singletons"; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -183530,6 +180079,7 @@ self: { homepage = "https://github.com/zaoqi/Signal.hs"; description = "Singnal"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sink" = callPackage @@ -183567,20 +180117,20 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade - , contravariant, either, HUnit, pipes, profunctors, QuickCheck - , streaming, test-framework, test-framework-hunit + , contravariant, doctest, either, HUnit, pipes, profunctors + , QuickCheck, streaming, test-framework, test-framework-hunit , test-framework-quickcheck2, text, transformers, vector }: mkDerivation { pname = "siphon"; - version = "0.7"; - sha256 = "1k03gzgi9d27yzcvmxzibpgc5l6k7g41048x1qxd3l67qpxxbsl9"; + version = "0.8.0"; + sha256 = "1ssjbpl4vdx7z2gbl3xywlljk8iq25kaqgcsryigsmx9mgv7194q"; libraryHaskellDepends = [ attoparsec base bytestring colonnade streaming text transformers vector ]; testHaskellDepends = [ - base bytestring colonnade contravariant either HUnit pipes + base bytestring colonnade contravariant doctest either HUnit pipes profunctors QuickCheck streaming test-framework test-framework-hunit test-framework-quickcheck2 text ]; @@ -183592,26 +180142,29 @@ self: { "siren-json" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hspec, http-media, http-types, network-uri - , network-uri-json, QuickCheck, quickcheck-instances - , test-invariant, text, unordered-containers + , 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.0.2"; - sha256 = "0jkrqqfl713vpmypm7bkzvv5sia23zjhk0l90slyk4cmcmxn1s1a"; + version = "0.1.3.0"; + sha256 = "1dhza76kvifjsi6cznvy61r6pv7vbaqc7xk5ygd1lw1kw6ksmq9s"; 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-uri network-uri-json QuickCheck - quickcheck-instances test-invariant text unordered-containers + http-types network-arbitrary network-uri network-uri-json + QuickCheck quickcheck-instances test-invariant text + unordered-containers ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/alunduil/siren-json.hs"; description = "Siren Tools for Haskell"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ alunduil ]; }) {}; "sirkel" = callPackage @@ -183641,7 +180194,6 @@ self: { homepage = "http://github.com/alpmestan/sitemap"; description = "Sitemap parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sitepipe" = callPackage @@ -183663,6 +180215,7 @@ self: { homepage = "https://github.com/ChrisPenner/sitepipe#readme"; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sixfiguregroup" = callPackage @@ -183691,6 +180244,8 @@ self: { pname = "size-based"; version = "0.1.0.0"; sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx"; + revision = "1"; + editedCabalFile = "089942604ikg40v4nl25c4j856bylmmm06py4k2spz3y2z4k49rb"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -183714,7 +180269,6 @@ self: { ]; description = "Sized sequence data-types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sized-types" = callPackage @@ -183737,6 +180291,7 @@ self: { homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools"; description = "Sized types in Haskell using the GHC Nat kind"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sized-vector" = callPackage @@ -183919,6 +180474,7 @@ self: { homepage = "http://github.com/geekyfox/skulk"; description = "Eclectic collection of utility functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylark-client" = callPackage @@ -183946,40 +180502,6 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring - , case-insensitive, containers, criterion, Diff, directory - , filepath, HUnit, hxt, mtl, pretty-show, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text - , utf8-string - }: - mkDerivation { - pname = "skylighting"; - version = "0.1.1.5"; - sha256 = "0g5i6cz2b1rlx1h66zjl2lcdr6li7rk4sdmxhr9x7vng5imncjqa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base blaze-html bytestring case-insensitive containers - directory filepath hxt mtl regex-pcre-builtin safe text utf8-string - ]; - executableHaskellDepends = [ - aeson base blaze-html bytestring case-insensitive containers - directory filepath hxt pretty-show regex-pcre-builtin safe text - utf8-string - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show random tasty tasty-golden tasty-hunit text - ]; - benchmarkHaskellDepends = [ - base criterion directory filepath text - ]; - homepage = "https://github.com/jgm/skylighting"; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "skylighting_0_4_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -183988,8 +180510,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.4.1"; - sha256 = "1zvq31nbswidkr52fx91z5g326h4wnfk5sij3przgha117pl3v2j"; + version = "0.5.0.1"; + sha256 = "1jq61wdb83by5qkyfjp9bda2651ddnbskldc4cisr2xm4qjds1ap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184012,6 +180534,42 @@ self: { homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; + }) {}; + + "skylighting_0_5_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , blaze-html, bytestring, case-insensitive, containers, criterion + , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show + , QuickCheck, random, regex-pcre-builtin, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, utf8-string + }: + mkDerivation { + pname = "skylighting"; + version = "0.5.1"; + sha256 = "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary blaze-html + bytestring case-insensitive containers directory filepath hxt mtl + regex-pcre-builtin safe text utf8-string + ]; + executableHaskellDepends = [ + aeson base base64-bytestring binary blaze-html bytestring + case-insensitive containers directory filepath hxt pretty-show + regex-pcre-builtin safe text utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + homepage = "https://github.com/jgm/skylighting"; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -184116,6 +180674,30 @@ self: { }) {}; "slack-web" = callPackage + ({ mkDerivation, aeson, base, containers, errors, hspec + , http-api-data, http-client, http-client-tls, megaparsec, mtl + , servant, servant-client, text, time, transformers + }: + mkDerivation { + pname = "slack-web"; + version = "0.2.0.1"; + sha256 = "1v1w6szcjy4qgdx66754vkp7w4fnkyg0pngijy2v422pqmc4jpr9"; + libraryHaskellDepends = [ + aeson base containers errors http-api-data http-client + http-client-tls megaparsec mtl servant servant-client text time + transformers + ]; + testHaskellDepends = [ + aeson base containers errors hspec http-api-data megaparsec text + time + ]; + homepage = "https://github.com/jpvillaisaza/slack-web"; + description = "Bindings for the Slack web API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "slack-web_0_2_0_2" = 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 @@ -184140,6 +180722,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slate" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative }: + mkDerivation { + pname = "slate"; + version = "0.4.0.0"; + sha256 = "0j2n2wix01ildnpy6k289j5dlf9i7zbi1yd4k5hdvamwlvibqzjl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath optparse-applicative + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + testHaskellDepends = [ + base directory filepath optparse-applicative + ]; + homepage = "https://github.com/evuez/slate#readme"; + description = "A note taking CLI tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "slave-thread" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore @@ -184248,6 +180852,7 @@ self: { homepage = "http://akc.is/sloane"; description = "A command line interface to Sloane's OEIS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slope-field" = callPackage @@ -184352,14 +180957,15 @@ self: { ]; description = "Flatten camel case text in LaTeX files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallcheck" = callPackage ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: mkDerivation { pname = "smallcheck"; - version = "1.1.2"; - sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm"; + version = "1.1.3.1"; + sha256 = "1lmx0sxkhryra7laln8m7z0518jshahsvz121xybajjcz9pz3xcz"; libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; @@ -184411,6 +181017,7 @@ self: { homepage = "https://github.com/jdnavarro/smallcheck-series"; description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallpt-hs" = callPackage @@ -184571,6 +181178,7 @@ self: { testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; homepage = "https://github.com/zmactep/smiles#readme"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smoothie" = callPackage @@ -184601,6 +181209,7 @@ self: { homepage = "https://github.com/GetShopTV/smsaero"; description = "SMSAero API and HTTP client based on servant library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smt-lib" = callPackage @@ -184695,6 +181304,7 @@ self: { ]; description = "Helper functions to create SMTLib expressions in QuickCheck"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtlib2-timing" = callPackage @@ -184779,6 +181389,7 @@ self: { homepage = "https://github.com/enzoh/smtps-gmail"; description = "Gmail SMTP Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snake" = callPackage @@ -185206,10 +181817,8 @@ self: { }: mkDerivation { pname = "snap-templates"; - version = "1.0.0.0"; - sha256 = "06sns89y2b2y8ln9ci99vph9v67yphcvw7fwdqgp41wx2x496a7n"; - revision = "1"; - editedCabalFile = "0y86zbaw4ain6ia15b7fpr48sxxz37x230qvrf28dicxcxm8jmva"; + version = "1.0.0.1"; + sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185219,6 +181828,7 @@ self: { homepage = "http://snapframework.com/"; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-testing" = callPackage @@ -186206,6 +182816,7 @@ self: { homepage = "https://github.com/nmattia/snipcheck#readme"; description = "Markdown tester"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snippet-extractor" = callPackage @@ -186322,6 +182933,7 @@ self: { homepage = "http://hub.darcs.net/dag/snowball"; description = "Bindings to the Snowball library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snowflake" = callPackage @@ -186415,6 +183027,8 @@ self: { pname = "soap"; version = "0.2.3.5"; sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs"; + revision = "1"; + editedCabalFile = "0ki4g5520i7bam1gmammbb0nh8ibmjskqfv7kw2qjzzg4i9q3x95"; libraryHaskellDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -186437,6 +183051,8 @@ self: { pname = "soap-openssl"; version = "0.1.0.2"; sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; + revision = "1"; + editedCabalFile = "1b3aivn9jfaax00id7x4cqvpmd6lgynslchlry0qsmq1lj466cdf"; libraryHaskellDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text @@ -186455,6 +183071,8 @@ self: { pname = "soap-tls"; version = "0.1.1.2"; sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4"; + revision = "1"; + editedCabalFile = "0h6jgiifrphdphxfvgk95and4a86xp6afxi90v0b93cs2zyi0vsy"; libraryHaskellDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation @@ -186537,6 +183155,7 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-sctp" = callPackage @@ -186658,13 +183277,11 @@ self: { ({ mkDerivation, base, bytestring, cereal, network }: mkDerivation { pname = "socks"; - version = "0.5.5"; - sha256 = "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6"; - revision = "1"; - editedCabalFile = "0nz8q0xvd8y6f42bd1w3q8d8bg1qzl8ggx0a23kb3jb60g36dmvw"; + version = "0.5.6"; + sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs"; libraryHaskellDepends = [ base bytestring cereal network ]; homepage = "http://github.com/vincenthz/hs-socks"; - description = "Socks proxy (version 5) implementation"; + description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -186716,6 +183333,7 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Simple typesafe web routing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solga-swagger" = callPackage @@ -186734,6 +183352,7 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Swagger generation for Solga"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solr" = callPackage @@ -187120,7 +183739,6 @@ self: { homepage = "https://github.com/SeanRBurton/spaceprobe"; description = "Optimization over arbitrary search spaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spake2" = callPackage @@ -187171,31 +183789,6 @@ self: { }) {}; "sparkle" = callPackage - ({ mkDerivation, base, binary, bytestring, choice - , distributed-closure, filepath, jni, jvm, jvm-streaming, process - , regex-tdfa, singletons, streaming, text, vector, zip-archive - }: - mkDerivation { - pname = "sparkle"; - version = "0.5.0.1"; - sha256 = "0cyihfhxry3jrwyqrki14s6nw652w39m32ramg0nf1c85ahmhd3b"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring choice distributed-closure jni jvm - jvm-streaming singletons streaming text vector - ]; - executableHaskellDepends = [ - base bytestring filepath process regex-tdfa text zip-archive - ]; - homepage = "http://github.com/tweag/sparkle#readme"; - description = "Distributed Apache Spark applications in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "sparkle_0_6" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, choice , distributed-closure, filepath, inline-java, jni, jvm , jvm-streaming, process, regex-tdfa, singletons, streaming, text @@ -187203,8 +183796,8 @@ self: { }: mkDerivation { pname = "sparkle"; - version = "0.6"; - sha256 = "11i0bk9yl8ba84xm2hfxlnspygfafdannafg42iqfg1q6f8h2y7w"; + version = "0.7.2.1"; + sha256 = "1bfgj1a43aj4nwzq1471l2sb9il7sh0czc22fhmd8mhpbz6wlnsp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -187490,22 +184083,20 @@ self: { ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculate" = callPackage ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.3.1"; - sha256 = "01w44hd53n770fm49x70k3c4pwvsvp641x7kdnafg6czy8500s2k"; + version = "0.3.2"; + sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; homepage = "https://github.com/rudymatela/speculate#readme"; description = "discovery of properties about Haskell functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "speculation" = callPackage @@ -187605,6 +184196,7 @@ self: { homepage = "https://github.com/gregwebs/haskell-sphinx-client"; description = "Haskell bindings to the Sphinx full-text searching daemon"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sphinx-cli" = callPackage @@ -187638,6 +184230,7 @@ self: { homepage = "https://github.com/mackeyrms/sphinxesc#readme"; description = "Transform queries for sphinx input"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spice" = callPackage @@ -187934,6 +184527,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Splot"; description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spool" = callPackage @@ -188002,8 +184596,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.6"; - sha256 = "0xqkkycyl8dw1nv9glag98arvgb9b1yk95c8sfa2p2fh9mvyy3sk"; + version = "0.1.3.7"; + sha256 = "180vv2bka5b97gl1g6vdsri2yrfyy6ivdq4jw98qiw50pz66c2l4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188486,6 +185080,7 @@ self: { homepage = "http://functionalley.eu/Squeeze/squeeze.html"; description = "A file-packing application"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sr-extra" = callPackage @@ -188671,6 +185266,7 @@ self: { homepage = "https://github.com/Teaspot-Studio/ssh-tunnel#readme"; description = "Proxy http-client via ssh tunnel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sshd-lint" = callPackage @@ -188832,6 +185428,7 @@ self: { libraryHaskellDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-tree" = callPackage @@ -188861,36 +185458,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.2.2"; - sha256 = "0vmqfs956cziwb3q2v4nzn4b9d87062z9pixwfr7iiwd0ypmmiv6"; - revision = "2"; - editedCabalFile = "1bwdg0y98bw8p1857isjcg3f51d0nv52zbfc0s6f9syq70ahbhz9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_1_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec , megaparsec, mtl, template-haskell, text, unordered-containers @@ -188915,74 +185482,90 @@ self: { homepage = "https://github.com/stackbuilders/stache"; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base-compat, base64-bytestring, binary - , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit - , conduit-extra, containers, cryptonite, cryptonite-conduit - , deepseq, directory, echo, either, errors, exceptions, extra - , fast-logger, file-embed, filelock, filepath, fsnotify - , generic-deriving, ghc-prim, gitrev, hackage-security, hashable - , hastache, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-async, lifted-base, memory - , microlens, microlens-mtl, mintty, monad-control, monad-logger - , monad-unlift, mono-traversable, mtl, neat-interpolation - , network-uri, open-browser, optparse-applicative, optparse-simple - , path, path-io, persistent, persistent-sqlite, persistent-template - , pid1, pretty, process, project-template, QuickCheck - , regex-applicative-text, resourcet, retry, safe, safe-exceptions - , semigroups, smallcheck, split, stm, store, store-core - , streaming-commons, tar, template-haskell, temporary, text - , text-binary, text-metrics, th-reify-many, time, tls, transformers - , transformers-base, unicode-transforms, unix, unix-compat - , unordered-containers, vector, vector-binary-instances, yaml - , zip-archive, zlib + , attoparsec, base, base64-bytestring, bindings-uname + , blaze-builder, bytestring, Cabal, clock, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, fast-logger, file-embed, filelock + , filepath, fsnotify, generic-deriving, gitrev, hackage-security + , hashable, hastache, hpack, hpc, hspec, http-client + , http-client-tls, http-conduit, http-types, memory, microlens + , microlens-mtl, mintty, monad-logger, mono-traversable, mtl + , neat-interpolation, network-uri, open-browser + , optparse-applicative, optparse-simple, path, path-io, persistent + , persistent-sqlite, persistent-template, pid1, pretty, primitive + , process, project-template, QuickCheck, regex-applicative-text + , resourcet, retry, semigroups, smallcheck, split, stm, store + , store-core, streaming-commons, tar, template-haskell, temporary + , text, text-metrics, th-reify-many, time, tls, transformers + , unicode-transforms, unix, unix-compat, unliftio + , unordered-containers, vector, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.5.1"; - sha256 = "1hw8lwk4dxfzw27l64g2z7gscpnp7adw5cc8kplldazj0y2cnf6x"; - revision = "1"; - editedCabalFile = "1ywghpdjnwzk1m67fg5hzz16hxf7pqf5wayyzk1xjbnnl989gll6"; + version = "1.6.3"; + sha256 = "0ylika6qf7agj07wh47xjirhg74l63lx80q0xm41yd9g5ssk9cbj"; + revision = "2"; + editedCabalFile = "01kpvjg6a71yf1l4mlm292wr75vhgjvkkqzxkycimdjnn4j89bds"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base-compat base64-bytestring binary binary-tagged blaze-builder - bytestring Cabal clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo either errors exceptions - extra fast-logger file-embed filelock filepath fsnotify - generic-deriving ghc-prim hackage-security hashable hastache hpack - hpc http-client http-client-tls http-conduit http-types - lifted-async lifted-base memory microlens microlens-mtl mintty - monad-control monad-logger monad-unlift mtl network-uri - open-browser optparse-applicative path path-io persistent - persistent-sqlite persistent-template pid1 pretty process - project-template regex-applicative-text resourcet retry safe - safe-exceptions semigroups split stm store store-core - streaming-commons tar template-haskell temporary text text-binary - text-metrics time tls transformers transformers-base - unicode-transforms unix unix-compat unordered-containers vector - vector-binary-instances yaml zip-archive zlib + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hpack hpc http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + path path-io persistent persistent-sqlite persistent-template pid1 + pretty primitive process project-template regex-applicative-text + resourcet retry semigroups split stm store store-core + streaming-commons tar template-haskell temporary text text-metrics + th-reify-many time tls transformers unicode-transforms unix + unix-compat unliftio unordered-containers vector yaml zip-archive + zlib ]; executableHaskellDepends = [ - base bytestring Cabal conduit containers directory either filelock - filepath gitrev hpack http-client lifted-base microlens - monad-control monad-logger mtl optparse-applicative optparse-simple - path path-io split text transformers + aeson annotated-wl-pprint ansi-terminal async attoparsec base + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + gitrev hackage-security hashable hastache hpack hpc http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + optparse-simple path path-io persistent persistent-sqlite + persistent-template pid1 pretty primitive process project-template + regex-applicative-text resourcet retry semigroups split stm store + store-core streaming-commons tar template-haskell temporary text + text-metrics th-reify-many time tls transformers unicode-transforms + unix unix-compat unliftio unordered-containers vector yaml + zip-archive zlib ]; testHaskellDepends = [ - async attoparsec base bytestring Cabal conduit conduit-extra - containers cryptonite directory exceptions filepath hashable hspec - http-client-tls http-conduit monad-logger mono-traversable - neat-interpolation optparse-applicative path path-io process - QuickCheck resourcet retry smallcheck store template-haskell - temporary text th-reify-many transformers unix-compat - unordered-containers vector yaml + aeson annotated-wl-pprint ansi-terminal async attoparsec base + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hpack hpc hspec http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + path path-io persistent persistent-sqlite persistent-template pid1 + pretty primitive process project-template QuickCheck + regex-applicative-text resourcet retry semigroups smallcheck split + stm store store-core streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -189065,6 +185648,7 @@ self: { homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-run" = callPackage @@ -189085,6 +185669,7 @@ self: { homepage = "https://github.com/yamadapc/stack-run"; description = "An equivalent to cabal run for stack"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-run-auto" = callPackage @@ -189113,6 +185698,7 @@ self: { homepage = "http://github.com/yamadapc/stack-run-auto#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-type" = callPackage @@ -189127,6 +185713,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack-yaml" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, filepath + , Glob, text, yaml + }: + mkDerivation { + pname = "stack-yaml"; + version = "0.1.0.0"; + sha256 = "14cs9mds6xfy39nzyariisqxkzpkzi0r86ldb0kw60g4wgy9m6m5"; + libraryHaskellDepends = [ + base bytestring directory filepath text yaml + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/phlummox/stack-yaml"; + description = "Parse a stack.yaml file"; + license = stdenv.lib.licenses.mit; + }) {}; + "stack2nix" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , data-fix, directory, filepath, Glob, hnix, monad-parallel @@ -189146,7 +185749,6 @@ self: { executableHaskellDepends = [ base Cabal optparse-applicative ]; description = "Convert stack.yaml files into Nix build instructions."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage" = callPackage @@ -189237,54 +185839,10 @@ self: { homepage = "https://www.stackage.org/package/stackage-cli"; description = "A CLI library for stackage commands"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-curator" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal - , classy-prelude-conduit, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, data-default-class, directory - , exceptions, filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale - , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stm, store, streaming-commons, syb - , system-fileio, system-filepath, tar, temporary, text, time - , transformers, unix-compat, unordered-containers, utf8-string - , vector, xml-conduit, xml-types, yaml, zlib - }: - mkDerivation { - pname = "stackage-curator"; - version = "0.14.5"; - sha256 = "11ccjjv6lvivjnkwcgr565hlxgs1sispx561fl1hkxw0mwp1q0hi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring blaze-html byteable bytestring Cabal - classy-prelude-conduit conduit conduit-extra containers cryptohash - cryptohash-conduit data-default-class directory exceptions filepath - hashable html-conduit http-client http-client-tls http-conduit - lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stm store - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib - ]; - executableHaskellDepends = [ - aeson base http-client http-client-tls optparse-applicative - optparse-simple system-filepath text - ]; - testHaskellDepends = [ - base Cabal classy-prelude-conduit containers directory hspec - http-client http-client-tls QuickCheck text yaml - ]; - homepage = "https://github.com/fpco/stackage-curator"; - description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stackage-curator_0_15_1_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, blaze-html, bytestring, Cabal, classy-prelude-conduit , conduit, conduit-extra, containers, cryptonite @@ -189327,7 +185885,6 @@ self: { homepage = "https://github.com/fpco/stackage-curator"; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-install" = callPackage @@ -189376,6 +185933,7 @@ self: { homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool"; description = "Grab current metadata for all packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-query" = callPackage @@ -189395,6 +185953,7 @@ self: { homepage = "https://github.com/juhp/stackage-query"; description = "Stackage package query"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-sandbox" = callPackage @@ -189416,6 +185975,7 @@ self: { homepage = "https://www.stackage.org/package/stackage-sandbox"; description = "Work with shared stackage sandboxes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-setup" = callPackage @@ -189459,6 +186019,7 @@ self: { homepage = "https://github.com/fpco/stackage-types"; description = "Shared data types between various Stackage packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-update" = callPackage @@ -189497,6 +186058,7 @@ self: { homepage = "https://github.com/fpco/stackage-upload"; description = "A more secure version of cabal upload which uses HTTPS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage2nix" = callPackage @@ -189509,8 +186071,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.3.0"; - sha256 = "1cgcdgsw8qbc7dcfvj2jhwaja5x03fqa8f67c8f86fzrn0wcvw47"; + version = "0.4.0"; + sha256 = "0qj8v7kdyqsgm518gfrpdsvv7njwzrg2lm3k6cwd3lh50l9vsgcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189524,7 +186086,7 @@ self: { testHaskellDepends = [ base bytestring Cabal hspec pretty shakespeare text yaml ]; - homepage = "https://github.com/4e6/stackage2nix#readme"; + homepage = "https://github.com/typeable/stackage2nix#readme"; description = "Convert Stack files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -189598,8 +186160,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "star"; - version = "0.0.0.2"; - sha256 = "1xg1gfdkskhkvd1a2nlaxc9942xi1j406p58i4ycb15lqcz8nz27"; + version = "0.0.1.0"; + sha256 = "03lk46s8v3pgxgk4ddyf382rspqvkf61v9bffhym0pd4didnz9d5"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/chessai/star#readme"; description = "*-semirings"; @@ -189734,6 +186296,7 @@ self: { testHaskellDepends = [ base checkers mtl QuickCheck ]; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state-record" = callPackage @@ -189847,7 +186410,6 @@ self: { homepage = "http://github.com/brendanhay/statgrab"; description = "Collect system level metrics and statistics"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libstatgrab;}; "static-canvas" = callPackage @@ -189860,6 +186422,7 @@ self: { homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "static-hash" = callPackage @@ -189901,8 +186464,8 @@ self: { }: mkDerivation { pname = "static-tensor"; - version = "0.2.0.0"; - sha256 = "1jnl9gv2z4554arzfkrna49vn646i4q57l3g8pq4phzzmq79hh1p"; + version = "0.2.1.0"; + sha256 = "0h95kmrm2kqs84kcp2n3cdrkqn7ygnypqj357gvwxv3wj6zldrp2"; libraryHaskellDepends = [ base deepseq lens mono-traversable singletons split template-haskell @@ -189931,30 +186494,6 @@ self: { }) {}; "statistics" = callPackage - ({ mkDerivation, aeson, base, binary, deepseq, 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 - }: - mkDerivation { - pname = "statistics"; - version = "0.13.3.0"; - sha256 = "1vc12c3mnpspbycwkl0b22jqrdbg9fpmr1fxdxlmqwl603qy0zvf"; - libraryHaskellDepends = [ - aeson base binary deepseq erf math-functions monad-par mwc-random - primitive vector vector-algorithms vector-binary-instances - ]; - testHaskellDepends = [ - base binary erf HUnit ieee754 math-functions mwc-random primitive - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 vector vector-algorithms - ]; - homepage = "https://github.com/bos/statistics"; - description = "A library of statistical types, data, and functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "statistics_0_14_0_2" = callPackage ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive , QuickCheck, test-framework, test-framework-hunit @@ -189978,7 +186517,6 @@ self: { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statistics-dirichlet" = callPackage @@ -190091,6 +186629,7 @@ self: { homepage = "https://github.com/keithduncan/statsd-client"; description = "Statsd UDP client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statsd-datadog" = callPackage @@ -190147,6 +186686,7 @@ self: { homepage = "https://github.com/debug-ito/staversion"; 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 @@ -190165,15 +186705,14 @@ self: { ({ mkDerivation, base, hspec, vector }: mkDerivation { pname = "stb-image-redux"; - version = "0.2.1.0"; - sha256 = "07gbj7qqgm3dwx6bign8qma3a0187p5nil7z612976bdpz9abr60"; - revision = "2"; - editedCabalFile = "1ils1w36y3c4ik0mxnadrhxw1fy426av438ckg2fgnzys0i5zqp2"; + version = "0.2.1.2"; + sha256 = "1s23f38za0zv9vzj4qn5qq2ajhgr6g9gsd2nck2hmkqfjpw1mx1v"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; - homepage = "https://github.com/sasinestro/stb-image-redux#readme"; + homepage = "https://github.com/typedrat/stb-image-redux#readme"; description = "Image loading and writing microlibrary"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stb-truetype" = callPackage @@ -190267,6 +186806,7 @@ self: { homepage = "https://github.com/schell/steeloverseer#readme"; description = "A file watcher and development tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stego-uuid" = callPackage @@ -190294,6 +186834,7 @@ self: { homepage = "http://www.github.com/bgamari/stemmer"; description = "Haskell bindings to the Snowball stemming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stemmer-german" = callPackage @@ -190305,6 +186846,7 @@ self: { libraryHaskellDepends = [ base text ]; description = "Extract the stem of a German inflected word form"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "step-function" = callPackage @@ -190320,7 +186862,6 @@ self: { homepage = "https://github.com/jonpetterbergman/step-function"; description = "Step functions, staircase functions or piecewise constant functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stepwise" = callPackage @@ -190390,6 +186931,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "lightweight CSS DSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm" = callPackage @@ -190603,6 +187145,7 @@ self: { homepage = "http://www.github.com/danr/stm-promise"; description = "Simple STM Promises for IO computations and external processes"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-queue-extras" = callPackage @@ -191011,43 +187554,14 @@ self: { }) {}; "stratosphere" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.6.0"; - sha256 = "0mv21ac8lnrrgmay4j4bfmw9k8r7cw4mh0i9145drl62p0zi26g2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hashable hlint lens - tasty tasty-hspec template-haskell text unordered-containers - ]; - homepage = "https://github.com/frontrowed/stratosphere#readme"; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "stratosphere_0_13_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.13.0"; - sha256 = "15b7s0jgsqrpsjh4l4i39k45qx9m0k4xsbhhm6ffzxlqi2ivkayz"; + version = "0.14.0"; + sha256 = "11y97l0qsyab8hk126qi4lj8a8d13wp8zhk2qsqwy31rcmjipr0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191065,7 +187579,6 @@ self: { homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stratum-tool" = callPackage @@ -191246,18 +187759,17 @@ self: { "streaming" = callPackage ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph - , monad-control, mtl, resourcet, time, transformers - , transformers-base + , mtl, transformers, transformers-base }: mkDerivation { pname = "streaming"; - version = "0.1.4.5"; - sha256 = "0hv8vajs0syi5r5bbqra0lp2ycfd7gw3x0n51x431slcq3i21afn"; + version = "0.2.0.0"; + sha256 = "08l7x3cbska45pv754nnkms1m6jmgi0qv4apsvdmc2mni4cb5jkn"; libraryHaskellDepends = [ - base containers exceptions ghc-prim mmorph monad-control mtl - resourcet time transformers transformers-base + base containers exceptions ghc-prim mmorph mtl transformers + transformers-base ]; - homepage = "https://github.com/michaelt/streaming"; + homepage = "https://github.com/haskell-streaming/streaming"; description = "an elementary streaming prelude and general stream type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -191288,8 +187800,8 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.4.6"; - sha256 = "00kars95baxdg97vfp904phnfszv4sicq7248wijkkzbg3frgmc9"; + version = "0.1.5"; + sha256 = "0ih7ngqbign834i7z1hlqb0g0f3gphgrz6n8sdj81h36vmm6yd8j"; libraryHaskellDepends = [ base bytestring deepseq exceptions mmorph mtl resourcet streaming transformers transformers-base @@ -191298,7 +187810,7 @@ self: { base bytestring smallcheck streaming tasty tasty-smallcheck transformers ]; - homepage = "https://github.com/michaelt/streaming-bytestring"; + homepage = "https://github.com/haskell-streaming/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -191326,31 +187838,6 @@ self: { }) {}; "streaming-commons" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , criterion, deepseq, directory, hspec, network, process - , QuickCheck, random, stm, text, transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; - version = "0.1.17"; - sha256 = "1abxyjkn8xc8d33yhqxy1ki01kpzf4hy55f167qg4vk2ig5kh2p5"; - libraryHaskellDepends = [ - array async base blaze-builder bytestring directory network process - random stm text transformers unix zlib - ]; - testHaskellDepends = [ - array async base blaze-builder bytestring deepseq hspec network - QuickCheck text unix zlib - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text - ]; - homepage = "https://github.com/fpco/streaming-commons"; - description = "Common lower-level functions needed by various streaming data libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "streaming-commons_0_1_18" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , criterion, deepseq, directory, hspec, network, process , QuickCheck, random, stm, text, transformers, unix, zlib @@ -191373,7 +187860,6 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -191394,6 +187880,7 @@ self: { ]; description = "Concurrency support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-conduit" = callPackage @@ -191410,6 +187897,7 @@ self: { testHaskellDepends = [ base conduit hspec streaming ]; description = "Bidirectional support between the streaming and conduit libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-eversion" = callPackage @@ -191432,6 +187920,7 @@ self: { ]; description = "Translate pull-based stream folds into push-based iteratees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-histogram" = callPackage @@ -191471,6 +187960,7 @@ self: { ]; description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-png" = callPackage @@ -191501,16 +187991,15 @@ self: { }: mkDerivation { pname = "streaming-postgresql-simple"; - version = "0.2.0.1"; - sha256 = "1ffsxwgsaxqnf49n4lnyrh2zy6q9zc1i3ssd03m08ip813pk5j8k"; - revision = "1"; - editedCabalFile = "1y5j3p3gphr3mnzl1dvfmbm8iipsdy0vq2fk0klxgid1dsqfl2vn"; + version = "0.2.0.3"; + sha256 = "1gy6yy14q18zfbbj6rvsnhvhkra78m2jwbyd3hnpbx25jgvz230n"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers ]; description = "Stream postgresql-query results using the streaming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-utils" = callPackage @@ -191531,6 +188020,7 @@ self: { homepage = "https://github.com/michaelt/streaming-utils"; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-wai" = callPackage @@ -191565,6 +188055,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streamly" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion + , exceptions, hspec, lifted-base, lockfree-queue, monad-control + , mtl, stm, transformers, transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.1.0"; + sha256 = "1apw961n69rix4vvb7bsdald0w1qnal1vawi66nw64cyn696sbzi"; + revision = "1"; + editedCabalFile = "0cx4s17r2nn6xwa9lpcn7scvbqqxi6ihxyb20axhj5rim8iz94hm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base containers exceptions lifted-base + lockfree-queue monad-control mtl stm transformers transformers-base + ]; + testHaskellDepends = [ base containers hspec ]; + benchmarkHaskellDepends = [ atomic-primops base criterion mtl ]; + homepage = "https://github.com/composewell/streamly"; + description = "Beautiful Streaming, Concurrent and Reactive Composition"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -191603,8 +188117,8 @@ self: { }: mkDerivation { pname = "strelka"; - version = "2.0.1"; - sha256 = "12bmfbsrgplyd42scppp74d5zck0a7vakc5jjz07lpvw0qahvxr4"; + version = "2.0.2"; + sha256 = "1lrp6llvl0g469gjgl7rl67qj8zn1ssbg61n6qwkb8lqqqpq03mq"; libraryHaskellDepends = [ attoparsec attoparsec-data base base-prelude base64-bytestring bifunctors bytestring bytestring-tree-builder hashable http-media @@ -191705,7 +188219,6 @@ self: { homepage = "https://github.com/ygale/strict-concurrency"; description = "Strict concurrency abstractions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-data" = callPackage @@ -191785,7 +188298,6 @@ self: { homepage = "https://github.com/pepeiborra/strict-types"; description = "A type level predicate ranging over strict types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-writer" = callPackage @@ -192063,6 +188575,7 @@ self: { ]; description = "Implements the \"StringPrep\" algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strings" = callPackage @@ -192162,7 +188675,6 @@ self: { homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-http-streams" = callPackage @@ -192183,7 +188695,6 @@ self: { doCheck = false; description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-tests" = callPackage @@ -192226,8 +188737,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "3.0.4"; - sha256 = "0bd2zq2v9fl97vadzs78h9v5ib4a7laqlqxaqgfk5y6hh42yvcyk"; + version = "4.0.3"; + sha256 = "1b1shq0jznyx9cbir33diflw1602py651rqj2hfjrgdywjrac8fq"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -192238,15 +188749,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "strive_4_0_1" = callPackage + "strive_5_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit , template-haskell, text, time, transformers }: mkDerivation { pname = "strive"; - version = "4.0.1"; - sha256 = "1bws8z9ky5zryzy7njllm2f7lddbncb1rxz2ngq6kqcdnc14ph2v"; + version = "5.0.0"; + sha256 = "1ywzn3vg47w36777ha0w2gx64kfnw2mdj9b9w60q3d6pl052lxq0"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -192288,7 +188799,6 @@ self: { homepage = "http://github.com/ekmett/structs/"; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "structural-induction" = callPackage @@ -192431,6 +188941,7 @@ self: { ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stunclient" = callPackage @@ -192454,6 +188965,7 @@ self: { ]; description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stunts" = callPackage @@ -192536,6 +189048,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylish-haskell_0_9_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, filepath, haskell-src-exts, HUnit, mtl + , optparse-applicative, strict, syb, test-framework + , test-framework-hunit, yaml + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.9.0.2"; + sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts mtl syb yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts mtl optparse-applicative strict syb yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts HUnit mtl syb test-framework test-framework-hunit + yaml + ]; + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -192655,6 +189198,7 @@ self: { homepage = "https://github.com/dahlia/submark#readme"; description = "Extract a part from CommonMark/Markdown docs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "subnet" = callPackage @@ -192724,13 +189268,13 @@ self: { }) {}; "subzero" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "subzero"; - version = "0.1.0.3"; - sha256 = "0va9j5vh3a4rsj7hcgq38ij7dsi08rhm43s3jsymx38q8kxhv6f8"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + version = "0.1.0.8"; + sha256 = "0vf5crr60nixklxndpay1lp9yvhxjzmza8g5b5gz97hkyqicaid7"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; homepage = "https://github.com/code5hot/subzero#readme"; description = "Helps when going \"seed values\" -> alternatives and optional -> answers"; license = stdenv.lib.licenses.gpl2; @@ -192756,12 +189300,13 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "successors"; - version = "0.1"; - sha256 = "0mkb9wsmd1q6d9qll15xf0fxp2hlyp5hsj7j7wv60a32si3cjvk3"; + version = "0.1.0.1"; + sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nomeata/haskell-successors"; description = "An applicative functor to manage successors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suffix-array" = callPackage @@ -192783,6 +189328,7 @@ self: { homepage = "https://github.com/kadoban/suffix-array#readme"; description = "Simple and moderately efficient suffix array implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suffixarray" = callPackage @@ -192868,7 +189414,6 @@ self: { homepage = "http://github.com/bgamari/sump"; description = "A Haskell interface to SUMP-compatible logic analyzers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sundown" = callPackage @@ -193028,6 +189573,7 @@ self: { homepage = "https://github.com/agrafix/superbuffer#readme"; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supercollider-ht" = callPackage @@ -193125,7 +189671,6 @@ self: { testHaskellDepends = [ base containers ghc QuickCheck ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supero" = callPackage @@ -193166,6 +189711,7 @@ self: { homepage = "https://github.com/agrafix/superrecord#readme"; description = "Supercharged anonymous records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supervisor" = callPackage @@ -193255,8 +189801,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.6.2"; - sha256 = "1vrrjdid864s86dqs9a37s8jw7a4pb3ghfxii45dd9phwnd5vr1b"; + version = "0.6.2.1"; + sha256 = "03xwx2gr3fi19rdkskxl1jwncngnjra234d378mfxxfvfs820f9q"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -193425,6 +189971,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "swagger-petstore_0_0_1_7" = 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 = "swagger-petstore"; + version = "0.0.1.7"; + sha256 = "07p2hd35wg5g1r3lmhffvjch5vy6idmhdv21k1g8v3131apgjpxy"; + 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 + ]; + homepage = "https://github.com/swagger-api/swagger-codegen#readme"; + description = "Auto-generated swagger-petstore API Client"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swagger-test" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, blaze-html , bytestring, case-insensitive, containers, directory, filepath @@ -193453,45 +190028,15 @@ self: { homepage = "https://github.com/rodrigosetti/swagger-test"; description = "Testing of Swagger APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger2" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob - , hashable, hspec, http-media, HUnit, insert-ordered-containers - , lens, mtl, network, QuickCheck, scientific, template-haskell - , text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.1.6"; - sha256 = "01a29h56vfyw0ilij1pn6qwy50ca90kyj884vs1q52vvh572758j"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat 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 bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - text time unordered-containers vector - ]; - homepage = "https://github.com/GetShopTV/swagger2"; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "swagger2_2_2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob - , hashable, hspec, http-media, HUnit, insert-ordered-containers - , lens, mtl, network, QuickCheck, scientific, template-haskell - , text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector + , hashable, hspec, hspec-discover, http-media, HUnit + , insert-ordered-containers, lens, mtl, network, QuickCheck + , scientific, template-haskell, text, time, transformers + , transformers-compat, unordered-containers, uuid-types, vector }: mkDerivation { pname = "swagger2"; @@ -193509,10 +190054,10 @@ self: { hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck text time unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -193629,7 +190174,6 @@ self: { ]; description = "A simple web server for serving directories, similar to weborf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sxml" = callPackage @@ -193720,6 +190264,7 @@ self: { homepage = "https://github.com/reactive-systems/syfco"; description = "Synthesis Format Conversion Tool / Library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sylvia" = callPackage @@ -193790,6 +190335,7 @@ self: { ]; description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symantic-document" = callPackage @@ -193817,6 +190363,7 @@ self: { ]; description = "Library for symantic grammars"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symantic-lib" = callPackage @@ -194274,42 +190821,9 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-core" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, event-list, explicit-exception, filepath - , non-empty, non-negative, numeric-prelude, numeric-quest, old-time - , process, QuickCheck, random, sample-frame-np, sox - , storable-record, storable-tuple, storablevector, timeit - , transformers, utility-ht - }: - mkDerivation { - pname = "synthesizer-core"; - version = "0.8.1.1"; - sha256 = "0drh5lmia3bvmdc7f7zl8y3ls43dl7mvb11383k49xlh0adlllka"; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq event-list - explicit-exception filepath non-empty non-negative numeric-prelude - numeric-quest process QuickCheck random sample-frame-np sox - storable-record storable-tuple storablevector transformers - utility-ht - ]; - testHaskellDepends = [ - base containers event-list non-empty non-negative numeric-prelude - QuickCheck random storable-tuple storablevector utility-ht - ]; - benchmarkHaskellDepends = [ - array base binary bytestring directory numeric-prelude old-time - storable-tuple storablevector timeit utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; - description = "Audio signal processing coded in Haskell: Low level part"; - license = "GPL"; - }) {}; - - "synthesizer-core_0_8_1_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, event-list, explicit-exception, filepath , non-empty, non-negative, numeric-prelude, numeric-quest, old-time @@ -194340,7 +190854,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell: Low level part"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-dimensional" = callPackage @@ -194457,7 +190970,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sys-auth-smbclient" = callPackage @@ -194492,6 +191004,7 @@ self: { homepage = "https://github.com/NICTA/sys-process"; description = "A replacement for System.Exit and System.Process."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sysinfo" = callPackage @@ -194505,7 +191018,6 @@ self: { homepage = "https://github.com/psibi/sysinfo#readme"; description = "Haskell Interface for getting overall system statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "system-argv0" = callPackage @@ -194555,6 +191067,7 @@ self: { homepage = "https://github.com/tonymorris/system-command"; description = "A replacement for System.Exit and System.Process"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-extra" = callPackage @@ -194643,7 +191156,6 @@ self: { homepage = "http://darcs.imperialviolet.org/system-inotify"; description = "Binding to Linux's inotify interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "system-lifted" = callPackage @@ -194770,7 +191282,6 @@ self: { homepage = "https://github.com/joeyadams/haskell-system-time-monotonic"; description = "Simple library for using the system's monotonic clock"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "system-util" = callPackage @@ -195035,6 +191546,7 @@ self: { ]; description = "An interactive theorem prover based on semantic tableaux"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tables" = callPackage @@ -195164,7 +191676,7 @@ self: { homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "tag-bits" = callPackage @@ -195266,6 +191778,7 @@ self: { homepage = "https://github.com/trskop/tagged-exception-core"; description = "Reflect exceptions using phantom types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged-identity" = callPackage @@ -195367,10 +191880,8 @@ self: { }: mkDerivation { pname = "taggy"; - version = "0.2.0"; - sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3"; - revision = "1"; - editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3"; + version = "0.2.1"; + sha256 = "1xmxwg024k5q4ah0pfn6nhyrznskgwg6anw558qzb4k5rjk3b7nq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -195389,7 +191900,6 @@ self: { homepage = "http://github.com/alpmestan/taggy"; description = "Efficient and simple HTML/XML parsing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taggy-lens" = callPackage @@ -195409,7 +191919,6 @@ self: { homepage = "http://github.com/alpmestan/taggy-lens"; description = "Lenses for the taggy html/xml parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taglib" = callPackage @@ -195471,20 +191980,6 @@ self: { }) {}; "tagsoup" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: - mkDerivation { - pname = "tagsoup"; - version = "0.14.1"; - sha256 = "1ssaqvwjjaqv30z44jm6z3xjpbvjxb57217rk67r3q34m1hfd2q2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring containers text ]; - homepage = "https://github.com/ndmitchell/tagsoup#readme"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tagsoup_0_14_2" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , process, QuickCheck, text, time }: @@ -195500,7 +191995,6 @@ self: { homepage = "https://github.com/ndmitchell/tagsoup#readme"; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagsoup-ht" = callPackage @@ -195543,6 +192037,7 @@ self: { homepage = "https://github.com/kseo/tagsoup-megaparsec#readme"; description = "A Tag token parser and Tag specific parsing combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagsoup-parsec" = callPackage @@ -195605,7 +192100,7 @@ self: { homepage = "https://oss.xkcd.com/"; description = "Support library to enable TAI usage on systems with time kept in UTC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tai64" = callPackage @@ -195625,6 +192120,7 @@ self: { homepage = "https://github.com/kim/tai64"; description = "Tai64 Labels for Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tailfile-hinotify" = callPackage @@ -195647,7 +192143,7 @@ self: { ]; description = "Tail files in Unix, using hinotify"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tak" = callPackage @@ -195736,6 +192232,7 @@ self: { homepage = "https://github.com/sweirich/tal"; description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tamarin-prover" = callPackage @@ -195953,8 +192450,8 @@ self: { }: mkDerivation { pname = "tart"; - version = "0.1.1"; - sha256 = "1a1nh093lklih1hq7lhkqp9l48wf66axlf1hsb8h2zmkv09z517h"; + version = "0.1.2"; + sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196064,18 +192561,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_0_12" = callPackage + "tasty_1_0" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays, unix + , deepseq, mtl, optparse-applicative, stm, tagged, unbounded-delays + , unix }: mkDerivation { pname = "tasty"; - version = "0.12"; - sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1"; + version = "1.0"; + sha256 = "0wdcq1467x511bs3s439szr5a36qhm7sjmdi6jsy9v3z9lfrf580"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays unix + optparse-applicative stm tagged unbounded-delays unix ]; homepage = "https://github.com/feuerbach/tasty"; description = "Modern and extensible testing framework"; @@ -196127,21 +192624,20 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.6.0.0"; - sha256 = "0qcfypb69052rdrfvssy3py2im86i71rmlv7w954y9rmbby1kl4n"; + version = "0.7.1.1"; + sha256 = "04qmgvm6z2bfbb8dsbj71famyiacswp7nbjwsa043w4i0hnsgpsl"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_1_1" = callPackage + "tasty-dejafu_1_0_0_0" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.1.1"; - sha256 = "04qmgvm6z2bfbb8dsbj71famyiacswp7nbjwsa043w4i0hnsgpsl"; + version = "1.0.0.0"; + sha256 = "1gybk59c1jcbpmyrddfqs45z026rvfk6idd99shds3qhlfbm4897"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -196150,35 +192646,14 @@ self: { }) {}; "tasty-discover" = callPackage - ({ mkDerivation, base, containers, directory, filepath, tasty - , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-discover"; - version = "3.0.2"; - sha256 = "1bd37d5gppi3lmc244bixv8jpzfx4m14cbqklnwmjhhqviic79h2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers directory filepath ]; - executableHaskellDepends = [ base containers directory filepath ]; - testHaskellDepends = [ - base containers directory filepath tasty tasty-hspec tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/lwm/tasty-discover#readme"; - description = "Test discovery for the tasty framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-discover_4_1_1" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-discover"; - version = "4.1.1"; - sha256 = "0lsz73rnvwb6z522bxfhlslvvymnjw7kw4fs8llwr3w6cvzl5vfj"; + version = "4.1.3"; + sha256 = "13w177l9ghfb9dwjwp4y1j45y2acv2ga7nw38jcqgj6a81ai9m5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196195,7 +192670,6 @@ self: { homepage = "https://github.com/lwm/tasty-discover#readme"; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -196236,8 +192710,8 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.3.1.1"; - sha256 = "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy"; + version = "2.3.1.2"; + sha256 = "088rvrvmi8wjci3zlyn3mph1yjl77j0wabdwzp4x2wxpygviy7k9"; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary @@ -196484,21 +192958,6 @@ self: { }) {}; "tasty-quickcheck" = callPackage - ({ mkDerivation, base, pcre-light, QuickCheck, tagged, tasty - , tasty-hunit - }: - mkDerivation { - pname = "tasty-quickcheck"; - version = "0.8.4"; - sha256 = "15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn"; - libraryHaskellDepends = [ base QuickCheck tagged tasty ]; - testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; - homepage = "http://documentup.com/feuerbach/tasty"; - description = "QuickCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-quickcheck_0_9_1" = callPackage ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged , tasty, tasty-hunit }: @@ -196511,7 +192970,6 @@ self: { homepage = "http://documentup.com/feuerbach/tasty"; description = "QuickCheck support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-rerun" = callPackage @@ -196520,8 +192978,8 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.7"; - sha256 = "18hz1xqinf59mzvd68ygj9333v0a32qxfcas7crn4iniq5zv71kj"; + version = "1.1.8"; + sha256 = "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788"; libraryHaskellDepends = [ base containers mtl optparse-applicative reducers split stm tagged tasty transformers @@ -196534,17 +192992,17 @@ self: { "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit - , temporary, text, transformers + , process-extras, regex-tdfa, semigroups, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers }: mkDerivation { pname = "tasty-silver"; - version = "3.1.10"; - sha256 = "1yvfkl1dkp2bmcaa0bjamw13ky007rhn4wci3cia97glpy9nv24f"; + version = "3.1.11"; + sha256 = "1rvky2661s77wnm8c0jh0hkp3jjp5c1vndv9ilg4s47kw77708az"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa - stm tagged tasty temporary text + semigroups stm tagged tasty temporary text ]; testHaskellDepends = [ base directory filepath process tasty tasty-hunit temporary @@ -196575,8 +193033,8 @@ self: { pname = "tasty-stats"; version = "0.2.0.3"; sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; - revision = "1"; - editedCabalFile = "1kvvz549gs7vm9w6gypr8pa1klsab335rzmdq7v638rvijgqfbn8"; + revision = "2"; + editedCabalFile = "1gkan66glb235kakvwkidmxd0cn7s9405w3njiwa5k6cvkpkny4x"; libraryHaskellDepends = [ base containers directory process stm tagged tasty time ]; @@ -196775,30 +193233,6 @@ self: { }) {}; "tcp-streams" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , HUnit, io-streams, network, pem, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, tls, x509 - , x509-store, x509-system - }: - mkDerivation { - pname = "tcp-streams"; - version = "0.6.0.0"; - sha256 = "1g0g9r62gklsn99ncqkyxlk8qwmxd7iyhshq03k7ghdlsj9linfg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring data-default-class io-streams network pem tls x509 - x509-store x509-system - ]; - testHaskellDepends = [ - base bytestring directory HUnit io-streams network QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/winterland1989/tcp-streams"; - description = "One stop solution for tcp client and server with tls support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tcp-streams_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, directory , HUnit, io-streams, network, pem, test-framework , test-framework-hunit, tls, x509, x509-store, x509-system @@ -196819,35 +193253,9 @@ self: { homepage = "https://github.com/didi-FP/tcp-streams"; description = "One stop solution for tcp client and server with tls support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tcp-streams-openssl" = callPackage - ({ mkDerivation, base, bytestring, directory, HsOpenSSL - , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck - , tcp-streams, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "tcp-streams-openssl"; - version = "0.6.0.0"; - sha256 = "154dpw0aqj5a2zqfqkhkv8n9rsmzzxwildpjgr875qqz0gnihk2c"; - libraryHaskellDepends = [ - base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network - tcp-streams - ]; - testHaskellDepends = [ - base bytestring directory HUnit io-streams network QuickCheck - tcp-streams test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "https://github.com/winterland1989/tcp-streams"; - description = "Tcp streams using openssl for tls support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tcp-streams-openssl_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system , HUnit, io-streams, network, tcp-streams, test-framework , test-framework-hunit @@ -196921,6 +193329,7 @@ self: { homepage = "https://github.com/futurice/haskell-tdigest#readme"; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdigest-Chart" = callPackage @@ -196944,6 +193353,7 @@ self: { homepage = "https://github.com/futurice/haskell-tdigest#readme"; description = "Chart generation from tdigest"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdoc" = callPackage @@ -196975,28 +193385,6 @@ self: { }) {}; "teardown" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest - , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit - , tasty-rerun, tasty-smallcheck, text, time - }: - mkDerivation { - pname = "teardown"; - version = "0.1.0.1"; - sha256 = "0jxhr73dq4gvbzrwhbqsrwg1v8qa2mj1nfygb44kj60diwa4cwj2"; - libraryHaskellDepends = [ - ansi-wl-pprint base deepseq protolude text time - ]; - testHaskellDepends = [ - base doctest Glob protolude QuickCheck tasty tasty-hspec - tasty-hunit tasty-rerun tasty-smallcheck text time - ]; - benchmarkHaskellDepends = [ base criterion protolude text time ]; - homepage = "https://github.com/roman/Haskell-teardown#readme"; - description = "Build composable, idempotent & transparent application cleanup sub-routines"; - license = stdenv.lib.licenses.mit; - }) {}; - - "teardown_0_3_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest , exceptions, Glob, protolude, QuickCheck, safe-exceptions, tasty , tasty-hspec, tasty-hunit, tasty-rerun, tasty-smallcheck, text @@ -197020,7 +193408,6 @@ self: { homepage = "https://github.com/roman/Haskell-teardown#readme"; description = "Build composable components for your application with clear teardown semantics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teeth" = callPackage @@ -197033,6 +193420,7 @@ self: { homepage = "https://github.com/expipiplus1/teeth"; description = "Dental data types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "telegram" = callPackage @@ -197055,13 +193443,13 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath , hjpath, hspec, http-api-data, http-client, http-client-tls , http-media, http-types, mime-types, mtl, optparse-applicative - , servant, servant-client, string-conversions, text, transformers - , utf8-string + , random, servant, servant-client, string-conversions, text + , transformers, utf8-string }: mkDerivation { pname = "telegram-api"; - version = "0.6.3.0"; - sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia"; + version = "0.7.1.0"; + sha256 = "0shb5al3ih6qrs2aw1h03mfqk954gml1lnyh6svzcsz9z6f7hvbb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media @@ -197070,7 +193458,7 @@ self: { ]; testHaskellDepends = [ aeson ansi-wl-pprint base filepath hjpath hspec http-client - http-client-tls http-types optparse-applicative servant + http-client-tls http-types optparse-applicative random servant servant-client text transformers utf8-string ]; homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; @@ -197236,6 +193624,7 @@ self: { homepage = "https://github.com/nikita-volkov/template-haskell-compat-v0208"; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-haskell-util" = callPackage @@ -197290,6 +193679,7 @@ self: { homepage = "https://github.com/kobargh/template-toolkit"; description = "Template Toolkit implementation for Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-yj" = callPackage @@ -197962,7 +194352,6 @@ self: { homepage = "http://mbays.freeshell.org/tersmu"; description = "A semantic parser for lojban"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-fixture" = callPackage @@ -197994,8 +194383,8 @@ self: { pname = "test-framework"; version = "0.8.1.1"; sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq"; - revision = "2"; - editedCabalFile = "1mp1h0fzwxa3xxnbw33lp8hj0rb8vwkd712r5ak8ny5nmawh2c9y"; + revision = "3"; + editedCabalFile = "1b6pi4j1dpcbiyx1bpfks29x293j02z7ashs2sdc8fhzbwsr9lxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198007,6 +194396,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-framework_0_8_2_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, bytestring + , containers, hostname, HUnit, libxml, old-locale, QuickCheck + , random, regex-posix, semigroups, time, xml + }: + mkDerivation { + pname = "test-framework"; + version = "0.8.2.0"; + sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base containers hostname old-locale + random regex-posix time xml + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base bytestring containers hostname + HUnit libxml old-locale QuickCheck random regex-posix semigroups + time xml + ]; + homepage = "http://haskell.github.io/test-framework/"; + description = "Framework for running and organising tests, with HUnit and QuickCheck support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework-doctest" = callPackage ({ mkDerivation, base, doctest, test-framework , test-framework-hunit @@ -198200,7 +194613,6 @@ self: { ]; description = "Template Haskell for test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-invariant" = callPackage @@ -198349,6 +194761,7 @@ self: { ]; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testCom" = callPackage @@ -198366,7 +194779,6 @@ self: { ]; description = "Write your tests in comments"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testPkg" = callPackage @@ -198415,6 +194827,8 @@ self: { pname = "testing-feat"; version = "0.4.0.3"; sha256 = "1kh7ak9qlxsr34hxccfgyz1ga90xxiaxqndk3jaln1f495w9rjil"; + revision = "1"; + editedCabalFile = "05j5i1sfg1k94prhwmg6z50w0flb9k181nhabwr3m9gkrrqzb4b4"; libraryHaskellDepends = [ base mtl QuickCheck tagshare template-haskell ]; @@ -198540,8 +194954,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.1.2"; - sha256 = "069y2d2k87sfx4mkmd8219iiyh9s6x79kigxbdi9swfa4k9xa1gm"; + version = "0.1.4.0"; + sha256 = "0i301a78790cqhgb28bhc2qksymbx2jdr31m2x59nsj7hmw268b2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198552,7 +194966,6 @@ self: { homepage = "https://gitlab.com/xaverdh/tex-builder#texbuilder"; description = "View your latex output while editing"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texmath" = callPackage @@ -198562,8 +194975,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.9.4.4"; - sha256 = "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd"; + version = "0.10.1"; + sha256 = "04qygn60f7920vm1f2xkf686kaimng8k030xlp3iy2hbgs33sxbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198579,31 +194992,6 @@ self: { license = "GPL"; }) {}; - "texmath_0_10" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, network-uri, pandoc-types, parsec, process, split, syb - , temporary, text, utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.10"; - sha256 = "0i9haxii7kklz6qrfidb54iv5cl73p201zy24mwkf4bf56lff1pa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - executableHaskellDepends = [ network-uri ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -198622,6 +195010,7 @@ self: { ]; description = "Functions for running Tex from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text" = callPackage @@ -198648,6 +195037,31 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "text_1_2_3_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , directory, ghc-prim, HUnit, integer-gmp, QuickCheck + , quickcheck-unicode, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "text"; + version = "1.2.3.0"; + sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10"; + libraryHaskellDepends = [ + array base binary bytestring deepseq ghc-prim integer-gmp + ]; + testHaskellDepends = [ + array base binary bytestring deepseq directory ghc-prim HUnit + integer-gmp QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + doCheck = false; + homepage = "https://github.com/haskell/text"; + description = "An efficient packed Unicode text type"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-all" = callPackage ({ mkDerivation, base, bytestring, text, text-format, utf8-string }: @@ -198734,7 +195148,6 @@ self: { ]; description = "Memory-efficient string-indexed container types"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-conversions" = callPackage @@ -198857,6 +195270,7 @@ self: { homepage = "https://github.com/bos/text-icu"; description = "Bindings to the ICU library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) icu;}; "text-icu-normalized" = callPackage @@ -198900,6 +195314,7 @@ self: { ]; description = "ICU transliteration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -198938,25 +195353,24 @@ self: { "text-ldap" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , containers, dlist, QuickCheck, quickcheck-simple, random - , semigroups, transformers + , transformers }: mkDerivation { pname = "text-ldap"; - version = "0.1.1.8"; - sha256 = "0ff057nr4v6hvwsa7avkz14nw63542l0zfsjb91q9nr60kvnsipj"; + version = "0.1.1.10"; + sha256 = "13wjarsshp64cc632bqmckx664a57w7cnlm8gs7rfp1bcm7vdnjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring containers dlist - semigroups transformers + transformers ]; executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ - base bytestring QuickCheck quickcheck-simple random semigroups + base bytestring QuickCheck quickcheck-simple random ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lens" = callPackage @@ -199163,6 +195577,7 @@ self: { ]; description = "Easy replacement when using text-icu regexes"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-region" = callPackage @@ -199205,7 +195620,24 @@ self: { homepage = "http://github.com/thinkpad20/text-render"; description = "A type class for rendering objects as text, pretty-printing, etc"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "text-replace" = callPackage + ({ mkDerivation, base, containers, hedgehog, neat-interpolation + , optparse-applicative, parsec, text + }: + mkDerivation { + pname = "text-replace"; + version = "0.0.0.1"; + sha256 = "15qf0pwjhaa2zwdzixil5q1iqs5cwlazggzsgwwq553jlggbf063"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base optparse-applicative parsec ]; + testHaskellDepends = [ base hedgehog neat-interpolation text ]; + homepage = "https://github.com/chris-martin/text-replace"; + description = "Simple text replacements from a list of search/replace pairs"; + license = stdenv.lib.licenses.asl20; }) {}; "text-short" = callPackage @@ -199225,59 +195657,21 @@ self: { ]; description = "Memory-efficient representation of Unicode text strings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant , criterion, deepseq, deriving-compat, generic-deriving - , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck - , quickcheck-instances, semigroups, tagged, template-haskell, text - , th-lift, transformers, transformers-compat, void + , ghc-boot-th, ghc-prim, hspec, hspec-discover, integer-gmp, nats + , QuickCheck, quickcheck-instances, semigroups, tagged + , template-haskell, text, th-abstraction, th-lift, transformers + , transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "3.6"; - sha256 = "0gvg1fpgvws75zhvxdkcg03m6sy5rv4m77fynjh8v6rakbiy7gb4"; - revision = "1"; - editedCabalFile = "052zp68y3fbwvg9xigngaqfv7afjw9prfns5qlx6s7mv3i8dc2mk"; - libraryHaskellDepends = [ - array base base-compat bifunctors bytestring bytestring-builder - containers contravariant generic-deriving ghc-boot-th ghc-prim - integer-gmp nats semigroups tagged template-haskell text th-lift - transformers transformers-compat void - ]; - testHaskellDepends = [ - array base base-compat base-orphans bifunctors bytestring - bytestring-builder containers contravariant deriving-compat - generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats - QuickCheck quickcheck-instances semigroups tagged template-haskell - text th-lift transformers transformers-compat void - ]; - benchmarkHaskellDepends = [ - array base base-compat bifunctors bytestring bytestring-builder - containers contravariant criterion deepseq generic-deriving - ghc-boot-th ghc-prim integer-gmp nats semigroups tagged - template-haskell text th-lift transformers transformers-compat void - ]; - homepage = "https://github.com/RyanGlScott/text-show"; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show_3_6_2" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors - , bytestring, bytestring-builder, containers, contravariant - , criterion, deepseq, deriving-compat, generic-deriving - , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck - , quickcheck-instances, semigroups, tagged, template-haskell, text - , th-abstraction, th-lift, transformers, transformers-compat, void - }: - mkDerivation { - pname = "text-show"; - version = "3.6.2"; - sha256 = "1wqzdpa7wxnqaa62mmw9fqklg12i9gyiaahj6xqy2h3rdw7r5qz2"; + version = "3.7.1"; + sha256 = "0gbf3cpxz92v4jphmwvz93il7m38qkwirfnk5453517k2s84s899"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -199291,6 +195685,7 @@ self: { QuickCheck quickcheck-instances semigroups tagged template-haskell text th-lift transformers transformers-compat void ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant criterion deepseq generic-deriving @@ -199300,45 +195695,9 @@ self: { homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty - , process, 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"; - sha256 = "111s9sw9j3pq0wdv6f4wbpf4wff6iiyj8ysq3k1d527f5ln7idmi"; - revision = "1"; - editedCabalFile = "1cw1zjkvfjjgmn8p20lqx5hly5zjlvp69gqp9xdf9zfs3fsgyp8r"; - libraryHaskellDepends = [ - base base-compat bifunctors binary bytestring containers directory - ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process - random semigroups tagged template-haskell terminfo text text-show - time transformers transformers-compat unix unordered-containers - vector xhtml - ]; - testHaskellDepends = [ - base base-compat bifunctors binary bytestring containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec - old-locale old-time pretty process QuickCheck quickcheck-instances - random semigroups tagged template-haskell terminfo text text-show - th-orphans time transformers transformers-compat unix - unordered-containers vector xhtml - ]; - homepage = "https://github.com/RyanGlScott/text-show-instances"; - description = "Additional instances for text-show"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show-instances_3_6_2" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty @@ -199369,7 +195728,6 @@ self: { homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -199404,6 +195762,7 @@ self: { homepage = "https://github.com/klangner/text-time"; description = "Library for Time parsing from Text into UTCTime"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-utf7" = callPackage @@ -199511,6 +195870,7 @@ self: { homepage = "https://github.com/qfpl/text1"; description = "Non-empty values of `Data.Text`."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "textPlot" = callPackage @@ -199710,6 +196070,7 @@ self: { homepage = "https://github.com/jkarni/th-alpha"; description = "Alpha equivalence for TH Exp"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-build" = callPackage @@ -199775,17 +196136,6 @@ self: { }) {}; "th-data-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-data-compat"; - version = "0.0.2.4"; - sha256 = "0zs36p32khrvdi5m6zhf93jyrcv184bhyxp49w8cj0fms51w2vcs"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Compatibility for data definition template of TH"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-data-compat_0_0_2_5" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; @@ -199794,33 +196144,9 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-desugar" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb - , template-haskell, th-expand-syns, th-lift, th-orphans - }: - mkDerivation { - pname = "th-desugar"; - version = "1.6"; - sha256 = "0kv3gxvr7izvg1s86p92b5318bv7pjghig2hx9q21cg9ppifry68"; - revision = "2"; - editedCabalFile = "0rimjzkqky6sq4yba7vqra7hj29903f9xsn2g8rc23abrm35vds3"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-expand-syns th-lift - th-orphans - ]; - testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-expand-syns - th-lift th-orphans - ]; - homepage = "https://github.com/goldfirere/th-desugar"; - description = "Functions to desugar Template Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-desugar_1_7" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans }: @@ -199839,6 +196165,40 @@ self: { homepage = "https://github.com/goldfirere/th-desugar"; description = "Functions to desugar Template Haskell"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "th-desugar_1_8" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb + , template-haskell, th-expand-syns, th-lift, th-orphans + }: + mkDerivation { + pname = "th-desugar"; + version = "1.8"; + sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv"; + libraryHaskellDepends = [ + base containers mtl syb template-haskell th-expand-syns th-lift + th-orphans + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-expand-syns + th-lift th-orphans + ]; + homepage = "https://github.com/goldfirere/th-desugar"; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "th-dict-discovery" = callPackage + ({ mkDerivation, base, constraints, template-haskell }: + mkDerivation { + pname = "th-dict-discovery"; + version = "0.1.0.0"; + sha256 = "1dmkj8is73mwngy1dw3ba34744whqj0jc243bjnkyrrwkbwn55ih"; + libraryHaskellDepends = [ base constraints template-haskell ]; + homepage = "http://github.com/isovector/th-dict-discovery/"; + description = "Automatically discover available dictionaries at compile time"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -199846,8 +196206,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.3.0"; - sha256 = "17b73q0d5r8xixhvdp0hv4ap96l7s3f2y0j5cknp81b1hyinivlz"; + version = "0.4.4.0"; + sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/DanielSchuessler/th-expand-syns"; @@ -200046,6 +196406,7 @@ self: { homepage = "https://github.com/joelteon/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-compat" = callPackage @@ -200175,8 +196536,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.2.0"; - sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; + version = "0.3.0"; + sha256 = "0cks475c8ivhikci7h8zkvxhxmp7n9w85b16wvx998q3bjrbkj04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200234,6 +196595,7 @@ self: { homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "themplate" = callPackage @@ -200312,34 +196674,6 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, containers - , data-default-class, deepseq, hashable, keys, mtl, profunctors - , QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "these"; - version = "0.7.3"; - sha256 = "16rx5929skbpn7f5v4hnnyps01y3bm51cr4z5b5zzjn23q8rqcql"; - revision = "4"; - editedCabalFile = "1hkhibphw12xshs24nnx20pkb0mdn5df67kjldj7phkvg88jmcyw"; - libraryHaskellDepends = [ - aeson base bifunctors binary containers data-default-class deepseq - hashable keys mtl profunctors QuickCheck semigroupoids transformers - transformers-compat unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - aeson base bifunctors binary containers hashable QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these_0_7_4" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, containers , data-default-class, deepseq, hashable, keys, mtl, profunctors , QuickCheck, quickcheck-instances, semigroupoids, tasty @@ -200350,8 +196684,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "1"; - editedCabalFile = "15vrym6g4vh4fbji8zxy1kxajnickmg6bq83m4hcy5bfv7rf9y39"; + revision = "2"; + editedCabalFile = "0mxl547dy7pp95kh3bvmdhsfcrmxcx8rzc94nnmcs3ahrbyw1nl1"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -200365,7 +196699,6 @@ self: { homepage = "https://github.com/isomorphism/these"; description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thespian" = callPackage @@ -200449,16 +196782,12 @@ self: { }) {}; "thread-hierarchy" = callPackage - ({ mkDerivation, base, containers, hspec, lifted-base - , monad-control, stm, transformers-base - }: + ({ mkDerivation, base, containers, hspec, stm }: mkDerivation { pname = "thread-hierarchy"; - version = "0.2.0.0"; - sha256 = "1y11q5ijb9hqvxgcf5jig6d24895nrrg06ig8sy7fk1s32rr0bqm"; - libraryHaskellDepends = [ - base containers lifted-base monad-control stm transformers-base - ]; + version = "0.3.0.0"; + sha256 = "064s46pg3l015lp4zvz9kj0yki48hvwqccfjxqs52jz5pd9rd1z8"; + libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base containers hspec stm ]; homepage = "https://github.com/nshimaza/thread-hierarchy#readme"; description = "Simple Haskel thread management in hierarchical manner"; @@ -200466,20 +196795,6 @@ self: { }) {}; "thread-local-storage" = callPackage - ({ mkDerivation, atomic-primops, base, containers, criterion }: - mkDerivation { - pname = "thread-local-storage"; - version = "0.1.1"; - sha256 = "1jj5k24b0q4lzlsb3cs305radc25x6nmm5r96pikjgdzgakxz80i"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ atomic-primops base ]; - benchmarkHaskellDepends = [ atomic-primops base criterion ]; - homepage = "https://github.com/rrnewton/thread-local-storage"; - description = "Several options for thread-local-storage (TLS) in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "thread-local-storage_0_1_2" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { pname = "thread-local-storage"; @@ -200491,7 +196806,6 @@ self: { homepage = "https://github.com/rrnewton/thread-local-storage"; description = "Several options for thread-local-storage (TLS) in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threadPool" = callPackage @@ -200603,7 +196917,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threefish" = callPackage @@ -200624,25 +196938,6 @@ self: { }) {}; "threepenny-editors" = callPackage - ({ mkDerivation, base, casing, containers, data-default - , generics-sop, profunctors, threepenny-gui - }: - mkDerivation { - pname = "threepenny-editors"; - version = "0.4.1"; - sha256 = "1fzipaqzhayqg581r4p02byxxxql8ydsyxpwdhvqw738a46afqxg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base casing containers data-default generics-sop profunctors - threepenny-gui - ]; - homepage = "https://github.com/pepeiborra/threepenny-editors"; - description = "Composable algebraic editors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "threepenny-editors_0_5_6" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop , profunctors, text, threepenny-gui }: @@ -200663,7 +196958,6 @@ self: { homepage = "https://github.com/pepeiborra/threepenny-editors"; description = "Composable algebraic editors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui" = callPackage @@ -200991,24 +197285,22 @@ self: { }) {}; "tickle" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, directory, doctest - , filepath, lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers, validation + ({ mkDerivation, base, bifunctors, bytestring, checkers, filepath + , lens, mtl, papa, QuickCheck, semigroupoids, semigroups, tasty + , tasty-hunit, tasty-quickcheck, transformers, validation }: mkDerivation { pname = "tickle"; - version = "0.0.6"; - sha256 = "19xv9s3qz2q2jvgzig8rfc47c25m8xl3d10xdx1d4dsmhbj1nw55"; - revision = "1"; - editedCabalFile = "1j0npns8ilxq84087gfdg1isncjssp9q0ijgrpg849cip8h0y5y1"; + version = "0.0.9"; + sha256 = "10fq51mvks300yhhzzsjfmjd0g888z35x7qc4b7a2i7307zjrjml"; libraryHaskellDepends = [ - base bifunctors bytestring filepath lens mtl semigroupoids + base bifunctors bytestring filepath mtl papa semigroupoids semigroups transformers validation ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/NICTA/tickle"; + homepage = "https://github.com/qfpl/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -201034,8 +197326,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.9.4"; - sha256 = "1i290r4invm7haw1pcq2v60iz7wr73c6qfxkghx6kfgawyl0v3pn"; + version = "0.9.6"; + sha256 = "1bldi0ygfn695x3an3qlsfzrbhmqcyhznkmsm5dsjmmh27zs1sx6"; libraryHaskellDepends = [ base colour containers hashable hosc mersenne-random-pure64 mtl parsec safe text time websockets @@ -201052,15 +197344,14 @@ self: { }: mkDerivation { pname = "tidal-midi"; - version = "0.9.4"; - sha256 = "09np70rmkm75g246bm5wl2f52618ri3kd66hqhwawq586mmjj1hv"; + version = "0.9.5.2"; + sha256 = "0yjbrsg2lwj6x32ly0j6b4ms6i1s447jk2b7c6qp85pblaanmzqc"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-serial" = callPackage @@ -201306,7 +197597,6 @@ self: { homepage = "https://github.com/enzoh/time-exts"; description = "Yet another time library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "time-http" = callPackage @@ -201362,9 +197652,10 @@ self: { ({ mkDerivation, base, data-lens-light, time }: mkDerivation { pname = "time-lens"; - version = "0.4.0.1"; - sha256 = "0916qfan93aq91icf87ifvskrq6s6s75rhkajvl8pxp74j28hlwz"; + version = "0.4.0.2"; + sha256 = "07nh97x1mx5hc48xqv3gk3cgls6xpb829h3bzsjx8rwqnzybijyq"; libraryHaskellDepends = [ base data-lens-light time ]; + homepage = "https://github.com/feuerbach/time-lens"; description = "Lens-based interface to Data.Time data structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -201404,6 +197695,7 @@ self: { homepage = "https://github.com/y-taka-23/time-machine#readme"; description = "A library to mock the current time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-out" = callPackage @@ -201442,6 +197734,7 @@ self: { homepage = "https://github.com/phadej/time-parsers#readme"; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-patterns" = callPackage @@ -201520,6 +197813,7 @@ self: { homepage = "https://github.com/klangner/time-series-lib"; description = "Library for Time Series processing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-units" = callPackage @@ -201713,38 +198007,6 @@ self: { }) {}; "timemap" = callPackage - ({ mkDerivation, base, containers, criterion, focus, hashable - , list-t, QuickCheck, quickcheck-instances, stm, stm-containers - , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers - }: - mkDerivation { - pname = "timemap"; - version = "0.0.4"; - sha256 = "1qyrs6yg30rqcp5izm20wadclpdb5jvxscswcgdm54gx4z3qaz3f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers focus hashable list-t stm stm-containers time - unordered-containers - ]; - executableHaskellDepends = [ - base containers focus hashable list-t stm stm-containers time - unordered-containers - ]; - testHaskellDepends = [ - base containers focus hashable list-t QuickCheck - quickcheck-instances stm stm-containers tasty tasty-hunit - tasty-quickcheck time unordered-containers - ]; - benchmarkHaskellDepends = [ - base containers criterion focus hashable list-t stm stm-containers - time unordered-containers - ]; - description = "A mutable hashmap, implicitly indexed by UTCTime"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "timemap_0_0_6" = callPackage ({ mkDerivation, base, containers, criterion, focus, hashable , list-t, QuickCheck, quickcheck-instances, stm, stm-containers , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers @@ -201774,7 +198036,6 @@ self: { ]; description = "A mutable hashmap, implicitly indexed by UTCTime"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeout" = callPackage @@ -202323,8 +198584,8 @@ self: { }: mkDerivation { pname = "tldr"; - version = "0.2.2"; - sha256 = "0ybg8d3zf4762525w0xmxrszb15vpiry8f0m9355pbxxvppq7dbl"; + version = "0.2.4"; + sha256 = "0kn3ns2v99z6lx6inphl140rlhdmmlig0z4jkdlimkmfss21d33v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202338,62 +198599,9 @@ self: { homepage = "https://github.com/psibi/tldr-hs#readme"; description = "Haskell tldr client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tldr_0_2_3" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory - , filepath, optparse-applicative, semigroups, shell-conduit, text - }: - mkDerivation { - pname = "tldr"; - version = "0.2.3"; - sha256 = "11xg9b2abfvwh484wkrj8j1c65qdy95c3xdc6gsmzqcyzi8d6k7j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring cmark text - ]; - executableHaskellDepends = [ - base directory filepath optparse-applicative semigroups - shell-conduit - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/psibi/tldr-hs#readme"; - description = "Haskell tldr client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , cereal, criterion, cryptonite, data-default-class, hourglass - , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck - , transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "tls"; - version = "1.3.11"; - sha256 = "00r7zfkdzy7hi6nhzkirp8jjims4kikgjcm3z4a82kw78awqw01z"; - libraryHaskellDepends = [ - asn1-encoding asn1-types async base bytestring cereal cryptonite - data-default-class memory mtl network transformers x509 x509-store - x509-validation - ]; - testHaskellDepends = [ - base bytestring cereal cryptonite data-default-class hourglass mtl - QuickCheck tasty tasty-quickcheck x509 x509-validation - ]; - benchmarkHaskellDepends = [ - base bytestring criterion cryptonite data-default-class hourglass - mtl QuickCheck tasty-quickcheck x509 x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-tls"; - description = "TLS/SSL protocol native implementation (Server and Client)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tls_1_4_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, criterion, cryptonite, data-default-class, hourglass , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck @@ -202420,30 +198628,9 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-debug" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, pem, time, tls, x509, x509-store, x509-system - , x509-validation - }: - mkDerivation { - pname = "tls-debug"; - version = "0.4.4"; - sha256 = "07amgj4hyxxrdadk1dpncqznygc49n87m8acpbjivwiqvqbf9rz5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring cryptonite data-default-class network pem time tls - x509 x509-store x509-system x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-tls"; - description = "Set of programs for TLS testing and debugging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tls-debug_0_4_5" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system , x509-validation @@ -202461,7 +198648,6 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "Set of programs for TLS testing and debugging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-extra" = callPackage @@ -202489,10 +198675,8 @@ self: { ({ mkDerivation, auto-update, base, clock, psqueues, tls }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.0.1"; - sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8"; - revision = "1"; - editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01"; + version = "0.0.0.2"; + sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5"; libraryHaskellDepends = [ auto-update base clock psqueues tls ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; @@ -202554,7 +198738,6 @@ self: { homepage = "https://github.com/jfischoff/tmp-postgres#readme"; description = "Start and stop a temporary postgres for testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tmpl" = callPackage @@ -202677,6 +198860,7 @@ self: { libraryHaskellDepends = [ base ]; description = "A todo bottom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "todos" = callPackage @@ -202834,7 +199018,7 @@ self: { homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -202926,8 +199110,8 @@ self: { }: mkDerivation { pname = "top"; - version = "0.2.2"; - sha256 = "1j97n3a66983pxnajk11c4jm4ccckvmf4xjvfxbmqj23ixl6isfp"; + version = "0.2.4"; + sha256 = "0kqyhcd407jyxpb487bx5jqnzaycycp5i8yxasgl37g45cdgb4gr"; libraryHaskellDepends = [ acid-state async base bytestring containers data-default-class deepseq extra filepath flat hslogger mtl pipes pretty safecopy @@ -203234,6 +199418,7 @@ self: { ]; description = "Applications for interacting with the Pushbullet API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tpdb" = callPackage @@ -203337,6 +199522,7 @@ self: { ]; description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracker" = callPackage @@ -203360,6 +199546,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traildb" = callPackage @@ -203723,7 +199910,6 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "transient-universe-tls" = callPackage @@ -203789,6 +199975,7 @@ self: { homepage = "https://github.com/andys8/translate-cli#readme"; description = "Translation cli tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa" = callPackage @@ -203811,6 +199998,7 @@ self: { homepage = "https://github.com/haskell-trasa/trasa#readme"; description = "Type Safe Web Routing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa-client" = callPackage @@ -203870,6 +200058,7 @@ self: { homepage = "https://github.com/haskell-trasa/trasa#readme"; description = "Type safe web server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traverse-with-class" = callPackage @@ -204008,7 +200197,6 @@ self: { homepage = "https://github.com/phadej/tree-diff"; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -204223,34 +200411,6 @@ self: { }) {}; "trifecta" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base - , blaze-builder, blaze-html, blaze-markup, bytestring, charset - , comonad, containers, deepseq, directory, doctest, filepath - , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors - , QuickCheck, reducers, semigroups, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "trifecta"; - version = "1.6.2.1"; - sha256 = "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"; - revision = "1"; - editedCabalFile = "0qy2nqxn2h20fp9gf5chvgimb2281pjwm075ap7ar7pk2k4n8ljr"; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html - blaze-markup bytestring charset comonad containers deepseq - fingertree ghc-prim hashable lens mtl parsers profunctors reducers - semigroups transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base directory doctest filepath parsers QuickCheck - ]; - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "trifecta_1_7_1_1" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal , cabal-doctest, charset, comonad, containers, deepseq, doctest @@ -204262,8 +200422,8 @@ self: { pname = "trifecta"; version = "1.7.1.1"; sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; - revision = "1"; - editedCabalFile = "17i9137mqcm74s8zwdnkcg5kj583zzwqjyyz1z0af4anxfs1hvng"; + revision = "2"; + editedCabalFile = "1pbywxk2aw0bkhkhhcdqhxnkvyxxnrj13qahlzf2ivd5awmynmqp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -204275,6 +200435,28 @@ self: { homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "trigger" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, clock, directory + , exceptions, filepath, formatting, fsnotify, Glob, hspec, process + , protolude, text, time, twitch, yaml + }: + mkDerivation { + pname = "trigger"; + version = "1.0.2.0"; + sha256 = "1nhhn3ackzhbikpn5q62kzqrk1g0lnzkddkw2p1c3iis3my148ik"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base clock directory exceptions filepath + formatting fsnotify Glob process protolude text time twitch yaml + ]; + executableHaskellDepends = [ base protolude ]; + testHaskellDepends = [ base hspec protolude ]; + homepage = "https://github.com/rhyskeepence/trigger"; + description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204340,6 +200522,7 @@ self: { homepage = "https://github.com/fumieval/trivia"; description = "The trivial monad and comonad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trivial-constraint" = callPackage @@ -204608,6 +200791,7 @@ self: { homepage = "https://github.com/Fuuzetsu/tsuntsun"; description = "Interacts with tesseract to ease reading of RAW Japanese manga"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tsv2csv" = callPackage @@ -204717,6 +200901,7 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tubes" = callPackage @@ -204760,7 +200945,6 @@ self: { homepage = "https://github.com/riaqn/tuntap-simple#readme"; description = "A simple tun/tap library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tup-functor" = callPackage @@ -204927,7 +201111,6 @@ self: { executableHaskellDepends = [ ALUT base ]; description = "Plays music generated by Turing machines with 5 states and 2 symbols"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "turingMachine" = callPackage @@ -204974,29 +201157,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , criterion, directory, doctest, foldl, hostname, managed - , optional-args, optparse-applicative, process, semigroups, stm - , system-fileio, system-filepath, temporary, text, time - , transformers, unix, unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.3.6"; - sha256 = "0fr8p6rnk2lrsgbfh60jlqcjr0nxrh3ywxsj5d4psck0kgyhvg1m"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock directory foldl hostname - managed optional-args optparse-applicative process semigroups stm - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ base doctest system-filepath temporary ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_4_5" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, foldl, hostname , managed, optional-args, optparse-applicative, process, semigroups @@ -205017,6 +201177,29 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "turtle_1_5_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , semigroups, stm, system-fileio, system-filepath, temporary, text + , time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.0"; + sha256 = "1ivskskvqbwm4bp8m2pfhb3ma9y747jfg5gfcsadwmqyqzzf90l5"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -205492,15 +201675,15 @@ self: { ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base , bytestring, Cabal, cabal-doctest, case-insensitive, conduit , conduit-extra, containers, data-default, doctest, exceptions - , hlint, hspec, http-client, http-conduit, http-types, lens - , lens-aeson, network-uri, resourcet, template-haskell, text, time - , transformers, transformers-base, twitter-types - , twitter-types-lens + , hlint, hspec, hspec-discover, http-client, http-conduit + , http-types, lens, lens-aeson, network-uri, resourcet + , template-haskell, text, time, transformers, transformers-base + , twitter-types, twitter-types-lens }: mkDerivation { pname = "twitter-conduit"; - version = "0.2.2.2"; - sha256 = "00bxqd77ccxa0cbbrgwhnivyi8jvmm5w0xx7fnx592yn7y9kgfip"; + version = "0.2.3"; + sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit @@ -205516,6 +201699,7 @@ self: { lens-aeson network-uri resourcet template-haskell text time twitter-types twitter-types-lens ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; @@ -205561,6 +201745,7 @@ self: { homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types" = callPackage @@ -205847,6 +202032,7 @@ self: { homepage = "http://github.com/glaebhoerl/type-eq"; description = "Type equality evidence you can carry around"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-equality" = callPackage @@ -205931,6 +202117,7 @@ self: { homepage = "https://github.com/oisdk/type-indexed-queues"; description = "Queues with verified and unverified versions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-int" = callPackage @@ -206092,6 +202279,7 @@ self: { libraryHaskellDepends = [ base singletons ]; description = "Operations on type-level lists and tuples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-map" = callPackage @@ -206100,10 +202288,8 @@ self: { }: mkDerivation { pname = "type-map"; - version = "0.1.0.0"; - sha256 = "1hssaqpic5l53l9pxvj75j87ywdnx985j6jgrqr8m9vx5hr1xrl4"; - revision = "1"; - editedCabalFile = "0821rnwnk0h9n62pnnfy68iyf1jjnb3dr72gs0667yj09r1x7cw2"; + version = "0.1.1.0"; + sha256 = "12c7gcwrshdcn26cagm4w30ckbq7iqwg5yrc9y272zllx54bikpd"; libraryHaskellDepends = [ base containers ghc-prim vector ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -206111,6 +202297,7 @@ self: { homepage = "https://github.com/Lysxia/type-map"; description = "Type-indexed maps"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-natural" = callPackage @@ -206139,8 +202326,8 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.2.0.0"; - sha256 = "0mnpa297x8ikgarr7wf8lllkyif240fsjzjigs9rx86r65vfszgy"; + version = "1.3.2.0"; + sha256 = "0zayqf18z3h4ix38gyqqvq2g3k74cm5f9gzkg4sh8ijw30xszq8p"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; @@ -206151,7 +202338,6 @@ self: { homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-operators" = callPackage @@ -206354,21 +202540,19 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring - , conduit, conduit-extra, exceptions, hspec, http-conduit, process - , stm, temporary, transformers + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers }: mkDerivation { pname = "typed-process"; - version = "0.1.1"; - sha256 = "1n93jy1z2xyin8j5dy972hdv2ydwfdbf5x1bygvn8cc6llb4wsml"; + version = "0.2.1.0"; + sha256 = "1l6wpkwnz4lriq1n0hxv3mdvzmrf44ddkb1ys8cyj3ywfn2xh56j"; libraryHaskellDepends = [ - async base bytestring conduit conduit-extra exceptions process stm - transformers + async base bytestring process stm transformers ]; testHaskellDepends = [ - async base base64-bytestring bytestring conduit conduit-extra hspec - http-conduit temporary + async base base64-bytestring bytestring hspec process stm temporary + transformers ]; homepage = "https://haskell-lang.org/library/typed-process"; description = "Run external processes, with strong typing of streams"; @@ -206381,17 +202565,15 @@ self: { }: mkDerivation { pname = "typed-spreadsheet"; - version = "1.1.0"; - sha256 = "0068krzx11gvp2w227z190s33yb4n48av1kcmz800xpqrdab8f3q"; + version = "1.1.1"; + sha256 = "1ypnyny0dznq6nxjdr5v5lsk93pd2ly71plw0xpjbwa5jv3iwb1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base diagrams-cairo diagrams-gtk diagrams-lib foldl gtk microlens stm text transformers ]; - executableHaskellDepends = [ - base diagrams-cairo diagrams-lib text - ]; + executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -206459,7 +202641,6 @@ self: { homepage = "http://github.com/typed-wire/hs-typed-wire-utils#readme"; description = "Haskell utility library required for code generated by typed-wire compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typedflow" = callPackage @@ -206619,8 +202800,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.4.0.0"; - sha256 = "0lwsa7zfja6sqvrd4ihqc8x6k2bbrj2qayxrgkxd0p4qvxfdzp7y"; + version = "0.5.0.1"; + sha256 = "1c1f6wmn8yf3crzmna4ww977cwga6wl814f0ka99s1sr65j2c5bx"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -206699,6 +202880,7 @@ self: { homepage = "https://github.com/rlupton20/tyro#readme"; description = "Type derived JSON parsing using Aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tz" = callPackage @@ -206727,7 +202909,6 @@ self: { homepage = "https://github.com/nilcons/haskell-tz"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tzdata" = callPackage @@ -206973,27 +203154,27 @@ self: { }) {}; "uhc-light" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fgl, filepath, hashable, mtl, network, old-locale - , primitive, process, syb, transformers, uhc-util, utf8-string - , uulib, vector + ({ mkDerivation, array, base, binary, bytestring, chr-data + , containers, directory, fgl, filepath, hashable, mtl, network + , old-locale, primitive, process, syb, transformers, uhc-util + , utf8-string, uulib, vector }: mkDerivation { pname = "uhc-light"; - version = "1.1.9.5"; - sha256 = "07b8hvam9n801ldwrm6jjds691gxjw4yp33zsg4bbbv2mk6z7fpa"; + version = "1.1.10.0"; + sha256 = "0l8p6jn5f2lakdq5lvish0w62cpc0dsx7xm0jcwy6bml3ivlpzw9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb transformers - uhc-util utf8-string uulib vector + array base binary bytestring chr-data containers directory fgl + filepath hashable mtl network old-locale primitive process syb + transformers uhc-util utf8-string uulib vector ]; executableHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb transformers - uhc-util utf8-string uulib vector + array base binary bytestring chr-data containers directory fgl + filepath hashable mtl network old-locale primitive process syb + transformers uhc-util utf8-string uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; @@ -207002,22 +203183,24 @@ self: { }) {}; "uhc-util" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fclabels, fgl, hashable, logict-state, mtl, pqueue - , process, time, time-compat, transformers, uulib + ({ mkDerivation, array, base, binary, bytestring, chr-core + , chr-data, chr-parse, chr-pretty, containers, directory, fclabels + , fgl, hashable, logict-state, mtl, pqueue, process, time + , time-compat, transformers, uulib, vector }: mkDerivation { pname = "uhc-util"; - version = "0.1.6.7"; - sha256 = "0xaa9xp7yaj6mjq392x2jyi6rdplfabmhbwwq4ammr4wbqbjfjyl"; + version = "0.1.7.0"; + sha256 = "1xz7r5sk18aqqzxmblihk6y271qr7dsv89xxxrz5n8ds9fmj4y3k"; libraryHaskellDepends = [ - array base binary bytestring containers directory fclabels fgl - hashable logict-state mtl pqueue process time time-compat - transformers uulib + array base binary bytestring chr-core chr-data chr-parse chr-pretty + containers directory fclabels fgl hashable logict-state mtl pqueue + process time time-compat transformers uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc-util"; description = "UHC utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uhexdump" = callPackage @@ -207056,6 +203239,7 @@ self: { homepage = "https://github.com/hvr/uhttpc"; description = "Minimal HTTP client library optimized for benchmarking"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ui-command" = callPackage @@ -207148,6 +203332,7 @@ self: { homepage = "http://github.com/jberryman/unagi-bloomfilter"; description = "A fast, cache-efficient, concurrent bloom filter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unagi-chan" = callPackage @@ -207156,8 +203341,8 @@ self: { }: mkDerivation { pname = "unagi-chan"; - version = "0.4.0.0"; - sha256 = "04m1ns6jc1yb1i9pmqmi8k21mwgkrq4q9fbcj4af1a9khxrjxcny"; + version = "0.4.1.0"; + sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -207225,6 +203410,7 @@ self: { homepage = "https://github.com/sweirich/replib"; description = "Generic support for programming with names and binders"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unbound-generics" = callPackage @@ -207419,6 +203605,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Event handling for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-graphs" = callPackage @@ -207435,6 +203622,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Graphs"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-htk" = callPackage @@ -207452,6 +203640,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/htk/"; description = "Graphical User Interface for Haskell Programs"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-posixutil" = callPackage @@ -207468,6 +203657,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Posix utilities for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-reactor" = callPackage @@ -207483,6 +203673,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Reactors for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-uDrawGraph" = callPackage @@ -207500,6 +203691,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb"; description = "Graphs binding"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-util" = callPackage @@ -207517,6 +203709,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Utilities for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode" = callPackage @@ -207726,8 +203919,8 @@ self: { pname = "union"; version = "0.1.1.2"; sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; - revision = "1"; - editedCabalFile = "17n6f3bpw7zwa9kgfpk6sa9bwg0gsi840kkzifwmp9lakykjf0cw"; + revision = "2"; + editedCabalFile = "088dcgyg9bzm5qczcddssjfwywk9lsj10lq7byh4f9rnsf0jppna"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -207899,8 +204092,8 @@ self: { }: mkDerivation { pname = "units"; - version = "2.4"; - sha256 = "0hd6d8nxyr5x3mlywjv3hyqx1r4dq5bpn18bnq5n4aw3b8lyyq2h"; + version = "2.4.1"; + sha256 = "1xvr2sivvmwpvqrpckqlkl8qr8h45aqimkwiq9m2ab45slnwwqwb"; libraryHaskellDepends = [ base containers deepseq lens linear mtl multimap singletons syb template-haskell th-desugar units-parser vector-space @@ -207913,6 +204106,7 @@ self: { homepage = "https://github.com/goldfirere/units"; description = "A domain-specific type system for dimensional analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "units-attoparsec" = callPackage @@ -207942,6 +204136,7 @@ self: { homepage = "http://github.com/goldfirere/units-defs"; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "units-parser" = callPackage @@ -207950,8 +204145,8 @@ self: { }: mkDerivation { pname = "units-parser"; - version = "0.1.1"; - sha256 = "0d39r1vcwqs61529gjz3329a41fp4pwx0x4j4kw4xl2lza3wr164"; + version = "0.1.1.2"; + sha256 = "06kmrqswlivsas183jswsnqi21rmdh6cqw392b3ycj2x5avghqqa"; libraryHaskellDepends = [ base containers mtl multimap parsec ]; testHaskellDepends = [ base containers mtl multimap parsec syb tasty tasty-hunit @@ -208145,20 +204340,18 @@ self: { "universum" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl - , safe, safe-exceptions, semigroups, stm, text, text-format - , transformers, type-operators, unordered-containers, utf8-string - , vector + , ghc-prim, hashable, microlens, microlens-mtl, mtl + , safe-exceptions, semigroups, stm, text, text-format, transformers + , type-operators, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "0.8.0"; - sha256 = "058c9fhf5lysswch8gwicpjjpqh6l03iz861vm913r3a8lam777f"; + version = "1.0.0"; + sha256 = "1wsglfacd2aqfxxri3hzs5zwxvfkn3kqb09icax1fncjmb0yc35w"; libraryHaskellDepends = [ - base bytestring containers deepseq exceptions ghc-prim hashable - microlens microlens-mtl mtl safe safe-exceptions stm text - text-format transformers type-operators unordered-containers - utf8-string vector + base bytestring containers deepseq ghc-prim hashable microlens + microlens-mtl mtl safe-exceptions stm text text-format transformers + type-operators unordered-containers utf8-string vector ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashable mtl semigroups text @@ -208169,6 +204362,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "universum_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , ghc-prim, hashable, microlens, microlens-mtl, mtl + , safe-exceptions, semigroups, stm, text, text-format, transformers + , type-operators, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "universum"; + version = "1.0.2"; + sha256 = "09pd637vxwnqhq8464bvv0y3nmdac289rxzbzdxz3cpj8xv9nhf4"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable microlens + microlens-mtl mtl safe-exceptions stm text text-format transformers + type-operators unordered-containers utf8-string vector + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl semigroups text + unordered-containers + ]; + homepage = "https://github.com/serokell/universum"; + description = "Custom prelude used in Serokell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unix_2_7_2_2" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { @@ -208198,29 +204416,14 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.4.3.1"; - sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j"; - revision = "2"; - editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2"; + version = "0.5.0.1"; + sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; }) {}; - "unix-compat_0_5" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; - version = "0.5"; - sha256 = "0jx7r35q83sx0h46khl39azjg3zplpvgf3aiz4r4qmp3x50hwy98"; - libraryHaskellDepends = [ base unix ]; - homepage = "http://github.com/jystic/unix-compat"; - description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unix-fcntl" = callPackage ({ mkDerivation, base, foreign-var, unix }: mkDerivation { @@ -208246,6 +204449,7 @@ self: { libraryHaskellDepends = [ base unix ]; description = "POSIX operations on Handles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-io-extra" = callPackage @@ -208366,30 +204570,56 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath - , monad-logger, resourcet, transformers, unix, unliftio-core + ({ mkDerivation, async, base, deepseq, directory, filepath, hspec + , stm, transformers, unix, unliftio-core }: mkDerivation { pname = "unliftio"; - version = "0.1.1.0"; - sha256 = "1hhqcxvfh906xl9qhqk6wrsd2xc6rkwh5lqgwfizlb2wns7irkkd"; + version = "0.2.2.0"; + sha256 = "0qqacdzwbrynk2ma49q830irpya1il8m5b9rkklm906k60yjz9b9"; libraryHaskellDepends = [ - async base deepseq directory filepath monad-logger resourcet - transformers unix unliftio-core + async base deepseq directory filepath stm transformers unix + unliftio-core + ]; + testHaskellDepends = [ + async base deepseq directory filepath hspec stm transformers unix + unliftio-core ]; homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; }) {}; + "unliftio_0_2_4_0" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath, hspec + , stm, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.4.0"; + sha256 = "0vpncmwaq5zb6bziqfns4qdgxmq8ky0rlxna2yngxp170s5zxx9z"; + libraryHaskellDepends = [ + async base deepseq directory filepath stm transformers unix + unliftio-core + ]; + testHaskellDepends = [ + async base deepseq directory filepath hspec stm transformers unix + unliftio-core + ]; + homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "unliftio-core"; - version = "0.1.0.0"; - sha256 = "0wxv6s91wpfv2f5x17lwm04fvghcfnmzqw7p65117pr1r6yz5fcj"; + version = "0.1.1.0"; + sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; libraryHaskellDepends = [ base transformers ]; - homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio-core#readme"; + homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; }) {}; @@ -208493,6 +204723,7 @@ self: { ]; description = "Graph library using unordered-containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unordered-intmap" = callPackage @@ -208674,6 +204905,7 @@ self: { homepage = "https://github.com/joshuaclayton/unused#readme"; description = "A command line tool to identify unused code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uom-plugin" = callPackage @@ -208693,6 +204925,7 @@ self: { homepage = "https://github.com/adamgundry/uom-plugin"; description = "Units of measure as a GHC typechecker plugin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "up" = callPackage @@ -208862,36 +205095,6 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, blaze-builder - , bytestring, containers, criterion, deepseq, deepseq-generics - , generics-sop, HUnit, network-uri, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, th-lift-instances - , transformers - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.3.3"; - sha256 = "050bimfsc912dh5sb2kjvvdd80ggjhakqq1dbn46cnp98zr8p0rx"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - template-haskell th-lift-instances - ]; - testHaskellDepends = [ - attoparsec base base-compat blaze-builder bytestring containers - generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck transformers - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq deepseq-generics - network-uri - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_3_0_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat, blaze-builder , bytestring, containers, criterion, deepseq, deepseq-generics , fail, generics-sop, HUnit, network-uri, QuickCheck @@ -208901,8 +205104,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.0.1"; - sha256 = "10bg6ia6l2blfb5068ppbnkk46linnda0c79yq99ls4j1x91wwgw"; + version = "0.3.1.0"; + sha256 = "04qjv1sgyrdg538290p9hqnvyxnahvr5cjwl8vm1rn9j0fv3ymq9"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers fail template-haskell th-lift-instances @@ -208919,7 +205122,6 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-bytestring-aeson" = callPackage @@ -209038,30 +205240,10 @@ self: { executableHaskellDepends = [ base ]; description = "URI template library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-templater" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, charset, containers, dlist - , HTTP, HUnit, mtl, parsers, template-haskell, text, trifecta - , unordered-containers, vector - }: - mkDerivation { - pname = "uri-templater"; - version = "0.2.2.0"; - sha256 = "13dgpsiihlgd0k18bh67ssrv5hgmp38xwicfgss84rar47m61hw6"; - libraryHaskellDepends = [ - ansi-wl-pprint base charset containers dlist HTTP mtl parsers - template-haskell text trifecta unordered-containers vector - ]; - testHaskellDepends = [ - ansi-wl-pprint base HUnit mtl template-haskell - ]; - homepage = "https://github.com/iand675/uri-templater"; - description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; - license = stdenv.lib.licenses.mit; - }) {}; - - "uri-templater_0_3_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, charset , containers, dlist, HTTP, HUnit, mtl, parsers, template-haskell , text, time, trifecta, unordered-containers, uuid-types, vector @@ -209070,6 +205252,8 @@ self: { pname = "uri-templater"; version = "0.3.1.0"; sha256 = "1hj93jgn8xch9bw9fs76qsfqarb15csfy0ddnr1dxcq04vznbri1"; + revision = "1"; + editedCabalFile = "0vl1nv40yzns9fnaz6h34x72vpfaaws8f0zm8qlr82333pxg2scw"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring charset containers dlist HTTP mtl parsers template-haskell text time trifecta unordered-containers @@ -209081,7 +205265,6 @@ self: { homepage = "https://github.com/iand675/uri-templater"; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "url" = callPackage @@ -209195,23 +205378,6 @@ self: { }) {}; "urlpath" = callPackage - ({ mkDerivation, base, exceptions, mmorph, monad-control - , monad-logger, mtl, path-extra, resourcet, transformers - , transformers-base - }: - mkDerivation { - pname = "urlpath"; - version = "5.0.0.1"; - sha256 = "1qvwb2yjzz3nkm5vb6vgnhav8fqw13n7h4pr5nw9nq1n9ijq1vh3"; - libraryHaskellDepends = [ - base exceptions mmorph monad-control monad-logger mtl path-extra - resourcet transformers transformers-base - ]; - description = "Painfully simple URL deployment"; - license = stdenv.lib.licenses.mit; - }) {}; - - "urlpath_7_0_1" = callPackage ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph , monad-control, monad-control-aligned, monad-logger, mtl , path-extra, resourcet, split, strict, text, transformers @@ -209554,8 +205720,8 @@ self: { pname = "utf8-string"; version = "1.0.1.1"; sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv"; - revision = "2"; - editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr"; + revision = "3"; + editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; @@ -209566,8 +205732,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.0.0"; - sha256 = "10n0c7yxvyzf7j4i3mlkxcz1xpc7vdll80rd4pwrs7rhqmd94viw"; + version = "0.1.5.0"; + sha256 = "0rll7fv31bamnqcy3hcm8vdgzz5wjzlqhvz5lnbp1gfymx43jrga"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -209626,6 +205792,7 @@ self: { homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: example programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uu-cco-hut-parsing" = callPackage @@ -209638,6 +205805,7 @@ self: { homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: Feedback wrapper around parser in uulib"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uu-cco-uu-parsinglib" = callPackage @@ -209723,6 +205891,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-bootstrap" = callPackage @@ -209746,6 +205915,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-cabal" = callPackage @@ -209754,14 +205924,15 @@ self: { }: mkDerivation { pname = "uuagc-cabal"; - version = "1.0.6.0"; - sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w"; + version = "1.1.0.0"; + sha256 = "0bdvrxdbs9672gfmf3r2j2nasc7map2jr191crf1d0jhmg6dmlzj"; libraryHaskellDepends = [ base Cabal containers directory filepath mtl process uulib ]; - homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; - description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System"; + homepage = "https://github.com/UU-ComputerScience/uuagc"; + description = "Cabal plugin for UUAGC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-diagrams" = callPackage @@ -209916,12 +206087,13 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uulib"; - version = "0.9.22"; - sha256 = "1b9in4xbyi518iix5ln765z99q8prdw6p6lx5dz3ckl36dfs3l6d"; + version = "0.9.23"; + sha256 = "1v9gwy1zdkyc8f36n52p127gz1r95ykaqklshg0abiai4xnr1yy6"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/UU-ComputerScience/uulib"; description = "Haskell Utrecht Tools Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uvector" = callPackage @@ -210177,27 +206349,6 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers - }: - mkDerivation { - pname = "validation"; - version = "0.5.5"; - sha256 = "0fgwgpwcisbabzyq11pkj57gp0kydi4px9gmgzqcq2hn6xb43qkd"; - libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers - ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/qfpl/validation"; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "validation_0_6_2" = callPackage ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl , semigroupoids, semigroups, transformers }: @@ -210212,7 +206363,6 @@ self: { homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -210477,6 +206627,7 @@ self: { ]; description = "Process mpileup output to identify significant differences"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "variable-precision" = callPackage @@ -210565,8 +206716,8 @@ self: { }: mkDerivation { pname = "vault-tool"; - version = "0.0.0.1"; - sha256 = "1s7q6xsq5y0hkxkb47hgnxhgy6545fvxdwsziybcsz9fbvhv7qvb"; + version = "0.0.0.3"; + sha256 = "0gs6qjahb3xl59cpbwcaqxsbzg28yw80fjyziqfd0s3vca4c9abm"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types text unordered-containers @@ -210582,8 +206733,8 @@ self: { }: mkDerivation { pname = "vault-tool-server"; - version = "0.0.0.1"; - sha256 = "03gmjna82v1ir2iafchvkc32gndcfnw3skvyl7s5cilc75igrrnd"; + version = "0.0.0.3"; + sha256 = "07j25ksqk5fnyp3gnp79jj4l3ax3y5wf29s2kwkq9r2pjb8577g4"; libraryHaskellDepends = [ aeson async base bytestring filepath http-client process temporary text vault-tool @@ -210636,7 +206787,6 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache"; description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcache-trie" = callPackage @@ -210653,7 +206803,6 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcard" = callPackage @@ -210759,7 +206908,7 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcswrapper" = callPackage @@ -210978,7 +207127,6 @@ self: { homepage = "https://github.com/nikita-volkov/vector-builder"; description = "Vector builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-bytes-instances" = callPackage @@ -211173,18 +207321,6 @@ self: { }) {}; "vector-sized" = callPackage - ({ mkDerivation, base, deepseq, finite-typelits, vector }: - mkDerivation { - pname = "vector-sized"; - version = "0.5.1.0"; - sha256 = "1rcs6rifan5zzcibxgn7fvycpzramb9wf2i9nb7b7rhk4h4bs5i1"; - libraryHaskellDepends = [ base deepseq finite-typelits vector ]; - homepage = "http://github.com/expipiplus1/vector-sized#readme"; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-sized_0_6_1_0" = callPackage ({ mkDerivation, base, deepseq, finite-typelits, vector }: mkDerivation { pname = "vector-sized"; @@ -211194,21 +207330,9 @@ self: { homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage - ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: - mkDerivation { - pname = "vector-space"; - version = "0.10.4"; - sha256 = "18pxpvf6rx0qbx5whshxq61pgj1njs5d0vpmjbjxkcbmqsgwq4mp"; - libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; - description = "Vector & affine spaces, linear maps, and derivatives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-space_0_12" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; @@ -211217,7 +207341,6 @@ self: { libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-map" = callPackage @@ -211231,6 +207354,7 @@ self: { homepage = "https://github.com/conklech/vector-space-map"; description = "vector-space operations for finite maps using Data.Map"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-opengl" = callPackage @@ -211318,32 +207442,6 @@ self: { }) {}; "vectortiles" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, criterion - , deepseq, hex, microlens, microlens-platform, protobuf, tasty - , tasty-hunit, text, transformers, vector - }: - mkDerivation { - pname = "vectortiles"; - version = "1.2.0.5"; - sha256 = "0pbilwfrz2lv10x9fgy1ndxnz1as0v41r9g36yc5g41dhyhnp82l"; - libraryHaskellDepends = [ - base bytestring cereal containers deepseq protobuf text - transformers vector - ]; - testHaskellDepends = [ - base bytestring cereal containers hex protobuf tasty tasty-hunit - text vector - ]; - benchmarkHaskellDepends = [ - base bytestring cereal containers criterion microlens - microlens-platform protobuf text vector - ]; - homepage = "https://github.com/fosskers/vectortiles"; - description = "GIS Vector Tiles, as defined by Mapbox"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "vectortiles_1_2_0_6" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion , deepseq, hex, microlens, microlens-platform, protobuf, tasty , tasty-hunit, text, transformers, vector @@ -211472,20 +207570,6 @@ self: { }) {}; "versions" = callPackage - ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens - , tasty, tasty-hunit, text - }: - mkDerivation { - pname = "versions"; - version = "3.1.1"; - sha256 = "1pnmbvlchjskavp6h04xdxwxg61aplqpxnawnbzflyf1mvpz0dm4"; - libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; - testHaskellDepends = [ base microlens tasty tasty-hunit text ]; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "versions_3_3_1" = callPackage ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -211500,7 +207584,6 @@ self: { ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vgrep" = callPackage @@ -211577,8 +207660,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.11"; - sha256 = "1j0pafrfqkp00z3jqcp2v49v2m931wyp9plwap2445b6ncpz1fhv"; + version = "0.0.0.12"; + sha256 = "0a9bf8smqjjwz4m0gqac9zf9qp6ka3dhy2qrflbg1k5spd0dqqh5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -211667,6 +207750,7 @@ self: { homepage = "http://github.com/pjones/vimeta"; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vimus" = callPackage @@ -211722,31 +207806,14 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, base, criterion, doctest, ghc-prim, lens, linear - , mwc-random, singletons, vector - }: - mkDerivation { - pname = "vinyl"; - version = "0.5.3"; - sha256 = "19h8fssvykx18dzhjfrz87xwarqa2cmy9akd49jcacplvr1nmy00"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base doctest lens singletons ]; - benchmarkHaskellDepends = [ - base criterion lens linear mwc-random vector - ]; - description = "Extensible Records"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vinyl_0_6_0" = callPackage ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens , linear, mwc-random, primitive, should-not-typecheck, singletons , vector }: mkDerivation { pname = "vinyl"; - version = "0.6.0"; - sha256 = "1gig8ki9v4spxy4x8irhfvjb55shsd9a7a9g37v2r0hfl6k3yc4b"; + version = "0.7.0"; + sha256 = "1gch1cx10466j2cyj7q4x0s3g9sjy35l5j9mvq4sfnf4sql1cfps"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base doctest hspec lens should-not-typecheck singletons @@ -211756,7 +207823,6 @@ self: { ]; description = "Extensible Records"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-gl" = callPackage @@ -211766,8 +207832,8 @@ self: { }: mkDerivation { pname = "vinyl-gl"; - version = "0.3.1"; - sha256 = "0rnwsz9ad7sxpk68qfmav05d6pkv8w2wg7ax31v090nd9bgwhv6a"; + version = "0.3.2"; + sha256 = "1g81dbcarbllij1h197j0g1x65jb4pcd8qwfwza9i4jn4sfmgps1"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -211838,12 +207904,13 @@ self: { ({ mkDerivation, base, contravariant, transformers, vinyl }: mkDerivation { pname = "vinyl-utils"; - version = "0.3.0.0"; - sha256 = "0gqlqh0apymn3zydxklqjfp4sr9h170n2r9rai5z2phxv666dmz6"; + version = "0.3.0.1"; + sha256 = "0lcpg2mxmr41lqpn5ksc35c0w16s45z6qq9wjbm0cv8r047k9bq5"; libraryHaskellDepends = [ base contravariant transformers vinyl ]; homepage = "https://github.com/marcinmrotek/vinyl-utils"; description = "Utilities for vinyl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-vectors" = callPackage @@ -211987,6 +208054,7 @@ self: { ]; description = "Visualize CBN reduction"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vivid" = callPackage @@ -212006,7 +208074,6 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vivid-osc" = callPackage @@ -212205,8 +208272,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.16"; - sha256 = "1zxjr4g7xl50zhjpbzk1a16cp2i1k75abpkna2q37hy1ss6sw637"; + version = "5.19.1"; + sha256 = "13vip07b1mgr8qgxl97ni87910lrl1yjg5lvnfjzyvfyn0vw47zl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212229,42 +208296,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_18_1" = 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.18.1"; - sha256 = "1sv04sirif4faj0zb2x2ls22xlrh6d2pca9bzhs27y0x4gf759qw"; - 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 - ]; - homepage = "https://github.com/jtdaugherty/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -212570,8 +208601,8 @@ self: { }: mkDerivation { pname = "wai-cors"; - version = "0.2.5"; - sha256 = "0vkn5nws9vcjn809qv2jfhf9ckfcgvfhs1v3xx1b03iy0j59n215"; + version = "0.2.6"; + sha256 = "11m9d8hn9pb9brprz0kglldmcqj83kjkjdwdpxdbl12430ii1ina"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base base-unicode-symbols bytestring case-insensitive @@ -212632,6 +208663,7 @@ self: { homepage = "https://github.com/singpolyma/wai-digestive-functors"; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -212671,37 +208703,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.20.0"; - sha256 = "0w8r0azjhl132sa8wzqjd8vs359h8dc7l6afr3g5wbw1kr9clqxd"; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive cookie fast-logger - hspec http-types HUnit resourcet text time transformers wai zlib - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_20_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.20.2"; - sha256 = "0szmh1wnbcw1mi89rrp35kgnjglc2dx6ib5l3rcki4d9fc04w8xn"; + version = "3.0.21.0"; + sha256 = "1kngdp16hia9x3i47a6f3cwbsn58678madzmj3l4qb6mcfnk1a3y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212718,7 +208721,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -212735,6 +208737,32 @@ self: { ]; description = "Run CGI apps on WAI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-git-http" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, containers, directory + , filepath, hspec, http-types, network, process, sockaddr, text + , wai, wai-conduit, warp + }: + mkDerivation { + pname = "wai-git-http"; + version = "0.0.0"; + sha256 = "15j0zkrd0m0qs0yg6b6zwhgfq283a2j8dxf1aqs9l9cbagzsg75g"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring case-insensitive conduit + conduit-extra containers directory filepath http-types network + process sockaddr text wai wai-conduit + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra directory hspec process wai + warp + ]; + homepage = "https://github.com/NorfairKing/wai-git-http"; + description = "Git http-backend CGI App of WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-graceful" = callPackage @@ -212944,8 +208972,8 @@ self: { }: mkDerivation { pname = "wai-logger"; - version = "2.3.0"; - sha256 = "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch"; + version = "2.3.1"; + sha256 = "0ldx9jiq70ga2clsrg1sw5jsy76n4s6kzs3785qs87gbj5dqfdip"; libraryHaskellDepends = [ base blaze-builder byteorder bytestring case-insensitive fast-logger http-types network unix unix-time wai @@ -213375,7 +209403,6 @@ self: { homepage = "https://github.com/orbital/wai-middleware-json-errors#readme"; description = "Converts errors from plaintext to json"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-metrics" = callPackage @@ -213422,16 +209449,16 @@ self: { }) {}; "wai-middleware-prometheus" = callPackage - ({ mkDerivation, base, bytestring, data-default, doctest - , http-types, prometheus-client, text, time, wai + ({ mkDerivation, base, bytestring, clock, data-default, doctest + , http-types, prometheus-client, text, wai }: mkDerivation { pname = "wai-middleware-prometheus"; - version = "0.1.1"; - sha256 = "0dd730nmbnbly4kdxwri3bwzl9dzdxgmz4lgmm86m70mvncgp4mj"; + version = "0.3.0"; + sha256 = "04ymaaby1pk60gg3bnz1a3mz0r7bl4p41kksbn40nvj5ahz41i6f"; libraryHaskellDepends = [ - base bytestring data-default http-types prometheus-client text time - wai + base bytestring clock data-default http-types prometheus-client + text wai ]; testHaskellDepends = [ base doctest prometheus-client ]; homepage = "https://github.com/fimad/prometheus-haskell"; @@ -213447,8 +209474,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.4.0"; - sha256 = "14dr25jn7xdx68ykrplcbnk1qvwbaxqpa63a6m56sfpwa4qj03ja"; + version = "0.8.1"; + sha256 = "1h12fypbk1y96s8v4qb44b6lvccgxy5namvd9blza222crmiriv1"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -213463,31 +209490,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-rollbar_0_6_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hostname, hspec, hspec-golden-aeson, http-client - , http-conduit, http-types, lens, lens-aeson, network, QuickCheck - , text, time, unordered-containers, uuid, wai - }: - mkDerivation { - pname = "wai-middleware-rollbar"; - version = "0.6.0"; - sha256 = "1vfykph1vszap8gbv3jr5a2mr8n0hhf2v2r39f27dg9yh8f6hq4q"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive hostname http-client - http-conduit http-types network text time unordered-containers uuid - wai - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers hspec - hspec-golden-aeson lens lens-aeson QuickCheck text - ]; - homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; - description = "Middleware that communicates to Rollbar"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-middleware-route" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit , test-framework, test-framework-hunit, text, wai, wai-test @@ -213573,27 +209575,6 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, hspec - , http-types, HUnit, network, stm, token-bucket, transformers, wai - , wai-extra - }: - mkDerivation { - pname = "wai-middleware-throttle"; - version = "0.2.1.0"; - sha256 = "0z7qziy3y0lxzaaf72hr598zkgg6w9288fd6ar7ipqn8p1xw0al6"; - libraryHaskellDepends = [ - base containers hashable http-types network stm token-bucket - transformers wai - ]; - testHaskellDepends = [ - base bytestring hspec http-types HUnit stm transformers wai - wai-extra - ]; - description = "WAI Middleware for Request Throttling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-middleware-throttle_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, containers , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm , text, token-bucket, transformers, wai, wai-extra @@ -213612,7 +209593,6 @@ self: { ]; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-verbs" = callPackage @@ -213642,29 +209622,6 @@ self: { }) {}; "wai-predicates" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, cookie, http-types - , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers - , vault, vector, wai - }: - mkDerivation { - pname = "wai-predicates"; - version = "0.9.0"; - sha256 = "0l0v9qfnz63j39g39l3rw9k6hgm80ijic5f1kh2f077cijmd60hq"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types singletons transformers vault vector wai - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types tasty - tasty-hunit tasty-quickcheck wai - ]; - homepage = "https://gitlab.com/twittner/wai-predicates/"; - description = "WAI request predicates"; - license = "unknown"; - }) {}; - - "wai-predicates_0_10_0" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types , singletons, tasty, tasty-hunit, tasty-quickcheck, text @@ -213685,7 +209642,6 @@ self: { homepage = "https://gitlab.com/twittner/wai-predicates/"; description = "WAI request predicates"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-request-spec" = callPackage @@ -213721,25 +209677,6 @@ self: { }) {}; "wai-route" = callPackage - ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck - , tasty, tasty-quickcheck, unordered-containers, wai - }: - mkDerivation { - pname = "wai-route"; - version = "0.3.1.1"; - sha256 = "03rckjjrsr741iawlc1vncydqn9x6m11d6rhgbv8ihx3ym97vzj3"; - libraryHaskellDepends = [ - base bytestring http-types unordered-containers wai - ]; - testHaskellDepends = [ - base bytestring http-types mtl QuickCheck tasty tasty-quickcheck - wai - ]; - description = "Minimalistic, efficient routing for WAI"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "wai-route_0_3_1_2" = callPackage ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck , tasty, tasty-quickcheck, unordered-containers, wai }: @@ -213756,7 +209693,6 @@ self: { ]; description = "Minimalistic, efficient routing for WAI"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-router" = callPackage @@ -213781,8 +209717,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.10.0"; - sha256 = "1yqd79gm0xl7p8ag2pii4kcn3vb90qkli54dq4jb619bia9lsfsy"; + version = "0.10.1"; + sha256 = "1ahlvyplg1mh3w2yxag0nk67w13k70rff77b96grgr48a8b9b82g"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -213795,6 +209731,7 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-routing" = callPackage @@ -213841,7 +209778,6 @@ self: { executableHaskellDepends = [ base bytestring cryptonite memory ]; homepage = "https://github.com/habibalamin/wai-secure-cookies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session" = callPackage @@ -213923,8 +209859,8 @@ self: { }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.1"; - sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9"; + version = "0.2.1.2"; + sha256 = "10xc34a1l6g2lr8b4grvv17281689gdb8q1vh3kkip5lk7fp1m9r"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai @@ -214158,6 +210094,7 @@ self: { homepage = "https://github.com/futurice/waitra"; description = "A very simple Wai router"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "waldo" = callPackage @@ -214488,6 +210425,7 @@ self: { homepage = "https://github.com/sasinestro/wavefront-obj#readme"; description = "Wavefront .obj file loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavesurfer" = callPackage @@ -214750,10 +210688,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.12"; - sha256 = "0c0wqr3f79gx26pfknvv4zka8g8fkfxw5fqb0qpq8zv0mv5rflba"; - revision = "1"; - editedCabalFile = "1pdp6x3q5423m99n24nhwlqmi0xyz0dhz02v2m8n4nkbg33lrv1q"; + version = "0.27.13"; + sha256 = "10b0hs7mmvs9ay3ik93s8xd7zlx8pyz20626nrha4mwyixgkmc59"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -215194,6 +211130,7 @@ self: { homepage = "http://github.com/ananthakumaran/webify"; description = "webfont generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webkit" = callPackage @@ -215241,7 +211178,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage @@ -215338,38 +211274,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers, entropy - , HUnit, network, QuickCheck, random, SHA, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.10.0.0"; - sha256 = "1sx27ys3zwxjp8nafnkv0f38i5748cf5jv9kgn5944ird2k6zr9y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - executableHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA test-framework test-framework-hunit test-framework-quickcheck2 - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_2_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA @@ -215378,8 +211282,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.2.0"; - sha256 = "1jjb3qp6kniddn7jf4vv25v3fqainiclw0f3iyk4shq49clllki1"; + version = "0.12.3.0"; + sha256 = "1k7mh4gpgzw83ck66kncz8jvmwc21jd2i36xnj78zbyi2sbclx86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215406,40 +211310,9 @@ self: { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck - , quickcheck-instances, stm, tasty, tasty-quickcheck, text - , transformers, unordered-containers, uuid, wai-transformers - , websockets, websockets-simple - }: - mkDerivation { - pname = "websockets-rpc"; - version = "0.4.0"; - sha256 = "13rvlh5yvznm8f6x8yiqghnrwn6gyr0xcqzvs338lvsaqanggg0p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bytestring containers exceptions hashable - monad-control mtl QuickCheck stm text transformers - unordered-containers uuid wai-transformers websockets - websockets-simple - ]; - executableHaskellDepends = [ - aeson async base exceptions MonadRandom mtl wai-transformers - websockets - ]; - testHaskellDepends = [ - aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck - ]; - description = "Simple streaming RPC mechanism using WebSockets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-rpc_0_6_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck , quickcheck-instances, stm, tasty, tasty-quickcheck, text @@ -215467,27 +211340,9 @@ self: { ]; description = "Simple streaming RPC mechanism using WebSockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-simple" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, exceptions - , monad-control, stm, wai-transformers, websockets - }: - mkDerivation { - pname = "websockets-simple"; - version = "0.0.2"; - sha256 = "1vkq7qp3gkhh9a7g3ickwnb68xdzynaxbbc2rpzpr1x6lik5vi8a"; - libraryHaskellDepends = [ - aeson async base bytestring exceptions monad-control stm - wai-transformers websockets - ]; - homepage = "https://github.com/athanclark/websockets-simple#readme"; - description = "Simpler interface to the websockets api"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-simple_0_0_6_3" = callPackage ({ mkDerivation, aeson, async, base, bytestring, every, exceptions , hspec, monad-control, stm, tasty, tasty-hspec, transformers , wai-transformers, websockets @@ -215504,26 +211359,9 @@ self: { homepage = "https://github.com/athanclark/websockets-simple#readme"; description = "Simpler interface to the websockets api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-snap" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, io-streams - , mtl, snap-core, snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; - version = "0.10.2.3"; - sha256 = "0zdpim80yyw33k90r22jxac3g6h64jk2f831s3kw9z98l0m4gqlm"; - libraryHaskellDepends = [ - base bytestring bytestring-builder io-streams mtl snap-core - snap-server websockets - ]; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-snap_0_10_2_4" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, io-streams , mtl, snap-core, snap-server, websockets }: @@ -215537,7 +211375,6 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -215601,8 +211438,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "0.1.7"; - sha256 = "0mvpy2qzwjdl204k3qfi1cjz44rknzyrc187wp9lvxv40mb2kyd6"; + version = "0.1.11"; + sha256 = "072gz2pwmzy7y4fnqgwwghgmcn5qy5aw8n9mhzwdspqjwyxr4rmh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -215615,26 +211452,6 @@ self: { }) {}; "weigh" = callPackage - ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl - , process, random, split, template-haskell, temporary - , unordered-containers - }: - mkDerivation { - pname = "weigh"; - version = "0.0.5"; - sha256 = "0s4bk2bglc5bf569zrbap7h6svd96sfgmvmrx57xwyinard7jfz9"; - libraryHaskellDepends = [ - base deepseq mtl process split template-haskell temporary - ]; - testHaskellDepends = [ - base bytestring-trie containers deepseq random unordered-containers - ]; - homepage = "https://github.com/fpco/weigh#readme"; - description = "Measure allocations of a Haskell functions/values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "weigh_0_0_7" = callPackage ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl , process, random, split, template-haskell, temporary , unordered-containers @@ -215652,7 +211469,6 @@ self: { homepage = "https://github.com/fpco/weigh#readme"; description = "Measure allocations of a Haskell functions/values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weighted" = callPackage @@ -215928,7 +211744,6 @@ self: { homepage = "https://github.com/erikd/wide-word"; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -216007,8 +211822,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.0.3"; - sha256 = "0zvkkxmlpfgb107cx2rcp7igsqxhdng88sk4hw6y7bikkd5pdxgj"; + version = "0.1.1.0"; + sha256 = "1z9jiqbla3nxfij6cxcpd5lpgnixz89mhnfr5ksma5khfyc01sis"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base hspec microlens QuickCheck stm transformers @@ -216024,8 +211839,8 @@ self: { }: mkDerivation { pname = "wild-bind-indicator"; - version = "0.1.0.1"; - sha256 = "0lvhczw0ah8kb1hd9k7rnjcs1pmn0qg1i2v0szvhh2ji8iznjznm"; + version = "0.2.0.0"; + sha256 = "09p7x77ksh9qp4ir5cy470y978m4ln0sp44pffm0mld1apdam27x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers gtk text transformers wild-bind @@ -216041,8 +211856,8 @@ self: { }: mkDerivation { pname = "wild-bind-task-x11"; - version = "0.1.0.1"; - sha256 = "1hvsaa8655wl74sikp59qgmi94285sbdnifynllgxdjdvzm4g4yl"; + version = "0.2.0.1"; + sha256 = "0n8sg0qg0ambh0744c19zwxxky2b0vwpmn464i3mp587dkfpm0p2"; libraryHaskellDepends = [ base text transformers wild-bind wild-bind-indicator wild-bind-x11 ]; @@ -216050,7 +211865,6 @@ self: { homepage = "https://github.com/debug-ito/wild-bind"; description = "Task to install and export everything you need to use WildBind in X11"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "wild-bind-x11" = callPackage @@ -216070,6 +211884,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_0" = callPackage + ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl + , semigroups, stm, text, time, transformers, wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.0"; + sha256 = "0x7zy76x9zmh6pjv6yhkb53l6pkn4wh76x34adx538fyf6a8mk6b"; + libraryHaskellDepends = [ + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 + ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "X11-specific implementation for WildBind"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "win-hp-path" = callPackage ({ mkDerivation, base, process, split }: mkDerivation { @@ -216173,6 +212008,7 @@ self: { homepage = "https://github.com/winterland1989/wire-streams"; description = "Fast binary io-streams adapter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wires" = callPackage @@ -216209,6 +212045,7 @@ self: { homepage = "http://github.com/seanparsons/wiring/"; description = "Wiring, promotion and demotion of types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wiringPi" = callPackage @@ -216269,23 +212106,6 @@ self: { }) {}; "witherable" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "witherable"; - version = "0.1.3.4"; - sha256 = "0rqdbxl5381bfvy75bdgr8q40g1ypqgfj29ca5lzsykw5d7i4nzl"; - libraryHaskellDepends = [ - base base-orphans containers hashable transformers - unordered-containers vector - ]; - homepage = "https://github.com/fumieval/witherable"; - description = "filterable traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "witherable_0_2" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable , transformers, unordered-containers, vector }: @@ -216300,7 +212120,6 @@ self: { homepage = "https://github.com/fumieval/witherable"; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witness" = callPackage @@ -216574,8 +212393,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.37"; - sha256 = "09ry5bq0hmrdv09hd9v16r4dyyyfzpf785sfrz3by6hal8bkwj6w"; + version = "0.3.39"; + sha256 = "0n7575l5sy4slzf0v15g7nlrxcq1lslgzzldsxlfaibk0j71xw08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216664,6 +212483,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "word2vec-model" = callPackage + ({ mkDerivation, attoparsec, base, binary, binary-ieee754 + , bytestring, conduit, conduit-combinators, conduit-extra, hspec + , HUnit, text, unordered-containers, vector + }: + mkDerivation { + pname = "word2vec-model"; + version = "0.1.0.0"; + sha256 = "1dz6q7ym5z5l0pkzmvawpdpjh8z6pf5ph26m0b7k9q95q42qypmj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary binary-ieee754 bytestring text + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec base binary binary-ieee754 bytestring conduit + conduit-combinators conduit-extra text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base binary binary-ieee754 bytestring hspec HUnit text + unordered-containers vector + ]; + homepage = "https://gonito.net/gitlist/word2vec-model.git"; + description = "Reading word2vec binary models"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "word8" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec }: mkDerivation { @@ -216699,7 +212546,6 @@ self: { homepage = "https://github.com/githubuser/wordchoice#readme"; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wordcloud" = callPackage @@ -216830,6 +212676,7 @@ self: { homepage = "http://github.com/sboosali/workflow-extra#readme"; description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "workflow-osx" = callPackage @@ -216993,8 +212840,8 @@ self: { }: mkDerivation { pname = "wrecker"; - version = "1.2.2.0"; - sha256 = "03iw04jg3lmar97l9mhgd5kabfjps1dh84s7r5p9cbc6rsy5knsh"; + version = "1.2.3.0"; + sha256 = "138a8az5500ys2yvwif17vbmsmisd0r3q4yc8azfrd09y359ndlq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217059,21 +212906,22 @@ self: { "wreq" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring - , byteable, bytestring, case-insensitive, containers, cryptohash - , directory, doctest, exceptions, filepath, ghc-prim, hashable - , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson - , 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 + , byteable, bytestring, Cabal, cabal-doctest, case-insensitive + , containers, cryptohash, directory, doctest, exceptions, filepath + , ghc-prim, hashable, http-client, http-client-tls, http-types + , HUnit, lens, lens-aeson, 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.0.1"; - sha256 = "138n138rczs5xb7pr25b5a2ajhhxph7vfrh02x71w2alh2xr4akc"; + version = "0.5.2.0"; + sha256 = "06v70dpnh7lp1sr0i0fvl2b2cx0z57dfwi8i2fxva0gcdwan0fki"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base base16-bytestring byteable bytestring case-insensitive containers cryptohash exceptions @@ -217094,45 +212942,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wreq_0_5_1_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec - , authenticate-oauth, base, base16-bytestring, base64-bytestring - , byteable, bytestring, case-insensitive, containers, cryptohash - , directory, doctest, exceptions, filepath, ghc-prim, hashable - , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson - , 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.1.0"; - sha256 = "1p8cn9yzm2ggb3kac17xc3if6sdxjdh544k730imvvhm0szx4j76"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec authenticate-oauth base base16-bytestring byteable - bytestring case-insensitive containers cryptohash exceptions - ghc-prim hashable http-client http-client-tls http-types lens - lens-aeson 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 - ]; - homepage = "http://www.serpentine.com/wreq"; - 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 @@ -217176,13 +212985,12 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: mkDerivation { pname = "wreq-stringless"; - version = "0.5.1.0"; - sha256 = "1f23f1dxim8xkx7jj0z7fr4xjpmxc8cr0rbh84hhb359mkfklhvf"; + version = "0.5.2.0"; + sha256 = "0nswlrrs5pby5l758i5bbrfj0rpjxb71jak26gzwkm674kby9hjq"; libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; homepage = "https://github.com/j-keck/wreq-stringless#readme"; description = "Simple wrapper to use wreq without Strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wright" = callPackage @@ -217343,8 +213151,8 @@ self: { }: mkDerivation { pname = "ws"; - version = "0.0.1"; - sha256 = "1i9jglq199pwxs9giigf3xgndspiwp30s2fb833mc7fl5s5mghhh"; + version = "0.0.2"; + sha256 = "1wl6ap3kv90fwi03dd7vi2qmih4irqj2lc25y8x4s2h9ks38qy9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217537,8 +213345,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.5"; - sha256 = "0n7sixmvy084hggvagkd9nq06gxhisrklm1b8fahkjylahbzh2qd"; + version = "1.1.6"; + sha256 = "1g2k48mngg8fr6cvkimjr39jc83b87lva0320bwdnf19nyz1fy9y"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -217558,7 +213366,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -217574,7 +213382,7 @@ self: { homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxFruit" = callPackage @@ -217627,7 +213435,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -217649,7 +213457,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell core"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -217668,6 +213476,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "helper tool for building wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxhnotepad" = callPackage @@ -217868,7 +213677,6 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-validation" = callPackage @@ -217947,7 +213755,6 @@ self: { homepage = "https://github.com/polachok/xbattbar"; description = "Simple battery indicator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xcb-types" = callPackage @@ -218051,6 +213858,7 @@ self: { homepage = "https://github.com/JanGe/xdcc"; description = "A wget-like utility for retrieving files from XDCC bots on IRC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xdg-basedir" = callPackage @@ -218098,31 +213906,10 @@ self: { ]; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, criterion, deepseq - , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector - , weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.2"; - sha256 = "09nd0z1ysgjj6wb6xzjkn1fbrbk88l0kdqj7vfqyr6q890c3cmmg"; - libraryHaskellDepends = [ - array base bytestring deepseq mtl mutable-containers vector - ]; - testHaskellDepends = [ base bytestring hexml hspec ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml - ]; - homepage = "https://github.com/ocramz/xeno"; - description = "A fast event-based XML parser in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xeno_0_3_2" = callPackage ({ mkDerivation, array, base, bytestring, criterion, deepseq , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector , weigh, xml @@ -218141,7 +213928,6 @@ self: { homepage = "https://github.com/ocramz/xeno"; description = "A fast event-based XML parser in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xenstore" = callPackage @@ -218402,7 +214188,7 @@ self: { benchmarkHaskellDepends = [ base random time vector ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -218439,7 +214225,6 @@ self: { homepage = "https://github.com/aisamanra/xleb"; description = "A simple monadic language for parsing XML structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xls" = callPackage @@ -218462,7 +214247,6 @@ self: { homepage = "http://github.com/harendra-kumar/xls"; description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xlsior" = callPackage @@ -218600,30 +214384,6 @@ self: { }) {}; "xml-conduit" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , data-default, deepseq, hspec, HUnit, monad-control, resourcet - , text, transformers, xml-types - }: - mkDerivation { - pname = "xml-conduit"; - version = "1.5.1"; - sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - conduit conduit-extra containers data-default deepseq monad-control - resourcet text transformers xml-types - ]; - testHaskellDepends = [ - base blaze-markup bytestring conduit containers hspec HUnit - resourcet text transformers xml-types - ]; - homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xml-conduit_1_7_0" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default-class, deepseq, hspec, HUnit, monad-control @@ -218631,8 +214391,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.7.0"; - sha256 = "0g0a6h52n6q3w09350d6vgjpvb6xj224isp4lphgwbmd2xr12i76"; + version = "1.7.0.1"; + sha256 = "16pg2zzh0nz16zg6y5s7392d76fnhlki48ni1c18dzn41ybj8vll"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default-class deepseq @@ -218645,7 +214405,6 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-decode" = callPackage @@ -218670,29 +214429,6 @@ self: { }) {}; "xml-conduit-parse" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, containers - , data-default, exceptions, hlint, parsers, resourcet, tasty - , tasty-hunit, text, xml-conduit, xml-types - }: - mkDerivation { - pname = "xml-conduit-parse"; - version = "0.3.1.1"; - sha256 = "1i20smw7cs2bjh7z1606grac779a60fcwpc8qrqavagbmkhx0ba8"; - libraryHaskellDepends = [ - base conduit conduit-parse containers exceptions parsers text - xml-conduit xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default hlint parsers resourcet - tasty tasty-hunit - ]; - homepage = "https://github.com/k0ral/xml-conduit-parse"; - description = "Streaming XML parser based on conduits"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "xml-conduit-parse_0_3_1_2" = callPackage ({ mkDerivation, base, conduit, conduit-parse, containers , data-default, exceptions, hlint, parsers, resourcet, tasty , tasty-hunit, text, xml-conduit, xml-types @@ -218712,7 +214448,6 @@ self: { homepage = "https://github.com/k0ral/xml-conduit-parse"; description = "Streaming XML parser based on conduits"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-writer" = callPackage @@ -218903,7 +214638,6 @@ self: { homepage = "https://github.com/typeable/xml-isogen"; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-lens" = callPackage @@ -219222,6 +214956,72 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xmlbf" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "xmlbf"; + version = "0.2"; + sha256 = "1jzh5xz4l3va58mqz11bh5ysavlr17jh7qd74qcqbmz2bsfav136"; + libraryHaskellDepends = [ + base bytestring containers text transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers + ]; + homepage = "https://gitlab.com/k0001/xmlbf"; + description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "xmlbf-xeno" = callPackage + ({ mkDerivation, base, bytestring, html-entities, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , unordered-containers, xeno, xmlbf + }: + mkDerivation { + pname = "xmlbf-xeno"; + version = "0.1"; + sha256 = "0xg7v4jqrh2qnnh6cxqlaaq6ss0vav7182gm92bm6lw0pb9mj5lq"; + libraryHaskellDepends = [ + base bytestring html-entities text unordered-containers xeno xmlbf + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text unordered-containers xmlbf + ]; + homepage = "https://gitlab.com/k0001/xmlbf"; + description = "xeno backend support for the xmlbf library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xmlbf-xmlhtml" = callPackage + ({ mkDerivation, base, bytestring, html-entities, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , unordered-containers, xmlbf, xmlhtml + }: + mkDerivation { + pname = "xmlbf-xmlhtml"; + version = "0.1"; + sha256 = "1f8q83jy45nqxmwmw6i47dq3v350cdlrz6c8w6r7dgsczgyda6vd"; + libraryHaskellDepends = [ + base bytestring html-entities text unordered-containers xmlbf + xmlhtml + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text unordered-containers xmlbf + ]; + homepage = "https://gitlab.com/k0001/xmlbf"; + description = "xmlhtml backend support for the xmlbf library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmlgen" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text @@ -219264,7 +215064,6 @@ self: { homepage = "https://github.com/snapframework/xmlhtml"; description = "XML parser and renderer with HTML 5 quirks mode"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmltv" = callPackage @@ -219347,7 +215146,7 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; @@ -219508,6 +215307,7 @@ self: { homepage = "https://github.com/xmonad/xmonad-extras"; description = "Third party extensions for xmonad with wacky dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-screenshot" = callPackage @@ -219534,21 +215334,20 @@ self: { homepage = "https://github.com/LeifW/xmonad-utils"; description = "A small collection of X utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xmonad-vanessa" = callPackage - ({ mkDerivation, base, composition, containers, hspec, process - , transformers, X11, xmonad, xmonad-contrib + ({ mkDerivation, base, composition-prelude, containers, hspec + , process, transformers, X11, xmonad, xmonad-contrib }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.1.4"; - sha256 = "1qbapbb72qa78n174x8y9q2zzb1g1bw6dgg260hxxzc7v9kb88xm"; + version = "0.1.1.6"; + sha256 = "1im97p6g7c7gvcm9an7nzv9k7yipvd5yv39zfgr26q7vnr6hj4dq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base composition containers process transformers X11 xmonad + base composition-prelude containers process transformers X11 xmonad xmonad-contrib ]; executableHaskellDepends = [ base ]; @@ -219778,6 +215577,7 @@ self: { homepage = "https://github.com/tonymorris/xsd"; description = "XML Schema data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xsha1" = callPackage @@ -219836,7 +215636,7 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xtest" = callPackage @@ -219976,32 +215776,10 @@ self: { homepage = "http://github.com/snoyberg/yackage"; description = "Personal Hackage replacement for testing new packages"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "yahoo-finance-api" = callPackage - ({ mkDerivation, aeson, base, doctest, either, Glob, hspec - , http-api-data, http-client, http-client-tls, mtl, safe, servant - , servant-client, text, time, transformers, vector - }: - mkDerivation { - pname = "yahoo-finance-api"; - version = "0.2.0.2"; - sha256 = "0frwwpcf7xwbh28sx6k7v9yw9kswx0wrbqgmsr6kcyzbxl2i54pj"; - libraryHaskellDepends = [ - aeson base either http-api-data http-client mtl servant - servant-client text time transformers vector - ]; - testHaskellDepends = [ - base doctest either Glob hspec http-client http-client-tls mtl safe - servant servant-client - ]; - homepage = "https://github.com/cdepillabout/yahoo-finance-api"; - description = "Read quotes from Yahoo Finance API"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yahoo-finance-api_0_2_0_3" = callPackage + "yahoo-finance-api" = callPackage ({ mkDerivation, aeson, base, doctest, either, Glob, hspec , http-api-data, http-client, http-client-tls, mtl, safe, servant , servant-client, text, time, transformers, vector @@ -220110,16 +215888,15 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, filepath, hspec - , HUnit, libyaml, mockery, resourcet, scientific, semigroups - , template-haskell, temporary, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, resourcet, scientific, semigroups, template-haskell + , temporary, text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.8.25"; - sha256 = "16bx7vkj455796wdklh8h13zm98h5m81dl8np0sjbx9hcsrfdbyp"; + version = "0.8.25.1"; + sha256 = "0s5db3ayjb9cs1pah1dggy9v95jnxis6v038jkh6229vi1piq4gz"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -220131,9 +215908,9 @@ self: { libraryPkgconfigDepends = [ libyaml ]; executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet temporary text transformers - unordered-containers vector + aeson base base-compat bytestring conduit directory hspec HUnit + mockery resourcet temporary text transformers unordered-containers + vector ]; homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; @@ -220421,6 +216198,7 @@ self: { ]; description = "Bindings to Yandex translate API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaop" = callPackage @@ -220469,6 +216247,44 @@ self: { homepage = "https://github.com/Profpatsch/yarn-lock#readme"; description = "Represent and parse yarn.lock files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yarn2nix" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async-pool, base + , bytestring, containers, data-fix, directory, either, filepath + , hnix, mtl, neat-interpolation, optparse-applicative, process + , protolude, regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, unix, unordered-containers + , yarn-lock + }: + mkDerivation { + pname = "yarn2nix"; + version = "0.5.0"; + sha256 = "1vnhf7na4ljlybxpwi0n7ivmigc1mwjzn1vbcl4rrwlr4qcvaylp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint async-pool base bytestring containers data-fix + directory either filepath hnix mtl process protolude regex-tdfa + regex-tdfa-text stm text unordered-containers yarn-lock + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async-pool base bytestring containers data-fix + directory either filepath hnix mtl optparse-applicative process + protolude regex-tdfa regex-tdfa-text stm text unix + unordered-containers yarn-lock + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint async-pool base bytestring containers data-fix + directory either filepath hnix mtl neat-interpolation process + protolude regex-tdfa regex-tdfa-text stm tasty tasty-hunit + tasty-quickcheck tasty-th text unordered-containers yarn-lock + ]; + homepage = "https://github.com/Profpatsch/yarn2nix#readme"; + description = "Convert yarn.lock files to nix expressions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yarr" = callPackage @@ -220518,7 +216334,6 @@ self: { ]; description = "Yet Another Template Engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yavie" = callPackage @@ -220642,7 +216457,6 @@ self: { ]; description = "YesQL-style SQL database abstraction"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod" = callPackage @@ -220759,8 +216573,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.19"; - sha256 = "1r6ykh9q9080wrshicmgxkjjlxb1rxv56kabqnyx44xihhcr19jp"; + version = "1.4.21"; + sha256 = "1qqwg9l65m9q3l8z0r1bnihqb5rbbp2c2w6gbk49kx9127rf4488"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -220775,36 +216589,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-auth_1_4_20" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptonite, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, memory - , mime-mail, network-uri, nonce, persistent, persistent-template - , random, resourcet, safe, shakespeare, template-haskell, text - , time, transformers, unordered-containers, wai, yesod-core - , yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.20"; - sha256 = "1p6kcx9g04x8vng12dc7kywxwnm74kpp5q4adcjcbzhgrvhrnvbj"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-conduit http-types lifted-base memory - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -220826,6 +216610,7 @@ self: { homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account-fork" = callPackage @@ -220981,8 +216766,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hmac-keccak"; - version = "0.0.0.3"; - sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8"; + version = "0.0.0.4"; + sha256 = "17i3xxxdpq58q7y80xrh266lzkl8dh686v25kpapn2r0c4vxm291"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cryptonite mtl persistent random shakespeare @@ -221109,8 +216894,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.3.0"; - sha256 = "1mdazbvmwm8b7b4sp5wvdjl4lms0jj3q0lrikzx0rvnd9qj6814v"; + version = "0.3.1"; + sha256 = "0lgn72kvhvxr77243fikkvyd1gz7iw9lw7azvw2cdd6lwgn3p73i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221125,7 +216910,6 @@ self: { homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-pam" = callPackage @@ -221191,13 +216975,13 @@ self: { , optparse-applicative, parsec, process, project-template , resourcet, safe-exceptions, say, shakespeare, split, stm , streaming-commons, tar, template-haskell, text, time - , transformers, transformers-compat, typed-process, unix-compat + , transformers, transformers-compat, unix-compat , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.5.2.6"; - sha256 = "1in4c0q2w0h36lm1cf48ai0zpl9r8x0z116j85mfmq66wxmd6h9r"; + version = "1.5.3"; + sha256 = "06q1lnr3q8hplm2fd6blkp2z9awnslyaabjj2pg1cxq2ki9ndvmq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -221208,8 +216992,8 @@ self: { optparse-applicative parsec process project-template resourcet safe-exceptions say shakespeare split stm streaming-commons tar template-haskell text time transformers transformers-compat - typed-process unix-compat unordered-containers wai wai-extra warp - warp-tls yaml zlib + unix-compat unordered-containers wai wai-extra warp warp-tls yaml + zlib ]; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; @@ -221247,7 +217031,6 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-comments" = callPackage @@ -221314,49 +217097,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , criterion, data-default, deepseq, deepseq-generics, directory - , exceptions, fast-logger, hspec, hspec-expectations, http-types - , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.37"; - sha256 = "0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_37_2" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -221397,7 +217137,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -221524,6 +217263,7 @@ self: { ]; description = "DSL for generating Yesod subsite to manage an RDBMS;"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-elements" = callPackage @@ -221801,6 +217541,7 @@ self: { homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme"; description = "Background jobs library for Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-json" = callPackage @@ -221891,6 +217632,7 @@ self: { homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -221998,30 +217740,6 @@ self: { }) {}; "yesod-persistent" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.4.2"; - sha256 = "0mhh7gka86spc51qcsi3y9nwdx9cn2fnm421dqm7yyp21518jf6r"; - revision = "1"; - editedCabalFile = "1aa1c3qbq223v3mslgj62jix10qff38zif8f6c8y3h7m0hix2fsf"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_4_3" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -222041,7 +217759,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -222231,6 +217948,7 @@ self: { ]; description = "A html documentation generator library for RAML"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-raml-mock" = callPackage @@ -222278,22 +217996,6 @@ self: { }) {}; "yesod-recaptcha2" = callPackage - ({ mkDerivation, base, classy-prelude-yesod, http-conduit - , yesod-auth - }: - mkDerivation { - pname = "yesod-recaptcha2"; - version = "0.1.0.1"; - sha256 = "0avlm1jchp0j65c3f6bj9gv9kba0cvvk77sq918dzjvx54hnygf3"; - libraryHaskellDepends = [ - base classy-prelude-yesod http-conduit yesod-auth - ]; - homepage = "https://github.com/ncaq/yesod-recaptcha2#readme"; - description = "yesod recaptcha2"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-recaptcha2_0_2_3" = callPackage ({ mkDerivation, base, classy-prelude-yesod, http-conduit , yesod-auth }: @@ -222307,7 +218009,6 @@ self: { homepage = "https://github.com/ncaq/yesod-recaptcha2#readme"; description = "yesod recaptcha2"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes" = callPackage @@ -222560,8 +218261,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5.8"; - sha256 = "0rvbvr8pa60b9rvhnsd1wcbs0x49s2rhqc76nqzv2i0qry5aym7h"; + version = "1.5.9.1"; + sha256 = "05l5n28azbh6r1vsi7xvz1h19if5zrwn1b3jsr2913axfs3d9r3y"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -222775,9 +218476,9 @@ self: { "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl - , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty - , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell - , yi-mode-javascript, yi-rope + , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs + , yi-keymap-vim, yi-misc-modes, yi-mode-haskell, yi-mode-javascript + , yi-rope }: mkDerivation { pname = "yi"; @@ -222788,13 +218489,12 @@ self: { isExecutable = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core - yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim - yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope + yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes + yi-mode-haskell yi-mode-javascript yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -222818,49 +218518,6 @@ self: { }) {}; "yi-core" = callPackage - ({ mkDerivation, array, attoparsec, base, binary, bytestring - , containers, criterion, data-default, deepseq, directory, dlist - , dynamic-state, filepath, hashable, ListLike, microlens-platform - , mtl, old-locale, oo-prototypes, parsec, pointedlist, process - , process-extras, quickcheck-text, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, text-icu, time - , transformers-base, unix, unix-compat, unordered-containers - , xdg-basedir, yi-language, yi-rope - }: - mkDerivation { - pname = "yi-core"; - version = "0.14.1"; - sha256 = "0lhx476whdsz9f6p996p12ys3vi7rz14rb3rgfw0qi12czc61hav"; - libraryHaskellDepends = [ - array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state filepath hashable ListLike - microlens-platform mtl old-locale oo-prototypes parsec pointedlist - process process-extras semigroups split text text-icu time - transformers-base unix unix-compat unordered-containers xdg-basedir - yi-language yi-rope - ]; - testHaskellDepends = [ - array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state filepath hashable ListLike - microlens-platform mtl old-locale oo-prototypes parsec pointedlist - process process-extras quickcheck-text split tasty tasty-hunit - tasty-quickcheck text text-icu time transformers-base unix - unix-compat unordered-containers xdg-basedir yi-language yi-rope - ]; - benchmarkHaskellDepends = [ - array attoparsec base binary bytestring containers criterion - data-default deepseq directory dlist dynamic-state filepath - hashable ListLike microlens-platform mtl old-locale oo-prototypes - parsec pointedlist process process-extras split text text-icu time - transformers-base unix unix-compat unordered-containers xdg-basedir - yi-language yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Yi editor core library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-core_0_17_1" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, directory, dlist , dynamic-state, exceptions, filepath, hashable, ListLike @@ -222889,7 +218546,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor core library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-dynamic-configuration" = callPackage @@ -222907,7 +218563,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Dynamic configuration support for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -222940,28 +218595,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Pango frontend for Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage - ({ mkDerivation, base, containers, data-default, dlist - , microlens-platform, pointedlist, stm, text, vty, yi-core - , yi-language, yi-rope - }: - mkDerivation { - pname = "yi-frontend-vty"; - version = "0.14.1"; - sha256 = "1ahiq7pf5dm6r6x7zpkrn9dbdqf4p1wr8g1zlffjncywk81h34f3"; - libraryHaskellDepends = [ - base containers data-default dlist microlens-platform pointedlist - stm text vty yi-core yi-language yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Vty frontend for Yi editor"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-frontend-vty_0_17_1" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core , yi-language, yi-rope @@ -222977,28 +218613,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Vty frontend for Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-fuzzy-open" = callPackage - ({ mkDerivation, base, binary, containers, data-default, directory - , filepath, mtl, text, transformers-base, vector, yi-core - , yi-language, yi-rope - }: - mkDerivation { - pname = "yi-fuzzy-open"; - version = "0.14.1"; - sha256 = "0qj8dlxdmsbas68zzmb99m5kw5jwp2vfj983s66a379z23zrg7wx"; - libraryHaskellDepends = [ - base binary containers data-default directory filepath mtl text - transformers-base vector yi-core yi-language yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Fuzzy open plugin for yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-fuzzy-open_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, pointedlist, text, transformers-base, vector , yi-core, yi-language, yi-rope @@ -223015,7 +218632,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Fuzzy open plugin for yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -223031,23 +218647,6 @@ self: { }) {}; "yi-ireader" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , microlens-platform, text, yi-core, yi-language, yi-rope - }: - mkDerivation { - pname = "yi-ireader"; - version = "0.14.1"; - sha256 = "0r10g7gw889snclv0jdrg8k6db9hm9zlkaxqvm7f22fj1ddb5kbi"; - libraryHaskellDepends = [ - base binary bytestring containers data-default microlens-platform - text yi-core yi-language yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Yi editor incremental reader"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-ireader_0_17_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , microlens-platform, text, yi-core, yi-language, yi-rope }: @@ -223062,26 +218661,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor incremental reader"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-keymap-cua" = callPackage - ({ mkDerivation, base, microlens-platform, text, yi-core - , yi-keymap-emacs, yi-rope - }: - mkDerivation { - pname = "yi-keymap-cua"; - version = "0.14.1"; - sha256 = "1s1nh2h1v4zhgklhzlzix1plfg1z458yhl6y77xbq5r81ammpr5v"; - libraryHaskellDepends = [ - base microlens-platform text yi-core yi-keymap-emacs yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Cua keymap for Yi editor"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-keymap-cua_0_17_1" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope }: @@ -223095,29 +218677,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Cua keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage - ({ mkDerivation, base, containers, filepath, Hclip - , microlens-platform, mtl, oo-prototypes, semigroups, text - , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope - }: - mkDerivation { - pname = "yi-keymap-emacs"; - version = "0.14.1"; - sha256 = "17fx1vhj4sdgbvih6ha6jqp74bfq0bcxilxlgm1vwlcafvc2vyfl"; - libraryHaskellDepends = [ - base containers filepath Hclip microlens-platform mtl oo-prototypes - semigroups text transformers-base yi-core yi-language yi-misc-modes - yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Emacs keymap for Yi editor"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-keymap-emacs_0_17_1" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, text, transformers-base , yi-core, yi-language, yi-misc-modes, yi-rope @@ -223133,39 +218695,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Emacs keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage - ({ mkDerivation, attoparsec, base, binary, containers, data-default - , directory, filepath, Hclip, microlens-platform, mtl - , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty - , tasty-hunit, tasty-quickcheck, text, transformers-base - , unordered-containers, yi-core, yi-language, yi-rope - }: - mkDerivation { - pname = "yi-keymap-vim"; - version = "0.14.1"; - sha256 = "19wdfhsvzy90jm9pskla40q94kvil5hvmx9r6a2frsbqjlbjk5ja"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base binary containers data-default directory filepath - Hclip microlens-platform mtl oo-prototypes pointedlist safe - semigroups text transformers-base unordered-containers yi-core - yi-language yi-rope - ]; - testHaskellDepends = [ - attoparsec base binary containers data-default directory filepath - Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck - safe semigroups tasty tasty-hunit tasty-quickcheck text - transformers-base unordered-containers yi-core yi-language yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Vim keymap for Yi editor"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-keymap-vim_0_17_1" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, data-default , directory, filepath, Hclip, microlens-platform, mtl , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit @@ -223190,38 +218722,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Vim keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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.14.1"; - sha256 = "1miszrvls06k5q78w5aswc7z5pbq8b1qvdxkhnfp0zw0vbs7wmgm"; - 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 - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Collection of language-related Yi libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-language_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -223247,29 +218750,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Collection of language-related Yi libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-misc-modes" = callPackage - ({ mkDerivation, alex, array, base, binary, data-default, filepath - , microlens-platform, semigroups, text, yi-core, yi-language - , yi-rope - }: - mkDerivation { - pname = "yi-misc-modes"; - version = "0.14.1"; - sha256 = "1ivpp0yyyvybs05h6i4x4jgdpakwis5wvj9bp8273bskw128sw1c"; - libraryHaskellDepends = [ - array base binary data-default filepath microlens-platform - semigroups text yi-core yi-language yi-rope - ]; - libraryToolDepends = [ alex ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Yi editor miscellaneous modes"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-misc-modes_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: @@ -223285,28 +218768,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor miscellaneous modes"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage - ({ mkDerivation, alex, array, base, binary, data-default, filepath - , microlens-platform, text, yi-core, yi-language, yi-rope - }: - mkDerivation { - pname = "yi-mode-haskell"; - version = "0.14.1"; - sha256 = "1z119jwpdj2i4dxvl7imhlpxjd03mxxxnvcha5jp3rxjlbsdp7zs"; - libraryHaskellDepends = [ - array base binary data-default filepath microlens-platform text - yi-core yi-language yi-rope - ]; - libraryToolDepends = [ alex ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Yi editor haskell mode"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-mode-haskell_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: @@ -223322,29 +218786,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor haskell mode"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-mode-javascript" = callPackage - ({ mkDerivation, alex, array, base, binary, data-default, dlist - , filepath, microlens-platform, mtl, text, yi-core, yi-language - , yi-rope - }: - mkDerivation { - pname = "yi-mode-javascript"; - version = "0.14.1"; - sha256 = "182bs6pnn2v2vvp0vl4sjpfdqcas1d35zf7ky00dyz9g24h8l2f5"; - libraryHaskellDepends = [ - array base binary data-default dlist filepath microlens-platform - mtl text yi-core yi-language yi-rope - ]; - libraryToolDepends = [ alex ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Yi editor javascript mode"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-mode-javascript_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language , yi-rope @@ -223361,7 +218805,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor javascript mode"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -223378,27 +218821,6 @@ self: { }) {}; "yi-rope" = callPackage - ({ mkDerivation, base, binary, bytestring, charsetdetect-ae - , criterion, data-default, deepseq, fingertree, hspec, QuickCheck - , quickcheck-instances, text, text-icu - }: - mkDerivation { - pname = "yi-rope"; - version = "0.9"; - sha256 = "0j9g96dgjy30zzygbrimcq6g6dz978xgk53j12kdn710ilklkhs6"; - libraryHaskellDepends = [ - base binary bytestring charsetdetect-ae data-default deepseq - fingertree text text-icu - ]; - testHaskellDepends = [ - base hspec QuickCheck quickcheck-instances text - ]; - benchmarkHaskellDepends = [ base criterion deepseq text ]; - description = "A rope data structure used by Yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-rope_0_10" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , fingertree, hspec, QuickCheck, quickcheck-instances, text }: @@ -223415,31 +218837,9 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-snippet" = callPackage - ({ mkDerivation, base, binary, containers, data-default, free - , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector - , yi-core, yi-rope - }: - mkDerivation { - pname = "yi-snippet"; - version = "0.14.1"; - sha256 = "14319na0hn21qrkkcfrqh5qvlx10f7462m466hhpfhq7rka8b28h"; - libraryHaskellDepends = [ - base binary containers data-default free microlens-platform mtl - text vector yi-core yi-rope - ]; - testHaskellDepends = [ - base containers tasty-hunit tasty-th yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Snippet support for yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-snippet_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector , yi-core, yi-rope @@ -223458,7 +218858,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Snippet support for yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -223639,14 +219038,15 @@ self: { ({ mkDerivation, base, bindings-DSL, ieee754 }: mkDerivation { pname = "yoga"; - version = "0.0.0.1"; - sha256 = "0allfj4ld6h77m5l9m1f9whrlhs18fvmcwa5jq25bv5prk9928bv"; + version = "0.0.0.2"; + sha256 = "1gkql9c7dd7h0wfq98mfhgjmqlxkdf4b66qympc7r8vyx38jps1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ieee754 ]; executableHaskellDepends = [ base ]; description = "Bindings to Facebook's Yoga layout library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yoko" = callPackage @@ -223745,7 +219145,6 @@ self: { homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yu-auth" = callPackage @@ -223777,6 +219176,7 @@ self: { homepage = "https://github.com/Qinka/Yu"; description = "The core of Yu"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yu-launch" = callPackage @@ -223793,6 +219193,7 @@ self: { homepage = "https://github.com/Qinka/Yu"; description = "The launcher for Yu"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yu-tool" = callPackage @@ -223908,6 +219309,7 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "z3" = callPackage @@ -223937,6 +219339,7 @@ self: { testHaskellDepends = [ base containers hspec z3 ]; description = "High-level assertion encoding to Z3 solver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zabt" = callPackage @@ -224188,8 +219591,8 @@ self: { }: mkDerivation { pname = "zeromq4-haskell"; - version = "0.6.7"; - sha256 = "1kjgmy8pbq9b00s8ak469afwgvhvnyyk7430x20amw01jcjbicll"; + version = "0.7.0"; + sha256 = "17q756mldxx9b8a2nx9lvjrgvbmgjbnp896sqcgnijq7wr751m2q"; libraryHaskellDepends = [ async base bytestring containers exceptions monad-control semigroups transformers transformers-base @@ -224228,22 +219631,22 @@ self: { }) {}; "zifter" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , filepath, genvalidity, genvalidity-hspec, genvalidity-path, hspec - , optparse-applicative, path, path-io, process, QuickCheck, safe - , stm, validity, validity-path + ({ mkDerivation, ansi-terminal, async, base, colour, directory + , exceptions, filepath, genvalidity, genvalidity-hspec + , genvalidity-path, hspec, optparse-applicative, path, path-io + , process, QuickCheck, safe, stm, validity, validity-path }: mkDerivation { pname = "zifter"; - version = "0.0.1.3"; - sha256 = "0hams2ayxm73p2m032vjxnrdpg7d8iz293sx29h011siv1xjyaab"; + version = "0.0.1.5"; + sha256 = "06bnj0zxxmspzw5rpc53hxksdd1h9nd6viwrvfmgj1fam1fhh856"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions filepath optparse-applicative path path-io process safe stm validity validity-path ]; testHaskellDepends = [ - ansi-terminal base directory genvalidity genvalidity-hspec + ansi-terminal base colour directory genvalidity genvalidity-hspec genvalidity-path hspec path path-io QuickCheck stm ]; homepage = "http://cs-syd.eu"; @@ -224258,8 +219661,8 @@ self: { }: mkDerivation { pname = "zifter-cabal"; - version = "0.0.0.2"; - sha256 = "009vhy3x5hb24n1ylr31hvgfk2bic1r9yy8nk78ym1yhjb4vrrj5"; + version = "0.0.0.3"; + sha256 = "04nwyma5p6ka86zh2hczli4842l5hg6kvhsv3bwwf722bkhzdznq"; libraryHaskellDepends = [ base directory filepath path path-io process safe zifter ]; @@ -224273,8 +219676,8 @@ self: { ({ mkDerivation, base, path, process, zifter }: mkDerivation { pname = "zifter-git"; - version = "0.0.0.0"; - sha256 = "0mq5aa7nljbdgimvs948kzn16m74771jyswbk0fq6jqyrb80li4j"; + version = "0.0.0.1"; + sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8"; libraryHaskellDepends = [ base path process zifter ]; homepage = "http://cs-syd.eu"; description = "zifter-git"; @@ -224288,8 +219691,8 @@ self: { }: mkDerivation { pname = "zifter-google-java-format"; - version = "0.0.0.0"; - sha256 = "0kl3mgg4hbzl9ifd8x30nnczrygs5ziqhmz47l5nzx40ja177546"; + version = "0.0.0.1"; + sha256 = "00am6djnk7ivb9cd5v59axlbi3da70m2fzfghmzq6dgvlkghng0c"; libraryHaskellDepends = [ base filepath path path-io process safe zifter ]; @@ -224305,8 +219708,8 @@ self: { }: mkDerivation { pname = "zifter-hindent"; - version = "0.0.0.1"; - sha256 = "10qwlvw1zq5q530xlh69ag9ap4jl5gv5xj7sc4bwjglbbcw39iag"; + version = "0.0.0.2"; + sha256 = "106iv5gqqlmvdjs1z4n7p3m11c36x4531395fpxh5sfzc8mrhgg2"; libraryHaskellDepends = [ base directory filepath path path-io process safe zifter ]; @@ -224321,10 +219724,8 @@ self: { }: mkDerivation { pname = "zifter-hlint"; - version = "0.0.0.0"; - sha256 = "0bvp6l5k42ls996h3qc7wy4qgcx0phd8hf0l99kcqan2gpx8qn6p"; - revision = "1"; - editedCabalFile = "08wmzid4g3av9w86ysybvg2mwkfx63b19v2i71hvik48bl5v6mlv"; + version = "0.0.0.1"; + sha256 = "1303crjb500psmsnc3ivy67qgz5gdbd3dsfnf3qis39amxmw1wf4"; libraryHaskellDepends = [ base filepath hlint path path-io safe zifter ]; @@ -224340,8 +219741,8 @@ self: { }: mkDerivation { pname = "zifter-stack"; - version = "0.0.0.6"; - sha256 = "0z2y77fd9ij8s9qqyjik1syh5ry169bda6wlsa4lj658f8yghggc"; + version = "0.0.0.8"; + sha256 = "03grslbsd7x1gj6fw80vsmj2cyfvrfmlqqzcrx3j2rk0icax0nla"; libraryHaskellDepends = [ base Cabal directory filepath path path-io process safe zifter ]; @@ -224391,32 +219792,6 @@ self: { }) {}; "zip" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, exceptions - , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck - , resourcet, text, time, transformers - }: - mkDerivation { - pname = "zip"; - version = "0.1.11"; - sha256 = "0adflrr7h6aqq4nz0751chs65zfj0ljz1mjwyym3s080sbrwncjn"; - revision = "1"; - editedCabalFile = "0f97aidxiw149m64bv6qnb6ba2xlmllv3cwalihvccc0vh5kn0as"; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest exceptions filepath mtl path - path-io plan-b resourcet text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions filepath hspec path - path-io QuickCheck text time transformers - ]; - homepage = "https://github.com/mrkkrp/zip"; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zip_0_2_0" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, exceptions , filepath, hspec, monad-control, mtl, path, path-io, plan-b @@ -224440,7 +219815,6 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage @@ -224566,7 +219940,6 @@ self: { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic zipper for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zippers" = callPackage @@ -224641,7 +220014,6 @@ self: { homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "zlib" = callPackage @@ -224721,40 +220093,18 @@ self: { }) {}; "zm" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptonite, deepseq - , flat, ListLike, memory, model, mtl, pretty, tasty, tasty-hunit - , tasty-quickcheck, text, timeit, transformers - }: - mkDerivation { - pname = "zm"; - version = "0.2.4"; - sha256 = "0ssds87mccbfm83lchr7kgcbjhdkz6l2v0ab2v5zd89q5vwz1knl"; - libraryHaskellDepends = [ - base bytestring containers cryptonite deepseq flat ListLike memory - model mtl pretty text transformers - ]; - testHaskellDepends = [ - base bytestring containers flat ListLike model pretty tasty - tasty-hunit tasty-quickcheck text timeit - ]; - homepage = "http://github.com/tittoassini/zm"; - description = "Language independent, reproducible, absolute types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zm_0_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , cryptonite, deepseq, doctest, either, filemanip, flat, memory - , model, mtl, pretty, tasty, tasty-hunit, tasty-quickcheck, text - , timeit, transformers + , model, pretty, tasty, tasty-hunit, tasty-quickcheck, text, timeit + , transformers }: mkDerivation { pname = "zm"; - version = "0.3.1"; - sha256 = "0cdggfyzb0h3xfjm91l3rx28yq1ksxfprn1wp1mdj1zm7y0paiiv"; + version = "0.3.2"; + sha256 = "02f7qm3l3xmdpv6w0hxhnzimxc1pab921c0rzprj4l5mvv69adx0"; libraryHaskellDepends = [ base bytestring containers convertible cryptonite deepseq either - flat memory model mtl pretty text transformers + flat memory model pretty text transformers ]; testHaskellDepends = [ base bytestring containers doctest filemanip flat model pretty @@ -224958,7 +220308,6 @@ self: { executableHaskellDepends = [ base monads-tf ]; description = "Zot language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "zre" = callPackage @@ -225054,7 +220403,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; } diff --git a/pkgs/development/haskell-modules/hie-packages.nix b/pkgs/development/haskell-modules/hie-packages.nix new file mode 100644 index 000000000000..5ed5fb62ca00 --- /dev/null +++ b/pkgs/development/haskell-modules/hie-packages.nix @@ -0,0 +1,460 @@ +{ pkgs, stdenv, callPackage }: self: +let src = pkgs.fetchFromGitHub + { owner = "haskell"; + repo = "haskell-ide-engine"; + rev = "3ec8e93e9ca751cf282556998851ffa65f32e06b"; + sha256 = "1wzqzvsa39c1cngmmjryqrq4vqdg6d4wp5wdf17vp96ljvz1cczw"; + }; + cabal-helper-src = pkgs.fetchgit + { url = "https://gitlab.com/dxld/cabal-helper.git"; + rev = "4bfc6b916fcc696a5d82e7cd35713d6eabcb0533"; + sha256 = "1a8231as0wdvi0q73ha9lc0qrx23kmcwf910qaicvmdar5p2b15m"; + }; + ghc-dump-tree-src = pkgs.fetchgit + { url = "https://gitlab.com/alanz/ghc-dump-tree.git"; + rev = "50f8b28fda675cca4df53909667c740120060c49"; + sha256 = "0v3r81apdqp91sv7avy7f0s3im9icrakkggw8q5b7h0h4js6irqj"; + }; + ghc-mod-src = pkgs.fetchFromGitHub + { owner = "wz1000"; + repo = "ghc-mod"; + rev = "03c91ea53b6389e7a1fcf4e471171aa3d6c8de41"; + sha256 = "11iic93klsh5izp8v4mhl7vnnlib821cfhdymlpg4drx7zbm9il6"; + }; + HaRe-src = pkgs.fetchgit + { url = "https://gitlab.com/alanz/HaRe.git"; + rev = "e325975450ce89d790ed3f92de3ef675967d9538"; + sha256 = "0z7r3l4j5a1brz7zb2rgd985m58rs0ki2p59y1l9i46fcy8r9y4g"; + }; + cabal-helper = self.cabal-helper_hie; + haddock-library = self.haddock-library_1_4_4; + hoogle = self.hoogle_5_0_14; + ghc-dump-tree = self.ghc-dump-tree_hie; + ghc-mod = self.ghc-mod_hie; + HaRe = self.HaRe_hie; +in + { ### Overrides required by hie + cabal-helper_hie = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers + , directory, exceptions, filepath, ghc-prim, mtl, process + , semigroupoids, template-haskell, temporary, transformers + , unix, unix-compat, utf8-string + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.8.0.0"; + src = cabal-helper-src; + isLibrary = true; + isExecutable = true; + jailbreak = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base Cabal directory filepath ghc-prim mtl process semigroupoids + transformers unix unix-compat + ]; + executableHaskellDepends = [ + base bytestring Cabal containers directory exceptions filepath + ghc-prim mtl process template-haskell temporary transformers unix + unix-compat utf8-string + ]; + testHaskellDepends = [ + base bytestring Cabal directory exceptions filepath ghc-prim mtl + process template-haskell temporary transformers unix unix-compat + utf8-string + ]; + testToolDepends = [ cabal-install ]; + postInstall = + '' + libexec="$out/libexec/$(basename $out/lib/ghc*/*ghc*)/$name" + mkdir -p "$libexec" + ln -sv $out/bin/cabal-helper-wrapper "$libexec" + ''; + doCheck = false; + description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + }) {}; + ghc-dump-tree_hie = callPackage + ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative + , pretty, pretty-show, process, unordered-containers + , vector + }: + mkDerivation { + pname = "ghc-dump-tree"; + version = "0.2.0.1"; + src = ghc-dump-tree-src; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring ghc pretty pretty-show process + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring ghc optparse-applicative pretty pretty-show + process unordered-containers vector + ]; + homepage = "https://github.com/edsko/ghc-dump-tree"; + description = "Dump GHC's parsed, renamed, and type checked ASTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + ghc-mod-core = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper + , containers, deepseq, directory, djinn-ghc, extra, fclabels + , filepath, fingertree, ghc, ghc-boot, ghc-paths, ghc-syb-utils + , haskell-src-exts, hlint, monad-control, monad-journal, mtl + , old-time, optparse-applicative, pipes, process, safe, semigroups + , split, syb, template-haskell, temporary, text, time + , transformers, transformers-base + }: + mkDerivation { + pname = "ghc-mod-core"; + version = "5.9.0.0"; + src = "${ghc-mod-src}/core"; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath fingertree ghc ghc-boot ghc-paths + ghc-syb-utils haskell-src-exts hlint monad-control monad-journal + mtl old-time optparse-applicative pipes process safe semigroups + split syb template-haskell temporary text time transformers + transformers-base + ]; + homepage = "https://github.com/DanielG/ghc-mod"; + description = "Happy Haskell Hacking"; + license = stdenv.lib.licenses.agpl3; + }) { inherit cabal-helper; }; + ghc-mod_hie = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest + , cabal-helper, containers, criterion, deepseq, directory + , djinn-ghc, doctest, extra, fclabels, filepath, ghc, ghc-boot + , ghc-mod-core, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint + , hspec, monad-control, monad-journal, mtl, old-time + , optparse-applicative, pipes, process, safe, semigroups, shelltest + , split, syb, template-haskell, temporary, text, time + , transformers, transformers-base + }: + mkDerivation { + pname = "ghc-mod"; + version = "5.9.0.0"; + src = ghc-mod-src; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base Cabal cabal-doctest containers directory filepath process + template-haskell transformers + ]; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath ghc ghc-boot ghc-mod-core + ghc-paths ghc-syb-utils haskell-src-exts hlint monad-control + monad-journal mtl old-time optparse-applicative pipes process safe + semigroups split syb template-haskell temporary text time + transformers transformers-base + ]; + executableHaskellDepends = [ + base binary deepseq directory fclabels filepath ghc ghc-mod-core + monad-control mtl old-time optparse-applicative process semigroups + split time + ]; + testHaskellDepends = [ + base cabal-helper containers directory doctest fclabels filepath + ghc ghc-boot ghc-mod-core hspec monad-journal mtl process split + temporary transformers + ]; + testToolDepends = [ shelltest ]; + # Doesn't work with our doctest + doCheck = false; + benchmarkHaskellDepends = [ + base criterion directory filepath ghc-mod-core temporary + ]; + homepage = "https://github.com/DanielG/ghc-mod"; + description = "Happy Haskell Hacking"; + license = stdenv.lib.licenses.agpl3; + }) { shelltest = null; inherit cabal-helper; }; + HaRe_hie = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, Cabal, cabal-helper + , case-insensitive, containers, conversion + , conversion-case-insensitive, conversion-text, Diff, directory + , filepath, foldl, ghc, ghc-exactprint, ghc-mod-core, ghc-syb-utils + , gitrev, hslogger, hspec, HUnit, monad-control, mtl + , optparse-applicative, optparse-simple, parsec, stdenv + , Strafunski-StrategyLib, syb, syz, turtle + }: + mkDerivation { + pname = "HaRe"; + version = "0.8.4.1"; + src = HaRe-src; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base cabal-helper containers directory filepath ghc ghc-exactprint + ghc-mod-core ghc-syb-utils hslogger monad-control mtl + Strafunski-StrategyLib syb syz + ]; + executableHaskellDepends = [ + base Cabal ghc-mod-core gitrev mtl optparse-applicative + optparse-simple + ]; + testHaskellDepends = [ + attoparsec base base-prelude cabal-helper case-insensitive + containers conversion conversion-case-insensitive conversion-text + Diff directory filepath foldl ghc ghc-exactprint ghc-mod-core + ghc-syb-utils hslogger hspec HUnit monad-control mtl parsec + Strafunski-StrategyLib syb syz turtle + ]; + # Test directory doesn't exist + doCheck = false; + homepage = "https://github.com/RefactoringTools/HaRe/wiki"; + description = "the Haskell Refactorer"; + license = stdenv.lib.licenses.bsd3; + }) { inherit cabal-helper; }; + ### hie packages + haskell-ide-engine = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, cabal-install + , containers, data-default, Diff, directory, either, ekg, filepath, ghc + , ghc-mod-core, gitrev, haskell-lsp, hie-apply-refact, hie-base + , hie-brittany, hie-build-plugin, hie-eg-plugin-async + , hie-example-plugin2, hie-ghc-mod, hie-ghc-tree, hie-haddock + , hie-hare, hie-hoogle, hie-plugin-api, hoogle, hslogger, hspec + , lens, mtl, optparse-simple, QuickCheck, quickcheck-instances + , sorted-list, stm, text, time, transformers + , unordered-containers, vector, vinyl, yaml, yi-rope + }: + mkDerivation { + pname = "haskell-ide-engine"; + version = "0.1.0.0"; + inherit src; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring Cabal containers data-default directory + either filepath ghc ghc-mod-core gitrev haskell-lsp + hie-apply-refact hie-base hie-brittany hie-ghc-mod hie-haddock + hie-hare hie-hoogle hie-plugin-api hslogger lens mtl + optparse-simple sorted-list stm text transformers + unordered-containers vector yi-rope + ]; + executableHaskellDepends = [ + base Cabal containers directory ekg ghc-mod-core gitrev haskell-lsp + hie-apply-refact hie-build-plugin hie-eg-plugin-async + hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle + hie-plugin-api hslogger optparse-simple stm text time transformers + unordered-containers vinyl + ]; + testHaskellDepends = [ + aeson base containers Diff directory filepath ghc-mod-core + haskell-lsp hie-apply-refact hie-base hie-eg-plugin-async + hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle + hie-plugin-api hoogle hslogger hspec QuickCheck + quickcheck-instances stm text transformers unordered-containers + vector vinyl yaml + ]; + preCheck = "export HOME=$NIX_BUILD_TOP/home; mkdir $HOME"; + # https://github.com/haskell/haskell-ide-engine/issues/425 + # The disabled tests do work in a local nix-shell with cabal available. + patches = [ ./patches/hie-testsuite.patch ]; + homepage = "http://github.com/githubuser/haskell-ide-engine#readme"; + description = "Provide a common engine to power any Haskell IDE"; + license = stdenv.lib.licenses.bsd3; + }) { inherit hoogle; }; + hie-apply-refact = callPackage + ({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod + , ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint + , text, transformers + }: + mkDerivation { + pname = "hie-apply-refact"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-apply-refact"; + libraryHaskellDepends = [ + aeson apply-refact base either extra ghc-mod ghc-mod-core + haskell-src-exts hie-base hie-plugin-api hlint text transformers + ]; + description = "Haskell IDE Apply Refact plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit ghc-mod; }; + hie-base = callPackage + ({ mkDerivation, aeson, base, haskell-lsp, text }: + mkDerivation { + pname = "hie-base"; + version = "0.1.0.0"; + inherit src; + preUnpack = "sourceRoot=source/hie-base"; + libraryHaskellDepends = [ aeson base haskell-lsp text ]; + description = "Haskell IDE API base types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + hie-brittany = callPackage + ({ mkDerivation, aeson, base, brittany, ghc-mod, ghc-mod-core + , haskell-lsp, hie-plugin-api, lens, text + }: + mkDerivation { + pname = "hie-brittany"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-brittany"; + libraryHaskellDepends = [ + aeson base brittany ghc-mod ghc-mod-core haskell-lsp hie-plugin-api + lens text + ]; + description = "Haskell IDE Hoogle plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit ghc-mod; }; + hie-build-plugin = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-helper + , containers, directory, filepath, haskell-lsp, hie-plugin-api + , process, stm, text, transformers, yaml + }: + mkDerivation { + pname = "hie-build-plugin"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-build-plugin"; + libraryHaskellDepends = [ + aeson base bytestring Cabal cabal-helper containers directory + filepath haskell-lsp hie-plugin-api process stm text transformers + yaml + ]; + description = "Haskell IDE build plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit cabal-helper; }; + hie-eg-plugin-async = callPackage + ({ mkDerivation, base, ghc-mod-core, hie-plugin-api, stm + , text + }: + mkDerivation { + pname = "hie-eg-plugin-async"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-eg-plugin-async"; + libraryHaskellDepends = [ + base ghc-mod-core hie-plugin-api stm text + ]; + description = "Haskell IDE example plugin, using async processes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + hie-example-plugin2 = callPackage + ({ mkDerivation, base, hie-plugin-api, text }: + mkDerivation { + pname = "hie-example-plugin2"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-example-plugin2"; + libraryHaskellDepends = [ base hie-plugin-api text ]; + description = "Haskell IDE example plugin"; + license = stdenv.lib.licenses.bsd3; + }) {}; + hie-ghc-mod = callPackage + ({ mkDerivation, aeson, base, containers, ghc, ghc-mod, ghc-mod-core + , hie-base, hie-plugin-api, text, transformers + }: + mkDerivation { + pname = "hie-ghc-mod"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-ghc-mod"; + libraryHaskellDepends = [ + aeson base containers ghc ghc-mod ghc-mod-core hie-base + hie-plugin-api text transformers + ]; + description = "Haskell IDE ghc-mod plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit ghc-mod; }; + hie-ghc-tree = callPackage + ({ mkDerivation, aeson, base, ghc-dump-tree, ghc-mod, ghc-mod-core + , hie-base, hie-plugin-api, text + }: + mkDerivation { + pname = "hie-ghc-tree"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-ghc-tree"; + libraryHaskellDepends = [ + aeson base ghc-dump-tree ghc-mod ghc-mod-core hie-base + hie-plugin-api text + ]; + description = "Haskell IDE GHC Tree plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit ghc-dump-tree ghc-mod; }; + hie-haddock = callPackage + ({ mkDerivation, aeson, base, containers, directory, either + , filepath, ghc, ghc-exactprint, ghc-mod, ghc-mod-core, haddock-api + , haddock-library, HaRe, haskell-lsp, hie-base, hie-ghc-mod + , hie-hare, hie-plugin-api, lens, monad-control, mtl, text + , transformers + }: + mkDerivation { + pname = "hie-haddock"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-haddock"; + libraryHaskellDepends = [ + aeson base containers directory either filepath ghc ghc-exactprint + ghc-mod ghc-mod-core haddock-api haddock-library HaRe haskell-lsp + hie-base hie-ghc-mod hie-hare hie-plugin-api lens monad-control mtl + text transformers + ]; + description = "Haskell IDE Haddock plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit haddock-library HaRe ghc-mod; }; + hie-hare = callPackage + ({ mkDerivation, aeson, base, containers, Diff, either, ghc + , ghc-exactprint, ghc-mod, ghc-mod-core, HaRe, haskell-lsp + , hie-base, hie-ghc-mod, hie-plugin-api, lens, monad-control, mtl + , text, transformers + }: + mkDerivation { + pname = "hie-hare"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-hare"; + libraryHaskellDepends = [ + aeson base containers Diff either ghc ghc-exactprint ghc-mod + ghc-mod-core HaRe haskell-lsp hie-base hie-ghc-mod hie-plugin-api + lens monad-control mtl text transformers + ]; + description = "Haskell IDE HaRe plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit ghc-mod HaRe; }; + hie-hoogle = callPackage + ({ mkDerivation, aeson, base, directory, filepath, ghc-mod + , ghc-mod-core, hie-plugin-api, hoogle, tagsoup, text + }: + mkDerivation { + pname = "hie-hoogle"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-hoogle"; + libraryHaskellDepends = [ + aeson base directory filepath ghc-mod ghc-mod-core hie-plugin-api + hoogle tagsoup text + ]; + description = "Haskell IDE Hoogle plugin"; + license = stdenv.lib.licenses.bsd3; + }) { inherit ghc-mod hoogle; }; + hie-plugin-api = callPackage + ({ mkDerivation, aeson, base, containers, Diff, directory, either + , filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base + , hslogger, lifted-base, monad-control, mtl, stdenv, stm, syb, text + , time, transformers, unordered-containers + }: + mkDerivation { + pname = "hie-plugin-api"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-plugin-api"; + libraryHaskellDepends = [ + aeson base containers Diff directory either filepath fingertree ghc + ghc-mod-core haskell-lsp hie-base hslogger lifted-base + monad-control mtl stm syb text time transformers + unordered-containers + ]; + description = "Haskell IDE API for plugin communication"; + license = stdenv.lib.licenses.bsd3; + }) {}; + } diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix new file mode 100644 index 000000000000..8e8712d90967 --- /dev/null +++ b/pkgs/development/haskell-modules/initial-packages.nix @@ -0,0 +1,2 @@ +args@{ pkgs, stdenv, callPackage }: self: + (import ./hie-packages.nix args self) // (import ./hackage-packages.nix args self) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 96520dce2b2d..da4e9c6777bd 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -147,4 +147,88 @@ rec { overrideSrc = drv: { src, version ? drv.version }: overrideCabal drv (_: { inherit src version; editedCabalFile = null; }); + # Extract the haskell build inputs of a haskell package. + # This is useful to build environments for developing on that + # package. + getHaskellBuildInputs = p: + (p.override { mkDerivation = extractBuildInputs p.compiler; + }).haskellBuildInputs; + + # Under normal evaluation, simply return the original package. Under + # nix-shell evaluation, return a nix-shell optimized environment. + shellAware = p: if lib.inNixShell then p.env else p; + + ghcInfo = ghc: + rec { isCross = (ghc.cross or null) != null; + isGhcjs = ghc.isGhcjs or false; + nativeGhc = if isCross || isGhcjs + then ghc.bootPkgs.ghc + else ghc; + }; + + ### mkDerivation helpers + # These allow external users of a haskell package to extract + # information about how it is built in the same way that the + # generic haskell builder does, by reusing the same functions. + # Each function here has the same interface as mkDerivation and thus + # can be called for a given package simply by overriding the + # mkDerivation argument it used. See getHaskellBuildInputs above for + # an example of this. + + # Some information about which phases should be run. + controlPhases = ghc: let inherit (ghcInfo ghc) isCross; in + { doCheck ? !isCross && (lib.versionOlder "7.4" ghc.version) + , doBenchmark ? false + , ... + }: { 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; + }; + } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 61043252155e..f85259e699bc 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,7 +1,10 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -{ # package-set used for non-haskell dependencies (all of nixpkgs) +{ # package-set used for build tools (all of nixpkgs) + buildPackages + +, # package-set used for non-haskell dependencies (all of nixpkgs) pkgs , # stdenv to use for building haskell packages @@ -28,19 +31,21 @@ self: let + inherit (stdenv) buildPlatform hostPlatform; inherit (stdenv.lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; + buildHaskellPackages = if hostPlatform != buildPlatform + then self.ghc.bootPkgs + else self; + mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; - inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; - nodejs = pkgs.nodejs-slim; - jailbreak-cabal = if (self.ghc.cross or null) != null - then self.ghc.bootPkgs.jailbreak-cabal - else self.jailbreak-cabal; + nodejs = buildPackages.nodejs-slim; + inherit (buildHaskellPackages) jailbreak-cabal; inherit (self) ghc; - hscolour = overrideCabal self.hscolour (drv: { + hscolour = overrideCabal buildHaskellPackages.hscolour (drv: { isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. @@ -95,22 +100,22 @@ let defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; - withPackages = packages: callPackage ./with-packages-wrapper.nix { + withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { inherit (self) llvmPackages; - haskellPackages = self; + inherit ghc; inherit packages; }; haskellSrc2nix = { name, src, sha256 ? null }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; - in pkgs.stdenv.mkDerivation { + in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; - buildInputs = [ pkgs.haskellPackages.cabal2nix ]; + nativeBuildInputs = [ pkgs.buildPackages.haskellPackages.cabal2nix ]; preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive"; installPhase = '' export HOME="$TMP" mkdir -p "$out" @@ -151,7 +156,9 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # `fetchFromGitHub`. overrideCabal (self.callPackage (haskellSrc2nix { inherit name; - src = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src; + src = builtins.filterSource (path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || pkgs.lib.hasSuffix "package.yaml" path + ) src; }) args) (_: { inherit src; }); # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet diff --git a/pkgs/development/haskell-modules/patches/hie-testsuite.patch b/pkgs/development/haskell-modules/patches/hie-testsuite.patch new file mode 100644 index 000000000000..86cac15c2464 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hie-testsuite.patch @@ -0,0 +1,40 @@ +diff --git a/test/HaRePluginSpec.hs b/test/HaRePluginSpec.hs +index 039c094..d0d1fa4 100644 +--- a/test/HaRePluginSpec.hs ++++ b/test/HaRePluginSpec.hs +@@ -326,35 +326,6 @@ hareSpec = do + $ List [TextEdit (Range (Position 4 0) (Position 8 12)) + "parseStr = char '\"' *> (many1 (noneOf \"\\\"\")) <* char '\"'"]) + Nothing) +- it "finds definition across components" $ do +- let u = filePathToUri "./app/Main.hs" +- let lreq = setTypecheckedModule u +- let req = findDef u (toPos (7,8)) +- r <- dispatchRequestPGoto $ lreq >> req +- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs") +- (Range (toPos (6,1)) (toPos (6,9)))] +- let req2 = findDef u (toPos (7,20)) +- r2 <- dispatchRequestPGoto $ lreq >> req2 +- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") +- (Range (toPos (5,1)) (toPos (5,2)))] +- it "finds definition in the same component" $ do +- let u = filePathToUri "./src/Lib2.hs" +- let lreq = setTypecheckedModule u +- let req = findDef u (toPos (6,5)) +- r <- dispatchRequestPGoto $ lreq >> req +- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs") +- (Range (toPos (6,1)) (toPos (6,9)))] +- it "finds local definitions" $ do +- let u = filePathToUri "./src/Lib2.hs" +- let lreq = setTypecheckedModule u +- let req = findDef u (toPos (7,11)) +- r <- dispatchRequestPGoto $ lreq >> req +- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") +- (Range (toPos (10,9)) (toPos (10,10)))] +- let req2 = findDef u (toPos (10,13)) +- r2 <- dispatchRequestPGoto $ lreq >> req2 +- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") +- (Range (toPos (9,9)) (toPos (9,10)))] + + + -- --------------------------------- diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ac484b3c1124..3e8fad712bff 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,7 +1,6 @@ -{ stdenv, lib, ghc, llvmPackages, packages, symlinkJoin, makeWrapper -, ignoreCollisions ? false, withLLVM ? false +{ lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper +, withLLVM ? false , postBuild ? "" -, haskellPackages , ghcLibdir ? null # only used by ghcjs, when resolving plugins }: @@ -36,9 +35,8 @@ let isHaLVM = ghc.isHaLVM or false; ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; @@ -46,10 +44,10 @@ let paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: - # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html + # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm llvm = lib.makeBinPath ([ llvmPackages.llvm ] - ++ lib.optional stdenv.isDarwin llvmPackages.clang); + ++ lib.optional targetPlatform.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else symlinkJoin { @@ -59,7 +57,6 @@ symlinkJoin { name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; extraOutputsToInstall = [ "out" "doc" ]; - inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook @@ -99,7 +96,7 @@ symlinkJoin { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" fi done - '' + (lib.optionalString stdenv.isDarwin '' + '' + (lib.optionalString targetPlatform.isDarwin '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local dynamicLinksDir="$out/lib/links" @@ -133,6 +130,5 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; - inherit haskellPackages; }; } diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 9dfa3430ed8b..66eddd0e3602 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -18,7 +18,8 @@ fi } - envHooks+=(addIdrisLibs) + # All run-time deps + addEnvHooks 0 addIdrisLibs ''; buildPhase = '' diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index d2b09808ec15..d4638670f699 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -14,7 +14,7 @@ fi } - envHooks+=(installIdrisLib) + envHostTargetHooks+=(installIdrisLib) ''; unpackPhase = '' diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index ed2c4db20f7c..5aaa18e5ac68 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }: +{ stdenv, fetchurl, jdk, makeWrapper }: -let version = "1.8.0"; in +let version = "1.9.0.273"; in stdenv.mkDerivation { name = "clojure-${version}"; src = fetchurl { - url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "1nip095fz5c492sw15skril60i1vd21ibg6szin4jcvyy3xr6cym"; + url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; + sha256 = "0xmrq3xvr002jgq8m1j0y5ld0rcr49608g3gqxgyxzjqswacglb4"; }; - buildInputs = [ unzip ant jdk makeWrapper ]; - - buildPhase = "ant jar"; + buildInputs = [ jdk makeWrapper ]; installPhase = '' - mkdir -p $out/share/java $out/bin - install -t $out/share/java clojure.jar - makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main" + pwd + ls -la + mkdir -p $out/libexec $out/bin + cp -f deps.edn example-deps.edn $out + cp -f clojure-tools-${version}.jar $out/libexec + sed -i -e "s@PREFIX@$out@g" clojure + cp -f clj clojure $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index 469502a3f85e..d32f91275652 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.5.2"; - sha256 = "0ng7z2gz1c8lkn07fric18b3awcw886s9xb864kmnn2iah5gc65j"; + version = "1.5.3"; + sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix new file mode 100644 index 000000000000..c8b0d904ccd3 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.6.0-rc.0"; + sha256 = "1yfyp7y0mfdbh410xsfkq9a7ai2y22mjh2qn2cvpim76s96qjpw6"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/setup-hook.sh b/pkgs/development/interpreters/elixir/setup-hook.sh index 2ed3b2e6454b..501eca3cf02a 100644 --- a/pkgs/development/interpreters/elixir/setup-hook.sh +++ b/pkgs/development/interpreters/elixir/setup-hook.sh @@ -2,4 +2,4 @@ addErlLibPath() { addToSearchPath ERL_LIBS $1/lib/elixir/lib } -envHooks+=(addErlLibPath) +addEnvHooks "$hostOffset" addErlLibPath diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix deleted file mode 100644 index 123d813fc77a..000000000000 --- a/pkgs/development/interpreters/erlang/R16.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, fetchurl }: - -mkDerivation rec { - version = "16B03-1"; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; - }; - - prePatch = '' - sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure - ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - # Do not install docs, instead use prebuilt versions. - installTargets = "install"; - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; -} diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix similarity index 87% rename from pkgs/development/interpreters/erlang/R16B02-8-basho.nix rename to pkgs/development/interpreters/erlang/R16B02-basho.nix index a5f79c197d63..33c34f7fecc0 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -2,13 +2,13 @@ mkDerivation rec { baseName = "erlang"; - version = "16B02"; + version = "16B02.basho10"; src = pkgs.fetchFromGitHub { owner = "basho"; repo = "otp"; - rev = "OTP_R16B02_basho8"; - sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; + rev = "OTP_R16B02_basho10"; + sha256 = "1s2c3ag9dnp6xmcr27kh95n1w50xly97n1mp8ivc2a3gpv4blqmj"; }; preConfigure = '' @@ -27,7 +27,7 @@ mkDerivation rec { installTargets = "install"; postInstall = let manpages = pkgs.fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + url = "http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz"; sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; }; in '' @@ -56,6 +56,8 @@ mkDerivation rec { repository. ''; + knownVulnerabilities = [ "CVE-2017-1000385" ]; + platforms = ["x86_64-linux" "x86_64-darwin"]; license = pkgs.stdenv.lib.licenses.asl20; maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix deleted file mode 100644 index 02d7513331eb..000000000000 --- a/pkgs/development/interpreters/erlang/R17.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, fetchurl }: - -mkDerivation rec { - version = "17.5"; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w"; - }; - - prePatch = '' - sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure - ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - # Do not install docs, instead use prebuilt versions. - installTargets = "install"; - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; - sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; -} diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 39a1a8a0048e..967940ca184f 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -12,8 +12,8 @@ let }; in mkDerivation rec { - version = "18.3.4.4"; - sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; + version = "18.3.4.7"; + sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l"; patches = [ rmAndPwdPatch diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 5e2e1c7f215d..aa8c941eb93b 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { - version = "19.3"; - sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; + version = "19.3.6.4"; + sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071"; 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 cf94a8800f9c..8e955349f2d7 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl }: mkDerivation rec { - version = "20.1"; - sha256 = "13f53lzgq2himg9kax41f66rzv5pjfrb1ln8b54yv9spkqx2hqqi"; + version = "20.2.2"; + sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6"; 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 af728b942ebb..eae4a50aa20e 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -26,7 +26,7 @@ , installTargets ? "install install-docs" , checkPhase ? "", preCheck ? "", postCheck ? "" , fixupPhase ? "", preFixup ? "", postFixup ? "" -, meta ? null +, meta ? {} }: assert wxSupport -> (if stdenv.isDarwin @@ -101,7 +101,7 @@ in stdenv.mkDerivation ({ setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with stdenv.lib; ({ homepage = http://www.erlang.org/; downloadPage = "http://www.erlang.org/download.html"; description = "Programming language used for massively scalable soft real-time systems"; @@ -118,7 +118,7 @@ in stdenv.mkDerivation ({ platforms = platforms.unix; maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; license = licenses.asl20; - }; + } // meta); } // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } @@ -140,5 +140,4 @@ in stdenv.mkDerivation ({ // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } -// optionalAttrs (meta != null) { inherit meta; } ) diff --git a/pkgs/development/interpreters/erlang/setup-hook.sh b/pkgs/development/interpreters/erlang/setup-hook.sh index 68c0f762dfc5..3962d154ba9f 100644 --- a/pkgs/development/interpreters/erlang/setup-hook.sh +++ b/pkgs/development/interpreters/erlang/setup-hook.sh @@ -2,4 +2,4 @@ addErlangLibPath() { addToSearchPath ERL_LIBS $1/lib/erlang/lib } -envHooks+=(addErlangLibPath) +addEnvHooks "$hostOffset" addErlangLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index fd1dc944ed44..c7fb4f70fc6a 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh index 86c1e0d3e4a9..73e700bde026 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.2.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/pkgs/development/interpreters/guile/setup-hook.sh index c1d19e579ed5..bf04fee1e893 100644 --- a/pkgs/development/interpreters/guile/setup-hook.sh +++ b/pkgs/development/interpreters/guile/setup-hook.sh @@ -5,4 +5,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 8906c9c5d249..dff3c1b201fb 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.8.6"; + version = "0.8.7"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "0m6xi1jgss6f4maxqpwjyyhyyc71wy5a7jpm908m49xx80mz5ams"; + sha256 = "1cmvja8qdrrzacdfn944f22mdg8177qkxfrb10ykq59c2yp1xn01"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix index d5cc0bc44b0b..ee99aeab69f8 100644 --- a/pkgs/development/interpreters/joker/deps.nix +++ b/pkgs/development/interpreters/joker/deps.nix @@ -8,4 +8,13 @@ sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; }; } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } ] diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index ff192c072865..2224a13ba7c0 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -36,7 +36,7 @@ jruby = stdenv.mkDerivation rec { addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF ''; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 43e289cd3690..0cdc4770a983 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; + inherit (hostPlatform) isDarwin isMinGW; in { configurePhase = '' makeFlagsArray=( @@ -65,10 +65,10 @@ stdenv.mkDerivation rec { INSTALL_MAN=$out/share/man/man1 V=${luaversion} R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' + ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' ''} ) - '' + stdenv.lib.optionalString isMingw '' + '' + stdenv.lib.optionalString isMinGW '' installFlagsArray=( TO_BIN="lua.exe luac.exe" TO_LIB="liblua.a lua52.dll" diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index a512a2513134..ad1dfa8823cb 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; + inherit (hostPlatform) isDarwin isMinGW; in { configurePhase = '' makeFlagsArray=( @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { INSTALL_MAN=$out/share/man/man1 V=${luaversion} R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' + ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' ''} ) - '' + stdenv.lib.optionalString isMingw '' + '' + stdenv.lib.optionalString isMinGW '' installFlagsArray=( TO_BIN="lua.exe luac.exe" TO_LIB="liblua.a lua52.dll" diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 21f656044a33..7aa41e95cc9b 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/keplerproject/luafilesystem; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.flosse ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index d2fff13e2ee4..62c63ef6c5c3 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -32,9 +32,16 @@ let setOutputFlags = false; patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.patch - ] + [ ] + # 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") ( + # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 + 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; @@ -127,4 +134,9 @@ in rec { version = "5.24.3"; sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; }; + + perl526 = common { + version = "5.26.1"; + sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7"; + }; } diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch new file mode 100644 index 000000000000..ad65d1339f36 --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch @@ -0,0 +1,250 @@ +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 +- + 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/setup-hook.sh b/pkgs/development/interpreters/perl/setup-hook.sh index a8656b8531db..7909412806c8 100644 --- a/pkgs/development/interpreters/perl/setup-hook.sh +++ b/pkgs/development/interpreters/perl/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } -envHooks+=(addPerlLibPath) +addEnvHooks "$hostOffset" addPerlLibPath diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index db4eb6eaee0c..c547e3d8adaf 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -4,7 +4,7 @@ , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd }: +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }: let @@ -12,9 +12,8 @@ let { version, sha256 }: let php7 = lib.versionAtLeast version "7.0"; - mysqlHeaders = mysql.lib.dev or mysql; mysqlndSupport = config.php.mysqlnd or false; - mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders; + mysqlBuildInputs = lib.optional (!mysqlndSupport) mysql.connector-c; in composableDerivation.composableDerivation {} (fixed: { @@ -121,7 +120,7 @@ let }; mysqli = { - configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"]; + configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"]; buildInputs = mysqlBuildInputs; }; @@ -132,7 +131,7 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"]; + configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"]; buildInputs = mysqlBuildInputs; }; @@ -226,6 +225,11 @@ let calendar = { configureFlags = ["--enable-calendar"]; }; + + sodium = { + configureFlags = ["--with-sodium=${libsodium.dev}"]; + buildInputs = [libsodium]; + }; }; cfg = { @@ -265,6 +269,7 @@ let mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin)); ztsSupport = config.php.zts or false; calendarSupport = config.php.calendar or true; + sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true; }; hardeningDisable = [ "bindnow" ]; @@ -333,17 +338,22 @@ let in { php56 = generic { - version = "5.6.32"; - sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y"; + version = "5.6.33"; + sha256 = "1k1ip1slk89hkp57qiqp8k2m5yrg9lx5rja542g87k8xfslrdxh7"; }; php70 = generic { - version = "7.0.25"; - sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm"; + version = "7.0.27"; + sha256 = "0ca174kp2l3fjcp8z0mqnkbjfhijjzz7rs7bkzg1qk2cpdijbylr"; }; php71 = generic { - version = "7.1.11"; - sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; + version = "7.1.13"; + sha256 = "18cqry8jy7q9fp82p3n9ndxffyba6f6q3maz3100jq245lfsbz9m"; + }; + + php72 = generic { + version = "7.2.1"; + sha256 = "0ygbcilbp3fiswd240ib2mvnhy0yy0az8kjzpjfd4kca4qzpj1py"; }; } diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 982542c1fc3e..12d17b2e8322 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -7,7 +7,7 @@ , setuptools , unzip , ensureNewerSourcesHook -, pythonModule +, toPythonModule , namePrefix , bootstrapped-pip , flit @@ -19,7 +19,7 @@ let wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; mkPythonDerivation = import ./mk-python-derivation.nix { - inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook pythonModule namePrefix; + inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook toPythonModule namePrefix; }; in diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index c7483a815297..9352bb4d52e0 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -16,6 +16,8 @@ , libffi , CF, configd, coreutils , python-setup-hook +# Some proprietary libs assume UCS2 unicode, especially on darwin :( +, ucsEncoding ? 4 # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -107,7 +109,7 @@ let configureFlags = [ "--enable-shared" "--with-threads" - "--enable-unicode=ucs4" + "--enable-unicode=ucs${toString ucsEncoding}" ] ++ optionals (hostPlatform.isCygwin || hostPlatform.isAarch64) [ "--with-system-ffi" ] ++ optionals hostPlatform.isCygwin [ @@ -199,7 +201,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; + 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;}; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index b44e167b9f00..d5ac94c76e6b 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "3"; + minorVersion = "4"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd"; + sha256 = "1fna7g8jxzl4kd2pqmmqhva5724c5m920x3fsrpsgskaylmr76qm"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index a0cac7d1ddda..d9cff16f448f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -7,13 +7,16 @@ , unzip , ensureNewerSourcesHook # Whether the derivation provides a Python module or not. -, pythonModule +, toPythonModule , namePrefix }: { name ? "${attrs.pname}-${attrs.version}" -# Dependencies for building the package +# Build-time dependencies for the package +, nativeBuildInputs ? [] + +# Run-time dependencies for the package , buildInputs ? [] # Dependencies needed for running the checkPhase. @@ -40,6 +43,12 @@ # Skip wrapping of python programs altogether , dontWrapPythonPrograms ? false +# Remove bytecode from bin folder. +# When a Python script has the extension `.py`, bytecode is generated +# Typically, executables in bin have no extension, so no bytecode is generated. +# However, some packages do provide executables with extensions, and thus bytecode is generated. +, removeBinBytecode ? true + , meta ? {} , passthru ? {} @@ -54,19 +63,21 @@ if disabled then throw "${name} not supported for interpreter ${python.executable}" else -python.stdenv.mkDerivation (builtins.removeAttrs attrs [ +toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" ] // { name = namePrefix + name; - buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ] - ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) + nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ] + ++ nativeBuildInputs; + + buildInputs = [ wrapPython ] + ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip ++ lib.optionals doCheck checkInputs - ++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools + ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools ++ buildInputs - ++ pythonPath - ); + ++ pythonPath; # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; @@ -77,6 +88,11 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs [ postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms + '' + lib.optionalString removeBinBytecode '' + if [ -d "$out/bin" ]; then + rm -rf "$out/bin/__pycache__" # Python 3 + find "$out/bin" -type f -name "*.pyc" -delete # Python 2 + fi '' + lib.optionalString catchConflicts '' # 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. @@ -84,14 +100,9 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs [ ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py '' + attrs.postFixup or ''''; - passthru = { - inherit python; # The python interpreter - inherit pythonModule; - } // passthru; - meta = { # default to python's platforms platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; } // meta; -}) +})) diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index dda9bed39f85..77ec9e9ac0bf 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -12,10 +12,13 @@ toPythonPath() { echo $result } -envHooks+=(addPythonPath) +addEnvHooks "$hostOffset" addPythonPath # 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. export DETERMINISTIC_BUILD=1; # Determinism: We fix the hashes of str, bytes and datetime objects. export PYTHONHASHSEED=0; +# Determinism. Whenever Python is included, it should not check user site-packages. +# This option is only relevant when the sandbox is disabled. +export PYTHONNOUSERSITE=1; diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index fc521828ffc4..8d4e68bf57ca 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -14,7 +14,8 @@ let name = "${python.name}-env"; inherit paths; - inherit ignoreCollisions extraOutputsToInstall; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d664c00bc31d..6a49107361ab 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, darwin ? null -, buildEnv, bundler, bundix +, buildEnv, bundler, bundix, Foundation } @ args: let @@ -27,6 +27,7 @@ let tag = ver.gitTag; isRuby20 = ver.majMin == "2.0"; isRuby21 = ver.majMin == "2.1"; + isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub @@ -40,7 +41,7 @@ let , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf , darwin ? null - , buildEnv, bundler, bundix + , buildEnv, bundler, bundix, Foundation }: let rubySrc = if useRailsExpress then fetchFromGitHub { @@ -75,11 +76,13 @@ let ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) + ++ (op isRuby25 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 # running on darwin ++ (op (!cursesSupport && stdenv.isDarwin) readline) + ++ (op (isRuby25 && stdenv.isDarwin) Foundation) ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ])); enableParallelBuilding = true; @@ -106,6 +109,11 @@ let cp ${config}/config.guess tool/ cp ${config}/config.sub tool/ '' + else if isRuby25 then '' + sed -i configure.ac -e '/config.guess/d' + cp ${config}/config.guess tool/ + cp ${config}/config.sub tool/ + '' else opString useRailsExpress '' sed -i configure.in -e '/config.guess/d' cp ${config}/config.guess tool/ @@ -142,7 +150,7 @@ let addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF '' + opString useRailsExpress '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) @@ -220,4 +228,12 @@ in { git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; }; }; + + ruby_2_5_0 = generic { + version = rubyVersion "2" "5" "0" ""; + sha256 = { + src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6"; + git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3d3b17cd2f70..858bc0a13f34 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -39,4 +39,9 @@ rec { "${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.0" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" + ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index c60d6e3728d0..1598cbc56e1d 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94"; - sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny"; + rev = "ba5a3c6f972e1b957b4b3fe28b5730ef0e27bff3"; + sha256 = "0sjmhhb8hshxa58x062j44w0xdck8ykgpsg33wjr0wv9npwpkwrz"; } diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh index 3696e743a07a..20382f18f529 100644 --- a/pkgs/development/libraries/SDL/setup-hook.sh +++ b/pkgs/development/libraries/SDL/setup-hook.sh @@ -4,8 +4,4 @@ addSDLPath () { fi } -if test -n "$crossConfig"; then - crossEnvHooks+=(addSDLPath) -else - envHooks+=(addSDLPath) -fi +addEnvHooks "$hostOffset" addSDLPath diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh index 5a26440f37b3..3acce9d473c5 100644 --- a/pkgs/development/libraries/SDL2/setup-hook.sh +++ b/pkgs/development/libraries/SDL2/setup-hook.sh @@ -4,8 +4,4 @@ addSDL2Path () { fi } -if test -n "$crossConfig"; then - crossEnvHooks+=(addSDL2Path) -else - envHooks+=(addSDL2Path) -fi +addEnvHooks "$hostOffset" addSDL2Path diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 8cadc7290aa9..07d256f4f571 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "Xaw3d-1.6.2"; src = fetchurl { urls = [ - ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2 + ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.2.tar.bz2 ]; - sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi"; + sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [imake gccmakedep libXpm libXp bison flex]; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index e342d8ab6c09..219c8df803b7 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "assimp-${version}"; - version = "3.3.1"; + version = "4.1.0"; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - sha256 = "13y44fymj13h6alig0nqab91j2qch0yh9gq8yql2zz744ch2s5vc"; + sha256 = "00g61g3ixmfszzjncpvm8x7gp2livaj4lmhbycjmrw4x3gfqlc4r"; }; buildInputs = [ cmake boost zlib ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index e2350cf2cd13..52c3a5f8c076 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { versionMajor = "2.26"; - versionMinor = "0"; + versionMinor = "1"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "d25e528e1406a10c7d9b675aa15e638bcbf0a122ca3681f655a30cce83272fb9"; + sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - intltool dbus_glib at_spi2_core libSM ]; + dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { platforms = platforms.unix; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 95de186a29a3..1743faafa687 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib +{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus_glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { versionMajor = "2.26"; - versionMinor = "0"; + versionMinor = "2"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "511568a65fda11fdd5ba5d4adfd48d5d76810d0e6ba4f7460f1b2ec0dbbbc337"; + sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; buildInputs = [ - python popt intltool dbus_glib + python popt dbus_glib libX11 xextproto libSM libICE libXtst libXi - gobjectIntrospection ]; # ToDo: on non-NixOS we create a symlink from there? diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 1574d8d037c7..f7d3887cc180 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -2,14 +2,14 @@ let ver_maj = "2.26"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "atk-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827"; + sha256 = "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g"; }; enableParallelBuilding = true; @@ -18,11 +18,14 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl gobjectIntrospection ]; - propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ]; + propagatedBuildInputs = [ + # Required by atk.pc + glib + ]; - #doCheck = true; # no checks in there (2.22.0) + doCheck = true; meta = { description = "Accessibility toolkit"; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index e13b102c7887..51ae14be4046 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python3 +, libsndfile, pkgconfig, python }: stdenv.mkDerivation rec { - name = "aubio-0.4.5"; + name = "aubio-0.4.6"; src = fetchurl { url = "http://aubio.org/pub/${name}.tar.bz2"; - sha256 = "1xkshac4wdm7r5sc04c38d6lmvv5sk4qrb5r1yy0xgsgdx781hkh"; + sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile python3 ]; + nativeBuildInputs = [ pkgconfig python ]; + buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; - configurePhase = "${python3.interpreter} waf configure --prefix=$out"; + configurePhase = "python waf configure --prefix=$out"; - buildPhase = "${python3.interpreter} waf"; + buildPhase = "python waf"; - installPhase = "${python3.interpreter} waf install"; + installPhase = "python waf install"; meta = with stdenv.lib; { description = "Library for audio labelling"; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 595dd9e0a536..4a632d07006b 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "lv2-unstable-${version}"; - version = "2016-10-23"; + version = "2017-07-08"; src = fetchgit { url = "http://lv2plug.in/git/cgit.cgi/lv2.git"; - rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12"; - sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm"; + rev = "39c7c726cd52b2863fcea356cafe1bcab2ba7f37"; + sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index b0b0c6bc59af..63e3ae36028b 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "raul-unstable-${rev}"; - rev = "2016-09-20"; + rev = "2017-07-23"; src = fetchgit { url = "http://git.drobilla.net/cgit.cgi/raul.git"; - rev = "f8bf77d3c3b77830aedafb9ebb5cdadfea7ed07a"; - sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj"; + rev = "4db870b2b20b0a608ec0283139056b836c5b1624"; + sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index b2cfb0be8bec..63f43ac7a2c0 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -8,12 +8,12 @@ assert !(withQt4 && withQt5); stdenv.mkDerivation rec { pname = "suil"; - version = "0.8.4"; + version = "0.10.0"; name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { url = "http://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; + sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index fe06bcfab6d3..47d9e7dba4ce 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.1.18"; + version = "1.3.22"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1i85zpns3gj5by45ppg4rfk9csix8mjazpyj6dqic40b2wshnw8c"; + sha256 = "0sdgy8kqhxnw7n0sw4m3p3ay7yic3rhad5ab8m5lbx61ad9bq3c2"; }; # FIXME: might be nice to put different APIs in different outputs @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake curl ]; + buildInputs = [ zlib curl openssl ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" @@ -51,10 +52,6 @@ in stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; - NIX_LDFLAGS = lib.concatStringsSep " " ( - (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) - [ curl openssl zlib stdenv.cc.cc ]); - 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 133b39d07974..04e714f886ef 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.34"; + name = "babl-0.1.38"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0nwakj313l2dh5npx18avkg4z17i2prkxbl6vj547a08n6ry1gsy"; + sha256 = "11pfbyzq20596p9sgwraxspg3djg1jzz6wvz4bapf0yyr97jiyd0"; }; - meta = with stdenv.lib; { + doCheck = true; + + meta = with stdenv.lib; { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 421d7072397b..9a01cdfe8749 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 2666b1d6c5d2..603d7883c647 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -8,33 +8,33 @@ callPackage ./generic.nix (args // rec { sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; }; - patches = if stdenv.isCygwin then [ - ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch - ./cygwin-fedora-boost-1.50.0-pool.patch - ./cygwin-fedora-boost-1.57.0-mpl-print.patch - ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch - ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch - ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch - ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch - ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch - ./cygwin-fedora-boost-1.57.0-move-is_class.patch - ./cygwin-1.40.0-cstdint-cygwin.patch - ./cygwin-1.57.0-asio-cygwin.patch - ./cygwin-1.55.0-asio-MSG_EOR.patch - ./cygwin-1.57.0-config-cygwin.patch - ./cygwin-1.57.0-context-cygwin.patch - ./cygwin-1.57.0-filesystem-cygwin.patch - ./cygwin-1.55.0-interlocked-cygwin.patch - ./cygwin-1.40.0-iostreams-cygwin.patch - ./cygwin-1.57.0-locale-cygwin.patch - ./cygwin-1.57.0-log-cygwin.patch - ./cygwin-1.40.0-python-cygwin.patch - ./cygwin-1.40.0-regex-cygwin.patch - ./cygwin-1.57.0-smart_ptr-cygwin.patch - ./cygwin-1.57.0-system-cygwin.patch - ./cygwin-1.45.0-jam-cygwin.patch - ./cygwin-1.50.0-jam-pep3149.patch - ] else null; + patches = stdenv.lib.optionals stdenv.isCygwin [ + ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch + ./cygwin-fedora-boost-1.50.0-pool.patch + ./cygwin-fedora-boost-1.57.0-mpl-print.patch + ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch + ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch + ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch + ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch + ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch + ./cygwin-fedora-boost-1.57.0-move-is_class.patch + ./cygwin-1.40.0-cstdint-cygwin.patch + ./cygwin-1.57.0-asio-cygwin.patch + ./cygwin-1.55.0-asio-MSG_EOR.patch + ./cygwin-1.57.0-config-cygwin.patch + ./cygwin-1.57.0-context-cygwin.patch + ./cygwin-1.57.0-filesystem-cygwin.patch + ./cygwin-1.55.0-interlocked-cygwin.patch + ./cygwin-1.40.0-iostreams-cygwin.patch + ./cygwin-1.57.0-locale-cygwin.patch + ./cygwin-1.57.0-log-cygwin.patch + ./cygwin-1.40.0-python-cygwin.patch + ./cygwin-1.40.0-regex-cygwin.patch + ./cygwin-1.57.0-smart_ptr-cygwin.patch + ./cygwin-1.57.0-system-cygwin.patch + ./cygwin-1.45.0-jam-cygwin.patch + ./cygwin-1.50.0-jam-pep3149.patch + ]; }) diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix new file mode 100644 index 000000000000..3fd9c1608248 --- /dev/null +++ b/pkgs/development/libraries/boost/1.66.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.66_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_66_0.html + sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + }; + +}) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3c954bdd1474..c2a59431ac04 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv -, buildPlatform, hostPlatform -, toolset ? if stdenv.cc.isClang then "clang" else null +, which +, buildPackages, buildPlatform, hostPlatform +, toolset ? /**/ if stdenv.cc.isClang then "clang" + else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross" + else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now , enableStatic ? !enableShared -, enablePIC ? false -, enableExceptions ? false , enablePython ? hostPlatform == buildPlatform -, enableNumpy ? false, numpy ? null +, enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65" , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -, patches ? null +, patches ? [] , mpi ? null # Attributes inherit from specific versions @@ -21,8 +22,9 @@ }: # We must build at least one type of libraries -assert !enableShared -> enableStatic; +assert enableShared || enableStatic; +# Python isn't supported when cross-compiling assert enablePython -> hostPlatform == buildPlatform; assert enableNumpy -> enablePython; @@ -46,86 +48,41 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - cflags = if enablePIC && enableExceptions then - "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; - - withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; - - genericB2Flags = [ + b2Args = concatStringsSep " " ([ "--includedir=$dev/include" "--libdir=$out/lib" "-j$NIX_BUILD_CORES" "--layout=${layout}" "variant=${variant}" "threading=${threading}" - ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ + "runtime-link=${runtime-link}" "link=${link}" - "${cflags}" - ] ++ optional (variant == "release") "debug-symbols=off" - ++ optional (!enablePython) "--without-python"; - - nativeB2Flags = [ "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" - ] ++ optional (toolset != null) "toolset=${toolset}" - ++ optional (mpi != null) "--user-config=user-config.jam"; - nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); - - crossB2Flags = [ - "-sEXPAT_INCLUDE=${expat.crossDrv}/include" - "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" - "--user-config=user-config.jam" - "toolset=gcc-cross" - ] ++ optionals (hostPlatform.libc == "msvcrt") [ + ] ++ optional (variant == "release") "debug-symbols=off" + ++ optional (toolset != null) "toolset=${toolset}" + ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" + ++ optionals (hostPlatform.libc == "msvcrt") [ "target-os=windows" "threadapi=win32" "binary-format=pe" "address-model=${toString hostPlatform.parsed.cpu.bits}" "architecture=x86" - ]; - crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags); - - builder = b2Args: '' - ./b2 ${b2Args} - ''; - - installer = b2Args: '' - # boostbook is needed by some applications - mkdir -p $dev/share/boostbook - cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ - - # Let boost install everything else - ./b2 ${b2Args} install - ''; - - commonConfigureFlags = [ - "--includedir=$(dev)/include" - "--libdir=$(out)/lib" - ]; - - fixup = '' - # 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 '{}' \; - ) - '' + optionalString (hostPlatform.libc == "msvcrt") '' - ${stdenv.cc.targetPrefix}ranlib "$out/lib/"*.a - ''; + ]); in stdenv.mkDerivation { name = "boost-${version}"; - inherit src patches version; + inherit src; + + patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0"; + patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl { + url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/" + + "boost-mingw.patch"; + sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; + }); meta = { homepage = http://boost.org/; @@ -142,9 +99,13 @@ stdenv.mkDerivation { --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' - cat << EOF > user-config.jam + cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF + '' + optionalString (hostPlatform != buildPlatform) '' + cat << EOF >> user-config.jam + using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; + EOF ''; NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin @@ -152,46 +113,43 @@ stdenv.mkDerivation { enableParallelBuilding = true; + nativeBuildInputs = [ which buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (hostPlatform == buildPlatform) icu ++ optional stdenv.isDarwin fixDarwinDylibNames ++ optional enablePython python - ++ optional enableNumpy numpy; + ++ optional enableNumpy python.pkgs.numpy; configureScript = "./bootstrap.sh"; - configureFlags = commonConfigureFlags - ++ [ "--with-python=${python.interpreter}" ] - ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}" + configurePlatforms = []; + configureFlags = [ + "--includedir=$(dev)/include" + "--libdir=$(out)/lib" + ] ++ optional enablePython "--with-python=${python.interpreter}" + ++ [ (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ] ++ optional (toolset != null) "--with-toolset=${toolset}"; - buildPhase = builder nativeB2Args; + buildPhase = '' + ./b2 ${b2Args} + ''; - installPhase = installer nativeB2Args; + installPhase = '' + # boostbook is needed by some applications + mkdir -p $dev/share/boostbook + cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ - postFixup = fixup; + # Let boost install everything else + ./b2 ${b2Args} install + ''; + + postFixup = '' + # Make boost header paths relative so that they are not runtime dependencies + find "$dev/include" \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + -exec sed '1i#line 1 "{}"' -i '{}' \; + '' + optionalString (hostPlatform.libc == "msvcrt") '' + $RANLIB "$out/lib/"*.a + ''; outputs = [ "out" "dev" ]; setOutputFlags = false; - - crossAttrs = rec { - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}" - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ''; - buildPhase = builder crossB2Args; - installPhase = installer crossB2Args; - postFixup = fixup; - } // optionalAttrs (hostPlatform.libc == "msvcrt") { - patches = fetchurl { - url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/" - + "boost-mingw.patch"; - sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; - }; - - patchFlags = "-p0"; - }; } diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 727c6bfc4f3f..160f62305945 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platform = if stdenv.isLinux then "linux" else if stdenv.isDarwin then "macosx" - else abort "unrecognized platform"; + else throw "unrecognized system ${stdenv.system}"; buildInputs = [ premake4 ]; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 14ff7a5f16c3..6b3b69f99971 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, writeTextDir }: +let self = stdenv.mkDerivation rec { name = "c-ares-1.13.0"; @@ -14,4 +15,28 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; -} + + # Adapted from running a cmake build + passthru.cmake-config = writeTextDir "c-ares-config.cmake" + '' + set(c-ares_INCLUDE_DIR "${self}/include") + + set(c-ares_LIBRARY c-ares::cares) + + add_library(c-ares::cares SHARED IMPORTED) + + set_target_properties(c-ares::cares PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${self}/include" + INTERFACE_LINK_LIBRARIES "nsl;rt" + ) + set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(c-ares::cares PROPERTIES + IMPORTED_LOCATION_RELEASE "${self}/lib/libcares.so.2.2.0" + IMPORTED_SONAME_RELEASE "libcares.so.2" + ) + add_library(c-ares::cares_shared INTERFACE IMPORTED) + set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") + set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + ''; + +}; in self diff --git a/pkgs/development/libraries/c-ares/release.patch b/pkgs/development/libraries/c-ares/release.patch new file mode 100644 index 000000000000..e745648062a5 --- /dev/null +++ b/pkgs/development/libraries/c-ares/release.patch @@ -0,0 +1,19 @@ +diff -aur c-ares-cares-1_13_0/ares_version.h c-ares-1.13.0/ares_version.h +--- c-ares-cares-1_13_0/ares_version.h 2017-06-20 02:00:21.000000000 -0400 ++++ c-ares-1.13.0/ares_version.h 2017-06-20 02:03:54.000000000 -0400 +@@ -6,12 +6,12 @@ + #define ARES_COPYRIGHT "2004 - 2016 Daniel Stenberg, ." + + #define ARES_VERSION_MAJOR 1 +-#define ARES_VERSION_MINOR 12 +-#define ARES_VERSION_PATCH 1 ++#define ARES_VERSION_MINOR 13 ++#define ARES_VERSION_PATCH 0 + #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\ + (ARES_VERSION_MINOR<<8)|\ + (ARES_VERSION_PATCH)) +-#define ARES_VERSION_STR "1.12.1-DEV" ++#define ARES_VERSION_STR "1.13.0" + + #if (ARES_VERSION >= 0x010700) + # define CARES_HAVE_ARES_LIBRARY_INIT 1 diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b1ee0b8d2736..09d162db8532 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - #url = "http://www.cairographics.org/releases/${name}.tar.gz"; + url = "http://www.cairographics.org/releases/${name}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash - url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; - sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; + # url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index a97ca5cc6980..19f39217fd02 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "cdk-${version}"; - version ="5.0-20161210"; + version ="5.0-20171209"; buildInputs = [ ncurses ]; src = fetchurl { - url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz"; - sha256 = "1bazwcwz4qhxyc8jaahdd2nlm30f5dhy0f6cnix5rjjhi35mhxcy"; + urls = [ + "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" + "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" + ]; + sha256 = "0jq0dx7gm7gl6lv5mhlfkxhw5362g9dxqdlpjlrag069nns8xdc8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 72fa309b721f..07c6e1490e7e 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, sqlite, libmysql, postgresql, unixODBC }: +{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { name = "cppdb"; @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake sqlite libmysql postgresql unixODBC ]; + buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; meta = with stdenv.lib; { homepage = http://cppcms.com/sql/cppdb/; @@ -23,4 +24,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix new file mode 100644 index 000000000000..8f66b65e49ac --- /dev/null +++ b/pkgs/development/libraries/csfml/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, sfml }: + +let + version = "2.4"; +in + +stdenv.mkDerivation { + name = "csfml-${version}"; + src = fetchFromGitHub { + owner = "SFML"; + repo = "CSFML"; + rev = "b5facb85d13bff451a5fd2d088a97472a685576c"; + sha256 = "1q716gd7c7jlxzwpq5z4rjj5lsrn71ql2djphccdf9jannllqizn"; + }; + buildInputs = [ cmake sfml ]; + cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; + + meta = with stdenv.lib; { + homepage = http://www.sfml-dev.org/; + description = "Simple and fast multimedia library"; + longDescription = '' + SFML is a simple, fast, cross-platform and object-oriented multimedia API. + It provides access to windowing, graphics, audio and network. + It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python. + ''; + license = licenses.zlib; + maintainers = [ maintainers.jpdoyle ]; + + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index c1579b717484..c1c867abcdf5 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl ]; meta = with stdenv.lib; { - homepage = http://josephp91.github.io/curlcpp/; + homepage = https://josephp91.github.io/curlcpp/; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index 7cb7187a3ceb..5b05d64f0727 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "A general-purpose video codec based on wavelets"; platforms = platforms.linux; license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainer = maintainers.igsha; + maintainers = [ maintainers.igsha ]; }; } diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 61932b29e62c..bb150da67996 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.6"; + version = "19.8"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "1nlx4z53jnk7wysaxrzbyyqb65m45rw4g1fagazl2jvwh1qn49ds"; + sha256 = "0ras4dl1ws9f9680bi8wg0mnbqvrpn0l2xl5lrvq3jvnijb3cz9i"; }; postPatch = '' diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a1a07b43197f..7f5f19035179 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -7,6 +7,24 @@ stdenv.mkDerivation rec { url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; sha256 = "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"; }; + + 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"; + }) + (fetchpatch { + # many CVEs - see https://github.com/Exiv2/exiv2/pull/120 + url = "https://patch-diff.githubusercontent.com/raw/Exiv2/exiv2/pull/120.patch"; + sha256 = "1szl22xmh12hibzaqf2zi8zl377x841m52x4jm5lziw6j8g81sj8"; + excludes = [ "test/bugfixes-test.sh" ]; + }) + ]; + postPatch = "patchShebangs ./src/svn_version.sh"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 01f3c11ac737..e341ce842eb6 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputMan = "dev"; # tiny page for a dev tool - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = true; # not cross; preCheck = '' patchShebangs ./run.sh diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 554337860028..516968861482 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -8,11 +8,11 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { name = "faac-${version}"; - version = "1.29.3"; + version = "1.29.9.2"; src = fetchurl { url = "mirror://sourceforge/faac/${name}.tar.gz"; - sha256 = "0gssrz2vq52mj8x2hvdqc9bwkp64s4f4g7yj7ac6dwxs8dw8kwnf"; + sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl"; }; configureFlags = [ ] @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional mp4v2Support mp4v2; + enableParallelBuilding = true; + meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; homepage = http://www.audiocoding.com/faac.html; diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix deleted file mode 100644 index 4050bdfd9eb0..000000000000 --- a/pkgs/development/libraries/facile/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, ocaml }: - -stdenv.mkDerivation rec { - name = "facile-1.1"; - - src = fetchurl { - url = "${meta.homepage}/distrib/${name}.tar.gz"; - sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8"; - }; - - dontAddPrefix = 1; - - patches = [ ./ocaml_4.xx.patch ]; - - postPatch = "sed -e 's@mkdir@mkdir -p@' -i Makefile"; - - postConfigure = "make -C src .depend"; - - makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile"; - - buildInputs = [ ocaml ]; - - meta = { - homepage = http://www.recherche.enac.fr/log/facile; - license = "LGPL"; - description = "A Functional Constraint Library"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/facile/ocaml_4.xx.patch b/pkgs/development/libraries/facile/ocaml_4.xx.patch deleted file mode 100644 index 429405fabdaa..000000000000 --- a/pkgs/development/libraries/facile/ocaml_4.xx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN facile-1.1/src/fcl_data.ml facile-1.1-patched//src/fcl_data.ml ---- facile-1.1/src/fcl_data.ml 2004-09-08 11:51:02.000000000 +0200 -+++ facile-1.1-patched//src/fcl_data.ml 2012-12-16 13:49:36.286722670 +0100 -@@ -16,7 +16,7 @@ end - - module Hashtbl = struct - type ('a, 'b) t = ('a, 'b) Hashtbl.t -- let create = Hashtbl.create -+ let create x = Hashtbl.create x - let get h = h - - let add h k d = diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix new file mode 100644 index 000000000000..e781e2aab838 --- /dev/null +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation { + name = "fastpbkdf2-1.0.0"; + + src = fetchFromGitHub { + owner = "ctz"; + repo = "fastpbkdf2"; + rev = "v1.0.0"; + sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; + }; + + buildInputs = [ openssl ]; + + preBuild = '' + makeFlagsArray=(CFLAGS="-std=c99 -O3 -g") + ''; + + installPhase = '' + mkdir -p $out/{lib,include/fastpbkdf2} + cp *.a $out/lib + cp fastpbkdf2.h $out/include/fastpbkdf2 + ''; + + meta = with stdenv.lib; { + description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; + homepage = https://github.com/ctz/fastpbkdf2; + license = licenses.cc0; + maintainers = with maintainers; [ ledif ]; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d131fc13ced3..780008c95001 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,21 +231,13 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.4"; + version = "3.4.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf"; + sha256 = "1h4iz7q10wj04awr2wvmp60n7b09pfwrgwbbw9sgl7klcf52fxss"; }; - patches = [ - (fetchurl { - name = "CVE-2017-16840.patch"; - url = "http://git.videolan.org/?p=ffmpeg.git;a=patch;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74"; - sha256 = "0zx0vh110hrykk7j863j04bx6igm2q8dlkv25mf5g4rbxafpqig3"; - }) - ]; - prePatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 9890d030e44e..f4cda16424c3 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,16 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4"; - sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax"; + branch = "3.4.1"; + sha256 = "0b2aaxx8l7g3pvs4zd3mzig44cc73savrxzfm6w0lnaa2lh3wi7k"; darwinFrameworks = [ Cocoa CoreMedia ]; - - patches = [ - (fetchpatch{ - name = "CVE-2017-16840.patch"; - url = "http://git.videolan.org/?p=ffmpeg.git;a=patch;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74"; - sha256 = "1rjr9lc71cyy43wsa2zxb9ygya292h9jflvr5wk61nf0vp97gjg3"; - }) - ]; - }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e8eab4827e62..906a15c419d6 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { configureFlags = configureFlags ++ [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" - "--target_os=${hostPlatform.parsed.kernel}" + "--target_os=${hostPlatform.parsed.kernel.name}" "--arch=${hostPlatform.arch}" ]; }; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 5cf83752aa70..36c824c75287 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -5,7 +5,7 @@ with lib; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; let - version = "3.3.6-pl1"; + version = "3.3.7"; withDoc = stdenv.cc.isGNU; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y"; + sha256 = "0wsms8narnbhfsa8chdflv2j9hzspvflblnqdn7hw8x5xdzrnq1v"; }; outputs = [ "out" "dev" "man" ] diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index bdfbb97f0218..a107c9a478f2 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,22 +1,26 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { name = "fribidi-${version}"; version = "0.19.7"; - src = fetchurl { - url = "http://fribidi.org/download/${name}.tar.bz2"; - sha256 = "13jsb5qadlhsaxkbrb49nqslmbh904vvzhsm5mm2ghmv29i2l8h8"; + src = fetchFromGitHub { + owner = "fribidi"; + repo = "fribidi"; + rev = version; + sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d"; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + # Configure script checks for glib, but it is only used for tests. outputs = [ "out" "devdoc" ]; meta = with stdenv.lib; { - homepage = http://fribidi.org/; + homepage = https://github.com/fribidi/fribidi; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; - license = licenses.gpl2; + license = licenses.lgpl21; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 984d3da81198..54174e7cfe46 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.3"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j"; + sha256 = "a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.lib.dev}/bin/mysql_config" + "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index c9f0c0761019..7a80ce7fdb66 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl , libpng }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.lib.dev}/bin/mysql_config" + "--with-mysql=${mysql57.connector-c}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 3b78225a447f..7a602f5430eb 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx"; }; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index ba7ab82f50b4..5a7dcd792996 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -14,4 +14,4 @@ findGdkPixbufLoaders() { } -envHooks+=(findGdkPixbufLoaders) +addEnvHooks "$hostOffset" findGdkPixbufLoaders diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 48b1e47e0edc..158707557a52 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }: +, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw +, libwebp, gnome3 }: stdenv.mkDerivation rec { - name = "gegl-0.3.18"; + name = "gegl-0.3.26"; src = fetchurl { url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "1ywihjav9yhmsvbrdyx9c5q71rqdkjg8l66ywca6s4yydvr8x1fp"; + sha256 = "1a9zbi6ws0r0sqynvg2fh3ad0ipnphg7w62y7whlcrbpqi29izvf"; }; hardeningDisable = [ "format" ]; @@ -14,17 +15,24 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; + enableParallelBuilding = true; + + doCheck = true; + buildInputs = [ - babl libpng cairo libjpeg librsvg pango gtk bzip2 which json_glib intltool - libraw + libpng cairo libjpeg librsvg pango gtk bzip2 + libraw libwebp gnome3.gexiv2 ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + propagatedBuildInputs = [ glib json_glib babl ]; # for gegl-3.0.pc + + nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ jtojnar ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index a35d2380eded..9c3024ce25fb 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; + setupHook = ./gettext-setup-hook.sh; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh new file mode 100644 index 000000000000..fe3ef1f9e15d --- /dev/null +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -0,0 +1,7 @@ +gettextDataDirsHook() { + if [ -d "$1/share/gettext" ]; then + addToSearchPath GETTEXTDATADIRS "$1/share/gettext" + fi +} + +envHooks+=(gettextDataDirsHook) diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix new file mode 100644 index 000000000000..d79b76913358 --- /dev/null +++ b/pkgs/development/libraries/gflags/default.nix @@ -0,0 +1,10 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation + { name = "gflags-2.2.1"; + src = fetchurl + { url = "https://github.com/gflags/gflags/archive/v2.2.1.tar.gz"; + sha256 = "03lxc2ah8i392kh1naq99iip34k4fpv22kwflyx3byd2ssycs9xf"; + }; + nativeBuildInputs = [ cmake ]; + } diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fd8055fd0b39..87f3c78a82e8 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.54"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096"; + sha256 = "0bq16m9nh3gcz9x2fvygr0iwxd2pxcbrm3lj3kihsnh1afv8g9za"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index c5cf293902cd..98341376fdf6 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -5,7 +5,7 @@ make_glib_find_gsettings_schemas() { addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"* fi } -envHooks+=(make_glib_find_gsettings_schemas) +addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas # Install gschemas, if any, in a package-specific directory glibPreInstallPhase() { diff --git a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz new file mode 100644 index 000000000000..9bf1a4f7d39b Binary files /dev/null and b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz differ diff --git a/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch b/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch new file mode 100644 index 000000000000..ce18b874c427 --- /dev/null +++ b/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch @@ -0,0 +1,39 @@ +diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure +index cace758c01..38fe7fe0b0 100644 +--- a/sysdeps/unix/sysv/linux/configure ++++ b/sysdeps/unix/sysv/linux/configure +@@ -69,7 +69,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5 + $as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; } + decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +-abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; ++abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac +index 13abda0a51..6abc12eaed 100644 +--- a/sysdeps/unix/sysv/linux/configure.ac ++++ b/sysdeps/unix/sysv/linux/configure.ac +@@ -50,7 +50,7 @@ fi + AC_MSG_CHECKING(for kernel header at least $minimum_kernel) + changequote(,)dnl + decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +-abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; ++abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; + changequote([,])dnl + AC_TRY_COMPILE([#include + #if LINUX_VERSION_CODE < $decnum +diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h +index 823cd8224d..482caaeeec 100644 +--- a/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ b/sysdeps/unix/sysv/linux/dl-osinfo.h +@@ -39,7 +39,7 @@ + GLRO(dl_osversion) = version; \ + \ + /* Now we can test with the required version. */ \ +- if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION) \ ++ if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION && version != 0x020620) \ + /* Not sufficent. */ \ + FATAL ("FATAL: kernel too old\n"); \ + } \ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 86f3be15fea6..cfec3209b98a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -20,7 +20,7 @@ let version = "2.26"; - patchSuffix = "-75"; + patchSuffix = "-115"; sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -47,6 +47,7 @@ stdenv.mkDerivation ({ $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz */ ./2.26-75.patch.gz + ./2.26-75to115.diff.gz /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch @@ -64,6 +65,25 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch + + /* Allow running with RHEL 6 -like kernels. The patch adds an exception + for glibc to accept 2.6.32 and to tag the ELFs as 2.6.32-compatible + (otherwise the loader would refuse libc). + Note that glibc will fully work only on their heavily patched kernels + and we lose early mismatch detection on 2.6.32. + + On major glibc updates we should check that the patched kernel supports + all the required features. ATM it's verified up to glibc-2.26-115. + # HOWTO: check glibc sources for changes in kernel requirements + git log -p glibc-2.25.. sysdeps/unix/sysv/linux/x86_64/kernel-features.h sysdeps/unix/sysv/linux/kernel-features.h + # get kernel sources (update the URL) + mkdir tmp && cd tmp + curl http://vault.centos.org/6.9/os/Source/SPackages/kernel-2.6.32-696.el6.src.rpm | rpm2cpio - | cpio -idmv + tar xf linux-*.bz2 + # check syscall presence, for example + less linux-*?/arch/x86/kernel/syscall_table_32.S + */ + ./allow-kernel-2.6.32.patch ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch; @@ -121,7 +141,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; - nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 0841990fa95d..904727ceae63 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip, cmake }: stdenv.mkDerivation rec { - name = "glm-0.9.6.1"; + version = "0.9.8.5"; + name = "glm-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "1s1kpf9hpyq6bdf87nhlkxyr2ay0ip9wqicdma9h8yz4vs20r2hs"; + src = fetchzip { + url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip"; + sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "doc" ]; - installPhase = '' - mkdir -p "$out/include" - cp -r glm "$out/include" + cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; - mkdir -p "$doc/share/doc/glm" - cp -r doc/* "$doc/share/doc/glm" + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' + ''; + + postInstall = '' + mkdir -p $doc/share/doc/glm + cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm ''; meta = with stdenv.lib; { @@ -33,3 +38,4 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } + diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 4ab61a2d2826..d608b3af6ce7 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.63"; + name = "glpk-4.64"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci"; + sha256 = "096cqgjc7vkq6wd8znhcxjbs1s2rym3qf753fqxrrq531vs6g4jk"; }; doCheck = true; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index d6877e72a1f9..66d0cf88bd02 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.5"; name = "gmime-${version}"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.0/${name}.tar.xz"; - sha256 = "001y93b8mq9alzkvli6vfh3pzdcn5c5iy206ml23lzhhhvm5k162"; + sha256 = "1q45gd1ahnz9q1milc2lqqwl7j3q0wd6kiswhp25iak222n56lrg"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e3bacc86d58e..5973c89cef79 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, m4, cxx ? true , buildPackages -, buildPlatform, hostPlatform , withStatic ? false }: let inherit (stdenv.lib) optional optionalString; in @@ -19,8 +18,8 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; - nativeBuildInputs = [ m4 ] - ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ m4 ]; configureFlags = # Build a "fat binary", with routines for several sub-architectures @@ -43,7 +42,7 @@ let self = stdenv.mkDerivation rec { configureFlagsArray+=("--build=$(./configfsf.guess)") ''; - doCheck = buildPlatform == hostPlatform; + doCheck = true; # not cross; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix new file mode 100644 index 000000000000..0fac97aaa439 --- /dev/null +++ b/pkgs/development/libraries/gmtk/default.nix @@ -0,0 +1,32 @@ +{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3 +, libpulseaudio, mplayer, gnome_mplayer }: + +stdenv.mkDerivation rec { + name = "gmtk-${version}"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "kdekorte"; + repo = "gmtk"; + rev = "v${version}"; + sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; + }; + + nativeBuildInputs = [ libtool pkgconfig intltool ]; + buildInputs = [ glib gtk3 libpulseaudio ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + mplayer = "${mplayer}/bin/mplayer"; + }) + ]; + + meta = with stdenv.lib; { + description = "Common functions for gnome-mplayer and gecko-mediaplayer"; + homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + license = licenses.gpl2; + maintainers = gnome_mplayer.meta.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/pkgs/development/libraries/gmtk/fix-paths.patch new file mode 100644 index 000000000000..64738300aba4 --- /dev/null +++ b/pkgs/development/libraries/gmtk/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/gmtk_media_player.c ++++ b/src/gmtk_media_player.c +@@ -2449,7 +2449,7 @@ + player->minimum_mplayer = detect_mplayer_features(player); + + if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { +- argv[argn++] = g_strdup_printf("mplayer"); ++ argv[argn++] = g_strdup_printf("@mplayer@"); + } else { + argv[argn++] = g_strdup_printf("%s", player->mplayer_binary); + } +@@ -4135,7 +4135,7 @@ + return ret; + + if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", player->mplayer_binary); + } diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 583d8475ec3b..a79ce05a38df 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -1,5 +1,4 @@ make_gobject_introspection_find_gir_files() { - # required for .typelib files, eg mypaint git version if [ -d "$1/lib/girepository-1.0" ]; then addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0 @@ -11,11 +10,18 @@ make_gobject_introspection_find_gir_files() { fi } -envHooks+=(make_gobject_introspection_find_gir_files) +addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files + +giDiscoverSelf() { + if [ -d "$prefix/lib/girepository-1.0" ]; then + addToSearchPath GI_TYPELIB_PATH $prefix/lib/girepository-1.0 + fi +} + +preFixupHooks+=(giDiscoverSelf) _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" } preFixupHooks+=(_multioutMoveGlibGir) - diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index d2f3d848dd76..f67129c007ec 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.36"; + name = "goffice-0.10.38"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "cfe65fc0a665538704c7bab8541784291cf0781df8b4cff73cb0a513ee0baad6"; + sha256 = "443199d7a9833fddaadfc4f9065c289e639eed480de316f37da816e396bb9764"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 9773ef8b896e..1e59e8f1d65a 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -4,21 +4,13 @@ let inherit (stdenv) lib system; in stdenv.mkDerivation rec { - name = "gpgme-1.9.0"; + name = "gpgme-1.10.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"; + sha256 = "14q619lxbk64vz7lih5gjb928qm28jrnn1h3yhsrrff3jw8yv3qs"; }; - patches = [ - (fetchpatch { - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6"; - sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx"; - name = "qgpgme-format-security.patch"; - }) - ]; - outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh index aaa64868dc94..b51cb4a31909 100644 --- a/pkgs/development/libraries/grantlee/5/setup-hook.sh +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -10,8 +10,4 @@ _grantleeEnvHook() { propagatedUserEnvPkgs+=" $1" fi } -if [ "$crossEnv" ]; then - crossEnvHooks+=(_grantleeEnvHook) -else - envHooks+=(_grantleeEnvHook) -fi +addEnvHooks "$hostOffset" _grantleeEnvHook diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix new file mode 100644 index 000000000000..4e6fe783dc2c --- /dev/null +++ b/pkgs/development/libraries/grpc/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: + +stdenv.mkDerivation rec + { name = "grpc-1.8.3"; + src = fetchurl + { url = "https://github.com/grpc/grpc/archive/v1.8.3.tar.gz"; + sha256 = "14ichjllvhkbv8sjh9j5njnagpqw2sl12n41ga90jnj7qvfwwjy1"; + }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + cmakeFlags = + [ "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + "-DgRPC_GFLAGS_PROVIDER=package" + ]; + enableParallelBuilds = true; + } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c68c7a50cc48..c033140d8dc3 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.12.2"; + name = "gst-plugins-bad-1.12.3"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -i 's/openjpeg-2.1/openjpeg-${openJpegVersion}/' ext/openjpeg/* + sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/* ''; src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w"; + sha256 = "1v5z3i5ha20gmbb3r9dwsaaspv5fm1jfzlzwlzqx1gjj31v5kl1n"; }; outputs = [ "out" "dev" ]; @@ -70,4 +70,6 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) wildmidi; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; + + enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 2ff429179642..2cd0c14c1f34 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.12.2"; + name = "gst-plugins-base-1.12.3"; meta = { description = "Base plugins and helper libraries"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh"; + sha256 = "19ffwdch7m777ragmwpy6prqmfb742ym1n3ki40s0zyki627plyk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index fa69d358394c..ee9438d3c29b 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.12.2"; + name = "gstreamer-1.12.3"; meta = { description = "Open source multimedia framework"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz"; + sha256 = "0vi1g8rmmsnd630ds3jwv2iph46ll8y07fzf04mz15q88j9g926k"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 3dd7812ece6d..b8c741af578f 100644 --- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -5,5 +5,5 @@ addGstreamer1LibPath () { fi } -envHooks+=(addGstreamer1LibPath) +addEnvHooks "$hostOffset" addGstreamer1LibPath diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index e206f317d4ba..c38ab12ec964 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.12.2"; + name = "gstreamer-editing-services-1.12.3"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr"; + sha256 = "0xjz8r0wbzc0kwi9q8akv7w71ii1n2y2dmb0q2p5k4h78382ybh3"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1c7f7951e916..e4e4f3b394db 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -11,7 +11,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.12.2"; + name = "gst-plugins-good-1.12.3"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am"; + sha256 = "00sznj1sl97fqpn6j8ngps04clvxp8h8yhw6lvszx4b855wz9rqk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh index e89aeda5bc1c..65ce26112519 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh @@ -5,4 +5,4 @@ addGstreamerLibPath () { fi } -envHooks+=(addGstreamerLibPath) +addEnvHooks "$hostOffset" addGstreamerLibPath diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7c0a05f8202b..9969c5e604ff 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.12.2"; + name = "gst-libav-1.12.3"; meta = { homepage = https://gstreamer.freedesktop.org; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv"; + sha256 = "0l4nc6ikdx49l7bdrk3bd9p3pzry8a328r22zg48gyzpnv5ghph1"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 610f10075a8d..3aa8eb886d79 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.12.2"; + name = "gst-plugins-ugly-1.12.3"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw"; + sha256 = "0lh00rg26iy5lr5al23lxsyncjqkgzph1bzkrgp8x9sfr62ab378"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index becd4cf0d921..2033c07d9527 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.12.2"; + version = "1.12.4"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3"; + sha256 = "1jg9nvc8000yi2bcl3wn2yh2hwl7yvlwldj6778w8c0z5qj7fb8w"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 9704ca1d743c..47eeb3d32843 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.12.2"; + name = "gst-validate-1.12.3"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb"; + sha256 = "17j812pkzgbyn9ys3b305yl5mrf9nbm8whwj4iqdskr742fr8fai"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 45222b7d7fcc..169fd119d51f 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, libintlOrEmpty, xlibsWrapper +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null , gdktarget ? "x11" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - nativeBuildInputs = [ setupHook perl pkgconfig gettext ]; + nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ]; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index ffbab3fce421..5a4cf75048f7 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK+"; homepage = https://gtkd.org; - licence = licenses.lgpl3Plus; + license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index e1acacc328cc..4d6af866990b 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 -, pciutils, numactl }: +{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl +, cairo, libX11 +, x11Support ? (!stdenv.isCygwin) +}: with stdenv.lib; stdenv.mkDerivation rec { - name = "hwloc-1.11.6"; + name = "hwloc-1.11.8"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; + sha256 = "0karxv4r1r8sa7ki5aamlxdvyvz0bvzq4gdhq0yi5nc4a0k11vzc"; }; + hardeningDisable = [ "format" ]; + + configureFlags = [ + "--localstatedir=/var" + ]; + # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. nativeBuildInputs = [ pkgconfig ]; @@ -18,7 +26,7 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (optionals x11Support [ cairo libX11 ]) ++ (optionals stdenv.isLinux [ numactl ])); propagatedBuildInputs = @@ -37,7 +45,7 @@ stdenv.mkDerivation rec { test -d "$numalibdir" fi - sed -i "$out/lib/libhwloc.la" \ + sed -i "$lib/lib/libhwloc.la" \ -e "s|-lnuma|-L$numalibdir -lnuma|g" ''; @@ -45,6 +53,8 @@ stdenv.mkDerivation rec { # fail on some build machines. doCheck = false; + outputs = [ "out" "lib" "dev" "doc" "man" ]; + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 66b21b6fae6c..867ce024d2fe 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ignitionrobotics.org/libraries/math; + homepage = https://ignitionrobotics.org/libraries/math; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 21c2c46105e5..956a8667be5f 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-2.2.0"; + name = "ilmbase-2.2.1"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c"; + sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index fcd884f0a419..ca9aa8fc36e8 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,22 +1,83 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, jre }: -stdenv.mkDerivation { - name = "saxon-6.5.3"; - builder = ./unzip-builder.sh; - src = fetchurl { - url = mirror://sourceforge/saxon/saxon6_5_3.zip; - sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; +let + common = { pname, version, src, description + , prog ? null, jar ? null, license ? stdenv.lib.licenses.mpl20 }: + stdenv.mkDerivation { + name = "${pname}-${version}"; + inherit pname version src; + + nativeBuildInputs = [ unzip ]; + + buildCommand = let + prog' = if prog == null then pname else prog; + jar' = if jar == null then pname else jar; + in '' + unzip $src -d $out + mkdir -p $out/bin $out/share $out/share/java + cp -s "$out"/*.jar "$out/share/java/" # */ + rm -rf $out/notices + mv $out/doc $out/share + cat > $out/bin/${prog'} < stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s"; + sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 4adb7e535789..90d41e30502f 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: +{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "libgig-svn-${version}"; - version = "2334"; + name = "libgig-${version}"; + version = "4.1.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/libgig/trunk"; - rev = "${version}"; - sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc"; + src = fetchurl { + url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libsndfile libtool libuuid ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - preConfigure = "make -f Makefile.cvs"; + buildInputs = [ libsndfile libuuid ]; + + preConfigure = "make -f Makefile.svn"; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index bfdd0cf8fd74..e659b31d9745 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -2,7 +2,10 @@ , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex , gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor -, getopt, perlPackages, ocamlPackages }: +, getopt, perlPackages, ocamlPackages +, javaSupport ? false, jdk ? null }: + +assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; @@ -24,7 +27,8 @@ stdenv.mkDerivation rec { cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild - ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]); + ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) + ++ stdenv.lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -40,7 +44,8 @@ stdenv.mkDerivation rec { # some scripts hardcore /usr/bin/env which is not available in the build env patchShebangs . ''; - configureFlags = "--disable-appliance --disable-daemon"; + configureFlags = [ "--disable-appliance" "--disable-daemon" ] + ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = "REALLY_INSTALL=yes"; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 88a3ebbc4fbe..c3405148242c 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: +{ stdenv, fetchurl, pkgconfig, meson, ninja, valadoc +, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { - major = "0.4"; + major = "0.6"; minor = "5"; version = "${major}.${minor}"; @@ -9,16 +10,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; - sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2"; + sha256 = "0ksf6vqjyjii29dvy5147dmgqlqsq4d70xxai0p2prkx4jrwgj3z"; }; - nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; - buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ]; + nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ]; + buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ]; + + mesonFlags = "-Denable_valadoc=true"; doCheck = true; checkPhase = "./httpseverywhere_test"; + outputs = [ "out" "devdoc" ]; + meta = { description = "library to use HTTPSEverywhere in desktop applications"; homepage = https://git.gnome.org/browse/libhttpseverywhere; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 9f75f17caeed..9c7e48f8f6a8 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -4,7 +4,7 @@ , pkgconfig, autoconf , glib, dbus_glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, pythonPackages, gobjectIntrospection, vala_0_23, gnome_doc_utils +, pythonPackages, gobjectIntrospection, vala, gnome_doc_utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -24,11 +24,11 @@ in stdenv.mkDerivation rec { sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome_doc_utils ]; buildInputs = [ glib dbus_glib libdbusmenu-glib - python pygobject2 pygtk gobjectIntrospection vala_0_23 gnome_doc_utils + python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 ]); diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 9bf54a115ffd..db4c0c7738de 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0fyy050hzk47g7305lx5pgyh2abvq7qs4xd3nn1is7zy3wj56s6x"; + sha256 = "09wkc5qqk1k2a68cwfy4x853z8z35wf2qkijh66kacsvc2fjq394"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 77f9d999de44..4ec0e5ebd9f4 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "0a5m0psfp5952y5vrcs0nbdz1y9wqzg2ms0xwrx752034wxr964h"; + sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j"; }; # github releases still need autotools, surprisingly patches = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; checkTarget = "test"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix new file mode 100644 index 000000000000..95b6b657fa2b --- /dev/null +++ b/pkgs/development/libraries/liblcf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: + +stdenv.mkDerivation rec { + name = "liblcf-${version}"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "EasyRPG"; + repo = "liblcf"; + rev = version; + sha256 = "1y3pbl3jxan9f0cb1rxkibqjc0h23jm3jlwlv0xxn2pgw8l0fk34"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ expat icu ]; + + meta = with stdenv.lib; { + homepage = https://github.com/EasyRPG/liblcf; + license = licenses.mit; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix new file mode 100644 index 000000000000..d3ddb99adada --- /dev/null +++ b/pkgs/development/libraries/liblouis/default.nix @@ -0,0 +1,57 @@ +{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, gettext, python3 +, texinfo, help2man, libyaml, perl +}: + +let + version = "3.4.0"; +in stdenv.mkDerivation rec { + name = "liblouis-${version}"; + + src = fetchFromGitHub { + owner = "liblouis"; + repo = "liblouis"; + rev = "v${version}"; + sha256 = "1b3vf6sq2iffdvj0r2q5g5k198camy3sq2nwfz391brpwivsnayh"; + }; + + outputs = [ "out" "dev" "man" "info" "doc" ]; + + nativeBuildInputs = [ + autoreconfHook pkgconfig gettext python3 + # Docs, man, info + texinfo help2man + ]; + + buildInputs = [ + # lou_checkYaml + libyaml + # maketable.d + perl + ]; + + configureFlags = [ + # Required by Python bindings + "--enable-ucs4" + ]; + + postPatch = '' + patchShebangs tests + substituteInPlace python/louis/__init__.py.in --replace "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so" + ''; + + postInstall = '' + pushd python + python setup.py install --prefix="$out" --optimize=1 + popd + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Open-source braille translator and back-translator"; + homepage = http://liblouis.org/; + license = licenses.lgpl21; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index c89b21de0d64..1a5a4baf8086 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "liblscp-svn-${version}"; - version = "2319"; + name = "liblscp-${version}"; + version = "0.6.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/liblscp/trunk"; - rev = "${version}"; - sha256 = "0jgdy9gi9n8x2pqrbll9158vhx8293lnxv8vzl0szcincslgk7hi"; + src = fetchurl { + url = "https://download.linuxsampler.org/packages/${name}.tar.gz"; + sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - preConfigure = "make -f Makefile.svn"; + preConfigure = "make -f Makefile.git"; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 68156c0c2171..35928e6dbf96 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.55"; + name = "libmicrohttpd-${version}"; + version = "0.9.58"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "1y6h1slav5l6k8zyb01dpw65dscdgxxgfa3a0z9qnn7jr66sn70c"; + sha256 = "1wq17qvizis7bsyvyw1gnfycvivssncngziddnyrbzv2dhvy24bs"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 4be59af6f0c2..d292dd1e536c 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CFLAGS = "-I${gmp.dev}/include"; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; meta = { description = "Library for multiprecision complex arithmetic with exact rounding"; diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix new file mode 100644 index 000000000000..0583d94ef7f4 --- /dev/null +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -0,0 +1,32 @@ +{stdenv, autoconf, automake, fetchFromGitHub, glib, intltool, json_c, libtool, pkgconfig}: + +let + version = "1.3.0"; +in stdenv.mkDerivation rec { + name = "libmypaint-${version}"; + + src = fetchFromGitHub { + owner = "mypaint"; + repo = "libmypaint"; + rev = "v${version}"; + sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc"; + }; + + nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; + + buildInputs = [ glib ]; + + propagatedBuildInputs = [ json_c ]; # for libmypaint.pc + + doCheck = true; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + homepage = http://mypaint.org/; + description = "Library for making brushstrokes which is used by MyPaint and other projects"; + license = licenses.isc; + maintainers = with maintainers; [ goibhniu jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 3905ba1b2716..c184e647d286 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ]; meta = { - homepage = http://dev.mysql.com/downloads/connector/cpp/; + homepage = https://dev.mysql.com/downloads/connector/cpp/; description = "C++ library for connecting to mysql servers."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 074c1a9dfd28..060f5ba4934c 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.7"; + name = "libnftnl-1.0.8"; src = fetchurl { url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "10irjrylcfkbp11617yr19vpfhgl54w0kw02jhj0i1abqv5nxdlv"; + sha256 = "0f10cfiyl4c0f8k3brxfrw28x7a6qvrakaslg4jgqncwxycxggg6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index f3e12db39819..d6d6989761bc 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "libopcodes-${version}"; - inherit (binutils-raw) version src; + inherit (binutils-raw.bintools) version src; outputs = [ "out" "dev" ]; - patches = binutils-raw.patches ++ [ + patches = binutils-raw.bintools.patches ++ [ ../../tools/misc/binutils/build-components-separately.patch ]; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"//' \; ''; - nativeBuildInputs = [ autoreconfHook264 bison buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook264 bison ]; buildInputs = [ libiberty ]; # dis-asm.h includes bfd.h propagatedBuildInputs = [ libbfd ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index db534d20c89c..a0924e791e3b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,23 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup -, libxslt, check, vala_0_23 ? null +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk_doc, docbook_xsl +, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: stdenv.mkDerivation rec { - name = "libosinfo-0.2.12"; + name = "libosinfo-1.1.0"; src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; - sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s"; + url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; + sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - intltool gobjectIntrospection libsoup libxslt check vala_0_23 + outputs = [ "out" "dev" "devdoc" ]; + + nativeBuildInputs = [ + pkgconfig vala intltool gobjectIntrospection gtk_doc docbook_xsl + ] ++ stdenv.lib.optionals doCheck checkInputs; + checkInputs = [ check curl perl ]; + buildInputs = [ glib libsoup libxml2 libxslt ]; + + patches = [ + ./osinfo-db-data-dir.patch ]; + postPatch = '' + patchShebangs . + substituteInPlace osinfo/osinfo_loader.c --subst-var-by OSINFO_DB_DATA_DIR "${osinfo-db}/share" + ''; + + configureFlags = [ + "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" + "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" + "--enable-gtk-doc" + ]; + + doCheck = true; + meta = with stdenv.lib; { - description = "Info about OSs, hypervisors and (virtual) hardware devices"; - homepage = http://libosinfo.org/; + description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; + homepage = https://libosinfo.org/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch new file mode 100644 index 000000000000..8d202a92d095 --- /dev/null +++ b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch @@ -0,0 +1,11 @@ +--- a/osinfo/osinfo_loader.c ++++ b/osinfo/osinfo_loader.c +@@ -2304,7 +2304,7 @@ + } else { + path = g_getenv("OSINFO_SYSTEM_DIR"); + if (!path) +- path = DATA_DIR "/osinfo"; ++ path = "@OSINFO_DB_DATA_DIR@/osinfo"; + + file = g_file_new_for_path(path); + } diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 26e754317df0..54e2616e782f 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.4"; + version = "0.4.7"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = name; - sha256 = "1jnpnwipmw3skw112qff36w046nyz5amiil228rn5divpkvx4axa"; + sha256 = "0n1i0pxj6l0vdq8gpdwfp5p9qd7wkymg0lpy6a17ix8hpqsljlhr"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 0cd9d758725c..bef5f9a9da34 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -26,6 +26,15 @@ stdenv.mkDerivation rec { 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"; + }) ]; preInstall = ''mkdir -p $out/bin''; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index c4a6a246b909..5ad9cf1e7b77 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { # it's hard to cross-run tests and some check programs didn't compile anyway makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS="; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; passthru = { inherit zlib; }; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index dc4981798bce..f537013d2fec 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; - rev = "v${version}"; - sha256 = "1dlanf0y65zf6n1b1f4jzw04w07sl85wiw01c3yyn2ivp3clr13l"; + rev = "v${version}-q0.0.5"; + sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8e6fa005635f..402af5d6f583 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl libxslt curl pcre libxml2 ] - ++ stdenv.lib.optional withMysql mysql + ++ stdenv.lib.optional withMysql mysql.connector-c ++ stdenv.lib.optional withSqlite sqlite ++ stdenv.lib.optional withPostgresql postgresql ++ stdenv.lib.optional withBdb db; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 8bef305a0ecc..d65fdc833960 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,16 +1,13 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.5.1"; + version = "0.5.6"; name = "libre-${version}"; - src=fetchurl { + src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1qs6gpflgwic2pp1nplhhyl585h9q0kf74h5z29ajr5ij0j65rsa"; + sha256 = "0sfz5c7b05crahblanrrvwca092qaqzhjkbkva58jbqnmlk9h4d3"; }; - buildInputs = [zlib openssl]; - makeFlags = [ - "USE_ZLIB=1" "USE_OPENSSL=1" - ''PREFIX=$(out)'' - ] + buildInputs = [ zlib openssl ]; + makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index a3e98d260cea..f6e041e57322 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.5.2"; name = "librem-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "1n1ajy1ccw0xw6bndad4js2pnj977s2angzs7lawadh7x5wnalbb"; + sha256 = "1sv4986yyq42irk9alwp20gc3r5y0r6kix15sl8qmljgxn0lxigv"; }; buildInputs = [zlib openssl libre]; makeFlags = [ diff --git a/pkgs/development/libraries/librep/setup-hook.sh b/pkgs/development/libraries/librep/setup-hook.sh index 420d63d6c513..4d875b693304 100644 --- a/pkgs/development/libraries/librep/setup-hook.sh +++ b/pkgs/development/libraries/librep/setup-hook.sh @@ -2,4 +2,4 @@ addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } -envHooks+=(addRepDLLoadPath) +addEnvHooks "$hostOffset" addRepDLLoadPath diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 812847ea123b..90f0afa5796c 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libserialport-0.1.1"; src = fetchurl { - url = "http://sigrok.org/download/source/libserialport/${name}.tar.gz"; + url = "https://sigrok.org/download/source/libserialport/${name}.tar.gz"; sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; # macOS, Windows and Android is also supported (according to upstream). platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index c8751c3e5dd4..49cdb2c95ba0 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of GTK+ widgets"; - homepage = http://blog.chipx86.com/tag/libsexy/; + homepage = https://blog.chipx86.com/tag/libsexy/; license = licenses.lgpl21; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 4a309a87f2ec..f6bfff78fa26 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -10,11 +10,6 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"; }; - patches = [(fetchpatch { - url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain" - + "/debian/patches/0002-Enforce-c-11-via-pkg-config.patch?id=d451a4d195b1"; - sha256 = "19g19473syp2z3kg8vdrli89lm9kcvaqajkqfmdig1vfpkbq0nci"; - })]; nativeBuildInputs = [ pkgconfig gnum4 ]; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 8e1079bfbc8a..4a13bfd9994b 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; meta = { homepage = http://www.gnu.org/software/libsigsegv/; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index fc5b41ac607f..5e36d0688694 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, fetchFromGitHub, - libtool, intltool, pkgconfig, + libtool, gettext, pkgconfig, vala, gnome_common, gobjectIntrospection, - libgee_0_8, json_glib, skk-dicts }: + libgee, json_glib, skk-dicts }: stdenv.mkDerivation rec { name = "libskk-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "ueno"; repo = "libskk"; - rev = "6a232e75de6d5dbe543ab17c9b85dc7560093509"; - sha256 = "1xa9akf95jyi4laiw1llnjdpfq5skhidm7dnkd0i0ds6npzzqnxc"; + rev = version; + sha256 = "092bjir866f350s4prq9q0yg34s91vmr8wbgf2vh3kcax1yj1axm"; }; buildInputs = [ skk-dicts ]; - nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool intltool pkgconfig ]; - propagatedBuildInputs = [ libgee_0_8 json_glib ]; + nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ]; + propagatedBuildInputs = [ libgee json_glib ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 18d18941b887..7803b2a5ff11 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; }; - buildInputs = [ cmake alsaLib libjack2 libpulseaudio ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libjack2 libpulseaudio ] + ++ stdenv.lib.optional stdenv.isLinux alsaLib + ++ stdenv.lib.optional stdenv.isDarwin AudioUnit; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; meta = with stdenv.lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index cdf24c79e5ef..e8d48bf668b3 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig +{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig , gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection , valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: let majorVersion = "2.60"; - version = "${majorVersion}.0"; + version = "${majorVersion}.2"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "b324edbecda0884143c0853b4a2bd5bd37fb3761f12f293c621ff34b9acdc84c"; + sha256 = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01"; }; prePatch = '' @@ -22,6 +22,15 @@ stdenv.mkDerivation { substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" ''; + patches = [ + # remove for >= 2.60.3 + (fetchpatch { + name = "buffer-overflow.patch"; # https://bugzilla.gnome.org/show_bug.cgi?id=788037 + url = "https://git.gnome.org/browse/libsoup/patch/?id=b79689833ba"; + sha256 = "1azbk540mbm4c6ip54ixbg9d6w7nkls9y81fzm3csq9a5786r3d3"; + }) + ]; + outputs = [ "out" "dev" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index a2e94c33ce32..7d9ea25e9d26 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { version = "1.0.18"; src = fetchurl { - url = "http://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; + url = "https://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; sha256 = "9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492"; }; meta = { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; - homepage = http://www.libsrs2.org/; + homepage = https://www.libsrs2.org/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 036bb806f687..72d73e358485 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { - homepage = http://www.i-scream.org/libstatgrab/; + homepage = https://www.i-scream.org/libstatgrab/; description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/libstdc++5/default.nix index baea981ca4a1..5c0e7c9bdfa4 100644 --- a/pkgs/development/libraries/libstdc++5/default.nix +++ b/pkgs/development/libraries/libstdc++5/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { # being generated to make sure that they use our glibc. EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before)" for i in $extraLDFlags; do EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i" done diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index a366baf27e33..8d3d2f4c60c7 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.20"; src = fetchurl { - url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; + url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for support vector machines"; - homepage = http://www.csie.ntu.edu.tw/~cjlin/libsvm/; + homepage = https://www.csie.ntu.edu.tw/~cjlin/libsvm/; license = licenses.bsd3; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 7fa53fe162b2..ccdc3aba6118 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ perl texinfo ]; + nativeBuildInputs = [ texinfo ]; + buildInputs = [ perl ]; doCheck = true; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ee21f3df7ac9..0f95b6d34c77 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix deleted file mode 100644 index fbd30ac04f76..000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ /dev/null @@ -1,13 +0,0 @@ -args@{ callPackage, fetchpatch, ... }: - -callPackage (import ./generic.nix { - version = "1.0.11"; - sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; - patches = [ - # Compatibility with new Boost - (fetchpatch { - url = "https://github.com/arvidn/libtorrent/commit/7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2.patch"; - sha256 = "07agbrii6i8q4wmgpqbln7ldhhadaf5npcinvi6hnyipsr48jbj5"; - }) - ]; -}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ff5027fd472e..00ec22986179 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ args@{ callPackage, ... }: callPackage (import ./generic.nix { - version = "1.1.5"; - sha256 = "1ifpcqw5mj2dwk23lhc2vpb47mg3j573v5z4zp8dkczpz7wg5jxq"; + version = "1.1.6"; + sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7"; }) args diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index af9c38a96346..a742be3c1e4d 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libtoxcore-${version}"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "TokTok"; repo = "c-toxcore"; rev = "v${version}"; - sha256 = "1d3f7lnlxra2lhih838bvlahxqv50j35g9kfyzspq971sb5z30mv"; + sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; }; cmakeFlags = [ @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; + description = "P2P FOSS instant messaging application aimed to replace Skype"; + homepage = https://tox.chat; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libtoxcore/old-api.nix b/pkgs/development/libraries/libtoxcore/old-api.nix deleted file mode 100644 index 5757e94559a8..000000000000 --- a/pkgs/development/libraries/libtoxcore/old-api.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus -, libvpx, check, libconfig, pkgconfig }: - -let - version = "4c220e336330213b151a0c20307d0a1fce04ac9e"; - date = "20150126"; - -in stdenv.mkDerivation rec { - name = "tox-core-old-${date}-${builtins.substring 0 7 version}"; - - src = fetchFromGitHub { - owner = "irungentoo"; - repo = "toxcore"; - rev = version; - sha256 = "152yamak9ykl8dgkx1qzyrpa3f4xr1s8lgcb5k58r9lb1iwnhvqc"; - }; - - NIX_LDFLAGS = "-lgcc_s"; - - postPatch = '' - # within Nix chroot builds, localhost is unresolvable - sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \ - auto_tests/network_test.c - # takes WAAAY too long (~10 minutes) and would timeout - sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \ - auto_tests/tox_test.c - ''; - - configureFlags = [ - "--with-libsodium-headers=${libsodium.dev}/include" - "--with-libsodium-libs=${libsodium.out}/lib" - "--enable-ntox" - "--enable-daemon" - ]; - - buildInputs = [ - autoreconfHook libsodium ncurses - check libconfig pkgconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ - libopus - ]; - - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; - - # Some tests fail randomly due to timeout. This kind of problem is well known - # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} - # They don't recommend running tests on 50core machines with other cpu-bound - # tests running in parallel. - # - # NOTE: run the tests locally on your machine before upgrading this package! - doCheck = false; - - meta = with stdenv.lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric jgeerds ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 683682cf8ea2..b0d6598fc63d 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-host; - description = "A C library and command-line tool thati mplements the host-side of the U2F protocol"; + 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/libunistring/clang.patch b/pkgs/development/libraries/libunistring/clang.patch deleted file mode 100644 index fdcbc0d528d0..000000000000 --- a/pkgs/development/libraries/libunistring/clang.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/stdint.in.h b/lib/stdint.in.h -index 997e406..e0827f5 100644 ---- a/lib/stdint.in.h -+++ b/lib/stdint.in.h -@@ -53,7 +53,8 @@ - in would reinclude us, skipping our contents because - _GL_STDINT_H is defined. - The include_next requires a split double-inclusion guard. */ --# @INCLUDE_NEXT@ @NEXT_STDINT_H@ -+# include -+// # @INCLUDE_NEXT@ @NEXT_STDINT_H@ - #endif - - #if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 42376b61f423..e1b8c04b4ce5 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,28 +1,25 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libunistring-0.9.7"; + name = "libunistring-${version}"; + version = "0.9.8"; src = fetchurl { url = "mirror://gnu/libunistring/${name}.tar.gz"; - sha256 = "1ra1baz2187kbw9im47g6kqb5mx9plq703mkjxaval8rxv5q3q4w"; + sha256 = "1x9wnpzg7vxyjpnzab6vw0afbcijfbd57qrrkqrppynh0nyz54mp"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch stdenv.secure-format-patch ]; - outputs = [ "out" "dev" "info" "doc" ]; propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - enableParallelBuilding = false; - configureFlags = [ "--with-libiconv-prefix=${libiconv}" ]; - # XXX: There are test failures on non-GNU systems, see - # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html . - doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform); + doCheck = true; + + enableParallelBuilding = true; meta = { homepage = http://www.gnu.org/software/libunistring/; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix deleted file mode 100644 index 66890f08ff3e..000000000000 --- a/pkgs/development/libraries/libunity/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, vala_0_23, python, intltool, pkgconfig -, glib, libgee_0_6, gtk3, dee, libdbusmenu-glib -}: - -stdenv.mkDerivation rec { - name = "libunity-${version}"; - version = "6.12.0"; - - src = fetchurl { - url = "https://launchpad.net/libunity/6.0/${version}/+download/${name}.tar.gz"; - sha256 = "1nadapl3390x98q1wv2yarh60hzi7ck0d1s8zz9xsiq3zz6msbjd"; - }; - - buildInputs = [ glib libgee_0_6 gtk3 ]; - propagatedBuildInputs = [ dee libdbusmenu-glib ]; - nativeBuildInputs = [ vala_0_23 python intltool pkgconfig ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A library for instrumenting- and integrating with all aspects of the Unity shell"; - homepage = https://launchpad.net/libunity; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index ba745010504b..4075505f8dd8 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.16.1"; + version = "1.18.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "06p3xy276spqbr9xzbs7qlpdk34qsn87s2qmp6xn4j7v3bnqja7z"; + sha256 = "0s71c2y4ll3vp463hsdk74q4hr7wprkxc2a4agw3za2hhzcb95pd"; }; postPatch = let diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix new file mode 100644 index 000000000000..fad721059124 --- /dev/null +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +, libdrm, libva +}: + +stdenv.mkDerivation rec { + name = "libva-utils-${version}"; + inherit (libva) version; + + src = fetchFromGitHub { + owner = "01org"; + repo = "libva-utils"; + rev = version; + sha256 = "02n51cvp8bzzjk4fargwvgh7z71y8spg24hqgaawbp3p3ahh7xxi"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libdrm libva ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "VAAPI tools: Video Acceleration API"; + homepage = http://www.freedesktop.org/wiki/Software/vaapi; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 031ac781651c..dca548a6f9d0 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,36 +1,43 @@ -{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +, libXext, libdrm, libXfixes, wayland, libffi, libX11 , mesa_noglu , minimal ? true, libva }: stdenv.mkDerivation rec { - name = "libva-${version}"; - version = "1.7.3"; + name = "libva-${lib.optionalString (!minimal) "full-"}${version}"; + version = "2.0.0"; - src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; + src = fetchFromGitHub { + owner = "01org"; + repo = "libva"; + rev = version; + sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy"; }; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "dev" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them - configureFlags = - [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++ - lib.optionals (!minimal) [ "--enable-glx" ]; + enableParallelBuilding = true; - installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + configureFlags = [ + "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" + ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; + + installFlags = [ + "dummy_drv_video_ladir=$(out)/lib/dri" + ]; meta = with stdenv.lib; { + description = "VAAPI library: Video Acceleration API"; homepage = http://www.freedesktop.org/wiki/Software/vaapi; license = licenses.mit; - description = "VAAPI library: Video Acceleration API"; - platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index ceb42fe2bfc3..eccee83fa85e 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libvdpau-1.1.1"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "moduledir=$(out)/lib/vdpau" ]; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~aplattner/vdpau/; + homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index e41ab5fe5a33..83b2983d9c4b 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -16,7 +16,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor + python pygobject2 gobjectIntrospection libcap_ng numactl libapparmor + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + xen ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ff72cc84d265..2dbf80e71f77 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,19 +4,19 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen, zfs, parted, qemu +, curl, libiconv, gmp, xen, zfs, parted }: with stdenv.lib; -# if you update, also bump pythonPackages.libvirt or it will break +# if you update, also bump or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1y83z4jb2by6ara0nw4sivh7svqcrw97yfhqwdscxl4y10saisvk"; + sha256 = "03kb37iv3dvvdlslznlc0njvjpmq082lczmsslz5p4fcwb50kwfz"; }; patches = [ ./build-on-bsd.patch ]; @@ -27,9 +27,11 @@ stdenv.mkDerivation rec { libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs - libapparmor libcap_ng numactl xen attr parted + libapparmor libcap_ng numactl attr parted + ] ++ optionals (stdenv.isLinux && stdenv.isx86_64) [ + xen ] ++ optionals stdenv.isDarwin [ - libiconv gmp + libiconv gmp ]; preConfigure = optionalString stdenv.isLinux '' @@ -39,8 +41,6 @@ stdenv.mkDerivation rec { # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations - substituteInPlace src/qemu/qemu_capabilities.c \ - --replace '"/usr/libexec/qemu-kvm"' '"/run/libvirt/nix-emulators/${if stdenv.isAarch64 then "qemu-system-aarch64" else "qemu-kvm"}"' substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' '' + '' @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl qemu ]} + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl ]} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 682fcca98a36..f8d61536bef4 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://xiph.org/vorbis/; + homepage = https://xiph.org/vorbis/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 4b50fe090e38..1e96ff9bb1ad 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = http://www.webmproject.org/; + homepage = https://www.webmproject.org/; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix new file mode 100644 index 000000000000..925c1b6d083d --- /dev/null +++ b/pkgs/development/libraries/libxc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gfortran, perl }: + +let + version = "2.2.3"; +in stdenv.mkDerivation { + name = "libxc-${version}"; + src = fetchurl { + url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/libxc-${version}.tar.gz"; + sha256 = "1rv8vsf7zzw0g7j93rqcipzhk2pj1iq71bpkwf7zxivmgavh0arg"; + }; + + buildInputs = [ gfortran ]; + nativeBuildInputs = [ perl ]; + + preConfigure = '' + patchShebangs ./ + ''; + + configureFlags = [ "--enable-shared" ]; + + doCheck = true; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library of exchange-correlation functionals for density-functional theory"; + homepage = http://octopus-code.org/wiki/Libxc; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 850bb27e3641..131b64c1c7f2 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; src = fetchurl { - url = "http://www.nih.at/libzip/${name}.tar.gz"; + url = "https://www.nih.at/libzip/${name}.tar.gz"; sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.nih.at/libzip; + homepage = https://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 9aea42082c51..f5660e93d79a 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Distributed tracing system built on top of the OpenTracing standard"; - homepage = "http://lightstep.com/"; + homepage = "https://lightstep.com/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index e8f8a6ab9bba..df5cb7c67f38 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = true; # not cross; meta = with stdenv.lib; { description = "Real-time data (de)compression library"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2fe872701b70..e1fe061a9651 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.2.6"; + version = "17.2.8"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -81,7 +81,7 @@ 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 = "1pihiymglf3bf6w2vphac65v64hv71wgrj38mckbwc03c8j55n3a"; + sha256 = "0pq9kmmyllgd63d936f3x1zsg7sqaswx47khbn0gvbgari2h753f"; }; prePatch = "patchShebangs ."; @@ -214,7 +214,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; - homepage = http://www.mesa3d.org/; + homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ eduarrrd vcunat ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f3bdc005247c..7111a78381d1 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; + homepage = https://www.mltframework.org/; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 4cba89d9206f..2a933ef78401 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig which perl ]; - buildInputs = [ openssl zlib snappy ]; - propagatedBuildInputs = [ libbson ]; + buildInputs = [ openssl zlib ]; + propagatedBuildInputs = [ libbson snappy ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "The official C client library for MongoDB"; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index de8e5f786466..736c31b442a5 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "mp4v2-2.0.0"; @@ -18,10 +18,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + meta = { homepage = https://code.google.com/archive/p/mp4v2/; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mpl11; + platforms = lib.platforms.unix; + license = lib.licenses.mpl11; }; } diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 6be199af1930..fe364f22f9a3 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional hostPlatform.isSunOS "--disable-thread-safe" ++ stdenv.lib.optional hostPlatform.is64bit "--with-pic"; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 4e4ddfb63899..5a841f165cab 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.116.0"; src = fetchurl { - url = "http://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; + url = "https://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; sha256 = "1k7vnanpgawnj84x2xs6md57pfib9p7c3acngqzkl3c2aqw8qay0"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A flexible memory management and garbage collection library"; - homepage = "http://www.ravenbrook.com/project/mps"; + homepage = "https://www.ravenbrook.com/project/mps"; license = stdenv.lib.licenses.sleepycat; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index b8c7ff2f07d2..0dd7b37e1a66 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,18 +11,23 @@ }: stdenv.mkDerivation rec { - version = if abiVersion == "5" then "5.9" else "6.0-20170902"; + version = if abiVersion == "5" then "5.9" else "6.0-20171125"; name = "ncurses-${version}"; src = fetchurl (if abiVersion == "5" then { url = "mirror://gnu/ncurses/${name}.tar.gz"; sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; } else { - url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz"; - sha256 = "1cks4gsz4148jw6wpqia4w5jx7cfxr29g2kmpvp0ssmvwczh8dr4"; + urls = [ + "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz" + "https://invisible-mirror.net/archives/ncurses/current/${name}.tgz" + ]; + sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); - patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; + # Unnecessarily complicated in order to avoid mass-rebuilds + patches = lib.optional (!stdenv.cc.isClang || abiVersion == "5") ./clang.patch + ++ lib.optional (stdenv.cc.isGNU && abiVersion == "5") ./gcc-5.patch; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported @@ -37,10 +42,11 @@ stdenv.mkDerivation rec { # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (buildPlatform != hostPlatform) [ - buildPackages.ncurses buildPackages.stdenv.cc + buildPackages.ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index f1232d7d253a..c84cddc897c1 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. ''; - homepage = http://www.ntop.org/products/deep-packet-inspection/ndpi/; + homepage = https://www.ntop.org/products/deep-packet-inspection/ndpi/; license = with licenses; lgpl3; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index de9023a57106..d67fdc110f04 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; - homepage = http://www.unidata.ucar.edu/software/netcdf/; + homepage = https://www.unidata.ucar.edu/software/netcdf/; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/nettle/3.3.nix b/pkgs/development/libraries/nettle/3.3.nix deleted file mode 100644 index 3923daad6f4b..000000000000 --- a/pkgs/development/libraries/nettle/3.3.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "3.3"; - - src = fetchurl { - url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526"; - }; -}) diff --git a/pkgs/development/libraries/nss/ckpem.patch b/pkgs/development/libraries/nss/ckpem.patch new file mode 100644 index 000000000000..c1a65a6c0b28 --- /dev/null +++ b/pkgs/development/libraries/nss/ckpem.patch @@ -0,0 +1,11 @@ +--- nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:12.000000000 -0800 ++++ nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:20.000000000 -0800 +@@ -156,8 +156,6 @@ + NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; + NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; + +- PRBool logged_in; +- + /* our raw object data array */ + NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; + NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3e8ed856bfa8..47f5c1ef5cf9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch + ./ckpem.patch ]; patchFlags = "-p0"; @@ -45,7 +46,8 @@ in stdenv.mkDerivation rec { "NSS_ENABLE_ECC=1" "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" - ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; + ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1" + ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++"; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -84,15 +86,22 @@ in stdenv.mkDerivation rec { postFixup = '' for libname in freebl3 nssdbm3 softokn3 - do - libfile="$out/lib/lib$libname.so" - LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" + do '' + + (if stdenv.isDarwin + then '' + libfile="$out/lib/lib$libname.dylib" + DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '' else '' + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '') + '' + $out/bin/shlibsign -v -i "$libfile" done moveToOutput bin "$tools" moveToOutput bin/nss-config "$dev" moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example - rm "$out"/lib/*.a + rm -f "$out"/lib/*.a ''; meta = { diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index aba02827665b..a12d23ed5b1d 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; - homepage = http://www.ogre3d.org/; + homepage = https://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a9b3c85d3965..bcb3bde5ad7d 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -24,7 +24,7 @@ , enableTesseract ? false, tesseract, leptonica , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, QTKit +, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 }: let @@ -168,6 +168,8 @@ stdenv.mkDerivation rec { ++ 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 enableEigen eigen ++ lib.optional enableOpenblas openblas diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index aadd108620aa..cbac7210a10e 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.org/; + homepage = https://opencv.org/; license = licenses.bsd3; maintainers = with maintainers; [ viric ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 37afa3fd5070..48ec5141e34f 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export CPPFLAGS="-I${getDev mysql.client}/include/mysql" - export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib" + export CPPFLAGS="-I${mysql.connector-c}/include/mysql" + export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [ readline mysql.client postgresql sqlite ]; + buildInputs = [ readline mysql.connector-c postgresql sqlite ]; } diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 27a9860c8683..8d5a6bb65a91 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { name = "openexr-${lib.getVersion ilmbase}"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; + sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg"; }; + patches = [ + ./bootstrap.patch + ]; + outputs = [ "bin" "dev" "out" "doc" ]; preConfigure = '' @@ -20,8 +24,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./bootstrap.patch ]; - meta = with stdenv.lib; { homepage = http://www.openexr.com/; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/pkgs/development/libraries/openslp/CVE-2016-4912.patch new file mode 100644 index 000000000000..06223deda89b --- /dev/null +++ b/pkgs/development/libraries/openslp/CVE-2016-4912.patch @@ -0,0 +1,11 @@ +--- a/common/slp_xmalloc.c ++++ b/common/slp_xmalloc.c +@@ -206,7 +206,7 @@ void * _xrealloc(const char * file, int line, void * ptr, size_t size) + if (newptr == 0) + return 0; + memcpy(newptr, ptr, x->size); +- _xfree(file, line, x); ++ _xfree(file, line, ptr); + } + return newptr; + } diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 3ab3f68cde5e..3e178d92013e 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { url = "https://src.fedoraproject.org/cgit/rpms/openslp.git/plain/openslp-2.0.0-cve-2016-7567.patch"; sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; }) + ./CVE-2016-4912.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 68e88cc57d06..94c49af8c4f1 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, buildPackages, perl , hostPlatform +, fetchpatch , withCryptodev ? false, cryptodevHeaders , enableSSL2 ? false }: @@ -107,13 +108,20 @@ let in { openssl_1_0_2 = common { - version = "1.0.2m"; - sha256 = "03vvlfnxx4lhxc83ikfdl6jqph4h52y7lb7li03va6dkqrgg2vwc"; + version = "1.0.2n"; + sha256 = "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp"; }; openssl_1_1_0 = common { version = "1.1.0g"; sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; + patches = [ + (fetchpatch { + name = "CVE-2017-3738.patch"; + url = "https://github.com/openssl/openssl/commit/563066.patch"; + sha256 = "0ni9fwpxf8raw8b58pfa15akbqmxx4q64v0ldsm4b9dqhbxf8mkz"; + }) + ]; }; } diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index b179ca8803c1..1aa0f2684571 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -1,16 +1,20 @@ -{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, libxml2, curl, cmake, pam, sblim-sfcc }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { - version = "2.6.0"; name = "openwsman-${version}"; + version = "2.6.5"; - src = fetchurl { - url = "https://github.com/Openwsman/openwsman/archive/v${version}.tar.gz"; - sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4"; + src = fetchFromGitHub { + owner = "Openwsman"; + repo = "openwsman"; + rev = "v${version}"; + sha256 = "1r0zslgpcr4m20car4s3hsccy10xcb39qhpw3dhpjv42xsvvs5xv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool libxml2 curl cmake pam sblim-sfcc ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ curl libxml2 pam sblim-sfcc ]; cmakeFlags = [ "-DCMAKE_BUILD_RUBY_GEM=no" @@ -22,18 +26,13 @@ stdenv.mkDerivation rec { configureFlags = "--disable-more-warnings"; - meta = { - description = "Openwsman server implementation and client api with bindings"; - - homepage = https://github.com/Openwsman/openwsman; - downloadPage = "https://github.com/Openwsman/openwsman/releases"; - - maintainers = [ stdenv.lib.maintainers.deepfire ]; - - license = stdenv.lib.licenses.bsd3; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - + meta = with stdenv.lib; { + description = "Openwsman server implementation and client API with bindings"; + downloadPage = https://github.com/Openwsman/openwsman/releases; + homepage = https://openwsman.github.io; + license = licenses.bsd3; + maintainers = with maintainers; [ deepfire ]; + platforms = platforms.linux; # PAM is not available on Darwin inherit version; }; } diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index d0085752623d..1c629c137796 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -4,10 +4,12 @@ assert odbcSupport -> unixODBC != null; -let optional = stdenv.lib.optional; - optionalString = stdenv.lib.optionalString; - requireSource = version: part: hash: (requireFile rec { - name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; +with stdenv.lib; + +let + baseVersion = "12.2"; + requireSource = version: rel: part: hash: (requireFile rec { + name = "oracle-instantclient${baseVersion}-${part}-${version}-${rel}.x86_64.rpm"; message = '' This Nix expression requires that ${name} already be part of the store. Download the file @@ -24,13 +26,13 @@ let optional = stdenv.lib.optional; sha256 = hash; }); in stdenv.mkDerivation rec { - version = "12.1.0.2.0-1"; + version = "${baseVersion}.0.1.0"; name = "oracle-instantclient-${version}"; - srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed"); - srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296"); - srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam"); - srcOdbc = optionalString odbcSupport (requireSource version "odbc" "d3aa1a4957a2f15ced05921dab551ba823aa7925d8fcb58d5b3a7f624e4df063"); + srcBase = (requireSource version "1" "basic" "43c4bfa938af741ae0f9964a656f36a0700849f5780a2887c8e9f1be14fe8b66"); + srcDevel = (requireSource version "1" "devel" "4c7ad8d977f9f908e47c5e71ce56c2a40c7dc83cec8a5c106b9ff06d45bb3442"); + srcSqlplus = (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552"); + srcOdbc = optionalString odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1"); buildInputs = [ glibc patchelf rpmextract ] ++ optional odbcSupport unixODBC; @@ -41,15 +43,13 @@ in stdenv.mkDerivation rec { ${rpmextract}/bin/rpmextract "${srcBase}" ${rpmextract}/bin/rpmextract "${srcDevel}" ${rpmextract}/bin/rpmextract "${srcSqlplus}" - ${optionalString odbcSupport '' - ${rpmextract}/bin/rpmextract "${srcOdbc}" - ''} - + '' + optionalString odbcSupport ''${rpmextract}/bin/rpmextract ${srcOdbc} + '' + '' mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"} - mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/" - mv "usr/include/oracle/12.1/client64/"* "$out/include/" - mv "usr/lib/oracle/12.1/client64/lib/"* "$out/lib/" - mv "usr/lib/oracle/12.1/client64/bin/"* "$out/bin/" + mv "usr/share/oracle/${baseVersion}/client64/demo/"* "$out/share/${name}/demo/" + mv "usr/include/oracle/${baseVersion}/client64/"* "$out/include/" + mv "usr/lib/oracle/${baseVersion}/client64/lib/"* "$out/lib/" + mv "usr/lib/oracle/${baseVersion}/client64/bin/"* "$out/bin/" ln -s "$out/bin/sqlplus" "$out/bin/sqlplus64" for lib in $out/lib/lib*.so; do @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { command line SQL client. ''; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ pesterhazy ]; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e6055151301c..b34c9ff31f2c 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -33,6 +33,9 @@ in stdenv.mkDerivation rec { buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; + # https://bugs.exim.org/show_bug.cgi?id=2173 + patches = [ ./stacksize-detection.patch ]; + doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra diff --git a/pkgs/development/libraries/pcre/stacksize-detection.patch b/pkgs/development/libraries/pcre/stacksize-detection.patch new file mode 100644 index 000000000000..4bc97069b1e2 --- /dev/null +++ b/pkgs/development/libraries/pcre/stacksize-detection.patch @@ -0,0 +1,16 @@ +diff --git a/pcre_exec.c b/pcre_exec.c +--- a/pcre_exec.c ++++ b/pcre_exec.c +@@ -509,6 +509,12 @@ + (e.g. stopped by repeated call or recursion limit) + */ + ++#ifdef __GNUC__ ++static int ++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, ++ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, ++ unsigned int rdepth) __attribute__((noinline,noclone)); ++#endif + static int + match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, + PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 1a203172d2c8..93e0fa99c347 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph"; + sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 3e80e5758522..5d533d4250aa 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1qi7am60f2l4krd3sbj95mbzfk82lir0wy8z27yr9ncq6qcm48kp"; + sha256 = "1mvsa3v8d1pl2fj1dcdf8sikzm1yb2jcl0q34fyfsjw2cisxpv5f"; }; - postPatch = "patchShebangs ./src/Analyses/cat_with_lines"; - patches = [ ./darwin.patch # configure relies on impure sw_vers to -Dunix ]; @@ -29,6 +27,13 @@ stdenv.mkDerivation rec { buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; + preConfigure = '' + substituteInPlace bin/rivet-buildplugin.in \ + --replace '"which"' '"${which}/bin/which"' \ + --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ + --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " + ''; + preInstall = '' substituteInPlace bin/make-plots \ --replace '"which"' '"${which}/bin/which"' \ @@ -40,10 +45,6 @@ stdenv.mkDerivation rec { --replace '"convert"' '"${imagemagick.out}/bin/convert"' substituteInPlace bin/rivet \ --replace '"less"' '"${less}/bin/less"' - substituteInPlace bin/rivet-buildplugin \ - --replace '"which"' '"${which}/bin/which"' \ - --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ - --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " substituteInPlace bin/rivet-mkhtml \ --replace '"make-plots"' \"$out/bin/make-plots\" \ --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index dd1b33056468..7519d0da03fc 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, withRootSupport ? false }: +{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.6.7"; + version = "1.7.0"; src = fetchurl { url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "05jyv5dypa6d4q1m8wm2qycgq1i0bgzwzzm9qqdj0b43ff2kggra"; + sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk"; }; pythonPath = []; # python wrapper support buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ] ++ stdenv.lib.optional withRootSupport root; + propagatedBuildInputs = [ zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 0f971cff64d4..407559137370 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysql }: +{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }: stdenv.mkDerivation rec { name = "poco-${version}"; @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ]; + buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ]; cmakeFlags = [ - "-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql" "-DPOCO_UNBUNDLED=ON" ]; diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix new file mode 100644 index 000000000000..550d0b1bace2 --- /dev/null +++ b/pkgs/development/libraries/protobuf/2.5.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "2.5.0"; + # make sure you test also -A pythonPackages.protobuf + src = fetchurl { + url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; + sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; + }; +}) \ No newline at end of file diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix index 5c78c1a288f6..dd6037e68329 100644 --- a/pkgs/development/libraries/psol/default.nix +++ b/pkgs/development/libraries/psol/default.nix @@ -1,5 +1,5 @@ { callPackage }: callPackage ./generic.nix {} { - version = "1.11.33.4"; - sha256 = "1jq2llp0i4666rwqnx1hs4pjlpblxivvs1jkkjzlmdbsv28jzjq8"; + version = "1.13.35.1"; # Latest beta, 2017-11-08 + sha256 = "126823gpr3rdqakwixmr887rbvwhksr3xg14jnyzlp84q4hg1p0n"; } diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix index 3e82bb4975dc..c61926fe13fa 100644 --- a/pkgs/development/libraries/psol/generic.nix +++ b/pkgs/development/libraries/psol/generic.nix @@ -3,7 +3,7 @@ { inherit version; } // fetchzip { inherit sha256; name = "psol-${version}"; - url = "https://dl.google.com/dl/page-speed/psol/${version}.tar.gz"; + url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz"; meta = { description = "PageSpeed Optimization Libraries"; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 6d92de001cb7..1bc4fd1085e1 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include 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 369f328666da..488306fc1ce2 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 { [ ./glib-2.32.patch ./libressl.patch ./parallel-configure.patch + ./qt-4.8.7-unixmake-darwin.patch (substituteAll { src = ./dlopen-absolute-paths.diff; cups = if cups != null then stdenv.lib.getLib cups else null; @@ -76,7 +77,19 @@ stdenv.mkDerivation rec { glibc = stdenv.cc.libc.out; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; }) - ] ++ stdenv.lib.optional gtkStyle (substituteAll ({ + (fetchpatch { + name = "fix-medium-font.patch"; + url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" + + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; + sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; + }) + (fetchpatch { + name = "qt4-gcc6.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + }) + ] + ++ stdenv.lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter gtk = gtk2.out; @@ -93,20 +106,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl"; - }) - ++ [ - (fetchpatch { - name = "fix-medium-font.patch"; - url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" - + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; - sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; - }) - (fetchpatch { - name = "qt4-gcc6.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - }) - ]; + }); preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { buildInputs = [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] - ++ optionals (mysql != null) [ mysql.lib ] + ++ optionals (mysql != null) [ mysql.connector-c ] ++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; @@ -185,37 +185,8 @@ stdenv.mkDerivation rec { sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release ''; - installPhase = optionalString stdenv.isDarwin '' - runHook preInstall - cp -r lib $out - - mkdir -p $out/Applications - mv bin/*.app $out/Applications - rm -rf bin/*.app - - cp -r bin $out - - mkdir -p $out/share/doc/${name} - mkdir -p $out/lib - mkdir -p $out/lib/qt4/plugins - mkdir -p $out/lib/qt4/imports - mkdir -p $out/bin - mkdir -p $out/include - mkdir -p $out/share/${name} - - cp -r mkspecs $out/share/${name} - cp -r translations $out/share/${name} - cp -r tools/linguist/phrasebooks $out/share/${name} - cp tools/porting/src/q3porting.xml $out/share/${name} - - cp -r plugins $out/lib/qt4 - cp -r imports $out/lib/qt4 - cp -r doc/* $out/share/doc/${name} - runHook postInstall - ''; - - postInstall = optionalString (!stdenv.isDarwin) '' - rm -rf $out/tests + postInstall = '' + rm -rf $out/tests ''; crossAttrs = { diff --git a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh index bf716a72d0fc..f288e99dd12a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh +++ b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh @@ -3,6 +3,11 @@ qmakeConfigurePhase() { $QMAKE PREFIX=$out $qmakeFlags + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "qmake4Hook: enabled parallel building" + fi + runHook postConfigure } diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch b/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch new file mode 100644 index 000000000000..99a36a24fe43 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch @@ -0,0 +1,11 @@ +--- a/qmake/generators/unix/unixmake.cpp ++++ b/qmake/generators/unix/unixmake.cpp +@@ -831,7 +831,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) + else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP")) + ret += " " + var("QMAKE_STRIPFLAGS_APP"); + if(bundle) +- ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; ++ ret += " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; + else + ret += " \"" + dst_targ + "\""; + } diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 7930bd909aa5..9ad5af8eecd2 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -51,8 +51,8 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = - optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebengine = [ ./qtwebengine-seccomp.patch ] + ++ optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; qtwebkit = [ ./qtwebkit.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch new file mode 100644 index 000000000000..bf6af8059823 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch @@ -0,0 +1,24 @@ +Backported to Qt 5.6 for epoll_pwait fix on newer glibc +Part of upstream Chromium's 4e8083b4ab953ba298aedfc4e79d464be15e4012 +Review URL: https://codereview.chromium.org/1613883002 +--- +diff --git a/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +index 10278dc5fc9b..b30b3e6acef6 100644 +--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -414,6 +414,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { + case __NR_epoll_create: + case __NR_epoll_wait: + #endif ++ case __NR_epoll_pwait: + case __NR_epoll_create1: + case __NR_epoll_ctl: + return true; +@@ -421,7 +422,6 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { + #if defined(__x86_64__) + case __NR_epoll_ctl_old: + #endif +- case __NR_epoll_pwait: + #if defined(__x86_64__) + case __NR_epoll_wait_old: + #endif diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 0582a9f3f825..7bf61c98086a 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -91,6 +91,7 @@ let 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 {}; @@ -104,7 +105,7 @@ let qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets - qtx11extras qtxmlpatterns + qtx11extras qtxmlpatterns qtvirtualkeyboard ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 17d3db65849e..eef2c7d24dfc 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -10,6 +10,11 @@ qmakeConfigurePhase() { NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?} \ $qmakeFlags + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "qmake: enabled parallel building" + fi + runHook postConfigure } diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 8ec7eeda8aee..754a75cbef4f 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -42,11 +42,7 @@ qtEnvHook() { propagatedUserEnvPkgs+=" $1" fi } -if [ "$crossConfig" ]; then - crossEnvHooks+=(qtEnvHook) -else - envHooks+=(qtEnvHook) -fi +envHostTargetHooks+=(qtEnvHook) postPatchMkspecs() { local bin="${!outputBin}" diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 172b20bc51bb..5f65f71bbbaa 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { ) ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (mysql != null) mysql.connector-c ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index ae6bd18cb148..622d841b4051 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -1,4 +1,4 @@ -{ qtModule, lib, qtbase }: +{ qtModule, stdenv, lib, qtbase }: with lib; @@ -28,6 +28,8 @@ qtModule { "bin/qhelpgenerator" "bin/qtplugininfo" "bin/qthelpconverter" + ] ++ optionals stdenv.isDarwin [ + "bin/macdeployqt" ]; setupHook = ../hooks/qttools-setup-hook.sh; diff --git a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix new file mode 100644 index 000000000000..2ba720c8eedc --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix @@ -0,0 +1,6 @@ +{ qtModule, qtbase, qtdeclarative, qtsvg, hunspell }: + +qtModule { + name = "qtvirtualkeyboard"; + qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; +} diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix new file mode 100644 index 000000000000..2f0e39eb5c90 --- /dev/null +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: + +stdenv.mkDerivation rec { + name = "qtstyleplugin-kvantum-qt4-${version}"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "Kvantum"; + rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; + sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + }; + + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 libX11 libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + + buildPhase = '' + qmake kvantum.pro + make + ''; + + installPhase = '' + mkdir $TMP/kvantum + make INSTALL_ROOT="$TMP/kvantum" install + mv $TMP/kvantum/usr/ $out + mv $TMP/kvantum/${qt4}/lib $out + ''; + + meta = with stdenv.lib; { + description = "SVG-based Qt4 theme engine"; + homepage = "https://github.com/tsujan/Kvantum"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bugworm ]; + }; +} diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix new file mode 100644 index 000000000000..5085d9bf5ef9 --- /dev/null +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }: + +stdenv.mkDerivation rec { + name = "qtstyleplugin-kvantum-${version}"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "Kvantum"; + rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; + sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + + postInstall= '' + mkdir -p $out/$qtPluginPrefix/styles + mv $NIX_QT5_TMP/$qtPluginPrefix/styles/libkvantum.so $out/$qtPluginPrefix/styles/libkvantum.so + ''; + + meta = with stdenv.lib; { + description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; + homepage = "https://github.com/tsujan/Kvantum"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bugworm ]; + }; +} diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 1183f46b8db7..75c25e12d667 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; + configureFlags = + stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + [ # This test requires running host code + "bash_cv_wcwidth_broken=no" + ]; + patches = [ ./link-against-ncurses.patch ./no-arch_only-6.3.patch diff --git a/pkgs/development/libraries/rep-gtk/setup-hook.sh b/pkgs/development/libraries/rep-gtk/setup-hook.sh index 420d63d6c513..4d875b693304 100644 --- a/pkgs/development/libraries/rep-gtk/setup-hook.sh +++ b/pkgs/development/libraries/rep-gtk/setup-hook.sh @@ -2,4 +2,4 @@ addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } -envHooks+=(addRepDLLoadPath) +addEnvHooks "$hostOffset" addRepDLLoadPath diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 5cef2576b711..159bad4c68ea 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, path }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "safefile"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = '' cd ${toString ./.} - ${toString } default.nix + ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix ''; }; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 016cc6f0472f..ba0b8f4e996f 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,30 +1,28 @@ -{ fetchgit, stdenv, autoconf, automake, libtool, curl }: +{ stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { - version = "2.2.9"; name = "sblim-sfcc-${version}"; + version = "2.2.9"; # this is technically 2.2.9-preview - src = fetchgit { - url = "https://github.com/kkaempf/sblim-sfcc.git"; - rev = "f70fecb410a53531e4fe99d39cf81b581819cac9"; - sha256 = "1hsxim284qzldh599gf6khxj80g8q5263xl3lj3hdndxbhbs843v"; + src = fetchFromGitHub { + owner = "kkaempf"; + repo = "sblim-sfcc"; + rev = "514a76af2020fd6dc6fc380df76cbe27786a76a2"; + sha256 = "06c1mskl9ixbf26v88w0lvn6v2xd6n5f0jd5mckqrn9j4vmh70hs"; }; - preConfigure = "./autoconfiscate.sh"; + buildInputs = [ curl ]; - buildInputs = [ autoconf automake libtool curl ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Small Footprint CIM Client Library"; - - homepage = https://sourceforge.net/projects/sblim/; - - maintainers = [ stdenv.lib.maintainers.deepfire ]; - - license = stdenv.lib.licenses.cpl10; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - + homepage = https://sourceforge.net/projects/sblim/; + license = licenses.cpl10; + maintainers = with maintainers; [ deepfire ]; + platforms = platforms.unix; inherit version; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 574899d3a89c..d6e55e7bf73c 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -30,16 +30,16 @@ in }; cudnn_cudatoolkit8 = generic rec { - version = "7.0.3"; + version = "7.0.5"; cudatoolkit = cudatoolkit8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4"; + sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e"; }; cudnn_cudatoolkit9 = generic rec { - version = "7.0.3"; + version = "7.0.5"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09"; + sha256 = "1a3e076447d5b9860c73d9bebe7087ffcb7b0c8814fd1e506096435a2ad9ab0e"; }; } diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix new file mode 100644 index 000000000000..c4deccff5b7e --- /dev/null +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, gcc5, eject, cudatoolkit +}: + +stdenv.mkDerivation rec { + name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; + version = "1.3.4-1"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nccl"; + rev = "v${version}"; + sha256 = "0fvnrfn572lc6i2a3xyhbifm53ivcrr46z6cqr3b0bwb1iq79m7q"; + }; + + nativeBuildInputs = [ + gcc5 + eject + ]; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + makeFlags = [ + "PREFIX=$(out)" + "CUDA_HOME=${cudatoolkit}" + "CUDA_LIB=${cudatoolkit.lib}/lib" + ]; + + meta = with stdenv.lib; { + description = '' + NVIDIA Collective Communications Library. + Multi-GPU and multi-node collective communication primitives. + ''; + homepage = https://developer.nvidia.com/nccl; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 7edc39c11f5c..42eaf71942e7 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -12,6 +12,14 @@ let blas64_ = blas64; in let # 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"; + }; + armv7l-linux = { BINARY = "32"; TARGET = "ARMV7"; @@ -20,6 +28,14 @@ let USE_OPENMP = "1"; }; + aarch64-linux = { + BINARY = "64"; + TARGET = "ARMV8"; + DYNAMIC_ARCH = "1"; + CC = "gcc"; + USE_OPENMP = "1"; + }; + i686-linux = { BINARY = "32"; TARGET = "P2"; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 968550675235..96449a8ed962 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, pcre, pkgconfig, python }: +{ stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { name = "serd-${version}"; - version = "0.26.0"; + version = "0.28.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73"; + sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcre python ]; + nativeBuildInputs = [ pkgconfig python ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; + configurePhase = "python waf configure --prefix=$out"; - buildPhase = "${python.interpreter} waf"; + buildPhase = "python waf"; - installPhase = "${python.interpreter} waf install"; + installPhase = "python waf install"; 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 001199cd8212..81dff49571da 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${ if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" }" ${ - if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" + if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos.dev}\"" } ''; diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index 62b72d6dc0ab..3c7e91e81886 100644 --- a/pkgs/development/libraries/slib/setup-hook.sh +++ b/pkgs/development/libraries/slib/setup-hook.sh @@ -10,4 +10,4 @@ addSlibPath () { fi } -envHooks+=(addSlibPath) +addEnvHooks "$hostOffset" addSlibPath diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 5ce636e6f0ca..8f37302cec50 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -11,18 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2"; }; + patches = [ ./disable-benchmark.patch ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - # -DNDEBUG for speed - configureFlags = [ "CXXFLAGS=-DNDEBUG" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - # SIGILL on darwin - doCheck = !stdenv.isDarwin; - checkPhase = '' - (cd .. && ./build/snappy_unittest) - ''; + checkTarget = "test"; + + doCheck = true; meta = with stdenv.lib; { homepage = https://google.github.io/snappy/; diff --git a/pkgs/development/libraries/snappy/disable-benchmark.patch b/pkgs/development/libraries/snappy/disable-benchmark.patch new file mode 100644 index 000000000000..c891c13fe74c --- /dev/null +++ b/pkgs/development/libraries/snappy/disable-benchmark.patch @@ -0,0 +1,5 @@ +--- a/snappy-test.cc ++++ b/snappy-test.cc +@@ -46 +46 @@ +-DEFINE_bool(run_microbenchmarks, true, ++DEFINE_bool(run_microbenchmarks, false, diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 57f81aa4613e..995ac631580d 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, serd }: +{ stdenv, fetchurl, pkgconfig, python, serd, pcre }: stdenv.mkDerivation rec { name = "sord-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python serd ]; + buildInputs = [ python serd pcre ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index ee45c0d1c65a..b27fd0843bc0 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,29 +1,70 @@ -{ fetchurl, lib, stdenv, intltool, libtool, pkgconfig, glib, dotconf, libsndfile -, libao, python3Packages -, withEspeak ? false, espeak +{ stdenv, pkgconfig, fetchurl, python3Packages +, intltool, itstool, libtool, texinfo, autoreconfHook +, glib, dotconf, libsndfile +, withLibao ? true, libao +, withPulse ? false, libpulseaudio +, withAlsa ? false, alsaLib +, withOss ? false +, withFlite ? true, flite +# , withFestival ? false, festival-freebsoft-utils +, withEspeak ? true, espeak, sonic, pcaudiolib , withPico ? true, svox +# , withIvona ? false, libdumbtts }: -stdenv.mkDerivation rec { +let + inherit (stdenv.lib) optional optionals; + inherit (python3Packages) python pyxdg wrapPython; + + # speechd hard-codes espeak, even when built without support for it. + selectedDefaultModule = + if withEspeak then + "espeak-ng" + else if withPico then + "pico" + else if withFlite then + "flite" + else + throw "You need to enable at least one output module."; +in stdenv.mkDerivation rec { name = "speech-dispatcher-${version}"; - version = "0.8.5"; + version = "0.8.8"; src = fetchurl { url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; - sha256 = "18jlxnhlahyi6njc6l6576hfvmzivjjgfjyd2n7vvrvx9inphjrb"; + sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw"; }; - buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ] - ++ lib.optional withEspeak espeak - ++ lib.optional withPico svox; - nativeBuildInputs = [ pkgconfig python3Packages.wrapPython ]; + nativeBuildInputs = [ pkgconfig autoreconfHook intltool libtool itstool texinfo wrapPython ]; - hardeningDisable = [ "format" ]; + buildInputs = [ glib dotconf libsndfile libao libpulseaudio alsaLib python ] + ++ optionals withEspeak [ espeak sonic pcaudiolib ] + ++ optional withFlite flite + ++ optional withPico svox + # TODO: add flint/festival support with festival-freebsoft-utils package + # ++ optional withFestival festival-freebsoft-utils + # TODO: add Ivona support with libdumbtts package + # ++ optional withIvona libdumbtts + ; - pythonPath = with python3Packages; [ pyxdg ]; + pythonPath = [ pyxdg ]; - postPatch = lib.optionalString withPico '' - sed -i 's,/usr/share/pico/lang/,${svox}/share/pico/lang/,g' src/modules/pico.c + configureFlags = [ + # Audio method falls back from left to right. + "--with-default-audio-method=\"libao,pulse,alsa,oss\"" + ] ++ optional withPulse "--with-pulse" + ++ optional withAlsa "--with-alsa" + ++ optional withLibao "--with-libao" + ++ optional withOss "--with-oss" + ++ optional withEspeak "--with-espeak-ng" + ++ optional withPico "--with-pico" + # ++ optional withFestival "--with-flint" + # ++ optional withIvona "--with-ivona" + ; + + postPatch = '' + substituteInPlace config/speechd.conf --replace "DefaultModule espeak" "DefaultModule ${selectedDefaultModule}" + substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" ''; postInstall = '' @@ -32,8 +73,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common interface to speech synthesis"; - homepage = http://www.freebsoft.org/speechd; + homepage = https://devel.freebsoft.org/speechd; license = licenses.gpl2Plus; + maintainers = with maintainers; [ berce ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 602359965f12..173b460a0ab2 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.speex.org/; + homepage = https://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix deleted file mode 100644 index bbc3aa20dd60..000000000000 --- a/pkgs/development/libraries/swc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig -, wld, wayland, xwayland, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm -}: - -stdenv.mkDerivation rec { - name = "swc-${version}"; - version = "git-2016-02-09"; - repo = "https://github.com/michaelforney/swc"; - rev = "1da0ef13fddc572accea12439a4471b4d2f64ddd"; - - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "d1894612d8aa1ce828efb78f1570290f84bba6563e21eb777e08c3c3859b7bbe"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ wld wayland xwayland fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ]; - - prePatch = '' - substituteInPlace launch/local.mk --replace 4755 755 - ''; - - makeFlags = "PREFIX=$(out)"; - installPhase = "PREFIX=$out make install"; - - meta = { - description = "A library for making a simple Wayland compositor"; - homepage = repo; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 71b8a764eed1..1caa8a376fb1 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj"; }; - cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - nativeBuildInputs = [ cmake ]; meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 602aab852ccc..67db6e5097d0 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,24 +1,40 @@ -{stdenv, fetchurl, zlib, cmake}: +{stdenv, fetchurl, zlib, cmake, fetchpatch}: stdenv.mkDerivation rec { - name = "taglib-1.10"; + name = "taglib-1.11.1"; src = fetchurl { - url = "http://taglib.github.io/releases/${name}.tar.gz"; - sha256 = "1alv6vp72p0x9i9yscmz2a71anjwqy53y9pbcbqxvc1c0i82vhr4"; + url = "http://taglib.org/releases/${name}.tar.gz"; + sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; }; - cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; + patches = [ + (fetchpatch { + # https://github.com/taglib/taglib/issues/829 + name = "CVE-2017-12678.patch"; + url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; + sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; + }) + ]; - buildInputs = [ zlib ]; nativeBuildInputs = [ cmake ]; - meta = { - homepage = http://developer.kde.org/~wheeler/taglib.html; - repositories.git = git://github.com/taglib/taglib.git; + buildInputs = [ zlib ]; - description = "A library for reading and editing the meta-data of several popular audio formats"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + meta = with stdenv.lib; { + homepage = http://taglib.org/; + repositories.git = git://github.com/taglib/taglib.git; + description = "A library for reading and editing audio file metadata."; + longDescription = '' + TagLib is a library for reading and editing the meta-data of several + popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 + files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, + Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. + ''; + license = with licenses; [ lgpl3 mpl11 ]; inherit (cmake.meta) platforms; - maintainers = [ ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 93d69d5a8d99..18888df5c52b 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -4,51 +4,37 @@ let inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.6.1"; + name = "telepathy-qt-0.9.7"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9"; + sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; }; - patches = let - mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash; - in [ - (fetchpatch { - name = "gst-1.6.patch"; - url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; - sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; - }) - (fetchpatch { - name = "parallel-make-1.patch"; - url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e"; - sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw"; - }) - (fetchpatch { - name = "parallel-make-2.patch"; - url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5"; - sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57"; - }) - ]; - nativeBuildInputs = [ cmake pkgconfig python ]; - propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib dbus-python ]; + propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ]; + buildInputs = [ dbus_glib ]; + checkInputs = [ dbus_daemon dbus-python ]; - buildInputs = stdenv.lib.optional doCheck dbus_daemon; + patches = [ + # https://github.com/TelepathyIM/telepathy-qt/issues/25 + (fetchpatch { + url = https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch; + sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; + }) + ]; - cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; - - # should be removable after the next update - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; - - preBuild = '' - NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" - ''; + # No point in building tests if they are not run + # On 0.9.7, they do not even build with QT4 + cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; enableParallelBuilding = true; doCheck = false; # giving up for now - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Telepathy Qt bindings"; + homepage = https://telepathy.freedesktop.org/components/telepathy-qt/; + license = licenses.lgpl21; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index a0110c5f22b2..2a1180533cea 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C library for property-based testing"; platforms = stdenv.lib.platforms.linux; - homepage = "http://github.com/silentbicycle/theft/"; + homepage = "https://github.com/silentbicycle/theft/"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.kquick ]; }; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index d11a5c344c9d..75a494cfbded 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; - buildInputs = [ cxxtools postgresql mysql sqlite zlib openssl ]; + buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index fec256e703fe..5e08a61cd1bb 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xiph.org/tremor/; + homepage = https://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix new file mode 100644 index 000000000000..9f9d8e62de50 --- /dev/null +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, bash, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "unicorn-emulator-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz"; + sha256 = "0z01apwmvhvdldm372ww9pjfn45awkw3m90c0h4v0nj0ihmlysis"; + }; + + configurePhase = '' patchShebangs make.sh ''; + buildPhase = '' ./make.sh ''; + installPhase = '' env PREFIX=$out ./make.sh install ''; + + nativeBuildInputs = [ pkgconfig python ]; + enableParallelBuilding = true; + + meta = { + description = "Lightweight multi-platform CPU emulator library"; + homepage = "http://www.unicorn-engine.org"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 233fdd902541..badcb7e661bb 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -37,19 +37,12 @@ }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC mariadb.lib ]; + buildInputs = [ unixODBC mariadb.connector-c ]; cmakeFlags = [ - "-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql" + "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" ]; - preConfigure = '' - sed -i \ - -e 's,mariadb_config,mysql_config,g' \ - -e 's,libmariadbclient,libmysqlclient,g' \ - cmake/FindMariaDB.cmake - ''; - passthru = { fancyName = "MariaDB"; driver = "lib/libmyodbc3-3.51.12.so"; @@ -60,7 +53,6 @@ homepage = https://downloads.mariadb.org/connector-odbc/; license = licenses.gpl2; platforms = platforms.linux; - broken = true; }; }; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index c2cd5a015168..4d49fdce3a92 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -7,13 +7,11 @@ assert readline != null; let - arch = if stdenv.isArm - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; + arch = if stdenv.isx86_64 then "x64" + else if stdenv.isi686 then "ia32" + else if stdenv.isAarch64 then "arm64" + else if stdenv.isArm then "arm" + else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; sharedFlag = if static then "static_library" else "shared_library"; @@ -172,6 +170,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + # the `libv8_libplatform` target is _only_ built as a static library, # and is expected to be statically linked in when needed. # see the following link for further commentary: diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 49f638a7bc56..7bd036cf2e5a 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, gnum4, pkgconfig, python2 +{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 , intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext }: stdenv.mkDerivation rec { name = "intel-vaapi-driver-${version}"; - version = "1.8.2"; + inherit (libva) version; - src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46"; + src = fetchFromGitHub { + owner = "01org"; + repo = "libva-intel-driver"; + rev = version; + sha256 = "1832nnva3d33wv52bj59bv62q7a807sdxjqqq0my7l9x7a4qdkzz"; }; patchPhase = '' @@ -25,12 +27,14 @@ stdenv.mkDerivation rec { "--enable-wayland" ]; - nativeBuildInputs = [ gnum4 pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { - homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; + homepage = https://cgit.freedesktop.org/vaapi/intel-driver/; license = licenses.mit; description = "Intel driver for the VAAPI library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 4522ecc1bb63..f0089110c3c8 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { - homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + homepage = https://cgit.freedesktop.org/vaapi/vdpau-driver/; license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 324d977c72e5..438b4eda454b 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; - homepage = http://hci.iwr.uni-heidelberg.de/vigra; + homepage = https://hci.iwr.uni-heidelberg.de/vigra; license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 9bef1b27e9cd..e0398487abc3 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.vmime.org/; + homepage = https://www.vmime.org/; description = "Free mail library for C++"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index ccdf2b05e7e3..18b9278539fc 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; - homepage = http://github.com/VMML/vmmlib/; + homepage = https://github.com/VMML/vmmlib/; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8330f7f44f33..5110dd1db647 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,12 +3,12 @@ libXext, wayland, mesa_noglu, makeWrapper }: let - version = "1.0.42.2"; + version = "1.0.61.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; - sha256 = "0na1ax2cgv6w29213mby56mndfsj3iizj3n5pbpy4s4p7ij9kdgn"; + sha256 = "043kw6wnrpdplnb40x6n9rgf3gygsn9jiv91y458sydbhalfr945"; }; in @@ -48,11 +48,12 @@ stdenv.mkDerivation rec { sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ + mkdir -p $demos/share/vulkan-demos + cp demos/*.spv demos/*.ppm $demos/share/vulkan-demos mkdir -p $demos/bin - cp demos/*.spv demos/*.ppm $demos/bin - find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \; + find demos -type f -executable -not -name vulkaninfo -exec cp -v {} $demos/bin \; for p in cube cubepp; do - wrapProgram $demos/bin/$p --run "cd $demos/bin" + wrapProgram $demos/bin/$p --run "cd $demos/share/vulkan-demos" done ''; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 5def37b791cf..a5b7a6a99ce4 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.14.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ codyopel wkennington ]; diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index bc9bdb223abb..1899234fc560 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -1,22 +1,25 @@ { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls -, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core +, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite +, enableGtk2Plugins ? false, gtk2 ? null , gst-plugins-base, gst-plugins-bad }: assert enableGeoLocation -> geoclue2 != null; +assert enableGtk2Plugins -> gtk2 != null; +assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.18.3"; + version = "2.18.4"; meta = { description = "Web content rendering engine, GTK+ port"; - homepage = http://webkitgtk.org/; + homepage = https://webkitgtk.org/; license = licenses.bsd2; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; @@ -42,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "17lgn7qwrwqxl1lgmq5icvzmna6aymx4c7al47rp0vvac7hj0m71"; + sha256 = "1f1j0r996l20cgkvbwpizn7d4yp58cy334b1pvn4kfb5c2dbpdl7"; }; # see if we can clean this up.... @@ -59,14 +62,13 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ] + ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" ++ optionals stdenv.isDarwin [ "-DUSE_SYSTEM_MALLOC=ON" "-DUSE_ACCELERATE=0" "-DENABLE_INTROSPECTION=ON" "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - "-DENABLE_MINIBROWSER=OFF" "-DENABLE_VIDEO=ON" "-DENABLE_QUARTZ_TARGET=ON" "-DENABLE_X11_TARGET=OFF" @@ -85,10 +87,11 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn + libwebp enchant libnotify gnutls pcre nettle libidn 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 xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] ++ optional stdenv.isLinux wayland; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index fbfc460db96d..8a0ec2523b94 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://www.zaphoyd.com/websocketpp/; + homepage = https://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 79bd8bb96659..c32f0a3b9384 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,30 +1,44 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap +, xcbutilwm, libX11, libcap, xcbutilimage }: let pname = "wlroots"; - version = "unstable-2017-10-31"; + version = "unstable-2017-12-22"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; - rev = "7200d643363e988edf6777c38e7f8fcd451a2c50"; - sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac"; + rev = "0a370c529806077a11638e7fa856d5fbb539496b"; + sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6"; }; # TODO: Temporary workaround for compilation errors - patches = [ ./libdrm.patch ./no-werror.patch ]; + patches = [ ./libdrm.patch ]; #./no-werror.patch + + # $out for the library and $bin for rootston + outputs = [ "out" "bin" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap + xcbutilwm libX11 libcap xcbutilimage ]; + # Install rootston (the reference compositor) to $bin + postInstall = '' + mkdir -p $bin/bin + cp rootston/rootston $bin/bin/ + mkdir $bin/lib + cp libwlroots.so $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 + ''; + meta = with stdenv.lib; { description = "A modular Wayland compositor library"; inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 3adf4f1497f8..37819c2a98e3 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,42 +1,56 @@ -{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu -, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, doxygen, qt48Full, libharu +, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pcre }: -stdenv.mkDerivation rec { - name = "wt-${version}"; - version = "4.0.0"; +let + generic = + { version, sha256 }: + stdenv.mkDerivation rec { + name = "wt-${version}"; - src = fetchFromGitHub { - owner = "kdeforche"; - repo = "wt"; - rev = version; - sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; + src = fetchFromGitHub { + owner = "kdeforche"; + repo = "wt"; + rev = version; + inherit sha256; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost165 doxygen qt48Full libharu + pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew + openssl pcre + ]; + + cmakeFlags = [ + "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" + "-DWT_CPP_11_MODE=-std=c++11" + "-DGM_PREFIX=${graphicsmagick}" + "-DMYSQL_PREFIX=${mysql.connector-c}" + "--no-warn-unused-cli" + ]; + + meta = with stdenv.lib; { + homepage = https://www.webtoolkit.eu/wt; + description = "C++ library for developing web applications"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ juliendehos willibutz ]; + }; + }; +in { + wt3 = generic { + # with the next version update the version pinning of boost should be omitted + version = "3.3.9"; + sha256 = "1mkflhvzzzxkc5yzvr6nk34j0ldpwxjxb6n7xml59h3j3px3ixjm"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysql postgresql graphicsmagick glew - openssl pcre - ]; - - cmakeFlags = [ - "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" - "-DWT_CPP_11_MODE=-std=c++11" - "-DGM_PREFIX=${graphicsmagick}" - "-DMYSQL_PREFIX=${libmysql.dev}" - "--no-warn-unused-cli" - ]; - - meta = with stdenv.lib; { - homepage = https://www.webtoolkit.eu/wt; - description = "C++ library for developing web applications"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = [ maintainers.juliendehos ]; + wt4 = generic { + # with the next version update the version pinning of boost should be omitted + version = "4.0.2"; + sha256 = "0r729gjd1sy0pcmir2r7ga33mp5cr5b4gvf44852q65hw2577w1x"; }; } - diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index a06003997845..49f12842533b 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; meta = with stdenv.lib; { - homepage = http://utelle.github.io/wxsqlite3/ ; + homepage = https://utelle.github.io/wxsqlite3/ ; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix new file mode 100644 index 000000000000..4b410a307bb4 --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchFromGitHub +, wxGTK30 +}: + +with stdenv.lib; + +wxGTK30.overrideAttrs (oldAttrs : rec { + name = "wxwidgets-${version}"; + version = "3.1.0"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + sha256 = "14kl1rsngm70v3mbyv1mal15iz2b18k97avjx8jn7s81znha1c7f"; + }; +}) \ No newline at end of file diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 29d7ddf1fdc9..418829e7af8a 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "05rxbnfcc8yl05q3xqkl1kk90k7zn5ih305r46dxnzjaa2djalrf"; + sha256 = "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 23fee81e0a52..482c765dcda9 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -27,7 +27,7 @@ let meta = with stdenv.lib; { description = "Search engine library"; - homepage = http://xapian.org/; + homepage = https://xapian.org/; license = licenses.gpl2Plus; maintainers = with maintainers; [ chaoflow ]; platforms = platforms.unix; @@ -36,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_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6"; + xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5"; } diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 2923bfc1fc68..09c2171945e4 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l"; + sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; }; buildInputs = [ xapian perl pcre zlib libmagic ]; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 81ac75489baf..17f8646b5177 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XCB cursor library (libxcursor port)"; - homepage = http://cgit.freedesktop.org/xcb/util-cursor; + homepage = https://cgit.freedesktop.org/xcb/util-cursor; license = licenses.mit; - maintainer = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 030246db3185..eea0fb727b01 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.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "09317g4zkalp3k11x6vbidcm4qf02ciml1wxgp3742lrlgcblgxy"; + sha256 = "1yadf4vz4m49lpwwwscxs6wf4v9dgqgxkwgwpby9lvb4pv8qbmaf"; }; nativeBuildInputs = [ cmake asciidoc ]; diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index 7ac8c70d59f8..eb6052d58db5 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -31,7 +31,7 @@ collectNixLispLDLP () { export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF -envHooks+=(addASDFPaths setLisp collectNixLispLDLP) +addEnvHooks "$targetOffset" addASDFPaths setLisp collectNixLispLDLP mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home" mkdir -p "$HOME"/.cache/common-lisp diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index a5d19ab0c160..d0731fc574ad 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -69,7 +69,7 @@ let lispPackages = rec { deps = []; system-info = quicklisp-to-nix-system-info; buildPhase = '' - ${sbcl}/bin/sbcl --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/ql-to-nix.lisp --eval '(ql-to-nix::dump-image)' + ${clwrapper}/bin/cl-wrapper.sh "${sbcl}/bin/sbcl" --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/ql-to-nix.lisp --eval '(ql-to-nix::dump-image)' ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 0f9761b0fcfb..09113bc30bb8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -30,6 +30,12 @@ in configurePhase = '' export makeFlags="$makeFlags LISP=common-lisp.sh" ''; + preInstall = '' + type gcc + mkdir -p "$out/lib/common-lisp/" + cp -r . "$out/lib/common-lisp/cl-fuse/" + "gcc" "-x" "c" "$out/lib/common-lisp/cl-fuse/fuse-launcher.c-minus" "-fPIC" "--shared" "-lfuse" "-o" "$out/lib/common-lisp/cl-fuse/libfuse-launcher.so" + ''; }; }; hunchentoot = addNativeLibs [pkgs.openssl]; @@ -47,11 +53,11 @@ in cl-async-ssl = addNativeLibs [pkgs.openssl]; cl-async-test = addNativeLibs [pkgs.openssl]; clsql = x: { - propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; + propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql" ''; }; }; diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index b29ba53159e6..d3cb7b36aeeb 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -5,11 +5,11 @@ self = rec { env = buildEnv { name = name; paths = buildInputs; }; buildInputs = [ gcc stdenv - openssl fuse libuv mariadb libfixposix libev sqlite + openssl fuse libuv mysql.connector-c libfixposix libev sqlite freetds lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index e074a4c46468..692f61cec747 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip; - sha256 = "1sik243xqx7kbdddcq3va8h8q2wijf9ffhgp752hx725x3pjh9ss"; + sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index bc99837d27af..fe75655c02bd 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "26.0.0"; + version = "26.0.2"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "02z5fxxdwd6359wmqdag9vvszdq49sm78cvfskqap18xa83q484h"; + sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; - sha256 = "13mcyi9l0mmmjr056z1i3rhpb4641iv0a5ky7ij0v8hwsb5r5lwq"; + sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56"; } else throw "System ${stdenv.system} not supported!"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd $out unzip $src cd platform-tools - + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' for i in adb dmtracedump fastboot hprof-conv sqlite3 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 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 @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { ln -sf $out/platform-tools/$i $out/bin/$i done ''; - + buildInputs = [ unzip ]; } diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 0c1bb5d4d42d..be4fc0f7f545 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0c9c3e3f42ca..660f1bbccabb 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ -{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, xcodeBaseDir}: -{ name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null +{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, file, xcodeBaseDir}: +{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "10.2" +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -19,6 +19,7 @@ let deleteKeychain = '' security default-keychain -s login.keychain security delete-keychain $keychainName + rm -f $HOME/lock-keychain ''; # On macOS, the java executable shows an -unoffical postfix in the version @@ -47,9 +48,11 @@ stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [ nodejs titanium alloy jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' + ${preBuild} + export HOME=$TMPDIR ${stdenv.lib.optionalString (tiVersion != null) '' @@ -77,9 +80,9 @@ stdenv.mkDerivation { export JAVA_HOME=${javaVersionFixWrapper} javac -version ''} - - titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec - + + 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 ${if release then @@ -129,7 +132,18 @@ stdenv.mkDerivation { then ln -s ${titaniumsdk}/modules modules fi - + + # Take precautions to prevent concurrent builds blocking the keychain + while [ -f $HOME/lock-keychain ] + do + echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..." + sleep 3 + done + + touch $HOME/lock-keychain + + security default-keychain -s $keychainName + # Do the actual build titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out @@ -184,10 +198,10 @@ stdenv.mkDerivation { '' cp -av build/iphone/build/* $out mkdir -p $out/nix-support - echo "file binary-dist \"$(echo $out/Products/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products + echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products ${stdenv.lib.optionalString enableWirelessDistribution '' - appname=$(basename $out/Products/Release-iphoneos/*.ipa .ipa) + 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') diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6ca4c441e640..031fe3b18c6b 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.3.1.GA"}: rec { androidenv = pkgs.androidenv; @@ -9,9 +9,7 @@ rec { } else null; titaniumsdk = let - titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix - else if tiVersion == "5.2.3.GA" then ./titaniumsdk-5.2.nix - else if tiVersion == "6.0.2.GA" then ./titaniumsdk-6.0.nix + titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -19,8 +17,8 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv python which jdk nodejs; - inherit (pkgs.nodePackages_4_x) titanium alloy; + inherit (pkgs) stdenv python which file jdk nodejs; + inherit (pkgs.nodePackages_6_x) alloy titanium; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; inherit titaniumsdk xcodeBaseDir; diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 3c5d3a018ec8..5753c8d7da97 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,10 +1,10 @@ { nixpkgs ? , systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "8.2.1" +, xcodeVersion ? "9.2" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "6.0.2.GA" +, tiVersion ? "6.3.1.GA" , rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "10.2" +, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 4abf650ebee1..5849ee368c1b 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,5 +1,5 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.2.GA", release ? false -, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1" +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "6.3.1.GA", release ? false +, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -9,9 +9,9 @@ let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; rev = "ec9edebf35030f61368000a8a9071dd7a0773884"; - sha256 = "1j41w4nhcbl40x550pjgabqrach80f9dybv7ya32771wnw2000iy"; + sha256 = "3e020004b73c9c2386f2672fdf9203083295f1524f5e504a07842e062de181c8"; }; - + # Rename the bundle id to something else renamedSrc = stdenv.mkDerivation { name = "KitchenSink-renamedsrc"; @@ -29,14 +29,17 @@ 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/titaniumsdk-5.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix deleted file mode 100644 index 670e55e0f304..000000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: - -stdenv.mkDerivation { - name = "mobilesdk-5.1.2.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-linux.zip; - sha256 = "013ipqwkfqj60mn09jbbf6a9mc4pjrn0kr0ix906whzb888zz6bv"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-osx.zip; - sha256 = "1ylwh7zxa5yfyckzn3a9zc4cmh8gdndgb3jyr61s3j7zb1whn9ww"; - } - 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 * 5.1.2.GA - cd * - - # Hack to make dx.jar work with new build-tools - sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js - - # 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/titaniumenv/titaniumsdk-5.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix deleted file mode 100644 index 511e8f0301b2..000000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: - -stdenv.mkDerivation { - name = "mobilesdk-5.2.3.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-linux.zip; - sha256 = "1acvkj3nrkgf9ch4js0pnjnwq5x6ddc15pkcanshp1zlc41z16gj"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-osx.zip; - sha256 = "04l7mrwiy3il2kzxz6sbfmczkqlkcrnwwndfzi8h5dzgh1672b7d"; - } - 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 * 5.2.3.GA - cd * - - # Hack to make dx.jar work with new build-tools - #sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js - - # 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/titaniumenv/titaniumsdk-6.0.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix similarity index 70% rename from pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix rename to pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix index fdaaff394534..fac8af2b6f7e 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "mobilesdk-6.0.2.GA"; + name = "mobilesdk-6.3.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-linux.zip; - sha256 = "1yjhr4fgjnxfxzwmgw71yynrfzhsjqj2cirjr5rd14zlp4q9751q"; + url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-linux.zip; + sha256 = "0g8dqqf5ffa7ll3rqm5naywipnv2vvfxcj9fmqg1wnvvxf0rflqj"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-osx.zip; - sha256 = "1ijd1wp56ygy238xpcffy112akim208wbv5zm901dvych83ibw1c"; + url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-osx.zip; + sha256 = "00bm8vv70mg4kd7jvmxd1bfqafv6zdpdx816i0hvf801zwnak4nj"; } else throw "Platform: ${stdenv.system} not supported!"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - mv * 6.0.2.GA + mv * 6.3.1.GA cd * # Patch some executables diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index bbbe1728ee5d..d208f26ab670 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, xcodewrapper}: { name , src -, sdkVersion ? "10.2" +, sdkVersion ? "11.2" , target ? null , configuration ? null , scheme ? null @@ -80,8 +80,10 @@ stdenv.mkDerivation { ''} # 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 + 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 generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} - + ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' # Produce an IPA file diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index afe430df383a..b3b9dbdf07ac 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv, version ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app"}: rec { xcodewrapper = import ./xcodewrapper.nix { diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 79f180759b09..17a203ed12be 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -17,6 +17,23 @@ is that a new package should be added to the collection for the latest stable LT release (which is currently 6.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 +build system it uses. Here are some examples: + +* `node-gyp` +* `node-gyp-builder` +* `node-pre-gyp` + +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-v6.nix`: + +```nix +dat = nodePackages.dat.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; +}); +``` + To add a package from NPM to nixpkgs: 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index f63ae1ef7503..2d9f1ae4217a 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! +# This file has been generated by node2nix 1.5.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 4d4f68cf50ca..9396c59be692 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! +# This file has been generated by node2nix 1.5.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix new file mode 100644 index 000000000000..c96c1ec2cbea --- /dev/null +++ b/pkgs/development/node-packages/composition-v8.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.5.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages-v8.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 179629ddfa69..5fc007bbfd09 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -6,6 +6,10 @@ let }; in nodePackages // { + dat = nodePackages.dat.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; + }); + dnschain = nodePackages.dnschain.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; postInstall = '' @@ -16,7 +20,7 @@ nodePackages // { node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); - + phantomjs = nodePackages.phantomjs.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix new file mode 100644 index 000000000000..ed0477a639a7 --- /dev/null +++ b/pkgs/development/node-packages/default-v8.nix @@ -0,0 +1,75 @@ +{pkgs, system, nodejs, stdenv}: + +let + nodePackages = import ./composition-v8.nix { + inherit pkgs system nodejs; + }; +in +nodePackages // { + dat = nodePackages.dat.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; + }); + + dnschain = nodePackages.dnschain.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin + ''; + }); + + node-inspector = nodePackages.node-inspector.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; + }); + + phantomjs = nodePackages.phantomjs.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); + + webdrvr = nodePackages.webdrvr.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + + preRebuild = '' + mkdir $TMPDIR/webdrvr + + ln -s ${pkgs.fetchurl { + url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; + sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; + }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar + ln -s ${pkgs.fetchurl { + url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; + sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; + }} $TMPDIR/webdrvr/chromedriver_linux64.zip + ''; + + dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. + }); + + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { + postInstall = "npm run-script prepublish"; + }; + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} + done + ''; + }); + + ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + preRebuild = '' + tmp=$(mktemp -d) + ln -s /usr/bin/xcodebuild $tmp + export PATH="$PATH:$tmp" + ''; + }); + + fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { + preRebuild = '' + # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore + sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js + ''; + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); +} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 9fa7929df686..5ce63dd882fe 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -4,3 +4,4 @@ rm -f node-env.nix node2nix -i node-packages-v4.json -o node-packages-v4.nix -c composition-v4.nix node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix +node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 33073e55ce56..15bc6c638d9f 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -194,9 +194,126 @@ let mv node-* $out ''; - # Builds and composes an NPM package including all its dependencies - buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args: + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args: + + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { name = "node-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; @@ -242,14 +359,25 @@ let export HOME=$TMPDIR cd "${packageName}" runHook preRebuild - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + ${stdenv.lib.optionalString bypassCache '' + if [ ! -f package-lock.json ] + then + echo "No package-lock.json file found, reconstructing..." + node ${reconstructPackageLock} + fi + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild if [ "$dontNpmInstall" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install fi # Create symlink to the deployed executable folder, if applicable @@ -278,8 +406,10 @@ let }); # Builds a development shell - buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, ... }@args: + buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args: let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + nodeDependencies = stdenv.mkDerivation { name = "node-dependencies-${name}-${version}"; @@ -299,6 +429,12 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." @@ -312,13 +448,23 @@ let export HOME=$PWD - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + ${stdenv.lib.optionalString bypassCache '' + if [ ! -f package-lock.json ] + then + echo "No package-lock.json file found, reconstructing..." + node ${reconstructPackageLock} + fi + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild ${stdenv.lib.optionalString (!dontNpmInstall) '' # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install ''} cd .. diff --git a/pkgs/development/node-packages/node-packages-v4.json b/pkgs/development/node-packages/node-packages-v4.json index c178f0fde820..b1349773a73d 100644 --- a/pkgs/development/node-packages/node-packages-v4.json +++ b/pkgs/development/node-packages/node-packages-v4.json @@ -6,5 +6,4 @@ , "node-inspector" , "node-pre-gyp" , "npm" -, "titanium" ] diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 14fcf145ddd1..c86e76cda151 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! +# This file has been generated by node2nix 1.5.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -175,22 +175,22 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "interpret-1.0.4" = { + "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz"; - sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; }; }; - "liftoff-2.3.0" = { + "liftoff-2.5.0" = { name = "liftoff"; packageName = "liftoff"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz"; - sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; + sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; "minimist-1.2.0" = { @@ -346,13 +346,13 @@ let sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; }; }; - "fancy-log-1.3.0" = { + "fancy-log-1.3.2" = { name = "fancy-log"; packageName = "fancy-log"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz"; - sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948"; + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; + sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; }; }; "gulplog-1.0.0" = { @@ -454,6 +454,24 @@ let sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; }; }; + "ansi-gray-0.1.1" = { + name = "ansi-gray"; + packageName = "ansi-gray"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; + sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; + }; + }; "time-stamp-1.1.0" = { name = "time-stamp"; packageName = "time-stamp"; @@ -463,6 +481,15 @@ let sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; }; }; + "ansi-wrap-0.1.0" = { + name = "ansi-wrap"; + packageName = "ansi-wrap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; + }; + }; "glogg-1.0.0" = { name = "glogg"; packageName = "glogg"; @@ -724,13 +751,13 @@ let sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; }; }; - "findup-sync-0.4.3" = { + "findup-sync-2.0.0" = { name = "findup-sync"; packageName = "findup-sync"; - version = "0.4.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz"; - sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; "fined-1.1.0" = { @@ -742,40 +769,31 @@ let sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; - "flagged-respawn-0.3.2" = { + "flagged-respawn-1.0.0" = { name = "flagged-respawn"; packageName = "flagged-respawn"; - version = "0.3.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz"; - sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5"; + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; + sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; }; }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; }; }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; + "object.map-1.0.1" = { + name = "object.map"; + packageName = "object.map"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; - }; - }; - "lodash.mapvalues-4.6.0" = { - name = "lodash.mapvalues"; - packageName = "lodash.mapvalues"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; - sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; }; }; "rechoir-0.6.2" = { @@ -796,157 +814,166 @@ let sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; }; }; - "detect-file-0.1.0" = { + "detect-file-1.0.0" = { name = "detect-file"; packageName = "detect-file"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz"; - sha1 = "4935dedfd9488648e006b0129566e9386711ea63"; - }; - }; - "is-glob-2.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; - sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; - }; - }; - "micromatch-2.3.11" = { - name = "micromatch"; - packageName = "micromatch"; - version = "2.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; - sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; - }; - }; - "resolve-dir-0.1.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz"; - sha1 = "b219259a5602fac5c5c496ad894a6e8cc430261e"; - }; - }; - "fs-exists-sync-0.1.0" = { - name = "fs-exists-sync"; - packageName = "fs-exists-sync"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"; - sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; - }; - }; - "is-extglob-1.0.0" = { - name = "is-extglob"; - packageName = "is-extglob"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; - sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; }; }; - "arr-diff-2.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "2.0.0"; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; - sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; }; }; - "array-unique-0.2.1" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.2.1"; + "micromatch-3.1.4" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; - sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.4.tgz"; + sha512 = "1z55bzyr3xwhvk8wbclnfjsbzwivqf9whb7k84gd8ljwfzmhsra430ikzd3p0nzxk90ybqas0c4bl6j4l1q5iyyz99h584q4az6sm4h"; }; }; - "braces-1.8.5" = { - name = "braces"; - packageName = "braces"; - version = "1.8.5"; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; - sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; }; }; - "expand-brackets-0.1.5" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; - }; - }; - "extglob-0.3.2" = { - name = "extglob"; - packageName = "extglob"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; - sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; - }; - }; - "filename-regex-2.0.1" = { - name = "filename-regex"; - packageName = "filename-regex"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; - sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "normalize-path-2.1.1" = { - name = "normalize-path"; - packageName = "normalize-path"; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "object.omit-2.0.1" = { - name = "object.omit"; - packageName = "object.omit"; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "braces-2.3.0" = { + name = "braces"; + packageName = "braces"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; + sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; - sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "parse-glob-3.0.4" = { - name = "parse-glob"; - packageName = "parse-glob"; - version = "3.0.4"; + "extglob-2.0.3" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; - sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz"; + sha512 = "31zb5fc59ps76hnxlnrcmm3lkv4pjd3cw55h5h7r9pn1q259bs15hw0bn4gp8kn91qwabgbj0cwkx9pxp8fgsj3ljlvmfv0xijnsah3"; }; }; - "regex-cache-0.4.4" = { - name = "regex-cache"; - packageName = "regex-cache"; - version = "0.4.4"; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; + }; + }; + "nanomatch-1.2.6" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.6.tgz"; + sha512 = "014pd4mh3hhi0gmrpss462ivnr8ic21ihmyjs4rx6v5prf5mw2zqzhsxbinx2mxiy4kc7wlw5w052bi18y6rgxq7l2pangg4r69g7jq"; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "regex-not-1.0.0" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; + sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; + }; + }; + "snapdragon-0.8.1" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; + sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; + }; + }; + "to-regex-3.0.1" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; + sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; }; }; "arr-flatten-1.1.0" = { @@ -958,22 +985,22 @@ let sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; - "expand-range-1.8.2" = { - name = "expand-range"; - packageName = "expand-range"; - version = "1.8.2"; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; - sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; - "preserve-0.2.0" = { - name = "preserve"; - packageName = "preserve"; - version = "0.2.0"; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; - sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; "repeat-element-1.1.2" = { @@ -985,49 +1012,22 @@ let sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; }; }; - "fill-range-2.2.3" = { - name = "fill-range"; - packageName = "fill-range"; - version = "2.2.3"; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; - sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; }; }; - "is-number-2.1.0" = { - name = "is-number"; - packageName = "is-number"; - version = "2.1.0"; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; - sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; - }; - }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - }; - "randomatic-1.1.7" = { - name = "randomatic"; - packageName = "randomatic"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; - sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; }; }; "is-number-3.0.0" = { @@ -1039,13 +1039,31 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; - "kind-of-4.0.0" = { + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "kind-of-3.2.2" = { name = "kind-of"; packageName = "kind-of"; - version = "4.0.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; }; }; "is-buffer-1.1.6" = { @@ -1057,31 +1075,67 @@ let sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; - "is-posix-bracket-0.1.1" = { - name = "is-posix-bracket"; - packageName = "is-posix-bracket"; - version = "0.1.1"; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; }; }; - "remove-trailing-separator-1.1.0" = { - name = "remove-trailing-separator"; - packageName = "remove-trailing-separator"; - version = "1.1.0"; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; - "for-own-0.1.5" = { - name = "for-own"; - packageName = "for-own"; - version = "0.1.5"; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; - sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; }; }; "is-extendable-0.1.1" = { @@ -1093,6 +1147,375 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "is-odd-1.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; + sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-resolve-0.5.1" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; + sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; + }; + }; + "use-2.0.2" = { + name = "use"; + packageName = "use"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; + sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + }; + }; + "class-utils-0.3.5" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz"; + sha1 = "17e793103750f9627b2176ea34cfd1b565903c80"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "mixin-deep-1.3.0" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; + sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "lazy-cache-2.0.2" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; + sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "set-getter-0.1.0" = { + name = "set-getter"; + packageName = "set-getter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; + sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; "for-in-1.0.2" = { name = "for-in"; packageName = "for-in"; @@ -1102,94 +1525,67 @@ let sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; }; }; - "glob-base-0.3.0" = { - name = "glob-base"; - packageName = "glob-base"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; - sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; - }; - }; - "is-dotfile-1.0.3" = { - name = "is-dotfile"; - packageName = "is-dotfile"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; - sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; - }; - }; - "glob-parent-2.0.0" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; - sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; - }; - }; - "is-equal-shallow-0.1.3" = { - name = "is-equal-shallow"; - packageName = "is-equal-shallow"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; - sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; - }; - }; - "is-primitive-2.0.0" = { - name = "is-primitive"; - packageName = "is-primitive"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; - sha1 = "207bab91638499c07b2adf240a41a87210034575"; - }; - }; - "expand-tilde-1.2.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz"; - sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; - }; - }; - "global-modules-0.2.3" = { - name = "global-modules"; - packageName = "global-modules"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"; - sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "global-prefix-0.1.5" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz"; - sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; - }; - }; - "is-windows-0.2.0" = { - name = "is-windows"; - packageName = "is-windows"; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; - sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "atob-2.0.3" = { + name = "atob"; + packageName = "atob"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; + sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; }; }; "homedir-polyfill-1.0.1" = { @@ -1201,6 +1597,33 @@ let sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; }; }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "is-windows-1.0.1" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; + sha1 = "310db70f742d259a16a369202b51af84233310d9"; + }; + }; "ini-1.3.5" = { name = "ini"; packageName = "ini"; @@ -1219,15 +1642,6 @@ let sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; }; }; - "parse-passwd-1.0.0" = { - name = "parse-passwd"; - packageName = "parse-passwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; - }; - }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -1237,24 +1651,6 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; - }; - }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; - }; - }; "object.defaults-1.1.0" = { name = "object.defaults"; packageName = "object.defaults"; @@ -1264,31 +1660,13 @@ let sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "object.pick-1.3.0" = { - name = "object.pick"; - packageName = "object.pick"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; - }; - }; - "parse-filepath-1.0.1" = { + "parse-filepath-1.0.2" = { name = "parse-filepath"; packageName = "parse-filepath"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz"; - sha1 = "159d6155d43904d16c10ef698911da1e91969b73"; - }; - }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; }; }; "array-each-1.0.1" = { @@ -1300,13 +1678,13 @@ let sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; }; }; - "array-slice-1.0.0" = { + "array-slice-1.1.0" = { name = "array-slice"; packageName = "array-slice"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; - sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; + sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; }; }; "for-own-1.0.0" = { @@ -1318,22 +1696,13 @@ let sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; }; }; - "is-absolute-0.2.6" = { + "is-absolute-1.0.0" = { name = "is-absolute"; packageName = "is-absolute"; - version = "0.2.6"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; - sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; - }; - }; - "map-cache-0.2.2" = { - name = "map-cache"; - packageName = "map-cache"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; }; }; "path-root-0.1.1" = { @@ -1345,22 +1714,22 @@ let sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; }; }; - "is-relative-0.2.1" = { + "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; - sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; }; }; - "is-unc-path-0.1.2" = { + "is-unc-path-1.0.0" = { name = "is-unc-path"; packageName = "is-unc-path"; - version = "0.1.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; - sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; }; }; "unc-path-regex-0.1.2" = { @@ -1381,6 +1750,15 @@ let sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; }; }; + "make-iterator-1.0.0" = { + name = "make-iterator"; + packageName = "make-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; + sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; + }; + }; "path-parse-1.0.5" = { name = "path-parse"; packageName = "path-parse"; @@ -1426,6 +1804,15 @@ let sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; }; }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; "user-home-1.1.1" = { name = "user-home"; packageName = "user-home"; @@ -1642,13 +2029,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "natives-1.1.0" = { + "natives-1.1.1" = { name = "natives"; packageName = "natives"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz"; - sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; + url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; + sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; }; }; "minimist-0.0.8" = { @@ -2119,13 +2506,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-5.5.0" = { + "ajv-5.5.2" = { name = "ajv"; packageName = "ajv"; - version = "5.5.0"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz"; - sha1 = "eb2840746e9dc48bd5e063a36e3fd400c5eab5a9"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; "har-schema-2.0.0" = { @@ -2380,15 +2767,6 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; - }; - }; "express-4.16.2" = { name = "express"; packageName = "express"; @@ -2947,15 +3325,6 @@ let sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; }; }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; "accepts-1.3.4" = { name = "accepts"; packageName = "accepts"; @@ -3649,519 +4018,6 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "adm-zip-0.4.7" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; - }; - }; - "async-2.1.2" = { - name = "async"; - packageName = "async"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; - sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; - }; - }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; - }; - }; - "fields-0.1.24" = { - name = "fields"; - packageName = "fields"; - version = "0.1.24"; - src = fetchurl { - url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz"; - sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3"; - }; - }; - "humanize-0.0.9" = { - name = "humanize"; - packageName = "humanize"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; - sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; - }; - }; - "longjohn-0.2.11" = { - name = "longjohn"; - packageName = "longjohn"; - version = "0.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; - sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; - }; - }; - "moment-2.16.0" = { - name = "moment"; - packageName = "moment"; - version = "2.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; - sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; - }; - }; - "node-appc-0.2.41" = { - name = "node-appc"; - packageName = "node-appc"; - version = "0.2.41"; - src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz"; - sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52"; - }; - }; - "request-2.79.0" = { - name = "request"; - packageName = "request"; - version = "2.79.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; - }; - }; - "sprintf-0.1.5" = { - name = "sprintf"; - packageName = "sprintf"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; - sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; - }; - }; - "temp-0.8.3" = { - name = "temp"; - packageName = "temp"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; - sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; - }; - }; - "winston-1.1.2" = { - name = "winston"; - packageName = "winston"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; - sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; - }; - }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "colors-0.6.2" = { - name = "colors"; - packageName = "colors"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - }; - "keypress-0.2.1" = { - name = "keypress"; - packageName = "keypress"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; - sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; - }; - }; - "source-map-support-0.3.2" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz"; - sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1"; - }; - }; - "source-map-0.1.32" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.32"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; - "async-2.1.4" = { - name = "async"; - packageName = "async"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; - sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; - }; - }; - "diff-3.2.0" = { - name = "diff"; - packageName = "diff"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; - }; - }; - "node-uuid-1.4.7" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - }; - "optimist-0.6.1" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - }; - "wrench-1.5.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; - sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; - }; - }; - "uglify-js-2.7.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; - }; - }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - }; - "minimist-0.0.10" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; - "caseless-0.11.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; - }; - }; - "har-validator-2.0.6" = { - name = "har-validator"; - packageName = "har-validator"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; - }; - }; - "qs-6.3.2" = { - name = "qs"; - packageName = "qs"; - version = "6.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; - sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; - }; - }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; - }; - }; - "commander-2.12.1" = { - name = "commander"; - packageName = "commander"; - version = "2.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.1.tgz"; - sha512 = "36cb2mrf9piidjbqiz8krwx7r9hikgirjxzfrbyk3hd39xpmg489lia9d3cmzci80sx99428hg960sz9j5b72fn7pi928z5289ln8rw"; - }; - }; - "is-my-json-valid-2.16.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz"; - sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51"; - }; - }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "async-1.0.0" = { - name = "async"; - packageName = "async"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; - sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; - }; - }; - "colors-1.0.3" = { - name = "colors"; - packageName = "colors"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; - }; - }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - }; - "eyes-0.1.8" = { - name = "eyes"; - packageName = "eyes"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - }; - "pkginfo-0.3.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - }; - "stack-trace-0.0.10" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; - }; - }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; - }; - }; }; in { @@ -4180,6 +4036,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; @@ -4235,6 +4092,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; gulp = nodeEnv.buildNodePackage { name = "gulp"; @@ -4270,8 +4128,14 @@ in sources."array-uniq-1.0.3" sources."beeper-1.1.1" sources."dateformat-2.2.0" - (sources."fancy-log-1.3.0" // { + (sources."fancy-log-1.3.2" // { dependencies = [ + (sources."ansi-gray-0.1.1" // { + dependencies = [ + sources."ansi-wrap-0.1.0" + ]; + }) + sources."color-support-1.1.3" sources."time-stamp-1.1.0" ]; }) @@ -4356,45 +4220,96 @@ in }) ]; }) - sources."interpret-1.0.4" - (sources."liftoff-2.3.0" // { + sources."interpret-1.1.0" + (sources."liftoff-2.5.0" // { dependencies = [ sources."extend-3.0.1" - (sources."findup-sync-0.4.3" // { + (sources."findup-sync-2.0.0" // { dependencies = [ - (sources."detect-file-0.1.0" // { + sources."detect-file-1.0.0" + (sources."is-glob-3.1.0" // { dependencies = [ - sources."fs-exists-sync-0.1.0" + sources."is-extglob-2.1.1" ]; }) - (sources."is-glob-2.0.1" // { + (sources."micromatch-3.1.4" // { dependencies = [ - sources."is-extglob-1.0.0" - ]; - }) - (sources."micromatch-2.3.11" // { - dependencies = [ - (sources."arr-diff-2.0.0" // { + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.0" // { dependencies = [ sources."arr-flatten-1.1.0" - ]; - }) - sources."array-unique-0.2.1" - (sources."braces-1.8.5" // { - dependencies = [ - (sources."expand-range-1.8.2" // { + (sources."fill-range-4.0.0" // { dependencies = [ - (sources."fill-range-2.2.3" // { + (sources."is-number-3.0.0" // { dependencies = [ - sources."is-number-2.1.0" - (sources."isobject-2.1.0" // { + (sources."kind-of-3.2.2" // { dependencies = [ - sources."isarray-1.0.0" + sources."is-buffer-1.1.6" ]; }) - (sources."randomatic-1.1.7" // { + ]; + }) + sources."repeat-string-1.6.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."isobject-3.0.1" + sources."repeat-element-1.1.2" + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + (sources."kind-of-3.2.2" // { dependencies = [ - (sources."is-number-3.0.0" // { + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + ]; + }) + (sources."split-string-3.1.0" // { + dependencies = [ + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."assign-symbols-1.0.0" + sources."is-extendable-1.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."define-property-1.0.0" // { + dependencies = [ + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + ]; + }) + ]; + }) + (sources."extend-shallow-2.0.1" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + (sources."extglob-2.0.3" // { + dependencies = [ + (sources."expand-brackets-2.1.4" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-descriptor-0.1.6" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ (sources."kind-of-3.2.2" // { dependencies = [ @@ -4403,81 +4318,335 @@ in }) ]; }) - (sources."kind-of-4.0.0" // { + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + sources."posix-character-classes-0.1.1" + ]; + }) + ]; + }) + (sources."fragment-cache-0.2.1" // { + dependencies = [ + sources."map-cache-0.2.2" + ]; + }) + sources."kind-of-6.0.2" + (sources."nanomatch-1.2.6" // { + dependencies = [ + (sources."is-odd-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + ]; + }) + sources."kind-of-5.1.0" + ]; + }) + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."regex-not-1.0.0" + (sources."snapdragon-0.8.1" // { + dependencies = [ + (sources."base-0.11.2" // { + dependencies = [ + (sources."cache-base-1.0.1" // { + dependencies = [ + (sources."collection-visit-1.0.0" // { + dependencies = [ + sources."map-visit-1.0.0" + sources."object-visit-1.0.1" + ]; + }) + sources."get-value-2.0.6" + (sources."has-value-1.0.0" // { + dependencies = [ + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + (sources."kind-of-4.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + ]; + }) + (sources."set-value-2.0.0" // { + dependencies = [ + sources."is-extendable-0.1.1" + (sources."split-string-3.1.0" // { + dependencies = [ + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."assign-symbols-1.0.0" + sources."is-extendable-1.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."to-object-path-0.3.0" // { + dependencies = [ + (sources."kind-of-3.2.2" // { dependencies = [ sources."is-buffer-1.1.6" ]; }) ]; }) - sources."repeat-string-1.6.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."arr-union-3.1.0" + sources."is-extendable-0.1.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."has-values-0.1.4" + (sources."isobject-2.1.0" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."class-utils-0.3.5" // { + dependencies = [ + sources."arr-union-3.1.0" + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-descriptor-0.1.6" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."lazy-cache-2.0.2" // { + dependencies = [ + (sources."set-getter-0.1.0" // { + dependencies = [ + (sources."to-object-path-0.3.0" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."static-extend-0.1.2" // { + dependencies = [ + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."copy-descriptor-0.1.1" + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."component-emitter-1.2.1" + (sources."define-property-1.0.0" // { + dependencies = [ + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + ]; + }) + ]; + }) + sources."isobject-3.0.1" + (sources."mixin-deep-1.3.0" // { + dependencies = [ + sources."for-in-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."pascalcase-0.1.1" + ]; + }) + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-descriptor-0.1.6" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + sources."kind-of-5.1.0" ]; }) ]; }) - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - ]; - }) - (sources."expand-brackets-0.1.5" // { - dependencies = [ - sources."is-posix-bracket-0.1.1" - ]; - }) - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - (sources."normalize-path-2.1.1" // { - dependencies = [ - sources."remove-trailing-separator-1.1.0" - ]; - }) - (sources."object.omit-2.0.1" // { - dependencies = [ - (sources."for-own-0.1.5" // { + sources."map-cache-0.2.2" + sources."source-map-0.5.7" + (sources."source-map-resolve-0.5.1" // { dependencies = [ - sources."for-in-1.0.2" + sources."decode-uri-component-0.2.0" + sources."source-map-url-0.4.0" + sources."atob-2.0.3" + sources."urix-0.1.0" + sources."resolve-url-0.2.1" ]; }) - sources."is-extendable-0.1.1" - ]; - }) - (sources."parse-glob-3.0.4" // { - dependencies = [ - (sources."glob-base-0.3.0" // { + (sources."use-2.0.2" // { dependencies = [ - sources."glob-parent-2.0.0" + sources."isobject-3.0.1" + (sources."lazy-cache-2.0.2" // { + dependencies = [ + (sources."set-getter-0.1.0" // { + dependencies = [ + (sources."to-object-path-0.3.0" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + ]; + }) + ]; + }) ]; }) - sources."is-dotfile-1.0.3" ]; }) - (sources."regex-cache-0.4.4" // { + (sources."to-regex-3.0.1" // { dependencies = [ - (sources."is-equal-shallow-0.1.3" // { + (sources."define-property-0.2.5" // { dependencies = [ - sources."is-primitive-2.0.0" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + sources."kind-of-5.1.0" + ]; + }) ]; }) ]; }) ]; }) - (sources."resolve-dir-0.1.1" // { + (sources."resolve-dir-1.0.1" // { dependencies = [ - (sources."expand-tilde-1.2.2" // { + (sources."expand-tilde-2.0.2" // { dependencies = [ - sources."os-homedir-1.0.2" + (sources."homedir-polyfill-1.0.1" // { + dependencies = [ + sources."parse-passwd-1.0.0" + ]; + }) ]; }) - (sources."global-modules-0.2.3" // { + (sources."global-modules-1.0.0" // { dependencies = [ - (sources."global-prefix-0.1.5" // { + (sources."global-prefix-1.0.2" // { dependencies = [ (sources."homedir-polyfill-1.0.1" // { dependencies = [ @@ -4492,7 +4661,7 @@ in }) ]; }) - sources."is-windows-0.2.0" + sources."is-windows-1.0.1" ]; }) ]; @@ -4510,15 +4679,10 @@ in }) ]; }) - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) (sources."object.defaults-1.1.0" // { dependencies = [ sources."array-each-1.0.1" - sources."array-slice-1.0.0" + sources."array-slice-1.1.0" (sources."for-own-1.0.0" // { dependencies = [ sources."for-in-1.0.2" @@ -4532,20 +4696,20 @@ in sources."isobject-3.0.1" ]; }) - (sources."parse-filepath-1.0.1" // { + (sources."parse-filepath-1.0.2" // { dependencies = [ - (sources."is-absolute-0.2.6" // { + (sources."is-absolute-1.0.0" // { dependencies = [ - (sources."is-relative-0.2.1" // { + (sources."is-relative-1.0.0" // { dependencies = [ - (sources."is-unc-path-0.1.2" // { + (sources."is-unc-path-1.0.0" // { dependencies = [ sources."unc-path-regex-0.1.2" ]; }) ]; }) - sources."is-windows-0.2.0" + sources."is-windows-1.0.1" ]; }) sources."map-cache-0.2.2" @@ -4558,10 +4722,30 @@ in }) ]; }) - sources."flagged-respawn-0.3.2" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.mapvalues-4.6.0" + sources."flagged-respawn-1.0.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."object.map-1.0.1" // { + dependencies = [ + (sources."for-own-1.0.0" // { + dependencies = [ + sources."for-in-1.0.2" + ]; + }) + (sources."make-iterator-1.0.0" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + ]; + }) + ]; + }) sources."rechoir-0.6.2" (sources."resolve-1.5.0" // { dependencies = [ @@ -4668,7 +4852,7 @@ in }) (sources."graceful-fs-3.0.11" // { dependencies = [ - sources."natives-1.1.0" + sources."natives-1.1.1" ]; }) (sources."mkdirp-0.5.1" // { @@ -4711,6 +4895,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; @@ -4835,7 +5020,7 @@ in }) (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-5.5.0" // { + (sources."ajv-5.5.2" // { dependencies = [ sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -4928,6 +5113,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; @@ -5819,6 +6005,7 @@ in homepage = http://github.com/node-inspector/node-inspector; }; production = true; + bypassCache = false; }; node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; @@ -6089,14 +6276,15 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.5.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz"; - sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik"; + url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; + sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; }; buildInputs = globalBuildInputs; meta = { @@ -6105,258 +6293,6 @@ in license = "Artistic-2.0"; }; production = true; - }; - titanium = nodeEnv.buildNodePackage { - name = "titanium"; - packageName = "titanium"; - version = "5.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz"; - sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b"; - }; - dependencies = [ - sources."adm-zip-0.4.7" - (sources."async-2.1.2" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) - sources."colors-1.1.2" - (sources."fields-0.1.24" // { - dependencies = [ - sources."colors-0.6.2" - sources."keypress-0.2.1" - ]; - }) - sources."humanize-0.0.9" - (sources."longjohn-0.2.11" // { - dependencies = [ - (sources."source-map-support-0.3.2" // { - dependencies = [ - (sources."source-map-0.1.32" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."moment-2.16.0" - (sources."node-appc-0.2.41" // { - dependencies = [ - (sources."async-2.1.4" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) - sources."diff-3.2.0" - sources."node-uuid-1.4.7" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - ]; - }) - sources."wrench-1.5.9" - (sources."uglify-js-2.7.5" // { - dependencies = [ - sources."async-0.2.10" - sources."source-map-0.5.7" - sources."uglify-to-browserify-1.0.2" - (sources."yargs-3.10.0" // { - dependencies = [ - sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - (sources."center-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - sources."lazy-cache-1.0.4" - ]; - }) - (sources."right-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - ]; - }) - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - ]; - }) - ]; - }) - sources."xmldom-0.1.27" - ]; - }) - (sources."request-2.79.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - sources."commander-2.12.1" - (sources."is-my-json-valid-2.16.1" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."qs-6.3.2" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.4.3" - sources."uuid-3.1.0" - ]; - }) - sources."semver-5.3.0" - sources."sprintf-0.1.5" - (sources."temp-0.8.3" // { - dependencies = [ - sources."os-tmpdir-1.0.2" - sources."rimraf-2.2.8" - ]; - }) - (sources."winston-1.1.2" // { - dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."isstream-0.1.2" - sources."pkginfo-0.3.1" - sources."stack-trace-0.0.10" - ]; - }) - (sources."fs-extra-2.1.2" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."jsonfile-2.4.0" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Appcelerator Titanium Command line"; - homepage = "https://github.com/appcelerator/titanium#readme"; - license = "Apache-2.0"; - }; - production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 82416cf3b230..ae70c54f2c0f 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -1,5 +1,6 @@ [ "alloy" +, "asar" , "azure-cli" , "bower" , "bower2nix" @@ -9,6 +10,7 @@ , "coinmon" , "cordova" , "csslint" +, "dat" , "dhcp" , "dnschain" , "docker-registry-server" @@ -34,6 +36,7 @@ , "istanbul" , "javascript-typescript-langserver" , "jayschema" +, "jsdoc" , "jshint" , "json" , "js-beautify" @@ -54,6 +57,7 @@ , "nijs" , "node2nix" , "node-gyp" +, "node-gyp-build" , "node-inspector" , "node-pre-gyp" , "nodemon" @@ -80,10 +84,14 @@ , "sloc" , "smartdc" , "socket.io" +, "stackdriver-statsd-backend" , "statsd" +, "statsd-influxdb-backend" +, "statsd-librato-backend" , "stylus" , "svgo" , "tern" +, "titanium" , "typescript" , "typings" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 021d48422794..138cbed81af7 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! +# This file has been generated by node2nix 1.5.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -85,13 +85,13 @@ let sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; - "deasync-0.1.11" = { + "deasync-0.1.12" = { name = "deasync"; packageName = "deasync"; - version = "0.1.11"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.11.tgz"; - sha1 = "3d1f228a2fecf4a1b359da2e636889942f8bf14c"; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.12.tgz"; + sha512 = "1vnaqczk6nr30xzzf6qxsaa2fj00z80rr6xrb7mxwn0d41zdwrgffk5vizwf6b17bps2zdr4f87s2mdmnixhsfh41vrh185ixi9r5l2"; }; }; "ejs-2.3.4" = { @@ -130,6 +130,15 @@ let sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; }; }; + "lodash-4.17.4" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + }; + }; "moment-2.17.1" = { name = "moment"; packageName = "moment"; @@ -166,13 +175,13 @@ let sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; }; }; - "source-map-0.1.9" = { + "source-map-0.6.1" = { name = "source-map"; packageName = "source-map"; - version = "0.1.9"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; - sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; }; }; "walk-sync-0.3.2" = { @@ -202,15 +211,6 @@ let sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; }; }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; "babel-code-frame-6.26.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; @@ -418,13 +418,13 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "core-js-2.5.1" = { + "core-js-2.5.3" = { name = "core-js"; packageName = "core-js"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz"; - sha1 = "ae6874dc66937789b80754ff5428df66819ca50b"; + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; + sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; }; }; "home-or-tmp-2.0.0" = { @@ -481,13 +481,13 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "regenerator-runtime-0.11.0" = { + "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"; - sha512 = "3a1pn2aankj443h5v8png8dbgrlyb7fcdn66vjglxwqvdpivpq959qsl2n44i6zwf1k5y6y23xwhim0x077yy275dyr6vwiny83987x"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; }; }; "ms-2.0.0" = { @@ -832,15 +832,6 @@ let sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; }; }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; "ensure-posix-path-1.0.2" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; @@ -877,6 +868,744 @@ let sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; + "chromium-pickle-js-0.2.0" = { + name = "chromium-pickle-js"; + packageName = "chromium-pickle-js"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + }; + }; + "commander-2.12.2" = { + name = "commander"; + packageName = "commander"; + version = "2.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"; + sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; + }; + }; + "cuint-0.2.2" = { + name = "cuint"; + packageName = "cuint"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz"; + sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; + }; + }; + "glob-6.0.4" = { + name = "glob"; + packageName = "glob"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + }; + }; + "mksnapshot-0.3.1" = { + name = "mksnapshot"; + packageName = "mksnapshot"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz"; + sha1 = "2501c05657436d742ce958a4ff92c77e40dd37e6"; + }; + }; + "tmp-0.0.28" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.28"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; + sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "decompress-zip-0.3.0" = { + name = "decompress-zip"; + packageName = "decompress-zip"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz"; + sha1 = "ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"; + }; + }; + "fs-extra-0.26.7" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.26.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; + }; + }; + "request-2.83.0" = { + name = "request"; + packageName = "request"; + version = "2.83.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; + sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + }; + }; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + }; + "mkpath-0.1.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "touch-0.0.3" = { + name = "touch"; + packageName = "touch"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz"; + sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d"; + }; + }; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + }; + "buffers-0.1.1" = { + name = "buffers"; + packageName = "buffers"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + }; + }; + "traverse-0.3.9" = { + name = "traverse"; + packageName = "traverse"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + }; + "jsonfile-2.4.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + }; + }; + "klaw-1.3.1" = { + name = "klaw"; + packageName = "klaw"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; + sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + }; + }; + "rimraf-2.6.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; + }; + }; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.6.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.1" = { + name = "extend"; + packageName = "extend"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; + sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; + sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; + }; + }; + "har-validator-5.0.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + }; + }; + "hawk-6.0.2" = { + name = "hawk"; + packageName = "hawk"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; + sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "mime-types-2.1.17" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; + sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "qs-6.5.1" = { + name = "qs"; + packageName = "qs"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + }; + }; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "tough-cookie-2.3.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; + sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "uuid-3.1.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; + sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "ajv-5.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "fast-deep-equal-1.0.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; + sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "json-schema-traverse-0.3.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; + "hoek-4.2.0" = { + name = "hoek"; + packageName = "hoek"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; + sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; + }; + }; + "boom-4.3.1" = { + name = "boom"; + packageName = "boom"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; + }; + }; + "cryptiles-3.1.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; + sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; + }; + }; + "sntp-2.1.0" = { + name = "sntp"; + packageName = "sntp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; + sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; + }; + }; + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "sshpk-1.13.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; + sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.1" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + }; + }; + "mime-db-1.30.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; + sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; "adal-node-0.1.21" = { name = "adal-node"; packageName = "adal-node"; @@ -1390,31 +2119,31 @@ let sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; }; }; - "moment-2.19.2" = { + "moment-2.20.1" = { name = "moment"; packageName = "moment"; - version = "2.19.2"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz"; - sha512 = "2s41fkwslr6lp0v2yz37fmsbfiy98x8s1fjc6smx82sf8r6fiq9wyx61javlkn8agzn51zcanhfyxj4wvsc8wyrz5yilzy4ff4a7zj5"; + url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; + sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; - "ms-rest-2.2.7" = { + "ms-rest-2.3.0" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.2.7"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.7.tgz"; - sha512 = "2fzxbr62dhaj91y7f1ckfiw67v4wc8ck44405n1h3mm5bv5h5v7nipdc4scx05f4k3dhxg8irkl6si33fjx5mm1d37dwj4qlxjxp74s"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.0.tgz"; + sha512 = "2dfmfxr3xagmds2agz7g6rnj1s9lh29fgfwxbqsfpkkabh3qhcc7sznkaviilpzr59fks1401wy6sh9xyy3wsaqbm975vm5b2bj6cwf"; }; }; - "ms-rest-azure-2.4.5" = { + "ms-rest-azure-2.5.0" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.4.5"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.4.5.tgz"; - sha512 = "17n7vax0wim6r3x51vaib4yblfkm791vv1awqs6p16y3zbfxdhgk1sks1iw2519187mmw4njnrja6kxvms4ly8l8qf481qh87xnia1v"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.0.tgz"; + sha512 = "22v7h9wa04laz1v40rq0wx3az880flfhz6xzjgk5pny3674kar5c0vj0ww1rjbsi891j9hvxvk9v51dykivirfjh5srqrjfmswzk3fw"; }; }; "node-forge-0.6.23" = { @@ -1552,15 +2281,6 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "uuid-3.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; - }; - }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1669,15 +2389,6 @@ let sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; }; }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; - }; - }; "buffer-equal-constant-time-1.0.1" = { name = "buffer-equal-constant-time"; packageName = "buffer-equal-constant-time"; @@ -1858,24 +2569,6 @@ let sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1894,15 +2587,6 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -2020,22 +2704,22 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "@types/node-8.0.53" = { + "@types/node-8.5.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.0.53"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.0.53.tgz"; - sha512 = "12x01f907cdv3cn1pm9jbxs65nm8i37l6g465qckym05jbzhzrjwiw4v6wz2qkssr8sl59h5lp894dgrash8x8hk6828yhqvklfd077"; + url = "https://registry.npmjs.org/@types/node/-/node-8.5.5.tgz"; + sha512 = "2w96jm9hd4hlx65a5rmlxj7il0xi7ag42xhzh12c0his0rknfbfckw4zmakp9nyf9ipjd6wdf81vskh3yswbjl5k0jq35qb3nidy695"; }; }; - "@types/request-2.0.8" = { + "@types/request-2.0.9" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.8.tgz"; - sha512 = "0x0whs0ls74h1hja129z6vxkbf7zzk5b4kqbp7iwxbilnbq9i53bfff95riw6n3k8pc4mahdg6p283bycw50f5b8mqax5hhknr217vy"; + url = "https://registry.npmjs.org/@types/request/-/request-2.0.9.tgz"; + sha512 = "2kdhxhp1x6x3bmggmcsf6zl71a5j4wr22gbxid1264gards2wxk9plfgr3q3vl7l2h7pp29c622dlmz91mnrpyr7mqjhxdv359bhsi1"; }; }; "@types/uuid-3.4.3" = { @@ -2074,15 +2758,6 @@ let sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; - }; - }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -2110,438 +2785,6 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "extend-3.0.1" = { - name = "extend"; - packageName = "extend"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.3.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; - }; - }; - "har-validator-5.0.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; - }; - }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "mime-types-2.1.17" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - }; - "qs-6.5.1" = { - name = "qs"; - packageName = "qs"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "tough-cookie-2.3.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "ajv-5.5.0" = { - name = "ajv"; - packageName = "ajv"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz"; - sha1 = "eb2840746e9dc48bd5e063a36e3fd400c5eab5a9"; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "fast-deep-equal-1.0.0" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; - }; - }; - "fast-json-stable-stringify-2.0.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; - }; - }; - "json-schema-traverse-0.3.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; - }; - }; - "hoek-4.2.0" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; - }; - }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; - "sshpk-1.13.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; - }; - }; - "mime-db-1.30.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; "async-2.5.0" = { name = "async"; packageName = "async"; @@ -2551,13 +2794,13 @@ let sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; }; }; - "adal-node-0.1.25" = { + "adal-node-0.1.26" = { name = "adal-node"; packageName = "adal-node"; - version = "0.1.25"; + version = "0.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.25.tgz"; - sha1 = "6554350ab42914870004c45c0d64448f3dbfcd03"; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.26.tgz"; + sha1 = "5a0a955b74ee8f2bb44f32305cafdc7a6877fced"; }; }; "debug-0.7.4" = { @@ -2650,60 +2893,6 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; - }; - }; - "glob-7.1.2" = { - name = "glob"; - packageName = "glob"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -2731,15 +2920,6 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -2821,22 +3001,13 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "commander-2.12.1" = { - name = "commander"; - packageName = "commander"; - version = "2.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.1.tgz"; - sha512 = "36cb2mrf9piidjbqiz8krwx7r9hikgirjxzfrbyk3hd39xpmg489lia9d3cmzci80sx99428hg960sz9j5b72fn7pi928z5289ln8rw"; - }; - }; - "is-my-json-valid-2.16.1" = { + "is-my-json-valid-2.17.1" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.16.1"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz"; - sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"; + sha512 = "2qkjhj6i3y40j35y8k722kklm1j8dfwk9506csa3vxr16vv7125v8jzpmkl551gsif98bzn205yj3sb99xi1i4bd6p5a1m81wvj2sa3"; }; }; "pinkie-promise-2.0.1" = { @@ -2992,6 +3163,15 @@ let sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; }; }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; "concat-stream-1.6.0" = { name = "concat-stream"; packageName = "concat-stream"; @@ -3145,15 +3325,6 @@ let sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }; }; - "fs-extra-0.26.7" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.26.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; - sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; - }; - }; "lodash-4.2.1" = { name = "lodash"; packageName = "lodash"; @@ -3190,15 +3361,6 @@ let sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; }; }; - "glob-6.0.4" = { - name = "glob"; - packageName = "glob"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; - sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; - }; - }; "sprintf-js-1.0.3" = { name = "sprintf-js"; packageName = "sprintf-js"; @@ -3280,13 +3442,13 @@ let sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; - "mime-db-1.31.0" = { + "mime-db-1.32.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz"; - sha512 = "1yvkd7sias7i24nvvbv8kj6sagzn758wclfky650vs38mhz0aq28bwcyg3y8nx13pa2fck3kdn5855cg62rxs3px8fj7l3rbkvg07d0"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.32.0.tgz"; + sha512 = "1bl21q8acya2jj67757518bdy1yhc5d7ybn755wnikwcca3gq5akfg835nj5mp2kmd4f97yyy0qwx662jlwk1rgx7nl9qsd2vzsi5gr"; }; }; "camelcase-keys-2.1.0" = { @@ -3622,40 +3784,13 @@ let sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; }; }; - "natives-1.1.0" = { + "natives-1.1.1" = { name = "natives"; packageName = "natives"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz"; - sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; - }; - }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; - }; - }; - "klaw-1.3.1" = { - name = "klaw"; - packageName = "klaw"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; - sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; - }; - }; - "q-1.5.1" = { - name = "q"; - packageName = "q"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; + sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; }; }; "rimraf-2.2.8" = { @@ -3667,13 +3802,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.3.1" = { + "JSONStream-1.3.2" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; - sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; + sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; }; }; "assert-1.4.1" = { @@ -3856,13 +3991,13 @@ let sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "module-deps-4.1.1" = { + "module-deps-5.0.0" = { name = "module-deps"; packageName = "module-deps"; - version = "4.1.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; - sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-5.0.0.tgz"; + sha512 = "23j70bns7rjajz5185sx3dvdrfws07cd5f6d807v579wl41bdjzj9d08v546c2q3bpqixqr2512mb4vl9bmz9n8xcs2bljs1282p3nd"; }; }; "os-browserify-0.3.0" = { @@ -4441,13 +4576,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.6.0" = { + "detective-5.0.1" = { name = "detective"; packageName = "detective"; - version = "4.6.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.6.0.tgz"; - sha512 = "1g05is493dwv51naw53l4jly2fr5xjawkkc859s2dsssgs9bjk99k401l3ms4fjkbnffv6z8s2wjx7mf3j05qvp28nidnb6mdda5yvf"; + url = "https://registry.npmjs.org/detective/-/detective-5.0.1.tgz"; + sha512 = "2k9749gg0b2s1mbys20ss7w9l6ln1vkd42j3yzww4pj1bfaq9rmf2pnib9hbabqgkzfxixrzxr6qj5j5c970hm81n896iq2iv6grzbl"; }; }; "stream-combiner2-1.1.1" = { @@ -4459,13 +4594,22 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "acorn-5.2.1" = { + "acorn-5.3.0" = { name = "acorn"; packageName = "acorn"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; - sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; + sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; + }; + }; + "acorn5-object-spread-5.0.0" = { + name = "acorn5-object-spread"; + packageName = "acorn5-object-spread"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn5-object-spread/-/acorn5-object-spread-5.0.0.tgz"; + sha1 = "922755b4e9dfda581e2664f177dc921804d2c1d4"; }; }; "path-platform-0.11.15" = { @@ -5125,13 +5269,13 @@ let sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; - "qap-3.3.0" = { + "qap-3.3.1" = { name = "qap"; packageName = "qap"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/qap/-/qap-3.3.0.tgz"; - sha1 = "cf2a6dc77b252d4268489961693d64be4a70869e"; + url = "https://registry.npmjs.org/qap/-/qap-3.3.1.tgz"; + sha1 = "11f9e8fa8890fe7cb99210c0f44d0613b7372cac"; }; }; "base64-js-1.2.0" = { @@ -5305,13 +5449,13 @@ let sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; }; }; - "rusha-0.8.7" = { + "rusha-0.8.11" = { name = "rusha"; packageName = "rusha"; - version = "0.8.7"; + version = "0.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.7.tgz"; - sha1 = "30673b7e95fafe0ebe1fe24dd6d95fd605f94ede"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.11.tgz"; + sha1 = "caa8963b1dbfd229d90626dd3f2a784430d6058d"; }; }; "decompress-response-3.3.0" = { @@ -5629,15 +5773,6 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; "bncode-0.2.3" = { name = "bncode"; packageName = "bncode"; @@ -5737,13 +5872,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.7.1" = { + "k-rpc-socket-1.7.2" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz"; - sha512 = "1xigw4j1na5gxiff1dad35vn0h91i77a9jzwsczl47rypanm2vfwyx2zchzdgny7mrxrn14bk9xss16nj2k3vng60v8pc7snjdc6q8n"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; + sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; }; }; "bencode-0.8.0" = { @@ -6547,22 +6682,22 @@ let sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; }; }; - "cordova-common-2.1.1" = { + "cordova-common-2.2.1" = { name = "cordova-common"; packageName = "cordova-common"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.1.1.tgz"; - sha1 = "e3a16a4f3d29a8e2b523128ac65478aca9ea1749"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz"; + sha1 = "7009bc591729caa7285a588cfd6a7b54cd834f0c"; }; }; - "cordova-lib-7.1.0" = { + "cordova-lib-8.0.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.1.0.tgz"; - sha1 = "f15aa0eda0e06e8c7e423a218404d59ec50f8594"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.0.0.tgz"; + sha1 = "864bd5de6b79fc4944361460aa3214e59da936f2"; }; }; "editor-1.0.0" = { @@ -6574,13 +6709,13 @@ let sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; }; }; - "insight-0.8.2" = { + "insight-0.8.4" = { name = "insight"; packageName = "insight"; - version = "0.8.2"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.2.tgz"; - sha1 = "18c2acf1b6055491278fc7529f1f21d32e1f0eda"; + url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; + sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; }; }; "nopt-3.0.1" = { @@ -6592,15 +6727,6 @@ let sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; }; }; - "q-1.0.1" = { - name = "q"; - packageName = "q"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; - }; - }; "update-notifier-0.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -6808,22 +6934,22 @@ let sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42"; }; }; - "cordova-create-1.1.1" = { + "cordova-create-1.1.2" = { name = "cordova-create"; packageName = "cordova-create"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.1.tgz"; - sha1 = "55282493ab396d9303f72febbaf2f978fa764cd2"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz"; + sha1 = "83b09271b378d1c03bc7d9a786fedd60485c3ccf"; }; }; - "cordova-fetch-1.2.0" = { + "cordova-fetch-1.3.0" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.2.0.tgz"; - sha1 = "e32ea33f5834d68585a3f4946295c3ffe71f8060"; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz"; + sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea"; }; }; "cordova-js-4.2.2" = { @@ -6853,6 +6979,24 @@ let sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }; }; + "detect-indent-5.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + }; + "dependency-ls-1.1.1" = { + name = "dependency-ls"; + packageName = "dependency-ls"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; + sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; + }; + }; "glob-7.1.1" = { name = "glob"; packageName = "glob"; @@ -6880,15 +7024,6 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "npm-2.15.12" = { - name = "npm"; - packageName = "npm"; - version = "2.15.12"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz"; - sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; - }; - }; "opener-1.4.2" = { name = "opener"; packageName = "opener"; @@ -6916,6 +7051,15 @@ let sha1 = "1316e9539ffbfd93845e369b211022abd478771a"; }; }; + "q-1.0.1" = { + name = "q"; + packageName = "q"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; + sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + }; + }; "request-2.79.0" = { name = "request"; packageName = "request"; @@ -6952,13 +7096,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.9.3" = { + "xcode-1.0.0" = { name = "xcode"; packageName = "xcode"; - version = "0.9.3"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz"; - sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"; + url = "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz"; + sha1 = "e1f5b1443245ded38c180796df1a10fdeda084ec"; }; }; "browserify-transform-tools-1.7.0" = { @@ -7006,33 +7150,6 @@ let sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; - "cordova-common-2.0.3" = { - name = "cordova-common"; - packageName = "cordova-common"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.3.tgz"; - sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38"; - }; - }; - "cordova-fetch-1.1.0" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.1.0.tgz"; - sha1 = "1549f9ff4e6345f3c6fb6bd6523e8b19311a7b54"; - }; - }; - "dependency-ls-1.1.1" = { - name = "dependency-ls"; - packageName = "dependency-ls"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; - sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; - }; - }; "is-url-1.2.2" = { name = "is-url"; packageName = "is-url"; @@ -7051,22 +7168,13 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "q-1.4.1" = { - name = "q"; - packageName = "q"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; - sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; - }; - }; - "interpret-1.0.4" = { + "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz"; - sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; }; }; "rechoir-0.6.2" = { @@ -7096,6 +7204,15 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; + "module-deps-4.1.1" = { + name = "module-deps"; + packageName = "module-deps"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; + }; + }; "os-browserify-0.1.2" = { name = "os-browserify"; packageName = "os-browserify"; @@ -7114,6 +7231,15 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; + "detective-4.7.1" = { + name = "detective"; + packageName = "detective"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; + sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; + }; + }; "compression-1.7.1" = { name = "compression"; packageName = "compression"; @@ -7510,6 +7636,15 @@ let sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; }; }; + "q-1.4.1" = { + name = "q"; + packageName = "q"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; + sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + }; + }; "npm-package-arg-5.1.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -7564,15 +7699,6 @@ let sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; - }; - }; "base64-js-1.1.2" = { name = "base64-js"; packageName = "base64-js"; @@ -8032,6 +8158,1734 @@ let sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4"; }; }; + "chalk-2.3.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; + sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; + }; + }; + "cli-truncate-1.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; + sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; + }; + }; + "dat-doctor-1.3.1" = { + name = "dat-doctor"; + packageName = "dat-doctor"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; + sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; + }; + }; + "dat-encoding-4.0.2" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-4.0.2.tgz"; + sha1 = "b01068fe0d080f3d3e4985a0c4ad21b7c14675f6"; + }; + }; + "dat-json-1.0.1" = { + name = "dat-json"; + packageName = "dat-json"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; + sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; + }; + }; + "dat-link-resolve-1.1.1" = { + name = "dat-link-resolve"; + packageName = "dat-link-resolve"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-1.1.1.tgz"; + sha512 = "3a3rmwv687r07qnzdp4k15ng7xbbgibssjiqjvhhhrxq5mc22m34g7hi1h15rqjs3zzlajn291j3xv9af22j3fynpygky13zzvxj367"; + }; + }; + "dat-log-1.1.1" = { + name = "dat-log"; + packageName = "dat-log"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; + sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; + }; + }; + "dat-node-3.5.6" = { + name = "dat-node"; + packageName = "dat-node"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; + sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; + }; + }; + "dat-registry-4.0.0" = { + name = "dat-registry"; + packageName = "dat-registry"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz"; + sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; + }; + }; + "neat-log-1.1.2" = { + name = "neat-log"; + packageName = "neat-log"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; + sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; + }; + }; + "prettier-bytes-1.0.4" = { + name = "prettier-bytes"; + packageName = "prettier-bytes"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-bytes/-/prettier-bytes-1.0.4.tgz"; + sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; + }; + }; + "progress-string-1.2.2" = { + name = "progress-string"; + packageName = "progress-string"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz"; + sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; + }; + }; + "prompt-1.0.0" = { + name = "prompt"; + packageName = "prompt"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz"; + sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; + }; + }; + "pump-1.0.3" = { + name = "pump"; + packageName = "pump"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; + sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; + }; + }; + "speedometer-1.0.0" = { + name = "speedometer"; + packageName = "speedometer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz"; + sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; + }; + }; + "subcommand-2.1.0" = { + name = "subcommand"; + packageName = "subcommand"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subcommand/-/subcommand-2.1.0.tgz"; + sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; + }; + }; + "throttle-1.0.3" = { + name = "throttle"; + packageName = "throttle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/throttle/-/throttle-1.0.3.tgz"; + sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; + }; + }; + "ansi-styles-3.2.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; + sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + }; + }; + "supports-color-4.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; + sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; + }; + }; + "color-convert-1.9.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz"; + sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs"; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + }; + }; + "slice-ansi-1.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; + sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "datland-swarm-defaults-1.0.2" = { + name = "datland-swarm-defaults"; + packageName = "datland-swarm-defaults"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; + sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; + }; + }; + "discovery-swarm-4.4.2" = { + name = "discovery-swarm"; + packageName = "discovery-swarm"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; + sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; + }; + }; + "dns-discovery-5.6.1" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "5.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; + sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; + }; + }; + "connections-1.4.2" = { + name = "connections"; + packageName = "connections"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connections/-/connections-1.4.2.tgz"; + sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; + }; + }; + "discovery-channel-5.4.6" = { + name = "discovery-channel"; + packageName = "discovery-channel"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.6.tgz"; + sha1 = "1b0f25e58124507e861b6dc3ecb744366bb53cad"; + }; + }; + "length-prefixed-message-3.0.3" = { + name = "length-prefixed-message"; + packageName = "length-prefixed-message"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.3.tgz"; + sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; + }; + }; + "to-buffer-1.1.0" = { + name = "to-buffer"; + packageName = "to-buffer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; + sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + }; + }; + "utp-native-1.6.2" = { + name = "utp-native"; + packageName = "utp-native"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; + sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + }; + }; + "bittorrent-dht-7.8.2" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "7.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.8.2.tgz"; + sha512 = "33jcwf8rh9r7m810lw75s1ij9k0bv1kjmnc24488i6nd1ri9a1p2gmci5z1xdfriyb8j7x8h1ch3aj5a1chdglwn6pbsll7cx4j6wd4"; + }; + }; + "pretty-hash-1.0.1" = { + name = "pretty-hash"; + packageName = "pretty-hash"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-hash/-/pretty-hash-1.0.1.tgz"; + sha1 = "16e0579188def56bdb565892bcd05a5d65324807"; + }; + }; + "k-bucket-3.3.1" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz"; + sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; + }; + }; + "k-rpc-4.2.1" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; + sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; + }; + }; + "lru-3.1.0" = { + name = "lru"; + packageName = "lru"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz"; + sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; + }; + }; + "varint-3.0.1" = { + name = "varint"; + packageName = "varint"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-3.0.1.tgz"; + sha1 = "9d3f53e036c0ab12000a74bc2d24cbf093a581d9"; + }; + }; + "node-gyp-build-3.2.2" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; + sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + }; + }; + "dns-socket-1.6.2" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.2.tgz"; + sha512 = "0ibd2ndmlqbk96vdcimsl4w1njplh9gplvqa5f7653km79f9kqpd6d7f0f3lq1sz548lqcbjfcgcr7fc9159b4gzzk1g86kjxzxmmk6"; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "multicast-dns-6.2.1" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; + sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; + }; + }; + "network-address-1.1.2" = { + name = "network-address"; + packageName = "network-address"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; + sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; + }; + }; + "unordered-set-1.1.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-1.1.0.tgz"; + sha1 = "2ba7ef316edd0b9590cc547c74f76a2f164fecca"; + }; + }; + "dns-packet-1.2.2" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz"; + sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh"; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; + }; + }; + "toiletdb-1.4.0" = { + name = "toiletdb"; + packageName = "toiletdb"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.0.tgz"; + sha1 = "6c6f871834b22178c5490f9f832b58c3c7cba852"; + }; + }; + "last-one-wins-1.0.4" = { + name = "last-one-wins"; + packageName = "last-one-wins"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/last-one-wins/-/last-one-wins-1.0.4.tgz"; + sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; + }; + }; + "dat-dns-1.3.2" = { + name = "dat-dns"; + packageName = "dat-dns"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-1.3.2.tgz"; + sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; + }; + }; + "nets-3.2.0" = { + name = "nets"; + packageName = "nets"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nets/-/nets-3.2.0.tgz"; + sha1 = "d511fbab7af11da013f21b97ee91747d33852d38"; + }; + }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + }; + "xhr-2.4.1" = { + name = "xhr"; + packageName = "xhr"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz"; + sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4"; + }; + }; + "global-4.3.2" = { + name = "global"; + packageName = "global"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz"; + sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + }; + }; + "is-function-1.0.1" = { + name = "is-function"; + packageName = "is-function"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + }; + }; + "parse-headers-2.0.1" = { + name = "parse-headers"; + packageName = "parse-headers"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"; + sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; + }; + }; + "min-document-2.19.0" = { + name = "min-document"; + packageName = "min-document"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + }; + }; + "process-0.5.2" = { + name = "process"; + packageName = "process"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }; + }; + "dom-walk-0.1.1" = { + name = "dom-walk"; + packageName = "dom-walk"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"; + sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + }; + }; + "for-each-0.3.2" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; + sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + }; + }; + "trim-0.0.1" = { + name = "trim"; + packageName = "trim"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + }; + "random-access-memory-2.4.0" = { + name = "random-access-memory"; + packageName = "random-access-memory"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; + sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; + }; + }; + "dat-ignore-2.0.0" = { + name = "dat-ignore"; + packageName = "dat-ignore"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; + sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + }; + }; + "dat-link-resolve-2.1.0" = { + name = "dat-link-resolve"; + packageName = "dat-link-resolve"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.0.tgz"; + sha512 = "0dzpf71lpzr1z3g6m3v29xvcs9r12sgjpzzmg2viy3azkgpscl7p2v8im2ibsa22q64abifkibb4nc3nshs19wvai67m3gdqx15qzvn"; + }; + }; + "dat-storage-1.0.3" = { + name = "dat-storage"; + packageName = "dat-storage"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; + sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; + }; + }; + "dat-swarm-defaults-1.0.0" = { + name = "dat-swarm-defaults"; + packageName = "dat-swarm-defaults"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; + sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; + }; + }; + "hyperdrive-9.12.0" = { + name = "hyperdrive"; + packageName = "hyperdrive"; + version = "9.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.0.tgz"; + sha512 = "285nxd3xfdr51r8av9d7dal8hqa3lfrac1m46gn9b73ljwivlhhsxpbrqyhdf80v7bnmw8vpy61x77gm8cfmwv5z8pffmmnla2p8l5y"; + }; + }; + "hyperdrive-http-4.2.2" = { + name = "hyperdrive-http"; + packageName = "hyperdrive-http"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; + sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; + }; + }; + "hyperdrive-network-speed-2.0.1" = { + name = "hyperdrive-network-speed"; + packageName = "hyperdrive-network-speed"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; + sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; + }; + }; + "mirror-folder-2.1.1" = { + name = "mirror-folder"; + packageName = "mirror-folder"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; + sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + }; + }; + "multicb-1.2.2" = { + name = "multicb"; + packageName = "multicb"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz"; + sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; + }; + }; + "sparse-bitfield-3.0.3" = { + name = "sparse-bitfield"; + packageName = "sparse-bitfield"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; + sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; + }; + }; + "stream-each-1.2.2" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; + }; + }; + "untildify-3.0.2" = { + name = "untildify"; + packageName = "untildify"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; + sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; + }; + }; + "anymatch-1.3.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; + sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; + }; + }; + "micromatch-2.3.11" = { + name = "micromatch"; + packageName = "micromatch"; + version = "2.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "arr-diff-2.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + }; + "braces-1.8.5" = { + name = "braces"; + packageName = "braces"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + }; + "expand-brackets-0.1.5" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + }; + "extglob-0.3.2" = { + name = "extglob"; + packageName = "extglob"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + }; + "filename-regex-2.0.1" = { + name = "filename-regex"; + packageName = "filename-regex"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + }; + "is-extglob-1.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + }; + "is-glob-2.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + }; + "parse-glob-3.0.4" = { + name = "parse-glob"; + packageName = "parse-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + }; + "regex-cache-0.4.4" = { + name = "regex-cache"; + packageName = "regex-cache"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; + sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; + }; + }; + "expand-range-1.8.2" = { + name = "expand-range"; + packageName = "expand-range"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + }; + "preserve-0.2.0" = { + name = "preserve"; + packageName = "preserve"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + }; + "repeat-element-1.1.2" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; + sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; + }; + }; + "fill-range-2.2.3" = { + name = "fill-range"; + packageName = "fill-range"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; + sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; + }; + }; + "is-number-2.1.0" = { + name = "is-number"; + packageName = "is-number"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "randomatic-1.1.7" = { + name = "randomatic"; + packageName = "randomatic"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "is-posix-bracket-0.1.1" = { + name = "is-posix-bracket"; + packageName = "is-posix-bracket"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + }; + "for-own-0.1.5" = { + name = "for-own"; + packageName = "for-own"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "glob-base-0.3.0" = { + name = "glob-base"; + packageName = "glob-base"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + }; + "is-dotfile-1.0.3" = { + name = "is-dotfile"; + packageName = "is-dotfile"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + }; + "glob-parent-2.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + }; + "is-equal-shallow-0.1.3" = { + name = "is-equal-shallow"; + packageName = "is-equal-shallow"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + }; + "is-primitive-2.0.0" = { + name = "is-primitive"; + packageName = "is-primitive"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "dat-encoding-5.0.1" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz"; + sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; + }; + }; + "append-tree-2.4.0" = { + name = "append-tree"; + packageName = "append-tree"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.0.tgz"; + sha512 = "1ym9wsmz3fjv0wf675xclbnjp825cyvxp3a9x8af96yms45dbk8c79jrx5vgdii1zimcnr2pg305g9sw79k5yqah9267k71lsz5vv35"; + }; + }; + "dat-secret-storage-4.0.0" = { + name = "dat-secret-storage"; + packageName = "dat-secret-storage"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; + sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; + }; + }; + "multi-random-access-2.1.1" = { + name = "multi-random-access"; + packageName = "multi-random-access"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multi-random-access/-/multi-random-access-2.1.1.tgz"; + sha1 = "6462f1b204109ccc644601650110a828443d66e2"; + }; + }; + "array-lru-1.1.1" = { + name = "array-lru"; + packageName = "array-lru"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-lru/-/array-lru-1.1.1.tgz"; + sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; + }; + }; + "brfs-1.4.3" = { + name = "brfs"; + packageName = "brfs"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/brfs/-/brfs-1.4.3.tgz"; + sha1 = "db675d6f5e923e6df087fca5859c9090aaed3216"; + }; + }; + "codecs-1.2.0" = { + name = "codecs"; + packageName = "codecs"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; + sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "mutexify-1.2.0" = { + name = "mutexify"; + packageName = "mutexify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; + sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; + }; + }; + "protocol-buffers-3.2.1" = { + name = "protocol-buffers"; + packageName = "protocol-buffers"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-3.2.1.tgz"; + sha1 = "37258e17e24a082f06ebb17731e92851d1c76889"; + }; + }; + "varint-5.0.0" = { + name = "varint"; + packageName = "varint"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz"; + sha1 = "d826b89f7490732fabc0c0ed693ed475dcb29ebf"; + }; + }; + "quote-stream-1.0.2" = { + name = "quote-stream"; + packageName = "quote-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz"; + sha1 = "84963f8c9c26b942e153feeb53aae74652b7e0b2"; + }; + }; + "static-module-1.5.0" = { + name = "static-module"; + packageName = "static-module"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz"; + sha1 = "27da9883c41a8cd09236f842f0c1ebc6edf63d86"; + }; + }; + "duplexer2-0.0.2" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; + sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + }; + }; + "escodegen-1.3.3" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; + sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + }; + }; + "object-inspect-0.4.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; + sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; + }; + }; + "quote-stream-0.0.0" = { + name = "quote-stream"; + packageName = "quote-stream"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz"; + sha1 = "cde29e94c409b16e19dc7098b89b6658f9721d3b"; + }; + }; + "shallow-copy-0.0.1" = { + name = "shallow-copy"; + packageName = "shallow-copy"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; + sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; + }; + }; + "static-eval-0.2.4" = { + name = "static-eval"; + packageName = "static-eval"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz"; + sha1 = "b7d34d838937b969f9641ca07d48f8ede263ea7b"; + }; + }; + "through2-0.4.2" = { + name = "through2"; + packageName = "through2"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; + sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; + }; + }; + "esutils-1.0.0" = { + name = "esutils"; + packageName = "esutils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; + }; + }; + "estraverse-1.5.1" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + }; + }; + "esprima-1.1.1" = { + name = "esprima"; + packageName = "esprima"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + }; + }; + "escodegen-0.0.28" = { + name = "escodegen"; + packageName = "escodegen"; + version = "0.0.28"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; + sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; + }; + }; + "esprima-1.0.4" = { + name = "esprima"; + packageName = "esprima"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + }; + }; + "estraverse-1.3.2" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; + sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; + }; + }; + "xtend-2.1.2" = { + name = "xtend"; + packageName = "xtend"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; + sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; + }; + }; + "object-keys-0.4.0" = { + name = "object-keys"; + packageName = "object-keys"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; + sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336"; + }; + }; + "protocol-buffers-schema-3.3.2" = { + name = "protocol-buffers-schema"; + packageName = "protocol-buffers-schema"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz"; + sha512 = "3rvq2xsb9y9vfy8vgf6ja08362bjcg132kxcwcfdik1j6j17dvlk535agpwiqzj47g1d7shcwq5h6zk5jy1ny25n4z6bzh1rfkv5mjx"; + }; + }; + "signed-varint-2.0.1" = { + name = "signed-varint"; + packageName = "signed-varint"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/signed-varint/-/signed-varint-2.0.1.tgz"; + sha1 = "50a9989da7c98c2c61dad119bc97470ef8528129"; + }; + }; + "abstract-random-access-1.1.2" = { + name = "abstract-random-access"; + packageName = "abstract-random-access"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-random-access/-/abstract-random-access-1.1.2.tgz"; + sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; + }; + }; + "sorted-array-functions-1.1.0" = { + name = "sorted-array-functions"; + packageName = "sorted-array-functions"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; + sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; + }; + }; + "hypercore-6.11.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.11.0.tgz"; + sha512 = "0q0972kpj73qndhwb3msk3xkfpx1zldfw1ld815kncb0lbr7mdhawjz701y230zji0lamnznrv61cmcnx2zlqjhvcyrf9fyyr93r6ds"; + }; + }; + "sodium-universal-2.0.0" = { + name = "sodium-universal"; + packageName = "sodium-universal"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz"; + sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; + }; + }; + "stream-collector-1.0.1" = { + name = "stream-collector"; + packageName = "stream-collector"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz"; + sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; + }; + }; + "uint64be-2.0.1" = { + name = "uint64be"; + packageName = "uint64be"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; + sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + }; + }; + "unixify-1.0.0" = { + name = "unixify"; + packageName = "unixify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz"; + sha1 = "3a641c8c2ffbce4da683a5c70f03a462940c2090"; + }; + }; + "atomic-batcher-1.0.2" = { + name = "atomic-batcher"; + packageName = "atomic-batcher"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-batcher/-/atomic-batcher-1.0.2.tgz"; + sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; + }; + }; + "bitfield-rle-2.1.0" = { + name = "bitfield-rle"; + packageName = "bitfield-rle"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield-rle/-/bitfield-rle-2.1.0.tgz"; + sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; + }; + }; + "bulk-write-stream-1.1.3" = { + name = "bulk-write-stream"; + packageName = "bulk-write-stream"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; + sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + }; + }; + "flat-tree-1.6.0" = { + name = "flat-tree"; + packageName = "flat-tree"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-tree/-/flat-tree-1.6.0.tgz"; + sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; + }; + }; + "hypercore-protocol-6.4.2" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "6.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.4.2.tgz"; + sha512 = "07lwyavmways0q0ljrvpgvdii96f96a692m4x8dwmdwlfgh604gjz47vs95zk2ryfs9qm5j9msvy955bgyqns2az3ypysi76k51n7y7"; + }; + }; + "memory-pager-1.1.0" = { + name = "memory-pager"; + packageName = "memory-pager"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz"; + sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri"; + }; + }; + "merkle-tree-stream-3.0.3" = { + name = "merkle-tree-stream"; + packageName = "merkle-tree-stream"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/merkle-tree-stream/-/merkle-tree-stream-3.0.3.tgz"; + sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; + }; + }; + "unordered-array-remove-1.0.2" = { + name = "unordered-array-remove"; + packageName = "unordered-array-remove"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz"; + sha1 = "c546e8f88e317a0cf2644c97ecb57dba66d250ef"; + }; + }; + "unordered-set-2.0.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.0.tgz"; + sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; + }; + }; + "varint-4.0.1" = { + name = "varint"; + packageName = "varint"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-4.0.1.tgz"; + sha1 = "490829b942d248463b2b35097995c3bf737198e9"; + }; + }; + "sorted-indexof-1.0.0" = { + name = "sorted-indexof"; + packageName = "sorted-indexof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-indexof/-/sorted-indexof-1.0.0.tgz"; + sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; + }; + }; + "sodium-javascript-0.5.4" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; + sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + }; + }; + "sodium-native-2.1.4" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; + sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + }; + }; + "blake2b-2.1.2" = { + name = "blake2b"; + packageName = "blake2b"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b/-/blake2b-2.1.2.tgz"; + sha1 = "6880eddca35cfede92c4fb2724221334f989145a"; + }; + }; + "nanoassert-1.1.0" = { + name = "nanoassert"; + packageName = "nanoassert"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; + sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; + }; + }; + "siphash24-1.1.0" = { + name = "siphash24"; + packageName = "siphash24"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz"; + sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; + }; + }; + "xsalsa20-1.0.2" = { + name = "xsalsa20"; + packageName = "xsalsa20"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz"; + sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; + }; + }; + "blake2b-wasm-1.1.4" = { + name = "blake2b-wasm"; + packageName = "blake2b-wasm"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.4.tgz"; + sha512 = "3hgcz1c3h2hxgavmlf5r4dwk0wy2sg9y4lfs5ifj4spdlwyy3ki9i1i4hjaw0029c896d6yw424mw2j1nf4qyibkz2lbh1ws6z6rdlg"; + }; + }; + "base64-to-uint8array-1.0.0" = { + name = "base64-to-uint8array"; + packageName = "base64-to-uint8array"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-to-uint8array/-/base64-to-uint8array-1.0.0.tgz"; + sha512 = "01a4ip2ivflpjsx4flnww5fqvdcsy2sqnjgp2cii6b2gnkkccr02vbf2y8r2wlcab4pb8x47qb3jpahca61v584bmz9xcwyqx0xdf3n"; + }; + }; + "corsify-2.1.0" = { + name = "corsify"; + packageName = "corsify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/corsify/-/corsify-2.1.0.tgz"; + sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; + }; + }; + "directory-index-html-2.1.0" = { + name = "directory-index-html"; + packageName = "directory-index-html"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/directory-index-html/-/directory-index-html-2.1.0.tgz"; + sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; + }; + }; + "http-methods-0.1.0" = { + name = "http-methods"; + packageName = "http-methods"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-methods/-/http-methods-0.1.0.tgz"; + sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; + }; + }; + "content-types-0.1.0" = { + name = "content-types"; + packageName = "content-types"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/content-types/-/content-types-0.1.0.tgz"; + sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; + }; + }; + "body-0.1.0" = { + name = "body"; + packageName = "body"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body/-/body-0.1.0.tgz"; + sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; + }; + }; + "iterators-0.1.0" = { + name = "iterators"; + packageName = "iterators"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iterators/-/iterators-0.1.0.tgz"; + sha1 = "d03f666ca4e6130138565997cacea54164203156"; + }; + }; + "ap-0.1.0" = { + name = "ap"; + packageName = "ap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ap/-/ap-0.1.0.tgz"; + sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; + }; + }; + "fd-read-stream-1.1.0" = { + name = "fd-read-stream"; + packageName = "fd-read-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-read-stream/-/fd-read-stream-1.1.0.tgz"; + sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; + }; + }; + "recursive-watch-1.1.2" = { + name = "recursive-watch"; + packageName = "recursive-watch"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; + sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; + }; + }; + "ttl-1.3.1" = { + name = "ttl"; + packageName = "ttl"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz"; + sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr"; + }; + }; + "township-client-1.3.2" = { + name = "township-client"; + packageName = "township-client"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz"; + sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; + }; + }; + "is-string-1.0.4" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz"; + sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; + }; + }; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + }; + }; + "nanobus-3.3.0" = { + name = "nanobus"; + packageName = "nanobus"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; + sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; + }; + }; + "status-logger-3.1.1" = { + name = "status-logger"; + packageName = "status-logger"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; + sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; + }; + }; + "nanotiming-1.0.1" = { + name = "nanotiming"; + packageName = "nanotiming"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; + sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; + }; + }; + "ansi-diff-stream-1.2.0" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; + sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + }; + }; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + }; + "wrap-ansi-3.0.1" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; + sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + }; + }; + "utile-0.3.0" = { + name = "utile"; + packageName = "utile"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz"; + sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "deep-equal-0.2.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + }; + }; + "ncp-1.0.1" = { + name = "ncp"; + packageName = "ncp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; + sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; + }; + }; + "cliclopts-1.1.1" = { + name = "cliclopts"; + packageName = "cliclopts"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cliclopts/-/cliclopts-1.1.1.tgz"; + sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; + }; + }; + "stream-parser-0.3.1" = { + name = "stream-parser"; + packageName = "stream-parser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz"; + sha1 = "1618548694420021a1182ff0af1911c129761773"; + }; + }; "bluebird-2.9.9" = { name = "bluebird"; packageName = "bluebird"; @@ -8585,13 +10439,13 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; + "extsprintf-1.4.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; }; }; "qs-1.2.0" = { @@ -8792,15 +10646,6 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "pump-1.0.3" = { - name = "pump"; - packageName = "pump"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; - sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; - }; - }; "pumpify-1.3.5" = { name = "pumpify"; packageName = "pumpify"; @@ -8846,15 +10691,6 @@ let sha1 = "02ddac9adc03ec0bb78c1282ec079ca6e85ae900"; }; }; - "stream-collector-1.0.1" = { - name = "stream-collector"; - packageName = "stream-collector"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz"; - sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; - }; - }; "tar-stream-1.5.5" = { name = "tar-stream"; packageName = "tar-stream"; @@ -8999,13 +10835,13 @@ let sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; - "errno-0.1.4" = { + "errno-0.1.6" = { name = "errno"; packageName = "errno"; - version = "0.1.4"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; - sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; + url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; + sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; }; }; "prr-0.0.0" = { @@ -9044,6 +10880,15 @@ let sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; }; }; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + }; "level-post-1.0.5" = { name = "level-post"; packageName = "level-post"; @@ -9179,13 +11024,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.157.0" = { + "aws-sdk-2.176.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.157.0"; + version = "2.176.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.157.0.tgz"; - sha1 = "b55b16f8413dfa9e7323b60b21fce9743206f8a1"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.176.0.tgz"; + sha1 = "2723c14e1c623ac45c5b890a3fc736eee8085f67"; }; }; "buffer-4.9.1" = { @@ -9350,6 +11195,15 @@ let sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd"; }; }; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + }; + }; "supports-color-4.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -9359,42 +11213,6 @@ let sha512 = "158ng0v99ac7csif7v6153bp63nxmlz2a613z8y09sk8jsj2rpalscgg0lfzdlpfdd5612jqsnkvrz0137inka2qjcmcjrmy2xhrkaf"; }; }; - "ansi-styles-3.2.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; - sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; - }; - }; - "color-convert-1.9.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz"; - sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs"; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; - }; - }; - "anymatch-1.3.2" = { - name = "anymatch"; - packageName = "anymatch"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; - sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; - }; - }; "async-each-1.0.1" = { name = "async-each"; packageName = "async-each"; @@ -9404,15 +11222,6 @@ let sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; }; }; - "glob-parent-2.0.0" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; - sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; - }; - }; "is-binary-path-1.0.1" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -9422,15 +11231,6 @@ let sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; }; }; - "is-glob-2.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; - sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; - }; - }; "readdirp-2.1.0" = { name = "readdirp"; packageName = "readdirp"; @@ -9440,294 +11240,6 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "micromatch-2.3.11" = { - name = "micromatch"; - packageName = "micromatch"; - version = "2.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; - sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; - }; - }; - "normalize-path-2.1.1" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; - }; - }; - "arr-diff-2.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; - sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; - }; - }; - "braces-1.8.5" = { - name = "braces"; - packageName = "braces"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; - sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; - }; - }; - "expand-brackets-0.1.5" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; - }; - }; - "extglob-0.3.2" = { - name = "extglob"; - packageName = "extglob"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; - sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; - }; - }; - "filename-regex-2.0.1" = { - name = "filename-regex"; - packageName = "filename-regex"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; - sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; - }; - }; - "is-extglob-1.0.0" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; - sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "object.omit-2.0.1" = { - name = "object.omit"; - packageName = "object.omit"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; - sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; - }; - }; - "parse-glob-3.0.4" = { - name = "parse-glob"; - packageName = "parse-glob"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; - sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; - }; - }; - "regex-cache-0.4.4" = { - name = "regex-cache"; - packageName = "regex-cache"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; - }; - }; - "arr-flatten-1.1.0" = { - name = "arr-flatten"; - packageName = "arr-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; - }; - }; - "expand-range-1.8.2" = { - name = "expand-range"; - packageName = "expand-range"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; - sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; - }; - }; - "preserve-0.2.0" = { - name = "preserve"; - packageName = "preserve"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; - sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; - }; - }; - "repeat-element-1.1.2" = { - name = "repeat-element"; - packageName = "repeat-element"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; - sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; - }; - }; - "fill-range-2.2.3" = { - name = "fill-range"; - packageName = "fill-range"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; - sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; - }; - }; - "is-number-2.1.0" = { - name = "is-number"; - packageName = "is-number"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; - sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; - }; - }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - }; - "randomatic-1.1.7" = { - name = "randomatic"; - packageName = "randomatic"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; - sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "is-number-3.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; - }; - }; - "kind-of-4.0.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; - }; - }; - "is-posix-bracket-0.1.1" = { - name = "is-posix-bracket"; - packageName = "is-posix-bracket"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; - }; - }; - "for-own-0.1.5" = { - name = "for-own"; - packageName = "for-own"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; - sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; - }; - }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; - }; - }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; - }; - }; - "glob-base-0.3.0" = { - name = "glob-base"; - packageName = "glob-base"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; - sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; - }; - }; - "is-dotfile-1.0.3" = { - name = "is-dotfile"; - packageName = "is-dotfile"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; - sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; - }; - }; - "is-equal-shallow-0.1.3" = { - name = "is-equal-shallow"; - packageName = "is-equal-shallow"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; - sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; - }; - }; - "is-primitive-2.0.0" = { - name = "is-primitive"; - packageName = "is-primitive"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; - sha1 = "207bab91638499c07b2adf240a41a87210034575"; - }; - }; - "remove-trailing-separator-1.1.0" = { - name = "remove-trailing-separator"; - packageName = "remove-trailing-separator"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; - }; - }; "binary-extensions-1.11.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -9800,15 +11312,6 @@ let sha1 = "c9f4886e7f7fbf0afc12d71941dce06b192aea05"; }; }; - "has-flag-2.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; - }; - }; "auto-bind-1.1.0" = { name = "auto-bind"; packageName = "auto-bind"; @@ -9827,13 +11330,13 @@ let sha512 = "2pq14hxz6w4k5yvndrm1fv3iyscdqf5c4nja421gl2661didzh80r08zddd84zny94831qs44biamjhvwmqh40pfy3pjv3vwl2ap8np"; }; }; - "conf-1.3.1" = { + "conf-1.4.0" = { name = "conf"; packageName = "conf"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.3.1.tgz"; - sha512 = "0s33rz07rq4r5kf3bgza6gz4157ph97cm2dh8ws0mj7b924prjaqwbsnljx61pvzkl3db82z51i2k41dpg0hqw6srhkx9qx4nb1yrs8"; + url = "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz"; + sha512 = "07g80zfanxf96as7ikxbv6csskj2033zw2hj8jpii0s3wqxjyq1x73fk1bqnj833clsmmiz6khcvid668gji5vsnhgb67ck5mcmafbg"; }; }; "got-7.1.0" = { @@ -10088,13 +11591,22 @@ let sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; - "p-limit-1.1.0" = { + "p-limit-1.2.0" = { name = "p-limit"; packageName = "p-limit"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz"; - sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; + sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; "duplexer3-0.1.4" = { @@ -10196,15 +11708,6 @@ let sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; }; }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; "babel-plugin-transform-es2015-destructuring-6.23.0" = { name = "babel-plugin-transform-es2015-destructuring"; packageName = "babel-plugin-transform-es2015-destructuring"; @@ -10313,15 +11816,6 @@ let sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; - "chalk-2.3.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; - sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; - }; - }; "indent-string-3.2.0" = { name = "indent-string"; packageName = "indent-string"; @@ -10331,15 +11825,6 @@ let sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; }; }; - "lodash.flattendeep-4.4.0" = { - name = "lodash.flattendeep"; - packageName = "lodash.flattendeep"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; - }; - }; "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; @@ -10367,15 +11852,6 @@ let sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856"; }; }; - "supports-color-4.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; - }; - }; "ansi-escapes-3.0.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -10385,42 +11861,6 @@ let sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; }; }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; - }; - }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; "fbjs-0.8.16" = { name = "fbjs"; packageName = "fbjs"; @@ -10520,6 +11960,15 @@ let sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; + "eslint-visitor-keys-1.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; + sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; + }; + }; "espree-3.5.2" = { name = "espree"; packageName = "espree"; @@ -10538,15 +11987,6 @@ let sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; }; }; - "estraverse-4.2.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; - }; - }; "file-entry-cache-2.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -10565,13 +12005,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "globals-11.0.1" = { + "globals-11.1.0" = { name = "globals"; packageName = "globals"; - version = "11.0.1"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.0.1.tgz"; - sha1 = "12a87bb010e5154396acc535e1e43fc753b0e5e8"; + url = "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz"; + sha512 = "24q4kgcwq3yjsidaajrrvd529l4yfxzv4icxzwl1y2l1nwpv8898gd4k5clygb2i4gsvyjdzm9xd28gwg0zm8iaq71m6kmav6vrcjxq"; }; }; "ignore-3.3.7" = { @@ -10592,13 +12032,13 @@ let sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; - "is-resolvable-1.0.0" = { + "is-resolvable-1.0.1" = { name = "is-resolvable"; packageName = "is-resolvable"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz"; - sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; + url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz"; + sha512 = "3kb6apf2r7xkp0saq6lbgg0y18fnqghd18rvmhhmbb537vsbs20rzq5n2xm51wync9igp4kprci8aggcm9iy6b0kp9ph1zgpihrg46b"; }; }; "js-yaml-3.10.0" = { @@ -10709,6 +12149,15 @@ let sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; }; }; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + }; "acorn-jsx-3.0.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; @@ -10808,13 +12257,13 @@ let sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; }; }; - "is-path-inside-1.0.0" = { + "is-path-inside-1.0.1" = { name = "is-path-inside"; packageName = "is-path-inside"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz"; - sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; }; }; "cli-width-2.2.0" = { @@ -10898,15 +12347,6 @@ let sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; - "tryit-1.0.3" = { - name = "tryit"; - packageName = "tryit"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz"; - sha1 = "393be730a9446fd1ead6da59a014308f36c289cb"; - }; - }; "argparse-1.0.9" = { name = "argparse"; packageName = "argparse"; @@ -11006,22 +12446,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "slice-ansi-1.0.0" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; - }; - }; - "eslint-4.12.0" = { + "eslint-4.14.0" = { name = "eslint"; packageName = "eslint"; - version = "4.12.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.12.0.tgz"; - sha512 = "31dhiy1b963gcs7s1ickygwm87vm943l5mhcxxwg97yc113b7fmdrzcb1m9gr9h0pkqacrdcmn59x3mdcqg0a4bgc2gjz859lszh6rs"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz"; + sha512 = "0jh5cxqg5w7zah8hra5wmm25nyky09lb7i8dbxpchhv2hj9q0ym3kn7wqw72g73sj1l6k6vv5fkdfmkim3zq5qdr82cfak3ci484pjj"; }; }; "supports-color-3.2.3" = { @@ -11078,13 +12509,13 @@ let sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; }; }; - "es6-promise-4.1.1" = { + "es6-promise-4.2.2" = { name = "es6-promise"; packageName = "es6-promise"; - version = "4.1.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; - sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.2.tgz"; + sha512 = "18ny66ql485risswmzx8r66ys0p4p48nznksxc407mgc36dc06212xd7pzb5mwcs0idzjzbhljw17v34h5gfps7khwa80rfzgkaq9id"; }; }; "extract-zip-1.6.6" = { @@ -11474,13 +12905,13 @@ let sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; }; }; - "simple-git-1.82.0" = { + "simple-git-1.85.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.82.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.82.0.tgz"; - sha1 = "5fd0efe9c4ee78e5d942f276ac492b32e041a01a"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.85.0.tgz"; + sha1 = "563ad291efc8a127735e8fbcd796967377614cd4"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -11520,15 +12951,6 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "nopt-3.0.6" = { - name = "nopt"; - packageName = "nopt"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; - }; - }; "coffee-script-1.12.7" = { name = "coffee-script"; packageName = "coffee-script"; @@ -11907,13 +13329,13 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "liftoff-2.3.0" = { + "liftoff-2.5.0" = { name = "liftoff"; packageName = "liftoff"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz"; - sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; + sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; "orchestrator-0.3.8" = { @@ -11997,13 +13419,13 @@ let sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; }; }; - "fancy-log-1.3.0" = { + "fancy-log-1.3.2" = { name = "fancy-log"; packageName = "fancy-log"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz"; - sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948"; + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; + sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; }; }; "gulplog-1.0.0" = { @@ -12087,6 +13509,24 @@ let sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; }; }; + "ansi-gray-0.1.1" = { + name = "ansi-gray"; + packageName = "ansi-gray"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; + sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; + }; + }; "time-stamp-1.1.0" = { name = "time-stamp"; packageName = "time-stamp"; @@ -12096,6 +13536,15 @@ let sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; }; }; + "ansi-wrap-0.1.0" = { + name = "ansi-wrap"; + packageName = "ansi-wrap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; + }; + }; "glogg-1.0.0" = { name = "glogg"; packageName = "glogg"; @@ -12213,15 +13662,6 @@ let sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; }; }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; - }; - }; "clone-stats-0.0.1" = { name = "clone-stats"; packageName = "clone-stats"; @@ -12231,13 +13671,13 @@ let sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; }; }; - "findup-sync-0.4.3" = { + "findup-sync-2.0.0" = { name = "findup-sync"; packageName = "findup-sync"; - version = "0.4.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz"; - sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; "fined-1.1.0" = { @@ -12249,85 +13689,13 @@ let sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; - "flagged-respawn-0.3.2" = { + "flagged-respawn-1.0.0" = { name = "flagged-respawn"; packageName = "flagged-respawn"; - version = "0.3.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz"; - sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5"; - }; - }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; - }; - }; - "lodash.mapvalues-4.6.0" = { - name = "lodash.mapvalues"; - packageName = "lodash.mapvalues"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; - sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; - }; - }; - "detect-file-0.1.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz"; - sha1 = "4935dedfd9488648e006b0129566e9386711ea63"; - }; - }; - "resolve-dir-0.1.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz"; - sha1 = "b219259a5602fac5c5c496ad894a6e8cc430261e"; - }; - }; - "fs-exists-sync-0.1.0" = { - name = "fs-exists-sync"; - packageName = "fs-exists-sync"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"; - sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; - }; - }; - "expand-tilde-1.2.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz"; - sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; - }; - }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; + sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; }; }; "is-plain-object-2.0.4" = { @@ -12339,13 +13707,139 @@ let sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; }; }; - "object.defaults-1.1.0" = { - name = "object.defaults"; - packageName = "object.defaults"; - version = "1.1.0"; + "object.map-1.0.1" = { + name = "object.map"; + packageName = "object.map"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; - sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; + }; + }; + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "micromatch-3.1.4" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.4.tgz"; + sha512 = "1z55bzyr3xwhvk8wbclnfjsbzwivqf9whb7k84gd8ljwfzmhsra430ikzd3p0nzxk90ybqas0c4bl6j4l1q5iyyz99h584q4az6sm4h"; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "braces-2.3.0" = { + name = "braces"; + packageName = "braces"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; + sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extglob-2.0.3" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz"; + sha512 = "31zb5fc59ps76hnxlnrcmm3lkv4pjd3cw55h5h7r9pn1q259bs15hw0bn4gp8kn91qwabgbj0cwkx9pxp8fgsj3ljlvmfv0xijnsah3"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; + }; + }; + "nanomatch-1.2.6" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.6.tgz"; + sha512 = "014pd4mh3hhi0gmrpss462ivnr8ic21ihmyjs4rx6v5prf5mw2zqzhsxbinx2mxiy4kc7wlw5w052bi18y6rgxq7l2pangg4r69g7jq"; }; }; "object.pick-1.3.0" = { @@ -12357,13 +13851,40 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; - "parse-filepath-1.0.1" = { - name = "parse-filepath"; - packageName = "parse-filepath"; - version = "1.0.1"; + "regex-not-1.0.0" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz"; - sha1 = "159d6155d43904d16c10ef698911da1e91969b73"; + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; + sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; + }; + }; + "snapdragon-0.8.1" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; + sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; + }; + }; + "to-regex-3.0.1" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; + sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; "isobject-3.0.1" = { @@ -12375,40 +13896,157 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; - "array-each-1.0.1" = { - name = "array-each"; - packageName = "array-each"; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; - sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; }; }; - "array-slice-1.0.0" = { - name = "array-slice"; - packageName = "array-slice"; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; - sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; - "for-own-1.0.0" = { - name = "for-own"; - packageName = "for-own"; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; - sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; }; }; - "is-absolute-0.2.6" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "0.2.6"; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; - sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; }; }; "map-cache-0.2.2" = { @@ -12420,6 +14058,393 @@ let sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; }; }; + "is-odd-1.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; + sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + }; + }; + "source-map-resolve-0.5.1" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; + sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; + }; + }; + "use-2.0.2" = { + name = "use"; + packageName = "use"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; + sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + }; + }; + "class-utils-0.3.5" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz"; + sha1 = "17e793103750f9627b2176ea34cfd1b565903c80"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "mixin-deep-1.3.0" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; + sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "lazy-cache-2.0.2" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; + sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "set-getter-0.1.0" = { + name = "set-getter"; + packageName = "set-getter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; + sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "atob-2.0.3" = { + name = "atob"; + packageName = "atob"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; + sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "is-windows-1.0.1" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; + sha1 = "310db70f742d259a16a369202b51af84233310d9"; + }; + }; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + }; + }; + "parse-filepath-1.0.2" = { + name = "parse-filepath"; + packageName = "parse-filepath"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + }; + "array-each-1.0.1" = { + name = "array-each"; + packageName = "array-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + }; + }; + "array-slice-1.1.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; + sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; + }; + }; + "for-own-1.0.0" = { + name = "for-own"; + packageName = "for-own"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + }; + }; + "is-absolute-1.0.0" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; + }; + }; "path-root-0.1.1" = { name = "path-root"; packageName = "path-root"; @@ -12429,22 +14454,22 @@ let sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; }; }; - "is-relative-0.2.1" = { + "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; - sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; }; }; - "is-unc-path-0.1.2" = { + "is-unc-path-1.0.0" = { name = "is-unc-path"; packageName = "is-unc-path"; - version = "0.1.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; - sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; }; }; "unc-path-regex-0.1.2" = { @@ -12465,6 +14490,15 @@ let sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; }; }; + "make-iterator-1.0.0" = { + name = "make-iterator"; + packageName = "make-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; + sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; + }; + }; "sequencify-0.0.7" = { name = "sequencify"; packageName = "sequencify"; @@ -12690,13 +14724,13 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-2.0.3" = { + "eventemitter3-3.0.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "2.0.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; - sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.0.tgz"; + sha512 = "0jijxlrlxb3vf5xqxibisd132qzlh9ag6ckxgvz791d4rqrzvzc2mzzn86jx1bgbsym1wi0pgm017i4rd5m84g1d38n56zqvh5g2r7b"; }; }; "csslint-0.10.0" = { @@ -12879,13 +14913,13 @@ let sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; }; }; - "uglify-js-3.2.0" = { + "uglify-js-3.3.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.2.0"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.0.tgz"; - sha512 = "2vgdxdcacmfv1079k2pbqi0cmgyg2xha1l1h91dnjb80wym2krmbq4i3kwk0ivknhj3mxm7iq584kx0rjyscz31cjkz38117fah7prg"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz"; + sha512 = "2xnm5j27ds49pw0jxr30vj79ib0l0g4sbpdy7l3jvcjxdrwy0g4g8w9h69fk7fr45bs0mm9xj9pv0d1jvcva53x7xbxkr880jw31wl5"; }; }; "xml-char-classes-1.0.0" = { @@ -12897,15 +14931,6 @@ let sha1 = "64657848a20ffc5df583a42ad8a277b4512bbc4d"; }; }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; - }; - }; "@ionic/cli-framework-0.1.2" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; @@ -12933,13 +14958,13 @@ let sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8"; }; }; - "tslib-1.8.0" = { + "tslib-1.8.1" = { name = "tslib"; packageName = "tslib"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz"; - sha512 = "0k910mhnraax4m75hvgb3f2mhfj6yrsqn7fmyqm2sx137f1kqpz8icww9zhlmqka5pfi8hvprd0wcyflim0nvh7jb14yksjj9crcqna"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz"; + sha1 = "6946af2d1d651a7b1863b531d6e5afa41aa44eac"; }; }; "ncp-2.0.0" = { @@ -12951,22 +14976,13 @@ let sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; }; - "superagent-3.8.1" = { + "superagent-3.8.2" = { name = "superagent"; packageName = "superagent"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.8.1.tgz"; - sha512 = "3lp63wkl3d6zz6lfrv6kzi29lcvhjxvjhq66sqjj5di7z5d2w653wvbb66sfng07f7czigzfacxy8hry6v304nlg1gigf85i0nlbh2l"; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; + sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; }; }; "cookiejar-2.1.1" = { @@ -13077,13 +15093,13 @@ let sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; }; }; - "tar-4.0.2" = { + "tar-4.2.0" = { name = "tar"; packageName = "tar"; - version = "4.0.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz"; - sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2"; + url = "https://registry.npmjs.org/tar/-/tar-4.2.0.tgz"; + sha512 = "2gxmbyhp1fl504kj9lkj0p7fx6z7ixvnjkvww945i6dbhc76lci537p5jpw1g64w5yj2npcyfspbg2dfzpcvbmn0a55z16yi670pkpi"; }; }; "tiny-lr-1.0.5" = { @@ -13095,13 +15111,13 @@ let sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; }; }; - "ws-3.3.2" = { + "ws-3.3.3" = { name = "ws"; packageName = "ws"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz"; - sha512 = "0nqwnjzy5hj2ay2lgxic67rg6dgj690xsiqwswfkrpr0vzyxmhkknfg145fwpqj3br9qa33k7jjdjdgpis9a0m1pxwc913iqfk8drdp"; + url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; + sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy"; }; }; "netmask-1.0.6" = { @@ -13203,15 +15219,6 @@ let sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; }; }; - "is-glob-3.1.0" = { - name = "is-glob"; - packageName = "is-glob"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; - }; - }; "eventemitter3-1.2.0" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -13230,15 +15237,6 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - }; "lodash.assign-3.2.0" = { name = "lodash.assign"; packageName = "lodash.assign"; @@ -13302,6 +15300,15 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; + "fs-minipass-1.2.5" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; + sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; + }; + }; "minipass-2.2.1" = { name = "minipass"; packageName = "minipass"; @@ -13311,13 +15318,13 @@ let sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; }; }; - "minizlib-1.0.4" = { + "minizlib-1.1.0" = { name = "minizlib"; packageName = "minizlib"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz"; - sha512 = "1lxpa3mkdc94i0d7b2ivilcky0gnmnxv5csmigzacb5gl2cz7rz4ciikq1r5an1simk86f61whwzyi5d8gic85w55q19d09sbv19pmh"; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; + sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; "yallist-3.0.2" = { @@ -13554,13 +15561,13 @@ let sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; }; }; - "rxjs-5.5.2" = { + "rxjs-5.5.6" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.2"; + version = "5.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz"; - sha512 = "208dclsk809q1ra99l8j8xzrl9kcm4wpzwjb89rwdqrz78x3i0861kkgqi1sp3v8sdnnvdq0flmazdv96ah7jxpvwf74lw1llh2h5m1"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz"; + sha512 = "293yj2n5f5bj8b8y9czwgm5l3bqa0g3bbghnxsxwdpiz6s2mxiw6a79w3sqq3c1by3avmb5bgk8xgi0yss5y09pxw87055l60f3k15z"; }; }; "semaphore-async-await-1.5.1" = { @@ -13752,13 +15759,13 @@ let sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; }; }; - "symbol-observable-1.0.4" = { + "symbol-observable-1.0.1" = { name = "symbol-observable"; packageName = "symbol-observable"; - version = "1.0.4"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"; - sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"; + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz"; + sha1 = "8340fc4702c3122df5d22288f88283f513d3fdd4"; }; }; "vscode-uri-1.0.1" = { @@ -13788,6 +15795,96 @@ let sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; }; }; + "babylon-7.0.0-beta.19" = { + name = "babylon"; + packageName = "babylon"; + version = "7.0.0-beta.19"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz"; + sha512 = "3y91819zra4jxfjqqdvbi44fr34m68vk7j76rkqkxvayhxmcmrvmxpk7rz16r2s3riql0xs322mkzm61asxzkc5b2zpw4firzv043an"; + }; + }; + "bluebird-3.5.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; + }; + }; + "catharsis-0.8.9" = { + name = "catharsis"; + packageName = "catharsis"; + version = "0.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz"; + sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; + }; + }; + "js2xmlparser-3.0.0" = { + name = "js2xmlparser"; + packageName = "js2xmlparser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz"; + sha1 = "3fb60eaa089c5440f9319f51760ccd07e2499733"; + }; + }; + "klaw-2.0.0" = { + name = "klaw"; + packageName = "klaw"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz"; + sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; + }; + }; + "marked-0.3.9" = { + name = "marked"; + packageName = "marked"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz"; + sha512 = "0pwzm37c83y03v5kd0py5nd7bfzm8h07ibq73j6kx2sjyj62p9c3swp9nk64nb4w67gdq4i5xp05673k3vsxwvwj3gi2pv9vk8nwvlx"; + }; + }; + "requizzle-0.2.1" = { + name = "requizzle"; + packageName = "requizzle"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz"; + sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; + }; + }; + "taffydb-2.6.2" = { + name = "taffydb"; + packageName = "taffydb"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz"; + sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; + }; + }; + "underscore-contrib-0.3.0" = { + name = "underscore-contrib"; + packageName = "underscore-contrib"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; + sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; + }; + }; + "xmlcreate-1.0.2" = { + name = "xmlcreate"; + packageName = "xmlcreate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz"; + sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f"; + }; + }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -13824,15 +15921,6 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "bluebird-3.5.1" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; - }; - }; "lru-cache-3.2.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -13842,13 +15930,22 @@ let sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; }; }; - "graphlib-2.1.1" = { + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + }; + }; + "graphlib-2.1.5" = { name = "graphlib"; packageName = "graphlib"; - version = "2.1.1"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.1.tgz"; - sha1 = "42352c52ba2f4d035cb566eb91f7395f76ebc951"; + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; }; }; "native-promise-only-0.8.1" = { @@ -13995,13 +16092,13 @@ let sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; }; }; - "yargs-10.0.3" = { + "yargs-10.1.0" = { name = "yargs"; packageName = "yargs"; - version = "10.0.3"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; - sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; + url = "https://registry.npmjs.org/yargs/-/yargs-10.1.0.tgz"; + sha512 = "0p5nja16hrpl08hyknccxdazyhaj2ha6gzzf2ab0f7w42brq3ms3bn8yhlkqx9x30x3pi0fhxxmqnal224mr5m1ag049v0lg8binykm"; }; }; "path-to-regexp-1.7.0" = { @@ -14040,13 +16137,13 @@ let sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; }; }; - "boxen-1.2.2" = { + "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz"; - sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; }; }; "configstore-3.1.1" = { @@ -14130,13 +16227,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "widest-line-1.0.0" = { + "widest-line-2.0.0" = { name = "widest-line"; packageName = "widest-line"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; + sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; }; }; "execa-0.7.0" = { @@ -14229,13 +16326,13 @@ let sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; }; }; - "cliui-3.2.0" = { + "cliui-4.0.0" = { name = "cliui"; packageName = "cliui"; - version = "3.2.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz"; + sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx"; }; }; "get-caller-file-1.0.2" = { @@ -14301,13 +16398,13 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; - "yargs-parser-8.0.0" = { + "yargs-parser-8.1.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz"; - sha1 = "21d476330e5a82279a4b881345bf066102e219c6"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz"; + sha512 = "0jyff04yy5xlrgvccky4f7phgp99lk2r1n7dk67hkb0picdjpa2ap27g4jrm94cw1d31vw8sh2b5cvnvga2w838bgh6l1kwld1bmzy8"; }; }; "wrap-ansi-2.1.0" = { @@ -14337,6 +16434,15 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; + "browserify-14.5.0" = { + name = "browserify"; + packageName = "browserify"; + version = "14.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; + sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; + }; + }; "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; @@ -14391,13 +16497,13 @@ let sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; }; }; - "log4js-0.6.38" = { + "log4js-2.4.1" = { name = "log4js"; packageName = "log4js"; - version = "0.6.38"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz"; - sha1 = "2c494116695d6fb25480943d3fc872e662a522fd"; + url = "https://registry.npmjs.org/log4js/-/log4js-2.4.1.tgz"; + sha512 = "3xd40iy8j9s89j8hy5jr11v377rfcv0293p986r9i4rq0syypl1vv7rk8al99pqkhi3wdf2hs5ik9xg7fgh53cdzazcmz0lqm7lb20s"; }; }; "qjobs-1.1.5" = { @@ -14409,13 +16515,13 @@ let sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; }; }; - "socket.io-1.7.3" = { + "socket.io-2.0.4" = { name = "socket.io"; packageName = "socket.io"; - version = "1.7.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz"; - sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; + sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; }; "useragent-2.2.1" = { @@ -14499,76 +16605,634 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; - "debug-2.3.3" = { + "circular-json-0.4.0" = { + name = "circular-json"; + packageName = "circular-json"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.4.0.tgz"; + sha512 = "2iz1fwlb43dgp5bjapmlbqzanpss2r3z2db7y26drfw4nxfzbay2yjc13pxf6y3r2i5s2kbja6a05x21ra0ffmvvxcnz0h3c39pk9dl"; + }; + }; + "date-format-1.2.0" = { + name = "date-format"; + packageName = "date-format"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz"; + sha1 = "615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"; + }; + }; + "streamroller-0.7.0" = { + name = "streamroller"; + packageName = "streamroller"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz"; + sha512 = "26pp7m15rrddwfr1w83nhrws5k82ld1l8njiqvhm43vckr0zszhhb8jwps2bhzylfp7xmb8p2kr86y1g97knikrlwm3blrb5mzk64ar"; + }; + }; + "hipchat-notifier-1.1.0" = { + name = "hipchat-notifier"; + packageName = "hipchat-notifier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz"; + sha1 = "b6d249755437c191082367799d3ba9a0f23b231e"; + }; + }; + "loggly-1.1.1" = { + name = "loggly"; + packageName = "loggly"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz"; + sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; + }; + }; + "mailgun-js-0.7.15" = { + name = "mailgun-js"; + packageName = "mailgun-js"; + version = "0.7.15"; + src = fetchurl { + url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.7.15.tgz"; + sha1 = "ee366a20dac64c3c15c03d6c1b3e0ed795252abb"; + }; + }; + "nodemailer-2.7.2" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-2.7.2.tgz"; + sha1 = "f242e649aeeae39b6c7ed740ef7b061c404d30f9"; + }; + }; + "redis-2.8.0" = { + name = "redis"; + packageName = "redis"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; + sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + }; + }; + "slack-node-0.2.0" = { + name = "slack-node"; + packageName = "slack-node"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz"; + sha1 = "de4b8dddaa8b793f61dbd2938104fdabf37dfa30"; + }; + }; + "axios-0.15.3" = { + name = "axios"; + packageName = "axios"; + version = "0.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz"; + sha1 = "2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"; + }; + }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "async-2.1.5" = { + name = "async"; + packageName = "async"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + }; + }; + "debug-2.2.0" = { name = "debug"; packageName = "debug"; - version = "2.3.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }; }; - "engine.io-1.8.3" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.3"; + "inflection-1.10.0" = { + name = "inflection"; + packageName = "inflection"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz"; - sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4"; + url = "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz"; + sha1 = "5bffcb1197ad3e81050f8e17e21668087ee9eb2f"; }; }; - "has-binary-0.1.7" = { - name = "has-binary"; - packageName = "has-binary"; - version = "0.1.7"; + "path-proxy-1.0.0" = { + name = "path-proxy"; + packageName = "path-proxy"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; + url = "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz"; + sha1 = "18e8a36859fc9d2f1a53b48dee138543c020de5e"; }; }; - "object-assign-4.1.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.0"; + "proxy-agent-2.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz"; + sha1 = "57eb5347aa805d74ec681cb25649dba39c933499"; }; }; - "socket.io-adapter-0.5.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.5.0"; + "tsscmp-1.0.5" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; - sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; + sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "socket.io-client-1.7.3" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz"; - sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377"; - }; - }; - "socket.io-parser-2.3.1" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; - sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; - }; - }; - "ms-0.7.2" = { + "ms-0.7.1" = { name = "ms"; packageName = "ms"; - version = "0.7.2"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; + "inflection-1.3.8" = { + name = "inflection"; + packageName = "inflection"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz"; + sha1 = "cbd160da9f75b14c3cc63578d4f396784bf3014e"; + }; + }; + "agent-base-2.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; + sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + }; + }; + "http-proxy-agent-1.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; + sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + }; + }; + "https-proxy-agent-1.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; + sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + }; + }; + "lru-cache-2.6.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"; + sha1 = "e56d6354148ede8d7707b58d143220fd08df0fd5"; + }; + }; + "pac-proxy-agent-1.1.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz"; + sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0"; + }; + }; + "socks-proxy-agent-2.1.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; + sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; + }; + }; + "semver-5.0.3" = { + name = "semver"; + packageName = "semver"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + }; + }; + "get-uri-2.0.1" = { + name = "get-uri"; + packageName = "get-uri"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz"; + sha512 = "10bm7v59d4pv7pk0smv9qwl8rp1iq60d20jdybycdpjqv85gdirf00kci8m5fz16gja9i5l60yxgiqzafj1195disavn21anrbab9zd"; + }; + }; + "pac-resolver-2.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz"; + sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"; + }; + }; + "data-uri-to-buffer-1.2.0" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz"; + sha512 = "18vh45y1sdi44vwca9js1hpy9mjwb641dwnc0fm9y2x3pgivzjndjksrlpk65kp5g99lsy2z2m8a4907bj11118c95m2dqg6h6kv95w"; + }; + }; + "ftp-0.3.10" = { + name = "ftp"; + packageName = "ftp"; + version = "0.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz"; + sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d"; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; + }; + }; + "xregexp-2.0.0" = { + name = "xregexp"; + packageName = "xregexp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; + sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; + }; + }; + "co-3.0.6" = { + name = "co"; + packageName = "co"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-3.0.6.tgz"; + sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda"; + }; + }; + "degenerator-1.0.4" = { + name = "degenerator"; + packageName = "degenerator"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz"; + sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; + }; + }; + "thunkify-2.1.2" = { + name = "thunkify"; + packageName = "thunkify"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz"; + sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; + }; + }; + "ip-1.0.1" = { + name = "ip"; + packageName = "ip"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz"; + sha1 = "c7e356cdea225ae71b36d70f2e71a92ba4e42590"; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "escodegen-1.9.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz"; + sha512 = "0il8dp1bh3n1am3xx5pazmpjb5m8wzdn9xg1lgh4j8axvsy8v24i1171c04qafx0j4xsaq76j29ljq2srf4i3kdl3qbrn9psjy1hhxz"; + }; + }; + "ast-types-0.10.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz"; + sha512 = "2wjsah372x6rjrrsq3bv915lccq4pjpyk4b0vb7kmc87ab5yjgac4rab0qclh6brhhyv95mbyy1k5sijfyx36676darz57k6gsgx3ji"; + }; + }; + "socks-1.1.10" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + }; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + }; + "libmime-3.0.0" = { + name = "libmime"; + packageName = "libmime"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; + sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; + }; + }; + "mailcomposer-4.0.1" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; + sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; + }; + }; + "nodemailer-direct-transport-3.3.2" = { + name = "nodemailer-direct-transport"; + packageName = "nodemailer-direct-transport"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz"; + sha1 = "e96fafb90358560947e569017d97e60738a50a86"; + }; + }; + "nodemailer-shared-1.1.0" = { + name = "nodemailer-shared"; + packageName = "nodemailer-shared"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; + }; + }; + "nodemailer-smtp-pool-2.8.2" = { + name = "nodemailer-smtp-pool"; + packageName = "nodemailer-smtp-pool"; + version = "2.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz"; + sha1 = "2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"; + }; + }; + "nodemailer-smtp-transport-2.7.2" = { + name = "nodemailer-smtp-transport"; + packageName = "nodemailer-smtp-transport"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz"; + sha1 = "03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"; + }; + }; + "socks-1.1.9" = { + name = "socks"; + packageName = "socks"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz"; + sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; + }; + }; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + }; + }; + "libbase64-0.1.0" = { + name = "libbase64"; + packageName = "libbase64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; + sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; + }; + }; + "libqp-1.1.0" = { + name = "libqp"; + packageName = "libqp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; + sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + }; + }; + "buildmail-4.0.1" = { + name = "buildmail"; + packageName = "buildmail"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; + sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; + }; + }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; + "nodemailer-fetch-1.6.0" = { + name = "nodemailer-fetch"; + packageName = "nodemailer-fetch"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; + }; + }; + "smtp-connection-2.12.0" = { + name = "smtp-connection"; + packageName = "smtp-connection"; + version = "2.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz"; + sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; + }; + }; + "httpntlm-1.6.1" = { + name = "httpntlm"; + packageName = "httpntlm"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz"; + sha1 = "ad01527143a2e8773cfae6a96f58656bb52a34b2"; + }; + }; + "httpreq-0.4.24" = { + name = "httpreq"; + packageName = "httpreq"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz"; + sha1 = "4335ffd82cd969668a39465c929ac61d6393627f"; + }; + }; + "underscore-1.7.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + }; + "nodemailer-wellknown-0.1.10" = { + name = "nodemailer-wellknown"; + packageName = "nodemailer-wellknown"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; + sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; + }; + }; + "double-ended-queue-2.1.0-0" = { + name = "double-ended-queue"; + packageName = "double-ended-queue"; + version = "2.1.0-0"; + src = fetchurl { + url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; + sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + }; + }; + "redis-commands-1.3.1" = { + name = "redis-commands"; + packageName = "redis-commands"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz"; + sha1 = "81d826f45fa9c8b2011f4cd7a0fe597d241d442b"; + }; + }; + "redis-parser-2.6.0" = { + name = "redis-parser"; + packageName = "redis-parser"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; + sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; + }; + }; + "requestretry-1.12.2" = { + name = "requestretry"; + packageName = "requestretry"; + version = "1.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/requestretry/-/requestretry-1.12.2.tgz"; + sha512 = "1gibp5f4n62642gyanvvyyskhzw5snx22d5wgy1ldcydbb605m83j863fb85jjyji2simmp9dy8b8rxm1axyvpawvnb5fm6i0gjfdn0"; + }; + }; + "when-3.7.8" = { + name = "when"; + packageName = "when"; + version = "3.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; + sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; + }; + }; + "follow-redirects-1.0.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz"; + sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37"; + }; + }; + "engine.io-3.1.4" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; + sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; + }; + }; + "socket.io-adapter-1.1.1" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; + sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + }; + }; + "socket.io-client-2.0.4" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; + sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; + }; + }; + "socket.io-parser-3.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; + sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; }; }; "accepts-1.3.3" = { @@ -14589,22 +17253,22 @@ let sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; - "engine.io-parser-1.3.2" = { + "engine.io-parser-2.1.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "1.3.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; - sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz"; + sha512 = "0rjbixsn5qvjwklnvvjdfz4wy85dk82zkvh6lk3znbd3p3isgr57a5kikgndr3xhhkv5zzvh4bfxbz7gqfsgijscyiiilgw78bwp2bl"; }; }; - "ws-1.1.2" = { - name = "ws"; - packageName = "ws"; - version = "1.1.2"; + "uws-0.14.5" = { + name = "uws"; + packageName = "uws"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; - sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; + url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; + sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; }; }; "after-0.8.2" = { @@ -14616,13 +17280,13 @@ let sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; - "arraybuffer.slice-0.0.6" = { + "arraybuffer.slice-0.0.7" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; - sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; + sha512 = "2ifpj39fza01g4z9jhgl0shmh5f79czgfh7bf40n66v5p93nrf43kiqhsgic9az2jrwmj8n60dn7kav1rzvm41a9kwi4ypf0mahhrf0"; }; }; "base64-arraybuffer-0.1.5" = { @@ -14643,13 +17307,22 @@ let sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; }; }; - "wtf-8-1.0.0" = { - name = "wtf-8"; - packageName = "wtf-8"; - version = "1.0.0"; + "has-binary2-1.0.2" = { + name = "has-binary2"; + packageName = "has-binary2"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; - sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; + sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; + }; + }; + "isarray-2.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; + sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; "backo2-1.0.2" = { @@ -14670,13 +17343,22 @@ let sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; }; }; - "engine.io-client-1.8.3" = { + "engine.io-client-3.1.4" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "1.8.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz"; - sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; + sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; + }; + }; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; }; }; "object-component-0.0.3" = { @@ -14688,6 +17370,15 @@ let sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; }; }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; "parseuri-0.0.5" = { name = "parseuri"; packageName = "parseuri"; @@ -14715,40 +17406,13 @@ let sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; }; }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - }; - "parsejson-0.0.3" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; - sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; - }; - }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - }; - "xmlhttprequest-ssl-1.5.3" = { + "xmlhttprequest-ssl-1.5.4" = { name = "xmlhttprequest-ssl"; packageName = "xmlhttprequest-ssl"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; - sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; + sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; }; }; "yeast-0.1.2" = { @@ -14778,33 +17442,6 @@ let sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; "lru-cache-2.2.4" = { name = "lru-cache"; packageName = "lru-cache"; @@ -15156,15 +17793,6 @@ let sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; }; }; - "tsscmp-1.0.5" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; - sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; - }; - }; "uid-safe-2.1.4" = { name = "uid-safe"; packageName = "uid-safe"; @@ -15219,6 +17847,15 @@ let sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; }; }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; "batch-0.5.3" = { name = "batch"; packageName = "batch"; @@ -15363,13 +18000,13 @@ let sha1 = "46c51496216b7406588883defa6fac589e9bb31e"; }; }; - "conventional-recommended-bump-1.0.3" = { + "conventional-recommended-bump-1.1.0" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.3.tgz"; - sha1 = "472b69b1b8f09c5c4ed40fe28a41e63cc04bd736"; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.1.0.tgz"; + sha512 = "3gh833x8hqmnxfmacs3ryrb2gh3y397ddkiwisv6g3dfz6j617i1fm22yq3r83y40pidmf1n77qzvwmbx4ws7jn4yydfxypi6fhgbaq"; }; }; "dedent-0.7.0" = { @@ -15381,13 +18018,13 @@ let sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; }; }; - "fs-extra-4.0.2" = { + "fs-extra-4.0.3" = { name = "fs-extra"; packageName = "fs-extra"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz"; - sha1 = "f91704c53d1b461f893452b0c307d9997647ab6b"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; + sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb"; }; }; "get-port-3.2.0" = { @@ -15417,13 +18054,13 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; - "is-ci-1.0.10" = { + "is-ci-1.1.0" = { name = "is-ci"; packageName = "is-ci"; - version = "1.0.10"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; - sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; }; }; "load-json-file-3.0.0" = { @@ -15471,13 +18108,13 @@ let sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; }; }; - "temp-write-3.3.0" = { + "temp-write-3.4.0" = { name = "temp-write"; packageName = "temp-write"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz"; - sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; + url = "https://registry.npmjs.org/temp-write/-/temp-write-3.4.0.tgz"; + sha1 = "8cff630fb7e9da05f047c74ce4ce4d685457d492"; }; }; "write-json-file-2.3.0" = { @@ -15534,13 +18171,13 @@ let sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; }; }; - "conventional-changelog-angular-1.5.2" = { + "conventional-changelog-angular-1.6.0" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.2.tgz"; - sha1 = "2b38f665fe9c5920af1a2f82f547f4babe6de57c"; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.0.tgz"; + sha1 = "0a26a071f2c9fcfcf2b86ba0cfbf6e6301b75bfa"; }; }; "conventional-changelog-atom-0.1.2" = { @@ -15561,22 +18198,22 @@ let sha1 = "299a4f7147baf350e6c8158fc54954a291c5cc09"; }; }; - "conventional-changelog-core-1.9.3" = { + "conventional-changelog-core-1.9.5" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.3.tgz"; - sha1 = "2899fe779389a329f0ec4b2746c36ddefb98da2d"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.5.tgz"; + sha1 = "5db7566dad7c0cb75daf47fbb2976f7bf9928c1d"; }; }; - "conventional-changelog-ember-0.2.9" = { + "conventional-changelog-ember-0.2.10" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.9.tgz"; - sha1 = "8ec73cc054e3ab064667fb1feb52fe8ef1b16438"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.10.tgz"; + sha512 = "04s2g1mkzbpbklqj81q25j87vxl4ggq0x9n7nyry9771cyawn7007wridq4hnhd4qa5vvz5lnslwvj7aliwi78l3vw2dvlhxrj4241c"; }; }; "conventional-changelog-eslint-0.2.1" = { @@ -15642,22 +18279,22 @@ let sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; - "conventional-changelog-writer-2.0.2" = { + "conventional-changelog-writer-2.0.3" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.2.tgz"; - sha1 = "b5857ded1b001daf9a78b9cd40926f45c134949b"; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.3.tgz"; + sha512 = "1nchhqyp5qmrwqn9yxrkn8zjhlk1ph5jgnky26lzkrd1j4lh2n93602xw1zm6gv7qg48r61qzk5qh74v480nx4q7d8zilfb8pnn2kfq"; }; }; - "conventional-commits-parser-2.0.1" = { + "conventional-commits-parser-2.1.0" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.1.tgz"; - sha1 = "1f15ce6b844f7ca41495c8190c0833c30b8b1693"; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.0.tgz"; + sha512 = "0mnckb77dj8jk9xspzh6q0kaybc5wyb2ny94qgnvbj5f1yjnk7s2sak86b0h3dhrfk4y9nncwfjpvsg8iyiary68sdbwrbl4gkz9h7h"; }; }; "dateformat-1.0.12" = { @@ -15705,22 +18342,13 @@ let sha1 = "188b453882bf9d7a23afd31baba537dab7388d5d"; }; }; - "conventional-commits-filter-1.1.0" = { + "conventional-commits-filter-1.1.1" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.0.tgz"; - sha1 = "1fc29af30b5edab76f54e229c411b0c663d0f9eb"; - }; - }; - "split-1.0.1" = { - name = "split"; - packageName = "split"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz"; + sha512 = "0jrsm3hlyq0a425d320l1rghxmmb621r0bcvlsfbdichzbyimflwn7wz1mhw62kdnr3wxskdpaq11f5qpdsz5g2d5f7ha4d4jvrl33d"; }; }; "is-subset-0.1.1" = { @@ -15957,15 +18585,6 @@ let sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; }; }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; - }; - }; "sort-keys-2.0.0" = { name = "sort-keys"; packageName = "sort-keys"; @@ -15975,6 +18594,15 @@ let sha1 = "658535584861ec97d730d6cf41822e1f56684128"; }; }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; "read-pkg-up-2.0.0" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -16101,15 +18729,6 @@ let sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; }; }; - "extend-shallow-2.0.1" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; - }; - }; "json-stable-stringify-1.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -16146,22 +18765,13 @@ let sha1 = "d6f73da5276ded956861337189addf3d52b93558"; }; }; - "markdown-it-task-checkbox-1.0.4" = { + "markdown-it-task-checkbox-1.0.6" = { name = "markdown-it-task-checkbox"; packageName = "markdown-it-task-checkbox"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.4.tgz"; - sha1 = "183d2d81cf2b8e4de1b91bab73a13ef5c6c16581"; - }; - }; - "socket.io-2.0.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; - sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; + url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz"; + sha512 = "0knj35b20bkc34hpfv73p4m855ysgdshml07fhj18j62p09y2066l7nl28g9kr2rwqm9x8j0bw20d32vqrrhih5ifvynk7axcg6977f"; }; }; "linkify-it-2.0.3" = { @@ -16227,96 +18837,6 @@ let sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; }; - "engine.io-3.1.4" = { - name = "engine.io"; - packageName = "engine.io"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; - sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; - }; - }; - "socket.io-adapter-1.1.1" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; - sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; - }; - }; - "socket.io-client-2.0.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; - sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; - }; - }; - "socket.io-parser-3.1.2" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; - sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; - }; - }; - "engine.io-parser-2.1.1" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz"; - sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668"; - }; - }; - "uws-0.14.5" = { - name = "uws"; - packageName = "uws"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; - sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; - }; - }; - "has-binary2-1.0.2" = { - name = "has-binary2"; - packageName = "has-binary2"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; - sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; - }; - }; - "isarray-2.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; - sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; - }; - }; - "engine.io-client-3.1.4" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; - sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; - }; - }; - "xmlhttprequest-ssl-1.5.4" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; - sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; - }; - }; "connect-3.5.1" = { name = "connect"; packageName = "connect"; @@ -16542,15 +19062,6 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "commander-2.11.0" = { - name = "commander"; - packageName = "commander"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; - }; - }; "diff-3.3.1" = { name = "diff"; packageName = "diff"; @@ -16983,15 +19494,6 @@ let sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; }; }; - "es6-promise-3.3.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; - sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; - }; - }; "ignore-by-default-1.0.1" = { name = "ignore-by-default"; packageName = "ignore-by-default"; @@ -17001,22 +19503,13 @@ let sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; }; }; - "lodash.defaults-3.1.2" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz"; - sha1 = "c7308b18dbf8bc9372d701a73493c61192bd2e2c"; - }; - }; - "ps-tree-1.1.0" = { - name = "ps-tree"; - packageName = "ps-tree"; + "pstree.remy-1.1.0" = { + name = "pstree.remy"; + packageName = "pstree.remy"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; - sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; + url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; + sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; }; }; "touch-3.1.0" = { @@ -17037,13 +19530,13 @@ let sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; }; }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; + "ps-tree-1.1.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; + sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; }; }; "body-parser-1.17.2" = { @@ -17253,15 +19746,6 @@ let sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; }; }; - "when-3.7.8" = { - name = "when"; - packageName = "when"; - version = "3.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; - sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; - }; - }; "ws-1.1.1" = { name = "ws"; packageName = "ws"; @@ -17298,13 +19782,13 @@ let sha512 = "3h9isciksl33ajjzn4s0dp8s8m3zkijqc7rbw4v8glrhz5y3npbv8501sffak943jyd4k3dqalizv9giwaxqfd1760pkhbzh816y6j4"; }; }; - "node-red-node-rbe-0.1.13" = { + "node-red-node-rbe-0.1.14" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.13"; + version = "0.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.13.tgz"; - sha1 = "734ff1264cdbe0a8aaade20696dd4bfc6bbcdd49"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.14.tgz"; + sha512 = "2xixj71payi14frjkb30lhnripprfcxzqaa9cbwh7w21s426y452ns0vpaycnbsbfwfcn5gcs4b2fjh0b6rxnbasd9hijqf6h3v26wa"; }; }; "bcrypt-1.0.3" = { @@ -17325,15 +19809,6 @@ let sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; }; }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -17622,15 +20097,6 @@ let sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"; }; }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; - }; - }; "commist-1.0.0" = { name = "commist"; packageName = "commist"; @@ -17721,13 +20187,13 @@ let sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; }; }; - "to-absolute-glob-2.0.1" = { + "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz"; - sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; + sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; }; }; "append-field-0.1.0" = { @@ -17883,24 +20349,6 @@ let sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; }; }; - "libbase64-0.1.0" = { - name = "libbase64"; - packageName = "libbase64"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; - sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; - }; - }; - "libqp-1.1.0" = { - name = "libqp"; - packageName = "libqp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; - }; - }; "buildmail-2.0.0" = { name = "buildmail"; packageName = "buildmail"; @@ -17937,15 +20385,6 @@ let sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; }; }; - "nodemailer-wellknown-0.1.10" = { - name = "nodemailer-wellknown"; - packageName = "nodemailer-wellknown"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; - sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; - }; - }; "mimelib-0.3.1" = { name = "mimelib"; packageName = "mimelib"; @@ -17964,15 +20403,6 @@ let sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; - }; - }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -18495,42 +20925,6 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-4.0.1" = { - name = "buildmail"; - packageName = "buildmail"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; - sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; - }; - }; - "libmime-3.0.0" = { - name = "libmime"; - packageName = "libmime"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; - sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; - }; - }; - "nodemailer-fetch-1.6.0" = { - name = "nodemailer-fetch"; - packageName = "nodemailer-fetch"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; - sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; - }; - }; - "nodemailer-shared-1.1.0" = { - name = "nodemailer-shared"; - packageName = "nodemailer-shared"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; - sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; - }; - }; "rai-0.1.12" = { name = "rai"; packageName = "rai"; @@ -18576,24 +20970,6 @@ let sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; }; }; - "esprima-1.0.4" = { - name = "esprima"; - packageName = "esprima"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }; - }; - "underscore-1.7.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; - }; - }; "underscore.string-2.4.0" = { name = "underscore.string"; packageName = "underscore.string"; @@ -18810,6 +21186,15 @@ let sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; }; }; + "rc-config-loader-2.0.1" = { + name = "rc-config-loader"; + packageName = "rc-config-loader"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.1.tgz"; + sha512 = "2sp3cd5mzpc91g5c8k7xwdm9gnax4pf6wvg09scksc81bs5p0qpzjf6s7xi36b0lxfhs76jmm48jv23biy4b4q3d6ldx77vjvhgcyiq"; + }; + }; "semver-utils-1.1.1" = { name = "semver-utils"; packageName = "semver-utils"; @@ -18819,13 +21204,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.51.0" = { + "snyk-1.65.1" = { name = "snyk"; packageName = "snyk"; - version = "1.51.0"; + version = "1.65.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.51.0.tgz"; - sha1 = "cba4d405d607f009dabada3fd62845f7283ce0b5"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.65.1.tgz"; + sha1 = "25a25e452399a0006b5ea2b5c973e25684afc5ab"; }; }; "spawn-please-0.3.0" = { @@ -18837,6 +21222,24 @@ let sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; + "require-from-string-2.0.1" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.1.tgz"; + sha1 = "c545233e9d7da6616e9d59adfb39fc9f588676ff"; + }; + }; + "es6-promise-3.3.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; + }; + }; "hasbin-1.2.3" = { name = "hasbin"; packageName = "hasbin"; @@ -18855,13 +21258,13 @@ let sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; }; }; - "needle-2.0.1" = { + "needle-2.1.0" = { name = "needle"; packageName = "needle"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.0.1.tgz"; - sha1 = "c21fc961ce3c340fb082250da6a08a32f38631f1"; + url = "https://registry.npmjs.org/needle/-/needle-2.1.0.tgz"; + sha1 = "54acebad9cc1a11822cd9ca522fb7c131c583fa4"; }; }; "proxy-from-env-1.0.0" = { @@ -18882,13 +21285,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.3.8" = { + "snyk-go-plugin-1.4.5" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.3.8"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.8.tgz"; - sha512 = "0q7vax6wyzrd2d3rzymrvhqcb1mnhpya12f26v05ly4ydivj1x67mbw0bpcdccagzijy8lbsvn9pp7zy59mikyfvfaj1084xkml4xwc"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.5.tgz"; + sha512 = "0m7m3yjv33vq1p6gwn30vxmacrahvw08j432pva601fm2b48j9f5hq8v6zdrzna2yw6xqg1dnhd7gxskpivvl4rzs3fji23yfvxgqxs"; }; }; "snyk-gradle-plugin-1.2.0" = { @@ -18918,40 +21321,40 @@ let sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r"; }; }; - "snyk-nuget-plugin-1.3.2" = { + "snyk-nuget-plugin-1.3.7" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.3.2"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.2.tgz"; - sha512 = "0r929vp7mqx07wqr1k9xzww6yawkvf2c3s3cyx38mm65r72v8p16acis2y8ircl6spzh5slxv5adqpd70l7khw0fi8x4smjs812cgzp"; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.7.tgz"; + sha512 = "1yvj79ywqm14jgvgkjmaz9vqig14xrx8m44n3nbirzv3smxxzymngfmn6aip77wnzs1a0xlv5f84gk0v8kirdq4npmdyvhnv2ij9vkl"; }; }; - "snyk-php-plugin-1.1.2" = { + "snyk-php-plugin-1.3.1" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.1.2"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.1.2.tgz"; - sha512 = "1vn9mfsmi72rnk8g69y27cpw9ljwv7qjnqmal344d0m20jjak38sz78xafc9l63j0s05bgax693548dn88ivgy5af2y8l8jp970vqp9"; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.1.tgz"; + sha512 = "3hn0csviga8k4drlpqla54qk1n7v3d7sajzpr7bd022vvdgwg0dg9kajjlqzcc6m78xfmkncfvziwyhqfgf9q7khnamjzsp7w37426l"; }; }; - "snyk-policy-1.7.1" = { + "snyk-policy-1.10.1" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.7.1"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz"; - sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.1.tgz"; + sha1 = "b1a26c8aef529c61604aca382111e535d511b763"; }; }; - "snyk-python-plugin-1.4.0" = { + "snyk-python-plugin-1.4.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.0.tgz"; - sha512 = "3ayb4vqwvz9srv07xfrzwwni6aabbxmmxq8gx55qkzbc7x912k7cvd4r8v96ij8ck45r89xhm2j60knmjhv6xj1gm2x9vhz20s325vk"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.1.tgz"; + sha512 = "0j8raq38cjnapa9dbfdmndkl9jm1wh4wdf8h6ahx53p233fiyhlp9sf5zdc2k7sakixsqaic4241ql6r9j33ql0nfgnx67869kjfwzs"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -19152,6 +21555,15 @@ let sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; }; }; + "email-validator-1.1.1" = { + name = "email-validator"; + packageName = "email-validator"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz"; + sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy"; + }; + }; "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; @@ -19251,6 +21663,15 @@ let sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; }; }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; "package-json-2.4.0" = { name = "package-json"; packageName = "package-json"; @@ -19350,13 +21771,13 @@ let sha1 = "df67e92bf12a796f49e928799c8db3ba74b9fcd6"; }; }; - "https-proxy-agent-2.1.0" = { + "https-proxy-agent-2.1.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; - sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz"; + sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic"; }; }; "nodesecurity-npm-utils-6.0.0" = { @@ -19515,13 +21936,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.4.4" = { + "service-runner-2.4.8" = { name = "service-runner"; packageName = "service-runner"; - version = "2.4.4"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.4.tgz"; - sha1 = "336f5fdfb1c5be7ea78044a013bb08d58b9ce08f"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.8.tgz"; + sha1 = "5dd23353bc85bd128ed50b9d5f224ff99b5e8388"; }; }; "simplediff-0.1.1" = { @@ -19551,13 +21972,13 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "object.assign-4.0.4" = { + "object.assign-4.1.0" = { name = "object.assign"; packageName = "object.assign"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; - sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; }; }; "define-properties-1.1.2" = { @@ -19569,6 +21990,15 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; "bunyan-1.8.12" = { name = "bunyan"; packageName = "bunyan"; @@ -19804,15 +22234,6 @@ let sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "network-address-1.1.2" = { - name = "network-address"; - packageName = "network-address"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; - sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; - }; - }; "winreg-1.2.3" = { name = "winreg"; packageName = "winreg"; @@ -19894,15 +22315,6 @@ let sha512 = "0xv0kpsablrjag5ci3qqwjf0hwvcp6yk0hgabv4im6ssanimgbr8yhzmyz4jd10sw5xhrimzhxp2xx34l8p6aryqxqqg0wnxlikbcgk"; }; }; - "buffer-indexof-1.1.1" = { - name = "buffer-indexof"; - packageName = "buffer-indexof"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; - }; - }; "next-line-1.1.0" = { name = "next-line"; packageName = "next-line"; @@ -19939,24 +22351,6 @@ let sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; }; }; - "dns-txt-2.0.2" = { - name = "dns-txt"; - packageName = "dns-txt"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; - sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; - }; - }; - "multicast-dns-6.2.1" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; - sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; - }; - }; "multicast-dns-service-types-1.1.0" = { name = "multicast-dns-service-types"; packageName = "multicast-dns-service-types"; @@ -19966,15 +22360,6 @@ let sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "dns-packet-1.2.2" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz"; - sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh"; - }; - }; "external-editor-1.1.1" = { name = "external-editor"; packageName = "external-editor"; @@ -20047,13 +22432,49 @@ let sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "engine.io-1.8.4" = { + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + }; + }; + "engine.io-1.8.5" = { name = "engine.io"; packageName = "engine.io"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.4.tgz"; - sha1 = "77bce12b80e5d60429337fec3b0daf691ebc9003"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz"; + sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g"; + }; + }; + "has-binary-0.1.7" = { + name = "has-binary"; + packageName = "has-binary"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; + sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; + }; + }; + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; }; }; "socket.io-client-1.7.4" = { @@ -20065,22 +22486,76 @@ let sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; }; }; - "ws-1.1.4" = { - name = "ws"; - packageName = "ws"; - version = "1.1.4"; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz"; - sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; - "engine.io-client-1.8.4" = { + "engine.io-parser-1.3.2" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; + sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; + }; + }; + "arraybuffer.slice-0.0.6" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + }; + }; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + }; + }; + "engine.io-client-1.8.5" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.4.tgz"; - sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz"; + sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + }; + }; + "json3-3.3.2" = { + name = "json3"; + packageName = "json3"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; "extract-zip-1.5.0" = { @@ -20326,13 +22801,13 @@ let sha1 = "8085d390b4c19f7b02dee8a7cd873e2af58667b5"; }; }; - "int64-buffer-0.1.9" = { + "int64-buffer-0.1.10" = { name = "int64-buffer"; packageName = "int64-buffer"; - version = "0.1.9"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.9.tgz"; - sha1 = "9e039da043b24f78b196b283e04653ef5e990f61"; + url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz"; + sha1 = "277b228a87d95ad777d07c13832022406a473423"; }; }; "bufferutil-2.0.1" = { @@ -20993,31 +23468,22 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "args-3.0.7" = { + "args-3.0.8" = { name = "args"; packageName = "args"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-3.0.7.tgz"; - sha512 = "1qi9fsw42grlhv4aj7v42xikvicr5657809syvp4dca33fjzzr1h7x1q9zwhclpyb879g6bgb2yd4i2iasnpmxn8ng1dcnq85yg001r"; + url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz"; + sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9"; }; }; - "clipboardy-1.1.4" = { - name = "clipboardy"; - packageName = "clipboardy"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.1.4.tgz"; - sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee"; - }; - }; - "detect-port-1.2.1" = { + "detect-port-1.2.2" = { name = "detect-port"; packageName = "detect-port"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.1.tgz"; - sha512 = "0r0mpkpa1r78cmagyv47v38fc8ik7pr3zvlnqg57v8nkh4ipd83rla5s1j2c8gymfbwzzlna6pp7h9xw94h93gic3l2z9hzpd68p9fq"; + url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz"; + sha512 = "2q44vf4c9rqz21wc7a1pj1xz6pa2s7sp2fz9zxksmz679xh8sbfzyzhgkkbyznsgbnif013n0a6387dppcs370gdkc0dhh2jgsgv8fk"; }; }; "filesize-3.5.11" = { @@ -21029,13 +23495,22 @@ let sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4"; }; }; - "micro-9.0.0" = { + "fs-extra-5.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; + sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb"; + }; + }; + "micro-9.0.2" = { name = "micro"; packageName = "micro"; - version = "9.0.0"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-9.0.0.tgz"; - sha512 = "1ga72y60zj44dy1y3md37x86klv6nxs7ii0aap37p4qwhq5rb5mcl5yn0kmkrgy6wbvgcnw761rjq7ripiqn1w8q2nl23g2rdj64x69"; + url = "https://registry.npmjs.org/micro/-/micro-9.0.2.tgz"; + sha512 = "1d0ybv5avz4np56a916wv9zwc42gn3y68hibiwg8ps0n23hp3x9zkb631mny9jn2i7imybhzh6fpic1hr6q08lwawf4wy03c4nl680n"; }; }; "micro-compress-1.0.0" = { @@ -21083,15 +23558,6 @@ let sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; }; }; - "execa-0.6.3" = { - name = "execa"; - packageName = "execa"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; - sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; - }; - }; "address-1.0.3" = { name = "address"; packageName = "address"; @@ -21608,13 +24074,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "sanitize-html-1.16.1" = { + "sanitize-html-1.16.3" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.16.1"; + version = "1.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.1.tgz"; - sha512 = "29wgrj32g4l1a8l4fxr55xg8kkbdb9nn9n4birdp20bsr8z1bfd2wh3hp6avhjw25s53shw6kxwbjirgd4yyry6jzalmnh335qvwzy3"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.3.tgz"; + sha512 = "35k1grf7gik1bf6rrxjzsmfdqd5if41gw40hrn44awhzshd3izirkxg734gfrrliwwd7qa4z83l3fg5nq6lgjrm0cxx6z0cg4d0k42y"; }; }; "linkify-it-1.2.4" = { @@ -21635,22 +24101,13 @@ let sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; }; }; - "lodash.isarray-4.0.0" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz"; - sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403"; - }; - }; - "postcss-6.0.14" = { + "postcss-6.0.15" = { name = "postcss"; packageName = "postcss"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz"; - sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz"; + sha512 = "1axgxq4wrv5di6khmfzgadlgzwfpmlk5aprzqacb8z8k3z9hy4rh3pzni9l274yybq2lxfgmigal1icmbb52wwfhwkdjvnbrk4akx5z"; }; }; "srcset-1.0.0" = { @@ -21671,13 +24128,13 @@ let sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; }; }; - "async-2.1.5" = { - name = "async"; - packageName = "async"; - version = "2.1.5"; + "supports-color-5.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz"; + sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; }; }; "assert-plus-0.1.5" = { @@ -22148,13 +24605,13 @@ let sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; }; }; - "unquote-1.1.0" = { + "unquote-1.1.1" = { name = "unquote"; packageName = "unquote"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unquote/-/unquote-1.1.0.tgz"; - sha1 = "98e1fc608b6b854c75afb1b95afc099ba69d942f"; + url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; }; }; "css-select-1.3.0-rc0" = { @@ -22319,13 +24776,148 @@ let sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; - "cli-truncate-1.1.0" = { - name = "cli-truncate"; - packageName = "cli-truncate"; - version = "1.1.0"; + "adm-zip-0.4.7" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; + sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; + }; + }; + "async-2.1.2" = { + name = "async"; + packageName = "async"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; + sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; + }; + }; + "fields-0.1.24" = { + name = "fields"; + packageName = "fields"; + version = "0.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz"; + sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3"; + }; + }; + "humanize-0.0.9" = { + name = "humanize"; + packageName = "humanize"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; + sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; + }; + }; + "longjohn-0.2.11" = { + name = "longjohn"; + packageName = "longjohn"; + version = "0.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; + }; + }; + "moment-2.16.0" = { + name = "moment"; + packageName = "moment"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; + }; + }; + "node-appc-0.2.41" = { + name = "node-appc"; + packageName = "node-appc"; + version = "0.2.41"; + src = fetchurl { + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz"; + sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52"; + }; + }; + "sprintf-0.1.5" = { + name = "sprintf"; + packageName = "sprintf"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; + }; + }; + "winston-1.1.2" = { + name = "winston"; + packageName = "winston"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; + sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; + }; + }; + "fs-extra-2.1.2" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; + sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; + }; + }; + "source-map-support-0.3.2" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz"; + sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1"; + }; + }; + "source-map-0.1.32" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.32"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; + sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; + }; + }; + "async-2.1.4" = { + name = "async"; + packageName = "async"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; + sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; + }; + }; + "diff-3.2.0" = { + name = "diff"; + packageName = "diff"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + }; + }; + "wrench-1.5.9" = { + name = "wrench"; + packageName = "wrench"; + version = "1.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; + sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; + }; + }; + "uglify-js-2.7.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; }; }; "elegant-spinner-1.0.1" = { @@ -22364,6 +24956,15 @@ let sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad"; }; }; + "is-absolute-0.2.6" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; + sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; + }; + }; "jspm-config-0.3.4" = { name = "jspm-config"; packageName = "jspm-config"; @@ -22463,13 +25064,13 @@ let sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de"; }; }; - "typescript-2.6.1" = { + "typescript-2.6.2" = { name = "typescript"; packageName = "typescript"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; - sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; + sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; }; }; "zip-object-0.1.0" = { @@ -22481,49 +25082,31 @@ let sha1 = "c1a0da04c88c837756e248680a03ff902ec3f53a"; }; }; - "make-error-1.3.0" = { + "is-relative-0.2.1" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; + sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; + }; + }; + "is-unc-path-0.1.2" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; + sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; + }; + }; + "make-error-1.3.2" = { name = "make-error"; packageName = "make-error"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz"; - sha1 = "52ad3a339ccf10ce62b4040b708fe707244b8b96"; - }; - }; - "http-proxy-agent-1.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; - }; - }; - "https-proxy-agent-1.0.0" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; - }; - }; - "agent-base-2.1.1" = { - name = "agent-base"; - packageName = "agent-base"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; - }; - }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz"; + sha512 = "1sw30dxbwvv9pa0871cyshryjqam7d0pl4m1f6zww2r81qv3sgmx5qz7aimhz2xhxlihy9fglnwc1sy7hwfbfwcvg2n4mbrk7gxmnlp"; }; }; "blueimp-md5-2.10.0" = { @@ -22832,15 +25415,6 @@ let sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; }; - "adm-zip-0.4.7" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; - }; - }; "kew-0.1.7" = { name = "kew"; packageName = "kew"; @@ -23354,13 +25928,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "pino-4.10.2" = { + "pino-4.10.3" = { name = "pino"; packageName = "pino"; - version = "4.10.2"; + version = "4.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.10.2.tgz"; - sha512 = "2dvx5p741a807ch31jbaxsn1qkkqjnvv8zikzjrk6pnm9da0gayl7g0swpvf87limyi61d3xfhasjy0v4fmvai2wb54pngfx2047lw4"; + url = "https://registry.npmjs.org/pino/-/pino-4.10.3.tgz"; + sha512 = "2kg8qqb15pav0a2f16xmj5iqzkx28d0c6i1ydy3vzn71hfv7b7kvsbv917bwj68bh8m2mgy9j0kj8j4npy14hg2h09q4h85sz8wm990"; }; }; "postcss-6.0.11" = { @@ -23525,15 +26099,6 @@ let sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; }; }; - "trim-0.0.1" = { - name = "trim"; - packageName = "trim"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; - sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; - }; - }; "trim-trailing-lines-1.1.0" = { name = "trim-trailing-lines"; packageName = "trim-trailing-lines"; @@ -23633,13 +26198,13 @@ let sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; }; }; - "unist-util-visit-1.2.0" = { + "unist-util-visit-1.3.0" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.2.0.tgz"; - sha512 = "37l6dcqgpyq3925kx2bbm0fmnnsjbq7ag41axij33ai456qfvs7winhdhy4aw2wc2h09j1lswq3pi24bk452q92v3cx3kj3z74a73wl"; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz"; + sha512 = "24s5gpqr3vip7zfd3c81k1mhcj1qzlmjhxpn80n3ay8kkg3zycjdkvi6d78j1d3lva7qr1lqrf2mcz5k41as5vwh8w5xdn52drmhyzn"; }; }; "unist-util-is-2.1.1" = { @@ -23831,6 +26396,15 @@ let sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; }; }; + "pump-2.0.0" = { + name = "pump"; + packageName = "pump"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.0.tgz"; + sha512 = "21jb2lq6ajsmcqs5j3yq4gpfzkpn9zfy514dmwd0rlh6r8c6iknng19c3kmpb607rk2xap7cw467qz5di30zki40phjbdmg6fk35ip8"; + }; + }; "quick-format-unescaped-1.1.1" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -23885,15 +26459,6 @@ let sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22"; }; }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; - }; - }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -24209,15 +26774,6 @@ let sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; }; }; - "insight-0.8.4" = { - name = "insight"; - packageName = "insight"; - version = "0.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; - sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; - }; - }; "npm-keyword-4.2.0" = { name = "npm-keyword"; packageName = "npm-keyword"; @@ -24317,6 +26873,15 @@ let sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4"; }; }; + "execa-0.6.3" = { + name = "execa"; + packageName = "execa"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; + sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; + }; + }; "filter-obj-1.1.0" = { name = "filter-obj"; packageName = "filter-obj"; @@ -24335,15 +26900,6 @@ let sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; }; }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - }; "passwd-user-2.1.0" = { name = "passwd-user"; packageName = "passwd-user"; @@ -24353,13 +26909,13 @@ let sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; }; }; - "p-some-2.0.0" = { + "p-some-2.0.1" = { name = "p-some"; packageName = "p-some"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz"; - sha512 = "23lpz1jyj01f06bndx53w1k931l6ki6m94mgf9lqpxka3366q0w1ql0igm7bj5nc0imzdjv3x5825c05mjnhkgahw99hd0h1kk5ri0a"; + url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz"; + sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06"; }; }; "aggregate-error-1.0.0" = { @@ -24650,15 +27206,6 @@ let sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; }; }; - "untildify-3.0.2" = { - name = "untildify"; - packageName = "untildify"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; - sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; - }; - }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -24710,10 +27257,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.10.9"; + version = "1.10.11"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.10.9.tgz"; - sha512 = "173lfbg90gljigg1hpfc6cw3qi4lg8k7nhlm0b0zhpclsnhz2za0v31y1v19j7w0f2yc4v10h0sqigfnvb8xhfb4sck2dn7rmsknvhq"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.10.11.tgz"; + sha512 = "27fw6d49zkpg07gr8wibkncnj9nijx8yqjijixkcihqrr65mspq19wwjswfvbwdb8zn19xswis87znvqmv70nfzqhwccwq8mqn0g8zp"; }; dependencies = [ sources."async-2.6.0" @@ -24733,20 +27280,26 @@ in sources."chmodr-1.0.2" sources."colors-0.6.0-1" sources."commander-0.6.1" - sources."deasync-0.1.11" + sources."deasync-0.1.12" sources."ejs-2.3.4" sources."fs-extra-3.0.1" sources."global-paths-0.1.2" - sources."jsonlint-1.5.1" + (sources."jsonlint-1.5.1" // { + dependencies = [ + sources."chalk-0.4.0" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + ]; + }) + sources."lodash-4.17.4" sources."moment-2.17.1" sources."node.extend-1.0.10" sources."pkginfo-0.2.2" sources."resolve-1.5.0" - sources."source-map-0.1.9" + sources."source-map-0.6.1" sources."walk-sync-0.3.2" sources."xml2tss-0.0.5" sources."xmldom-0.1.19" - sources."lodash-4.17.4" sources."babel-code-frame-6.26.0" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" @@ -24760,23 +27313,23 @@ in sources."path-is-absolute-1.0.1" sources."private-0.1.8" sources."slash-1.0.0" - sources."chalk-0.4.0" + sources."chalk-1.1.3" sources."esutils-2.0.2" sources."js-tokens-3.0.2" - sources."ansi-styles-1.0.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."strip-ansi-0.1.1" + sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."core-js-2.5.1" + sources."core-js-2.5.3" sources."home-or-tmp-2.0.0" sources."mkdirp-0.5.1" sources."source-map-support-0.4.18" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."minimist-0.0.8" - sources."regenerator-runtime-0.11.0" + sources."regenerator-runtime-0.11.1" sources."ms-2.0.0" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" @@ -24797,8 +27350,12 @@ in sources."jsonfile-3.0.1" sources."universalify-0.1.1" sources."array-unique-0.2.1" - sources."global-modules-0.2.3" - sources."is-windows-0.2.0" + (sources."global-modules-0.2.3" // { + dependencies = [ + sources."is-windows-0.2.0" + ]; + }) + sources."is-windows-0.1.1" sources."global-prefix-0.1.5" sources."homedir-polyfill-1.0.1" sources."ini-1.3.5" @@ -24811,7 +27368,6 @@ in sources."has-color-0.1.7" sources."is-0.3.0" sources."path-parse-1.0.5" - sources."amdefine-1.0.1" sources."ensure-posix-path-1.0.2" sources."matcher-collection-1.0.5" sources."xml2js-0.2.8" @@ -24824,6 +27380,126 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; + }; + asar = nodeEnv.buildNodePackage { + name = "asar"; + packageName = "asar"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asar/-/asar-0.14.0.tgz"; + sha512 = "149a2ndf9hbminr1y95b9l9p7pprrsw2j05w1mbmr0gbm07sqa6vk4x91ws7clnzc80mli1mgnw9xl5mllqfmiynjdrmss6k9zncvcp"; + }; + dependencies = [ + sources."chromium-pickle-js-0.2.0" + sources."commander-2.12.2" + sources."cuint-0.2.2" + sources."glob-6.0.4" + sources."minimatch-3.0.4" + sources."mkdirp-0.5.1" + (sources."mksnapshot-0.3.1" // { + dependencies = [ + sources."glob-7.1.2" + ]; + }) + sources."tmp-0.0.28" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."minimist-0.0.8" + sources."decompress-zip-0.3.0" + sources."fs-extra-0.26.7" + sources."request-2.83.0" + sources."binary-0.3.0" + sources."graceful-fs-4.1.11" + sources."mkpath-0.1.0" + sources."nopt-3.0.6" + sources."q-1.5.1" + sources."readable-stream-1.1.14" + (sources."touch-0.0.3" // { + dependencies = [ + sources."nopt-1.0.10" + ]; + }) + sources."chainsaw-0.1.0" + sources."buffers-0.1.1" + sources."traverse-0.3.9" + sources."abbrev-1.1.1" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."rimraf-2.6.2" + sources."fs.realpath-1.0.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" + sources."safe-buffer-5.1.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-5.5.2" + sources."har-schema-2.0.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."json-schema-traverse-0.3.1" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + sources."os-tmpdir-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Creating Electron app packages"; + homepage = https://github.com/electron/asar; + license = "MIT"; + }; + production = true; + bypassCache = false; }; azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; @@ -25009,19 +27685,20 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.19.2" - (sources."ms-rest-2.2.7" // { + sources."moment-2.20.1" + (sources."ms-rest-2.3.0" // { dependencies = [ sources."moment-2.18.1" sources."request-2.83.0" sources."through-2.3.8" sources."tunnel-0.0.5" + sources."extend-3.0.1" ]; }) - (sources."ms-rest-azure-2.4.5" // { + (sources."ms-rest-azure-2.5.0" // { dependencies = [ sources."async-2.5.0" - sources."adal-node-0.1.25" + sources."adal-node-0.1.26" sources."moment-2.18.1" ]; }) @@ -25031,25 +27708,56 @@ in sources."progress-1.1.8" (sources."prompt-0.2.14" // { dependencies = [ - sources."winston-0.8.3" + (sources."winston-0.8.3" // { + dependencies = [ + sources."pkginfo-0.3.1" + ]; + }) sources."async-0.2.10" sources."colors-0.6.2" ]; }) - sources."readable-stream-1.0.34" - (sources."request-2.74.0" // { + (sources."readable-stream-1.0.34" // { dependencies = [ - sources."readable-stream-2.0.6" - sources."async-2.6.0" - sources."commander-2.12.1" + sources."isarray-0.0.1" + ]; + }) + (sources."request-2.74.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + sources."caseless-0.11.0" + sources."extend-3.0.1" + sources."form-data-1.0.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."qs-6.2.3" + sources."tunnel-agent-0.4.3" + sources."readable-stream-2.0.6" + sources."async-2.6.0" + sources."chalk-1.1.3" + sources."commander-2.12.2" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + ]; + }) + (sources."ssh-key-to-pem-0.11.0" // { + dependencies = [ + sources."asn1-0.1.11" ]; }) - sources."ssh-key-to-pem-0.11.0" sources."streamline-0.10.17" sources."streamline-streams-0.1.5" (sources."sync-request-3.0.0" // { dependencies = [ sources."readable-stream-2.3.3" + sources."string_decoder-1.0.3" + sources."caseless-0.11.0" ]; }) sources."through-2.3.4" @@ -25062,6 +27770,7 @@ in dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" + sources."pkginfo-0.3.1" ]; }) sources."wordwrap-0.0.2" @@ -25082,7 +27791,7 @@ in sources."duplexer-0.1.1" sources."sax-0.5.2" sources."browserify-mime-1.2.9" - sources."extend-3.0.1" + sources."extend-1.2.1" sources."json-edm-parser-0.1.2" sources."md5.js-1.3.4" sources."jsonparse-1.2.0" @@ -25091,7 +27800,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.3" + sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."stack-trace-0.0.10" sources."keypress-0.1.0" @@ -25105,54 +27814,58 @@ in sources."stream-combiner-0.0.4" sources."nomnom-1.8.1" sources."JSV-4.0.2" - sources."chalk-1.1.3" + sources."chalk-0.4.0" sources."has-color-0.1.7" - sources."ansi-styles-2.2.1" - sources."strip-ansi-3.0.1" - sources."@types/node-8.0.53" - sources."@types/request-2.0.8" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + sources."@types/node-8.5.5" + sources."@types/request-2.0.9" sources."@types/uuid-3.4.3" sources."is-buffer-1.1.6" sources."is-stream-1.1.0" sources."@types/form-data-2.2.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" - sources."har-validator-2.0.6" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" sources."performance-now-2.1.0" - sources."qs-6.2.3" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" - sources."asn1-0.1.11" + sources."asn1-0.2.3" sources."dashdash-1.14.1" sources."getpass-0.1.7" sources."jsbn-0.1.1" @@ -25164,7 +27877,7 @@ in sources."lodash-4.17.4" sources."debug-0.7.4" sources."q-0.9.7" - sources."pkginfo-0.3.1" + sources."pkginfo-0.4.1" sources."revalidator-0.1.8" sources."utile-0.2.1" sources."deep-equal-1.0.1" @@ -25185,7 +27898,7 @@ in sources."concat-map-0.0.1" sources."cycle-1.0.3" sources."bl-1.1.2" - sources."is-my-json-valid-2.16.1" + sources."is-my-json-valid-2.17.1" sources."pinkie-promise-2.0.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -25219,6 +27932,7 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; bower = nodeEnv.buildNodePackage { name = "bower"; @@ -25235,6 +27949,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; @@ -25252,29 +27967,42 @@ in sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ + sources."graceful-fs-4.1.11" sources."glob-7.1.2" ]; }) sources."lodash-4.2.1" - sources."promised-temp-0.1.0" + (sources."promised-temp-0.1.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."semver-5.4.1" - sources."temp-0.8.3" + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) sources."glob-6.0.4" sources."sprintf-js-1.0.3" sources."deep-extend-0.4.2" - sources."ext-name-3.0.0" - sources."graceful-fs-4.1.11" + (sources."ext-name-3.0.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + ]; + }) + sources."graceful-fs-3.0.11" sources."intersect-1.0.1" sources."ends-with-0.2.0" sources."ext-list-2.2.2" sources."meow-3.7.0" sources."sort-keys-length-1.0.1" - sources."mime-db-1.31.0" + sources."mime-db-1.32.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."minimist-0.0.8" + sources."minimist-1.2.0" sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" @@ -25312,11 +28040,11 @@ in sources."get-stdin-4.0.1" sources."sort-keys-1.1.2" sources."is-plain-obj-1.1.0" - sources."natives-1.1.0" + sources."natives-1.1.1" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - sources."rimraf-2.2.8" + sources."rimraf-2.6.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -25339,17 +28067,18 @@ in license = "GPL-3.0"; }; production = true; + bypassCache = false; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.5.0"; + version = "15.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; - sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; + url = "https://registry.npmjs.org/browserify/-/browserify-15.0.0.tgz"; + sha512 = "17abx33xjyyd4ilaf2lsbq250gkc53622hqh4r65acmjhdp8i5g8jr5rm7s9shq8r5spby33h0lfl8caxamsy50rlaagjbq767p2i3l"; }; dependencies = [ - sources."JSONStream-1.3.1" + sources."JSONStream-1.3.2" sources."assert-1.4.1" sources."browser-pack-6.0.2" (sources."browser-resolve-1.11.2" // { @@ -25368,7 +28097,11 @@ in }) sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.12.0" + (sources."crypto-browserify-3.12.0" // { + dependencies = [ + sources."hash-base-2.0.2" + ]; + }) sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."domain-browser-1.1.7" @@ -25380,8 +28113,17 @@ in sources."https-browserify-1.0.0" sources."inherits-2.0.3" sources."insert-module-globals-7.0.1" - sources."labeled-stream-splicer-2.0.0" - sources."module-deps-4.1.1" + (sources."labeled-stream-splicer-2.0.0" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + (sources."module-deps-5.0.0" // { + dependencies = [ + sources."concat-stream-1.6.0" + sources."acorn-5.3.0" + ]; + }) sources."os-browserify-0.3.0" sources."parents-1.0.1" sources."path-browserify-0.0.0" @@ -25449,7 +28191,7 @@ in sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."md5.js-1.3.4" - sources."hash-base-2.0.2" + sources."hash-base-3.0.4" sources."bn.js-4.11.8" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" @@ -25477,8 +28219,9 @@ in sources."astw-2.2.0" sources."acorn-4.0.13" sources."stream-splicer-2.0.0" - sources."detective-4.6.0" + sources."detective-5.0.1" sources."stream-combiner2-1.1.1" + sources."acorn5-object-spread-5.0.0" sources."path-platform-0.11.15" sources."path-parse-1.0.5" sources."json-stable-stringify-0.0.1" @@ -25495,10 +28238,11 @@ in buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; - homepage = "https://github.com/substack/node-browserify#readme"; + homepage = "https://github.com/browserify/browserify#readme"; license = "MIT"; }; production = true; + bypassCache = false; }; castnow = nodeEnv.buildNodePackage { name = "castnow"; @@ -25518,32 +28262,74 @@ in sources."debug-2.6.9" sources."diveSync-0.3.0" sources."got-1.2.2" - sources."internal-ip-1.2.0" + (sources."internal-ip-1.2.0" // { + dependencies = [ + sources."object-assign-4.1.1" + ]; + }) sources."keypress-0.2.1" sources."mime-1.6.0" sources."minimist-1.2.0" (sources."peerflix-0.34.0" // { dependencies = [ - sources."debug-2.6.9" - sources."minimist-1.2.0" + sources."debug-3.1.0" + sources."object-assign-4.1.1" + sources."minimist-0.0.10" + sources."get-stdin-5.0.1" + sources."once-1.2.0" + sources."end-of-stream-0.1.5" + sources."thunky-1.0.2" + sources."magnet-uri-4.2.3" + sources."parse-torrent-file-2.1.4" + sources."thirty-two-0.0.2" + sources."bencode-0.7.0" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + sources."safe-buffer-5.0.1" + sources."ultron-1.0.2" ]; }) (sources."playerui-1.2.0" // { dependencies = [ sources."chalk-0.5.1" + sources."ansi-styles-1.1.0" + sources."has-ansi-0.1.0" + sources."strip-ansi-0.3.0" + sources."supports-color-0.2.0" + sources."ansi-regex-0.2.1" ]; }) sources."query-string-1.0.1" sources."range-parser-1.2.0" (sources."read-torrent-1.3.0" // { dependencies = [ + sources."magnet-uri-2.0.1" + (sources."parse-torrent-4.1.0" // { + dependencies = [ + sources."magnet-uri-4.2.3" + ]; + }) + sources."thirty-two-0.0.2" + sources."parse-torrent-file-2.1.4" + sources."bencode-0.7.0" sources."mime-1.2.11" ]; }) sources."router-0.6.2" - sources."srt2vtt-1.3.1" + (sources."srt2vtt-1.3.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."stream-transcoder-0.0.5" - sources."xml2js-0.4.19" + (sources."xml2js-0.4.19" // { + dependencies = [ + sources."xmlbuilder-9.0.4" + ]; + }) sources."xspfr-0.3.1" sources."xtend-4.0.1" sources."castv2-0.1.9" @@ -25554,13 +28340,13 @@ in sources."bufferview-1.0.1" sources."colour-0.7.1" sources."optjs-3.2.2" - sources."ansi-styles-1.1.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" - sources."has-ansi-0.1.0" - sources."strip-ansi-0.3.0" - sources."supports-color-0.2.0" - sources."ansi-regex-0.2.1" - sources."get-stdin-5.0.1" + sources."has-ansi-1.0.3" + sources."strip-ansi-2.0.1" + sources."supports-color-1.3.1" + sources."ansi-regex-1.1.1" + sources."get-stdin-4.0.1" sources."chromecast-scanner-0.5.0" sources."mutate.js-0.2.0" sources."promiscuous-0.6.0" @@ -25568,12 +28354,12 @@ in sources."ware-1.3.0" sources."array-find-0.1.1" sources."multicast-dns-4.0.1" - sources."thunky-1.0.2" + sources."thunky-0.1.0" sources."wrap-fn-0.1.5" sources."co-3.1.0" sources."ms-2.0.0" sources."append-0.1.1" - sources."object-assign-4.1.1" + sources."object-assign-1.0.0" sources."meow-3.7.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" @@ -25621,17 +28407,29 @@ in sources."numeral-1.5.6" sources."open-0.0.5" sources."optimist-0.6.1" - sources."parse-torrent-4.1.0" + sources."parse-torrent-5.8.3" sources."pump-0.3.5" sources."rc-0.4.0" - sources."torrent-stream-1.0.3" + (sources."torrent-stream-1.0.3" // { + dependencies = [ + sources."parse-torrent-4.1.0" + sources."once-1.3.3" + sources."minimist-0.0.8" + sources."debug-2.6.9" + sources."bencode-0.8.0" + ]; + }) sources."windows-no-runnable-0.0.6" sources."mdns-js-1.0.1" sources."plist-2.1.0" - sources."dns-js-0.2.1" - sources."qap-3.3.0" + (sources."dns-js-0.2.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."qap-3.3.1" sources."base64-js-1.2.0" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-8.2.2" sources."xmldom-0.1.27" sources."cli-width-1.1.1" sources."figures-1.7.0" @@ -25642,34 +28440,50 @@ in sources."mute-stream-0.0.4" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-2.0.1" - sources."parse-torrent-file-2.1.4" + sources."magnet-uri-5.1.7" + sources."parse-torrent-file-4.0.3" sources."simple-get-2.7.0" - sources."safe-buffer-5.0.1" - sources."thirty-two-0.0.2" + sources."safe-buffer-5.1.1" + sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.8.0" + sources."bencode-1.0.0" sources."simple-sha1-2.1.0" - sources."rusha-0.8.7" + sources."rusha-0.8.11" sources."decompress-response-3.3.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."simple-concat-1.0.0" sources."mimic-response-1.0.0" sources."wrappy-1.0.2" - sources."end-of-stream-0.1.5" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."deep-extend-0.2.11" sources."strip-json-comments-0.1.3" sources."ini-1.1.0" sources."bitfield-0.1.0" - sources."bncode-0.2.3" - sources."fs-chunk-store-1.6.5" + sources."bncode-0.5.3" + (sources."fs-chunk-store-1.6.5" // { + dependencies = [ + sources."mkdirp-0.5.1" + ]; + }) sources."hat-0.0.3" sources."immediate-chunk-store-1.0.8" sources."ip-set-1.0.1" - sources."mkdirp-0.5.1" - sources."peer-wire-swarm-0.12.1" + sources."mkdirp-0.3.5" + (sources."peer-wire-swarm-0.12.1" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) sources."rimraf-2.6.2" - sources."torrent-discovery-5.4.0" + (sources."torrent-discovery-5.4.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."torrent-piece-1.1.1" sources."random-access-file-1.8.1" sources."randombytes-2.0.5" @@ -25682,10 +28496,10 @@ in sources."peer-wire-protocol-0.7.0" sources."speedometer-0.1.4" sources."utp-0.0.7" - sources."readable-stream-2.3.3" + sources."readable-stream-1.1.14" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" sources."cyclist-0.1.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -25699,24 +28513,33 @@ in sources."bittorrent-tracker-7.7.0" sources."re-emitter-1.1.3" sources."buffer-equals-1.0.4" - sources."k-bucket-2.0.1" - sources."k-rpc-3.7.0" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."k-bucket-2.0.1" + sources."bencode-1.0.0" + ]; + }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.1" + sources."k-rpc-socket-1.7.2" sources."bn.js-4.11.8" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" sources."simple-peer-6.4.4" - sources."simple-websocket-4.3.1" + (sources."simple-websocket-4.3.1" // { + dependencies = [ + sources."ws-2.3.1" + ]; + }) sources."string2compact-1.2.2" - sources."ws-2.3.1" + sources."ws-1.1.5" sources."ipaddr.js-1.5.4" sources."get-browser-rtc-1.0.2" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" - sources."ultron-1.0.2" + sources."ultron-1.1.1" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" sources."pad-0.0.5" @@ -25744,7 +28567,7 @@ in sources."voc-1.0.0" sources."concat-stream-1.6.0" sources."exit-on-epipe-1.0.1" - sources."commander-2.12.1" + sources."commander-2.12.2" sources."typedarray-0.0.6" sources."sax-1.2.4" sources."underscore-1.6.0" @@ -25756,6 +28579,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; @@ -25772,6 +28596,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; coinmon = nodeEnv.buildNodePackage { name = "coinmon"; @@ -25788,26 +28613,39 @@ in sources."commander-2.9.0" ]; }) - sources."cli-table2-0.2.0" - sources."commander-2.12.1" + (sources."cli-table2-0.2.0" // { + dependencies = [ + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."commander-2.12.2" sources."humanize-plus-1.8.2" - sources."ora-1.3.0" + (sources."ora-1.3.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + ]; + }) sources."follow-redirects-1.2.6" sources."is-buffer-1.1.6" sources."debug-3.1.0" sources."ms-2.0.0" sources."babel-runtime-6.22.0" - sources."chalk-1.1.3" + sources."chalk-1.0.0" sources."change-case-3.0.0" sources."window-size-0.3.0" - sources."core-js-2.5.1" + sources."core-js-2.5.3" sources."regenerator-runtime-0.10.5" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" + sources."has-ansi-1.0.3" + sources."strip-ansi-2.0.1" + sources."supports-color-1.3.1" + sources."ansi-regex-1.1.1" sources."get-stdin-4.0.1" sources."camel-case-3.0.0" sources."constant-case-2.0.0" @@ -25849,53 +28687,72 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-7.1.0.tgz"; - sha1 = "559f5394e64145c9b6dd81800feb658d5087b096"; + url = "https://registry.npmjs.org/cordova/-/cordova-8.0.0.tgz"; + sha1 = "2e8446d9493caafd870b1090785e7f03e2ae6a43"; }; dependencies = [ sources."configstore-2.1.0" - (sources."cordova-common-2.1.1" // { - dependencies = [ - sources."q-1.5.1" - ]; - }) - (sources."cordova-lib-7.1.0" // { + sources."cordova-common-2.2.1" + (sources."cordova-lib-8.0.0" // { dependencies = [ + sources."glob-7.1.1" sources."nopt-4.0.1" - sources."cordova-common-2.0.3" - sources."q-1.5.1" + (sources."plist-2.0.1" // { + dependencies = [ + sources."base64-js-1.1.2" + ]; + }) + sources."q-1.0.1" + sources."shelljs-0.3.0" + sources."base64-js-1.2.1" + sources."isarray-1.0.0" + sources."hash-base-2.0.2" + sources."acorn-4.0.13" + sources."minimist-1.2.0" + sources."xmlbuilder-8.2.2" + sources."qs-6.3.2" + sources."uuid-3.1.0" ]; }) sources."editor-1.0.0" - (sources."insight-0.8.2" // { + (sources."insight-0.8.4" // { dependencies = [ - sources."configstore-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."uuid-3.1.0" + sources."mute-stream-0.0.5" + sources."minimist-1.2.0" ]; }) sources."nopt-3.0.1" - sources."q-1.0.1" (sources."update-notifier-0.5.0" // { dependencies = [ sources."configstore-1.4.0" + sources."object-assign-3.0.0" + sources."minimist-1.2.0" ]; }) sources."dot-prop-3.0.0" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" - sources."object-assign-3.0.0" + sources."object-assign-4.1.1" sources."os-tmpdir-1.0.2" sources."osenv-0.1.4" sources."uuid-2.0.3" sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" sources."is-obj-1.0.1" - sources."minimist-1.2.0" + sources."minimist-0.0.8" sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" sources."slide-1.1.6" @@ -25903,12 +28760,13 @@ in sources."bplist-parser-0.1.1" sources."cordova-registry-mapper-1.1.15" sources."elementtree-0.1.6" - sources."glob-7.1.2" + sources."glob-5.0.15" sources."minimatch-3.0.4" - sources."plist-2.0.1" + sources."plist-1.2.0" + sources."q-1.5.1" sources."semver-5.4.1" sources."shelljs-0.5.3" - sources."underscore-1.2.1" + sources."underscore-1.8.3" sources."unorm-1.4.1" sources."big-integer-1.6.26" sources."sax-0.3.5" @@ -25920,53 +28778,89 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."base64-js-1.1.2" - sources."xmlbuilder-8.2.2" + sources."base64-js-0.0.8" + sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" sources."lodash-3.10.1" sources."aliasify-2.1.0" - (sources."cordova-create-1.1.1" // { + sources."cordova-create-1.1.2" + (sources."cordova-fetch-1.3.0" // { + dependencies = [ + sources."q-1.5.1" + sources."shelljs-0.7.8" + ]; + }) + (sources."cordova-js-4.2.2" // { + dependencies = [ + sources."isarray-0.0.1" + sources."acorn-5.3.0" + ]; + }) + (sources."cordova-serve-2.0.0" // { + dependencies = [ + sources."shelljs-0.5.3" + ]; + }) + (sources."dep-graph-1.1.0" // { + dependencies = [ + sources."underscore-1.2.1" + ]; + }) + sources."detect-indent-5.0.0" + (sources."dependency-ls-1.1.1" // { dependencies = [ sources."q-1.4.1" ]; }) - sources."cordova-fetch-1.1.0" - sources."cordova-js-4.2.2" - sources."cordova-serve-2.0.0" - sources."dep-graph-1.1.0" sources."init-package-json-1.10.1" - sources."npm-2.15.12" sources."opener-1.4.2" sources."properties-parser-0.3.1" sources."request-2.79.0" sources."tar-2.2.1" sources."valid-identifier-0.0.1" - sources."xcode-0.9.3" + (sources."xcode-1.0.0" // { + dependencies = [ + sources."uuid-3.0.1" + ]; + }) sources."browserify-transform-tools-1.7.0" sources."falafel-2.1.0" sources."through-2.3.8" - sources."acorn-4.0.13" + sources."acorn-5.3.0" sources."foreach-2.0.5" - sources."isarray-1.0.0" + sources."isarray-0.0.1" sources."object-keys-1.0.11" sources."cordova-app-hello-world-3.12.0" - sources."dependency-ls-1.1.1" + sources."hosted-git-info-2.5.0" sources."is-url-1.2.2" - sources."interpret-1.0.4" + sources."interpret-1.1.0" sources."rechoir-0.6.2" - sources."fs.realpath-1.0.0" - sources."resolve-1.1.7" + sources."resolve-1.5.0" sources."path-parse-1.0.5" - sources."browserify-14.4.0" - sources."JSONStream-1.3.1" + (sources."browserify-14.4.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."acorn-4.0.13" + ]; + }) + sources."JSONStream-1.3.2" sources."assert-1.4.1" sources."browser-pack-6.0.2" - sources."browser-resolve-1.11.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) sources."browserify-zlib-0.1.4" sources."buffer-5.0.8" sources."cached-path-relative-1.0.1" - sources."concat-stream-1.5.2" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" + ]; + }) sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."crypto-browserify-3.12.0" @@ -25999,8 +28893,16 @@ in sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" - sources."url-0.11.0" - sources."util-0.10.3" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" sources."jsonparse-1.3.1" @@ -26035,7 +28937,7 @@ in sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."md5.js-1.3.4" - sources."hash-base-2.0.2" + sources."hash-base-3.0.4" sources."bn.js-4.11.8" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" @@ -26053,7 +28955,7 @@ in sources."lexical-scope-1.2.0" sources."astw-2.2.0" sources."stream-splicer-2.0.0" - sources."detective-4.6.0" + sources."detective-4.7.1" sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" sources."json-stable-stringify-0.0.1" @@ -26086,7 +28988,11 @@ in sources."mime-db-1.30.0" sources."ms-2.0.0" sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -26103,11 +29009,11 @@ in sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.2" - sources."qs-6.3.2" + sources."qs-6.5.1" sources."range-parser-1.2.0" sources."send-0.16.1" sources."serve-static-1.13.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" sources."type-is-1.6.15" sources."utils-merge-1.0.1" @@ -26121,14 +29027,14 @@ in sources."destroy-1.0.4" sources."mime-1.4.1" sources."media-typer-0.3.0" + sources."fs.realpath-1.0.0" sources."npm-package-arg-5.1.2" sources."promzard-0.3.0" sources."read-1.0.7" sources."read-package-json-2.0.12" sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" - sources."hosted-git-info-2.5.0" - sources."mute-stream-0.0.5" + sources."mute-stream-0.0.7" sources."json-parse-better-errors-1.0.1" sources."normalize-package-data-2.4.0" sources."slash-1.0.0" @@ -26159,8 +29065,8 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."commander-2.12.1" - sources."is-my-json-valid-2.16.1" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" sources."pinkie-promise-2.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -26171,9 +29077,17 @@ in sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -26194,7 +29108,6 @@ in sources."async-1.5.2" sources."inquirer-0.10.1" sources."lodash.debounce-3.1.1" - sources."node-uuid-1.4.8" sources."os-name-1.0.3" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" @@ -26244,6 +29157,7 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; csslint = nodeEnv.buildNodePackage { name = "csslint"; @@ -26264,6 +29178,455 @@ in license = "MIT"; }; production = true; + bypassCache = false; + }; + dat = nodeEnv.buildNodePackage { + name = "dat"; + packageName = "dat"; + version = "13.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat/-/dat-13.9.2.tgz"; + sha512 = "05x3ij83al1f0r7fiaq788q4k81vlbmydsa1g829pq0q6795p57b12mmmx8nvc8khbbv1iphr065c7h3d7kc9ylps39xn1qdg64jz90"; + }; + dependencies = [ + sources."bytes-3.0.0" + sources."chalk-2.3.0" + sources."cli-truncate-1.1.0" + (sources."dat-doctor-1.3.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."lru-2.0.1" + ]; + }) + sources."dat-encoding-4.0.2" + (sources."dat-json-1.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."dat-link-resolve-1.1.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."dat-log-1.1.1" + (sources."dat-node-3.5.6" // { + dependencies = [ + (sources."dat-link-resolve-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."dat-encoding-5.0.1" + sources."varint-5.0.0" + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."minimist-0.0.8" + sources."esprima-1.0.4" + sources."estraverse-1.3.2" + sources."object-keys-0.4.0" + sources."unordered-set-2.0.0" + ]; + }) + sources."dat-registry-4.0.0" + sources."debug-3.1.0" + (sources."neat-log-1.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."prettier-bytes-1.0.4" + sources."progress-string-1.2.2" + (sources."prompt-1.0.0" // { + dependencies = [ + sources."async-1.0.0" + ]; + }) + sources."pump-1.0.3" + sources."rimraf-2.6.2" + sources."speedometer-1.0.0" + (sources."subcommand-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."throttle-1.0.3" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."xtend-4.0.1" + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.5.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."slice-ansi-1.0.0" + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + sources."datland-swarm-defaults-1.0.2" + (sources."discovery-swarm-4.4.2" // { + dependencies = [ + sources."thunky-0.1.0" + ]; + }) + (sources."dns-discovery-5.6.1" // { + dependencies = [ + sources."thunky-0.1.0" + ]; + }) + sources."minimist-1.2.0" + sources."thunky-1.0.2" + sources."ms-2.0.0" + sources."buffer-equals-1.0.4" + sources."connections-1.4.2" + sources."discovery-channel-5.4.6" + sources."length-prefixed-message-3.0.3" + sources."to-buffer-1.1.0" + sources."utp-native-1.6.2" + (sources."bittorrent-dht-7.8.2" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."pretty-hash-1.0.1" + sources."bencode-1.0.0" + sources."inherits-2.0.3" + sources."k-bucket-3.3.1" + sources."k-rpc-4.2.1" + sources."lru-3.1.0" + sources."randombytes-2.0.5" + sources."safe-buffer-5.1.1" + sources."simple-sha1-2.1.0" + sources."k-rpc-socket-1.7.2" + sources."rusha-0.8.11" + sources."varint-3.0.1" + sources."nan-2.8.0" + sources."node-gyp-build-3.2.2" + sources."readable-stream-2.3.3" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."dns-socket-1.6.2" + sources."dns-txt-2.0.2" + sources."multicast-dns-6.2.1" + sources."network-address-1.1.2" + sources."unordered-set-1.1.0" + sources."dns-packet-1.2.2" + sources."ip-1.1.5" + sources."buffer-indexof-1.1.1" + sources."toiletdb-1.4.0" + sources."last-one-wins-1.0.4" + sources."dat-dns-1.3.2" + sources."nets-3.2.0" + sources."call-me-maybe-1.0.1" + sources."concat-stream-1.6.0" + sources."typedarray-0.0.6" + sources."request-2.83.0" + sources."xhr-2.4.1" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-5.5.2" + sources."har-schema-2.0.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."json-schema-traverse-0.3.1" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + sources."global-4.3.2" + sources."is-function-1.0.1" + sources."parse-headers-2.0.1" + sources."min-document-2.19.0" + sources."process-0.5.2" + sources."dom-walk-0.1.1" + sources."for-each-0.3.2" + sources."trim-0.0.1" + sources."random-access-memory-2.4.0" + sources."dat-ignore-2.0.0" + (sources."dat-storage-1.0.3" // { + dependencies = [ + sources."xtend-2.1.2" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + sources."dat-swarm-defaults-1.0.0" + (sources."hyperdrive-9.12.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + sources."varint-4.0.1" + ]; + }) + sources."hyperdrive-http-4.2.2" + (sources."hyperdrive-network-speed-2.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."mirror-folder-2.1.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + sources."multicb-1.2.2" + (sources."random-access-file-1.8.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."sparse-bitfield-3.0.3" + sources."stream-each-1.2.2" + sources."untildify-3.0.2" + sources."anymatch-1.3.2" + sources."micromatch-2.3.11" + sources."normalize-path-2.1.1" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.4" + sources."arr-flatten-1.1.0" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.6" + sources."is-posix-bracket-0.1.1" + sources."for-own-0.1.5" + sources."is-extendable-0.1.1" + sources."for-in-1.0.2" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.3" + sources."glob-parent-2.0.0" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."remove-trailing-separator-1.1.0" + (sources."append-tree-2.4.0" // { + dependencies = [ + sources."xtend-4.0.1" + ]; + }) + sources."dat-secret-storage-4.0.0" + sources."multi-random-access-2.1.1" + sources."array-lru-1.1.1" + sources."brfs-1.4.3" + sources."codecs-1.2.0" + sources."from2-2.3.0" + sources."mutexify-1.2.0" + sources."protocol-buffers-3.2.1" + sources."quote-stream-1.0.2" + sources."resolve-1.5.0" + (sources."static-module-1.5.0" // { + dependencies = [ + sources."quote-stream-0.0.0" + sources."through2-0.4.2" + ]; + }) + sources."through2-2.0.3" + sources."buffer-equal-0.0.1" + sources."path-parse-1.0.5" + (sources."duplexer2-0.0.2" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."escodegen-1.3.3" + sources."falafel-2.1.0" + sources."has-1.0.1" + sources."object-inspect-0.4.0" + sources."shallow-copy-0.0.1" + (sources."static-eval-0.2.4" // { + dependencies = [ + sources."escodegen-0.0.28" + ]; + }) + sources."esutils-1.0.0" + sources."estraverse-1.5.1" + sources."esprima-1.1.1" + sources."source-map-0.1.43" + sources."amdefine-1.0.1" + sources."acorn-5.3.0" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."function-bind-1.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."protocol-buffers-schema-3.3.2" + sources."signed-varint-2.0.1" + sources."is-property-1.0.2" + sources."os-homedir-1.0.2" + sources."abstract-random-access-1.1.2" + sources."sorted-array-functions-1.1.0" + sources."duplexify-3.5.1" + (sources."hypercore-6.11.0" // { + dependencies = [ + sources."varint-5.0.0" + ]; + }) + sources."sodium-universal-2.0.0" + sources."stream-collector-1.0.1" + sources."uint64be-2.0.1" + sources."unixify-1.0.0" + sources."end-of-stream-1.4.0" + sources."stream-shift-1.0.0" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."atomic-batcher-1.0.2" + sources."bitfield-rle-2.1.0" + sources."bulk-write-stream-1.1.3" + sources."flat-tree-1.6.0" + sources."hypercore-protocol-6.4.2" + sources."memory-pager-1.1.0" + sources."merkle-tree-stream-3.0.3" + sources."unordered-array-remove-1.0.2" + sources."sorted-indexof-1.0.0" + sources."sodium-javascript-0.5.4" + sources."sodium-native-2.1.4" + sources."blake2b-2.1.2" + sources."nanoassert-1.1.0" + sources."siphash24-1.1.0" + sources."xsalsa20-1.0.2" + sources."blake2b-wasm-1.1.4" + sources."base64-to-uint8array-1.0.0" + sources."ini-1.3.5" + sources."corsify-2.1.0" + sources."directory-index-html-2.1.0" + sources."mime-1.6.0" + sources."range-parser-1.2.0" + sources."http-methods-0.1.0" + sources."content-types-0.1.0" + sources."body-0.1.0" + sources."iterators-0.1.0" + sources."ap-0.1.0" + sources."fd-read-stream-1.1.0" + sources."recursive-watch-1.1.2" + sources."ttl-1.3.1" + sources."buffer-alloc-unsafe-1.0.0" + sources."mkdirp-0.5.1" + sources."township-client-1.3.2" + sources."is-string-1.0.4" + sources."lodash.throttle-4.1.1" + sources."nanobus-3.3.0" + sources."status-logger-3.1.1" + sources."nanotiming-1.0.1" + sources."ansi-diff-stream-1.2.0" + sources."lodash.flattendeep-4.4.0" + sources."wrap-ansi-3.0.1" + sources."colors-1.1.2" + sources."pkginfo-0.4.1" + sources."read-1.0.7" + sources."revalidator-0.1.8" + sources."utile-0.3.0" + (sources."winston-2.1.1" // { + dependencies = [ + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."mute-stream-0.0.7" + sources."async-0.9.2" + sources."deep-equal-0.2.2" + sources."i-0.3.6" + sources."ncp-1.0.1" + sources."cycle-1.0.3" + sources."eyes-0.1.8" + sources."stack-trace-0.0.10" + sources."glob-7.1.2" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.4" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."cliclopts-1.1.1" + sources."stream-parser-0.3.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Dat is the package manager for data. Easily share and version control data."; + homepage = https://datproject.org/; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; @@ -26283,6 +29646,7 @@ in license = "MIT OR GPL-2.0"; }; production = true; + bypassCache = false; }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; @@ -26296,11 +29660,18 @@ in sources."bluebird-2.9.9" sources."bottleneck-1.5.3" sources."event-stream-3.2.2" - sources."express-4.11.2" + (sources."express-4.11.2" // { + dependencies = [ + sources."mime-types-2.0.14" + sources."mime-db-1.12.0" + ]; + }) sources."hiredis-0.4.1" (sources."json-rpc2-0.8.1" // { dependencies = [ + sources."debug-1.0.5" sources."lodash-2.4.2" + sources."ms-2.0.0" ]; }) sources."lodash-3.1.0" @@ -26314,8 +29685,17 @@ in sources."properties-1.2.1" sources."redis-0.12.1" sources."string-2.0.1" - sources."winston-0.8.0" - sources."superagent-0.21.0" + (sources."winston-0.8.0" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + (sources."superagent-0.21.0" // { + dependencies = [ + sources."qs-1.2.0" + sources."methods-1.0.1" + ]; + }) sources."through-2.3.8" sources."duplexer-0.1.1" sources."from-0.1.7" @@ -26326,19 +29706,19 @@ in sources."accepts-1.2.13" sources."content-disposition-0.5.0" sources."cookie-signature-1.0.5" - sources."debug-2.6.9" + sources."debug-2.1.3" sources."depd-1.0.1" sources."escape-html-1.0.1" sources."etag-1.5.1" sources."finalhandler-0.3.3" sources."fresh-0.2.4" sources."media-typer-0.3.0" - sources."methods-1.0.1" + sources."methods-1.1.2" sources."on-finished-2.2.1" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.3" sources."proxy-addr-1.0.10" - sources."qs-1.2.0" + sources."qs-2.3.3" sources."range-parser-1.0.3" sources."send-0.11.1" sources."serve-static-1.8.1" @@ -26347,10 +29727,10 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.0.14" + sources."mime-types-2.1.17" sources."negotiator-0.5.3" - sources."mime-db-1.12.0" - sources."ms-2.0.0" + sources."mime-db-1.30.0" + sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" sources."forwarded-0.1.2" @@ -26377,7 +29757,7 @@ in sources."verror-1.10.0" sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" - sources."extsprintf-1.3.0" + sources."extsprintf-1.4.0" sources."async-0.9.2" sources."ini-1.3.5" sources."optimist-0.6.1" @@ -26408,6 +29788,7 @@ in license = "MPL-2.0"; }; production = true; + bypassCache = false; }; docker-registry-server = nodeEnv.buildNodePackage { name = "docker-registry-server"; @@ -26425,22 +29806,39 @@ in sources."docker-parse-image-3.0.1" sources."end-of-stream-1.4.0" sources."from2-1.3.0" - sources."fs-blob-store-5.2.1" + (sources."fs-blob-store-5.2.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."level-0.18.0" (sources."level-sublevel-6.6.1" // { dependencies = [ - sources."levelup-0.19.1" - sources."xtend-3.0.0" + (sources."levelup-0.19.1" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."readable-stream-1.0.34" + sources."looper-3.0.0" ]; }) sources."leveldown-0.10.6" (sources."levelup-0.18.6" // { dependencies = [ + sources."readable-stream-1.0.34" + sources."semver-2.3.2" sources."xtend-3.0.0" ]; }) sources."lexicographic-integer-1.1.0" - sources."memdown-0.10.2" + (sources."memdown-0.10.2" // { + dependencies = [ + sources."ltgt-1.0.2" + ]; + }) sources."minimist-0.2.0" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -26452,6 +29850,9 @@ in sources."minimist-1.2.0" sources."split2-2.2.0" sources."through2-2.0.3" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."pump-1.0.3" @@ -26461,8 +29862,19 @@ in sources."sorted-union-stream-1.0.2" sources."split2-0.2.1" sources."stream-collector-1.0.1" - sources."tar-stream-1.5.5" - sources."through2-0.6.5" + (sources."tar-stream-1.5.5" // { + dependencies = [ + sources."bl-1.2.1" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + (sources."through2-0.6.5" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) sources."thunky-0.1.0" sources."xtend-4.0.1" sources."jsonparse-0.0.5" @@ -26472,7 +29884,7 @@ in sources."once-1.4.0" sources."wrappy-1.0.2" sources."inherits-2.0.3" - sources."readable-stream-1.0.34" + sources."readable-stream-1.1.14" sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" @@ -26484,18 +29896,22 @@ in sources."util-deprecate-1.0.2" sources."level-packager-0.18.0" sources."bytewise-1.1.0" - sources."ltgt-1.0.2" + sources."ltgt-2.1.3" sources."pull-level-2.0.3" sources."pull-stream-3.6.1" sources."typewiselite-1.0.0" sources."bytewise-core-1.2.3" sources."typewise-1.0.3" sources."typewise-core-1.2.0" - sources."bl-1.2.1" + sources."bl-0.8.2" sources."deferred-leveldown-0.2.0" - sources."errno-0.1.4" + (sources."errno-0.1.6" // { + dependencies = [ + sources."prr-1.0.1" + ]; + }) sources."prr-0.0.0" - sources."semver-2.3.2" + sources."semver-5.1.1" sources."abstract-leveldown-0.12.4" sources."level-post-1.0.5" sources."pull-cat-1.1.11" @@ -26503,7 +29919,7 @@ in sources."pull-pushable-2.1.1" sources."pull-window-2.1.4" sources."stream-to-pull-stream-1.7.2" - sources."looper-3.0.0" + sources."looper-2.0.0" sources."bindings-1.2.1" sources."nan-2.1.0" sources."json-stringify-safe-5.0.1" @@ -26518,6 +29934,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; @@ -26528,13 +29945,17 @@ in sha512 = "21mmlyi12vnfg5s88vh8i7jk43m69bp4qhgkch8i2qbzf9fv4hqn7b6wcxkbbdxzdvnkkpklb2xxpxi5nflwl513w08d6ykvac2ambh"; }; dependencies = [ - sources."JSONStream-1.3.1" + sources."JSONStream-1.3.2" sources."async-2.6.0" sources."aws4-1.6.0" - sources."aws-sdk-2.157.0" + sources."aws-sdk-2.176.0" sources."ini-1.3.5" sources."optimist-0.6.1" - sources."request-2.83.0" + (sources."request-2.83.0" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."jsonparse-1.3.1" sources."through-2.3.8" sources."lodash-4.17.4" @@ -26551,7 +29972,7 @@ in sources."base64-js-1.2.1" sources."ieee754-1.1.8" sources."isarray-1.0.0" - sources."punycode-1.4.1" + sources."punycode-1.3.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.7.0" @@ -26576,15 +29997,19 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -26609,14 +30034,15 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.18.10"; + version = "0.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.10.tgz"; - sha512 = "2c8i6smwbashg8yx2qqbix6lz8lxcn1rri7i414vxi9zxiglbsxr01p209zpa0bl1ib07syyz5pfw0nwfwyvmi42pb6gzk1xls6kniq"; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz"; + sha512 = "1rcghwzkjcs25iz7dvfjxkwkn35jd7vyfs9idwncz2zvasyy1nkkpg6rcgilciwppccd29j2yrdzp95nddnh8lpqz41aiw2z0v6wzg6"; }; dependencies = [ (sources."binstall-1.2.0" // { @@ -26626,7 +30052,11 @@ in sources."minimist-0.0.8" ]; }) - sources."chalk-2.1.0" + (sources."chalk-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.0" + ]; + }) sources."chokidar-1.6.0" sources."cross-spawn-4.0.0" sources."find-parent-dir-0.3.0" @@ -26641,8 +30071,10 @@ in dependencies = [ sources."lodash-4.14.2" sources."firstline-1.2.0" + sources."rimraf-2.2.8" ]; }) + sources."split-1.0.1" sources."supports-color-4.2.0" sources."xmlbuilder-8.2.2" sources."request-2.79.0" @@ -26669,10 +30101,10 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."commander-2.12.1" - sources."is-my-json-valid-2.16.1" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" sources."pinkie-promise-2.0.1" - sources."ansi-styles-3.2.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" @@ -26687,9 +30119,17 @@ in sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -26708,7 +30148,7 @@ in sources."inherits-2.0.3" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" - sources."rimraf-2.2.8" + sources."rimraf-2.6.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."anymatch-1.3.2" @@ -26722,7 +30162,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -26736,9 +30180,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-buffer-1.1.6" @@ -26777,6 +30229,7 @@ in sources."find-elm-dependencies-1.0.2" sources."temp-0.8.3" sources."os-tmpdir-1.0.2" + sources."through-2.3.8" sources."has-flag-2.0.0" ]; buildInputs = globalBuildInputs; @@ -26786,6 +30239,7 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; emoj = nodeEnv.buildNodePackage { name = "emoj"; @@ -26798,19 +30252,36 @@ in dependencies = [ sources."auto-bind-1.1.0" sources."clipboardy-1.2.2" - sources."conf-1.3.1" + sources."conf-1.4.0" sources."got-7.1.0" sources."has-ansi-3.0.0" (sources."import-jsx-1.3.0" // { dependencies = [ sources."has-ansi-2.0.0" + sources."ansi-regex-2.1.1" + ]; + }) + (sources."ink-0.3.1" // { + dependencies = [ + sources."chalk-2.3.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + sources."strip-ansi-4.0.0" + sources."core-js-1.2.7" ]; }) - sources."ink-0.3.1" sources."ink-text-input-1.1.1" sources."lodash.debounce-4.0.8" sources."mem-1.1.0" - sources."meow-3.7.0" + (sources."meow-3.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + sources."pify-2.3.0" + sources."indent-string-2.1.0" + ]; + }) sources."skin-tone-1.0.0" sources."arch-2.1.0" sources."execa-0.8.0" @@ -26835,12 +30306,13 @@ in sources."pkg-up-2.0.0" sources."write-file-atomic-2.3.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" - sources."find-up-1.1.2" + sources."pify-3.0.0" + sources."find-up-2.1.0" sources."locate-path-2.0.0" sources."p-locate-2.0.0" - sources."path-exists-2.1.0" - sources."p-limit-1.1.0" + sources."path-exists-3.0.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."graceful-fs-4.1.11" sources."imurmurhash-0.1.4" sources."decompress-response-3.3.0" @@ -26887,27 +30359,27 @@ in sources."private-0.1.8" sources."slash-1.0.0" sources."source-map-0.5.7" - sources."chalk-2.3.0" + sources."chalk-1.1.3" sources."esutils-2.0.2" sources."js-tokens-3.0.2" - sources."ansi-styles-3.2.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" - sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" sources."detect-indent-4.0.0" sources."jsesc-1.3.0" sources."trim-right-1.0.1" sources."repeating-2.0.1" sources."is-finite-1.0.2" sources."number-is-nan-1.0.1" - sources."core-js-1.2.7" + sources."core-js-2.5.3" sources."home-or-tmp-2.0.0" sources."mkdirp-0.5.1" sources."source-map-support-0.4.18" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."minimist-1.2.0" - sources."regenerator-runtime-0.11.0" + sources."minimist-0.0.8" + sources."regenerator-runtime-0.11.1" sources."globals-9.18.0" sources."invariant-2.2.2" sources."loose-envify-1.3.1" @@ -26922,7 +30394,7 @@ in sources."caller-callsite-2.0.0" sources."callsites-2.0.0" sources."arrify-1.0.1" - sources."indent-string-2.1.0" + sources."indent-string-3.2.0" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" sources."log-update-2.3.0" @@ -26989,41 +30461,47 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.12.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.12.0.tgz"; - sha512 = "31dhiy1b963gcs7s1ickygwm87vm943l5mhcxxwg97yc113b7fmdrzcb1m9gr9h0pkqacrdcmn59x3mdcqg0a4bgc2gjz859lszh6rs"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz"; + sha512 = "0jh5cxqg5w7zah8hra5wmm25nyky09lb7i8dbxpchhv2hj9q0ym3kn7wqw72g73sj1l6k6vv5fkdfmkim3zq5qdr82cfak3ci484pjj"; }; dependencies = [ - sources."ajv-5.5.0" + sources."ajv-5.5.2" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" sources."strip-ansi-3.0.1" ]; }) - sources."chalk-2.3.0" + (sources."chalk-2.3.0" // { + dependencies = [ + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + ]; + }) sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" sources."debug-3.1.0" sources."doctrine-2.0.2" sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.2" sources."esquery-1.0.0" - sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.0.1" + sources."globals-11.1.0" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inquirer-3.3.0" - sources."is-resolvable-1.0.0" + sources."is-resolvable-1.0.1" sources."js-yaml-3.10.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -27037,7 +30515,11 @@ in sources."progress-2.0.0" sources."require-uncached-1.0.3" sources."semver-5.4.1" - sources."strip-ansi-4.0.0" + (sources."strip-ansi-4.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + ]; + }) sources."strip-json-comments-2.0.1" sources."table-4.0.2" sources."text-table-0.2.0" @@ -27046,11 +30528,11 @@ in sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."js-tokens-3.0.2" - sources."ansi-styles-3.2.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-4.5.0" - sources."ansi-regex-3.0.0" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."has-flag-2.0.0" @@ -27072,9 +30554,14 @@ in sources."isexe-2.0.0" sources."ms-2.0.0" sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" + sources."acorn-5.3.0" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) sources."flat-cache-1.3.0" sources."circular-json-0.3.3" sources."del-2.2.2" @@ -27089,7 +30576,7 @@ in sources."array-union-1.0.2" sources."arrify-1.0.1" sources."array-uniq-1.0.3" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."pinkie-2.0.4" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -27117,7 +30604,6 @@ in sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" - sources."tryit-1.0.3" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" @@ -27143,14 +30629,15 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.2.0.tgz"; - sha512 = "3isjjj3hxs689ajwa1mhqdhi4sq6ibk7sgdlrckn0f77nn60pl0j165hqz5wkc7gfznv7m6jlk5ylbcl0hj1n10jw5zsiicbapzvy9i"; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.2.1.tgz"; + sha512 = "34bi29ay098nrgv3vqardbkc6w1q9g7bf8231919ivnr8br41w0s9r91j97chpx0mnqca8d41qlrqxy34mwd37qnlyk1iplzm7m38nl"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -27158,24 +30645,36 @@ in sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.12.0" // { + (sources."eslint-4.14.0" // { dependencies = [ - sources."chalk-2.3.0" - sources."supports-color-4.5.0" + (sources."chalk-2.3.0" // { + dependencies = [ + sources."supports-color-4.5.0" + ]; + }) + sources."strip-ansi-4.0.0" + sources."supports-color-2.0.0" + sources."ansi-styles-3.2.0" + sources."ansi-regex-3.0.0" ]; }) sources."optionator-0.8.2" sources."resolve-1.5.0" - sources."supports-color-3.2.3" - sources."ansi-styles-3.2.0" + (sources."supports-color-3.2.3" // { + dependencies = [ + sources."has-flag-1.0.0" + ]; + }) + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - sources."ajv-5.5.0" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + sources."ajv-5.5.2" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" ]; }) sources."concat-stream-1.6.0" @@ -27183,18 +30682,18 @@ in sources."debug-3.1.0" sources."doctrine-2.0.2" sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.2" sources."esquery-1.0.0" - sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.0.1" + sources."globals-11.1.0" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inquirer-3.3.0" - sources."is-resolvable-1.0.0" + sources."is-resolvable-1.0.1" sources."js-yaml-3.10.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -27217,7 +30716,7 @@ in sources."js-tokens-3.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."has-flag-1.0.0" + sources."has-flag-2.0.0" sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.3.3" @@ -27236,9 +30735,14 @@ in sources."isexe-2.0.0" sources."ms-2.0.0" sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" + sources."acorn-5.3.0" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) sources."flat-cache-1.3.0" sources."circular-json-0.3.3" sources."del-2.2.2" @@ -27253,7 +30757,7 @@ in sources."array-union-1.0.2" sources."arrify-1.0.1" sources."array-uniq-1.0.3" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."pinkie-2.0.4" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -27281,7 +30785,6 @@ in sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" - sources."tryit-1.0.3" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" @@ -27308,6 +30811,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; emojione = nodeEnv.buildNodePackage { name = "emojione"; @@ -27323,6 +30827,7 @@ in homepage = http://www.emojione.com/; }; production = true; + bypassCache = false; }; "fast-cli-1.x" = nodeEnv.buildNodePackage { name = "fast-cli"; @@ -27336,8 +30841,18 @@ in sources."chalk-1.1.3" sources."log-update-1.0.2" sources."meow-3.7.0" - sources."ora-1.3.0" - sources."phantomjs-prebuilt-2.1.16" + (sources."ora-1.3.0" // { + dependencies = [ + sources."cli-cursor-2.1.0" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + ]; + }) + (sources."phantomjs-prebuilt-2.1.16" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."promise-phantom-3.1.6" sources."zen-observable-0.5.2" sources."ansi-styles-2.2.1" @@ -27347,15 +30862,15 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."ansi-escapes-1.4.0" - sources."cli-cursor-2.1.0" - sources."restore-cursor-2.0.0" + sources."cli-cursor-1.0.2" + sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" - sources."onetime-2.0.1" + sources."onetime-1.1.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."minimist-0.0.8" + sources."minimist-1.2.0" sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" @@ -27396,7 +30911,7 @@ in sources."cli-spinners-1.1.0" sources."log-symbols-1.0.2" sources."mimic-fn-1.1.0" - sources."es6-promise-4.1.1" + sources."es6-promise-4.2.2" sources."extract-zip-1.6.6" sources."fs-extra-1.0.0" sources."hasha-2.2.0" @@ -27447,15 +30962,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -27486,6 +31005,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; fetch-bower = nodeEnv.buildNodePackage { name = "fetch-bower"; @@ -27511,6 +31031,7 @@ in homepage = https://bitbucket.org/shlevy/fetch-bower; }; production = true; + bypassCache = false; }; forever = nodeEnv.buildNodePackage { name = "forever"; @@ -27542,6 +31063,7 @@ in }) (sources."nconf-0.6.9" // { dependencies = [ + sources."async-0.2.9" sources."optimist-0.6.0" ]; }) @@ -27552,23 +31074,28 @@ in (sources."prettyjson-1.2.1" // { dependencies = [ sources."colors-1.1.2" + sources."minimist-1.2.0" ]; }) sources."shush-1.0.0" sources."timespan-2.3.0" - sources."utile-0.2.1" + (sources."utile-0.2.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."winston-0.8.3" sources."eyes-0.1.8" sources."broadway-0.3.6" sources."prompt-0.2.14" sources."director-1.2.7" sources."eventemitter2-0.4.14" - sources."async-0.2.9" + sources."async-0.2.10" sources."cycle-1.0.3" sources."pkginfo-0.3.1" sources."stack-trace-0.0.10" sources."wordwrap-0.0.3" - sources."minimist-0.0.8" + sources."minimist-0.0.10" sources."read-1.0.7" sources."revalidator-0.1.8" sources."mute-stream-0.0.7" @@ -27587,7 +31114,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -27601,9 +31132,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-buffer-1.1.6" @@ -27658,6 +31197,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; git-run = nodeEnv.buildNodePackage { name = "git-run"; @@ -27671,7 +31211,7 @@ in sources."async-2.6.0" sources."lodash.groupby-4.6.0" sources."minilog-3.1.0" - sources."simple-git-1.82.0" + sources."simple-git-1.85.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."lodash-4.17.4" sources."microee-0.0.6" @@ -27685,6 +31225,7 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; git-standup = nodeEnv.buildNodePackage { name = "git-standup"; @@ -27701,6 +31242,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; @@ -27734,6 +31276,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; "guifi-earth-https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = nodeEnv.buildNodePackage { name = "guifi-earth"; @@ -27746,33 +31289,57 @@ in }; dependencies = [ sources."coffee-script-1.12.7" - sources."jade-1.11.0" - sources."q-2.0.3" + (sources."jade-1.11.0" // { + dependencies = [ + sources."promise-2.0.0" + sources."is-promise-1.0.1" + sources."source-map-0.1.43" + sources."wordwrap-0.0.2" + sources."acorn-1.2.2" + ]; + }) + (sources."q-2.0.3" // { + dependencies = [ + sources."asap-2.0.6" + ]; + }) sources."xml2js-0.4.19" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - sources."clean-css-3.4.28" - sources."commander-2.8.1" + (sources."clean-css-3.4.28" // { + dependencies = [ + sources."commander-2.8.1" + ]; + }) + sources."commander-2.6.0" sources."constantinople-3.0.2" sources."jstransformer-0.0.2" sources."mkdirp-0.5.1" - sources."transformers-2.1.0" - sources."uglify-js-2.2.5" + (sources."transformers-2.1.0" // { + dependencies = [ + sources."uglify-js-2.2.5" + ]; + }) + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."void-elements-2.0.1" sources."with-4.0.3" - sources."source-map-0.5.7" + sources."source-map-0.4.4" sources."graceful-readlink-1.0.1" sources."amdefine-1.0.1" sources."acorn-2.7.0" - sources."is-promise-1.0.1" - sources."promise-2.0.0" - sources."asap-2.0.6" + sources."is-promise-2.1.0" + sources."promise-6.1.0" + sources."asap-1.0.0" sources."minimist-0.0.8" sources."css-1.0.8" sources."css-parse-1.0.4" sources."css-stringify-1.0.5" sources."optimist-0.3.7" - sources."wordwrap-0.0.2" + sources."wordwrap-0.0.3" sources."yargs-3.10.0" sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" @@ -27787,7 +31354,11 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" - sources."acorn-globals-1.0.9" + (sources."acorn-globals-1.0.9" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" sources."sax-1.2.4" @@ -27800,6 +31371,7 @@ in homepage = https://github.com/jmendeth/guifi-earth; }; production = true; + bypassCache = false; }; gulp = nodeEnv.buildNodePackage { name = "gulp"; @@ -27813,9 +31385,33 @@ in sources."archy-1.0.0" sources."chalk-1.1.3" sources."deprecated-0.0.1" - sources."gulp-util-3.0.8" - sources."interpret-1.0.4" - sources."liftoff-2.3.0" + (sources."gulp-util-3.0.8" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + sources."interpret-1.1.0" + (sources."liftoff-2.5.0" // { + dependencies = [ + sources."is-extendable-0.1.1" + sources."is-descriptor-0.1.6" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."has-values-0.1.4" + sources."isarray-1.0.0" + sources."kind-of-3.2.2" + ]; + }) sources."minimist-1.2.0" sources."orchestrator-0.3.8" sources."pretty-hrtime-1.0.3" @@ -27824,7 +31420,18 @@ in sources."v8flags-2.1.1" (sources."vinyl-fs-0.3.14" // { dependencies = [ + (sources."through2-0.6.5" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."vinyl-0.4.6" + sources."glob-3.1.21" + sources."minimatch-0.2.14" + sources."inherits-1.0.2" sources."minimist-0.0.8" + sources."readable-stream-1.0.34" + sources."clone-0.2.0" ]; }) sources."ansi-styles-2.2.1" @@ -27837,7 +31444,7 @@ in sources."array-uniq-1.0.3" sources."beeper-1.1.1" sources."dateformat-2.2.0" - sources."fancy-log-1.3.0" + sources."fancy-log-1.3.2" sources."gulplog-1.0.0" sources."has-gulplog-0.1.0" sources."lodash._reescape-3.0.0" @@ -27847,9 +31454,12 @@ in sources."multipipe-0.1.2" sources."object-assign-3.0.0" sources."replace-ext-0.0.1" - sources."through2-0.6.5" - sources."vinyl-0.4.6" + sources."through2-2.0.3" + sources."vinyl-0.5.3" + sources."ansi-gray-0.1.1" + sources."color-support-1.1.3" sources."time-stamp-1.1.0" + sources."ansi-wrap-0.1.0" sources."glogg-1.0.0" sources."sparkles-1.0.0" sources."lodash._basecopy-3.0.1" @@ -27865,7 +31475,7 @@ in sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" sources."duplexer2-0.0.2" - sources."readable-stream-1.0.34" + sources."readable-stream-1.1.14" sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" @@ -27874,92 +31484,207 @@ in sources."process-nextick-args-1.0.7" sources."safe-buffer-5.1.1" sources."util-deprecate-1.0.2" - sources."clone-0.2.0" + sources."clone-1.0.3" sources."clone-stats-0.0.1" sources."extend-3.0.1" - sources."findup-sync-0.4.3" + (sources."findup-sync-2.0.0" // { + dependencies = [ + sources."is-descriptor-1.0.2" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-extendable-1.0.1" + ]; + }) sources."fined-1.1.0" - sources."flagged-respawn-0.3.2" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.mapvalues-4.6.0" + sources."flagged-respawn-1.0.0" + sources."is-plain-object-2.0.4" + sources."object.map-1.0.1" sources."rechoir-0.6.2" sources."resolve-1.5.0" - sources."detect-file-0.1.0" - sources."is-glob-2.0.1" - sources."micromatch-2.3.11" - sources."resolve-dir-0.1.1" - sources."fs-exists-sync-0.1.0" - sources."is-extglob-1.0.0" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-1.8.5" - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" + sources."detect-file-1.0.0" + sources."is-glob-3.1.0" + (sources."micromatch-3.1.4" // { + dependencies = [ + sources."is-descriptor-0.1.6" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."resolve-dir-1.0.1" + sources."is-extglob-2.1.1" + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + (sources."extglob-2.0.3" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."fragment-cache-0.2.1" + sources."kind-of-6.0.2" + (sources."nanomatch-1.2.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."object.pick-1.3.0" + sources."regex-not-1.0.0" + (sources."snapdragon-0.8.1" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."to-regex-3.0.1" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."arr-flatten-1.1.0" - sources."expand-range-1.8.2" - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."fill-range-4.0.0" sources."isobject-3.0.1" - sources."randomatic-1.1.7" + sources."repeat-element-1.1.2" + sources."snapdragon-node-2.1.1" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) + sources."is-number-3.0.0" sources."repeat-string-1.6.1" + sources."to-regex-range-2.1.1" sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.1.0" - sources."for-own-1.0.0" - sources."is-extendable-0.1.1" + sources."snapdragon-util-3.0.1" + sources."assign-symbols-1.0.0" + sources."is-extendable-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."debug-2.6.9" + sources."posix-character-classes-0.1.1" + sources."ms-2.0.0" + sources."map-cache-0.2.2" + sources."is-odd-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."use-2.0.2" + sources."cache-base-1.0.1" + (sources."class-utils-0.3.5" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."component-emitter-1.2.1" + sources."mixin-deep-1.3.0" + sources."pascalcase-0.1.1" + sources."collection-visit-1.0.0" + sources."get-value-2.0.6" + sources."has-value-1.0.0" + sources."set-value-2.0.0" + sources."to-object-path-0.3.0" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."map-visit-1.0.0" + sources."object-visit-1.0.1" + sources."has-values-1.0.0" + sources."arr-union-3.1.0" + sources."lazy-cache-2.0.2" + sources."static-extend-0.1.2" + sources."set-getter-0.1.0" + sources."object-copy-0.1.0" + sources."copy-descriptor-0.1.1" sources."for-in-1.0.2" - sources."glob-base-0.3.0" - sources."is-dotfile-1.0.3" - sources."glob-parent-2.0.0" - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" + sources."decode-uri-component-0.2.0" + sources."source-map-url-0.4.0" + sources."atob-2.0.3" + sources."urix-0.1.0" + sources."resolve-url-0.2.1" sources."expand-tilde-2.0.2" - sources."global-modules-0.2.3" - sources."os-homedir-1.0.2" - sources."global-prefix-0.1.5" - sources."is-windows-0.2.0" + sources."global-modules-1.0.0" sources."homedir-polyfill-1.0.1" + sources."parse-passwd-1.0.0" + sources."global-prefix-1.0.2" + sources."is-windows-1.0.1" sources."ini-1.3.5" sources."which-1.3.0" - sources."parse-passwd-1.0.0" sources."isexe-2.0.0" - sources."is-plain-object-2.0.4" sources."object.defaults-1.1.0" - sources."object.pick-1.3.0" - sources."parse-filepath-1.0.1" + sources."parse-filepath-1.0.2" sources."array-each-1.0.1" - sources."array-slice-1.0.0" - sources."is-absolute-0.2.6" - sources."map-cache-0.2.2" + sources."array-slice-1.1.0" + sources."for-own-1.0.0" + sources."is-absolute-1.0.0" sources."path-root-0.1.1" - sources."is-relative-0.2.1" - sources."is-unc-path-0.1.2" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" sources."unc-path-regex-0.1.2" sources."path-root-regex-0.1.2" + sources."make-iterator-1.0.0" sources."path-parse-1.0.5" sources."end-of-stream-0.1.5" sources."sequencify-0.0.7" sources."stream-consume-0.1.0" sources."once-1.3.3" sources."wrappy-1.0.2" + sources."os-homedir-1.0.2" sources."user-home-1.1.1" sources."defaults-1.0.3" sources."glob-stream-3.1.18" - sources."glob-watcher-0.0.6" - sources."graceful-fs-1.2.3" + (sources."glob-watcher-0.0.6" // { + dependencies = [ + sources."graceful-fs-1.2.3" + ]; + }) + sources."graceful-fs-3.0.11" sources."mkdirp-0.5.1" sources."strip-bom-1.0.0" - sources."glob-3.1.21" - sources."minimatch-0.2.14" + sources."glob-4.5.3" + sources."minimatch-2.0.10" sources."ordered-read-streams-0.1.0" sources."glob2base-0.0.12" sources."unique-stream-1.0.0" @@ -27973,7 +31698,7 @@ in sources."lodash-1.0.2" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."natives-1.1.0" + sources."natives-1.1.1" sources."first-chunk-stream-1.0.0" sources."is-utf8-0.2.1" ]; @@ -27984,6 +31709,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; hipache = nodeEnv.buildNodePackage { name = "hipache"; @@ -27998,7 +31724,7 @@ in sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-2.0.3" + sources."eventemitter3-3.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -28007,6 +31733,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; @@ -28024,6 +31751,7 @@ in sources."glob-5.0.15" (sources."jshint-2.8.0" // { dependencies = [ + sources."minimatch-2.0.10" sources."glob-3.2.11" ]; }) @@ -28033,14 +31761,18 @@ in sources."parserlib-0.2.5" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-0.3.0" + sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."cli-0.6.6" + (sources."cli-0.6.6" // { + dependencies = [ + sources."minimatch-0.3.0" + ]; + }) sources."console-browserify-1.1.0" sources."exit-0.1.2" sources."htmlparser2-3.8.3" @@ -28050,11 +31782,19 @@ in sources."sigmund-1.0.1" sources."date-now-0.1.4" sources."domhandler-2.3.0" - sources."domutils-1.5.1" - sources."domelementtype-1.1.3" + (sources."domutils-1.5.1" // { + dependencies = [ + sources."entities-1.1.1" + ]; + }) + sources."domelementtype-1.3.0" sources."readable-stream-1.1.14" - sources."entities-1.1.1" - sources."dom-serializer-0.1.0" + sources."entities-1.0.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" @@ -28071,28 +31811,33 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.7"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.7.tgz"; - sha512 = "31dxgy9vqkpkkmxi45mlnp7ijqigjx1s1z9j7ngvklwp6n4rck5cs3ilw3qxz0glsgj2k9n884wrcad9433ljjsh7z8w3hamagrg10q"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz"; + sha512 = "29sg4r25g8awvmlyzjip0c216bjcd0nq730jd5vihagf3vpxw070gi5nd7z7333givgislxfylv4jrxn4ngqxgnwns5lg3xy3lc6zjr"; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.1.9" - sources."commander-2.12.1" + sources."commander-2.12.2" sources."he-1.1.1" sources."ncname-1.0.0" sources."param-case-2.1.1" sources."relateurl-0.2.7" - sources."uglify-js-3.2.0" + (sources."uglify-js-3.3.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."no-case-2.3.2" sources."upper-case-1.1.3" sources."lower-case-1.1.4" - sources."source-map-0.6.1" + sources."source-map-0.5.7" sources."xml-char-classes-1.0.0" ]; buildInputs = globalBuildInputs; @@ -28102,6 +31847,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; ionic = nodeEnv.buildNodePackage { name = "ionic"; @@ -28113,15 +31859,28 @@ in }; dependencies = [ sources."@ionic/cli-framework-0.1.2" - sources."@ionic/cli-utils-1.19.0" + (sources."@ionic/cli-utils-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" + sources."mime-1.4.1" + sources."is-glob-3.1.0" + sources."is-extglob-2.1.1" + sources."yallist-3.0.2" + sources."raw-body-1.1.7" + sources."bytes-1.0.0" + sources."string_decoder-0.10.31" + ]; + }) sources."chalk-2.3.0" sources."opn-5.1.0" sources."semver-5.4.1" - sources."tslib-1.8.0" + sources."tslib-1.8.1" sources."ncp-2.0.0" sources."rimraf-2.6.2" sources."strip-ansi-4.0.0" - sources."superagent-3.8.1" + sources."superagent-3.8.2" sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -28136,12 +31895,12 @@ in sources."ansi-regex-3.0.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" - sources."debug-2.6.9" + sources."debug-3.1.0" sources."extend-3.0.1" sources."form-data-2.3.1" sources."formidable-1.1.1" sources."methods-1.1.2" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."qs-6.5.1" sources."readable-stream-2.3.3" sources."ms-2.0.0" @@ -28154,7 +31913,7 @@ in sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."safe-buffer-5.1.1" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."@ionic/discover-0.4.0" sources."archiver-2.1.0" @@ -28171,16 +31930,20 @@ in sources."inquirer-3.3.0" sources."leek-0.0.24" sources."lodash-4.17.4" - sources."minimist-0.0.8" + sources."minimist-1.2.0" sources."os-name-2.0.1" sources."slice-ansi-1.0.0" sources."ssh-config-1.1.3" sources."string-width-2.1.1" - sources."tar-4.0.2" + (sources."tar-4.2.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."tiny-lr-1.0.5" sources."uuid-3.1.0" sources."wrap-ansi-3.0.1" - sources."ws-3.3.2" + sources."ws-3.3.3" sources."netmask-1.0.6" sources."archiver-utils-1.3.0" sources."async-2.6.0" @@ -28197,16 +31960,16 @@ in sources."compress-commons-1.2.2" sources."crc32-stream-2.0.0" sources."crc-3.5.0" - sources."bytes-1.0.0" + sources."bytes-3.0.0" sources."content-type-1.0.4" sources."depd-1.1.1" sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."raw-body-1.1.7" + sources."raw-body-2.3.2" sources."type-is-1.6.15" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -28214,17 +31977,21 @@ in sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" + sources."is-glob-2.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.3" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" - sources."is-extglob-2.1.1" + sources."is-extglob-1.0.0" sources."kind-of-3.2.2" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" @@ -28234,9 +32001,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" @@ -28254,7 +32029,7 @@ in sources."shebang-command-1.2.0" sources."which-1.3.0" sources."pseudomap-1.0.2" - sources."yallist-3.0.2" + sources."yallist-2.1.2" sources."shebang-regex-1.0.0" sources."isexe-2.0.0" sources."sax-1.1.4" @@ -28319,8 +32094,9 @@ in sources."win-release-1.1.1" sources."is-fullwidth-code-point-2.0.0" sources."chownr-1.0.1" + sources."fs-minipass-1.2.5" sources."minipass-2.2.1" - sources."minizlib-1.0.4" + sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."body-5.1.0" sources."faye-websocket-0.10.0" @@ -28349,6 +32125,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; ios-deploy = nodeEnv.buildNodePackage { name = "ios-deploy"; @@ -28365,6 +32142,7 @@ in license = "GPLv3"; }; production = true; + bypassCache = false; }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; @@ -28382,7 +32160,8 @@ in sources."glob-5.0.15" (sources."handlebars-4.0.11" // { dependencies = [ - sources."wordwrap-0.0.2" + sources."source-map-0.4.4" + sources."wordwrap-0.0.3" ]; }) (sources."js-yaml-3.10.0" // { @@ -28390,7 +32169,11 @@ in sources."esprima-4.0.0" ]; }) - sources."mkdirp-0.5.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."nopt-3.0.6" sources."once-1.4.0" sources."resolve-1.1.7" @@ -28400,7 +32183,7 @@ in sources."estraverse-1.9.3" sources."esutils-2.0.2" sources."optionator-0.8.2" - sources."source-map-0.5.7" + sources."source-map-0.2.0" sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."type-check-0.3.2" @@ -28416,8 +32199,13 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."optimist-0.6.1" - sources."uglify-js-2.8.29" - sources."minimist-0.0.8" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + sources."wordwrap-0.0.2" + ]; + }) + sources."minimist-0.0.10" sources."yargs-3.10.0" sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" @@ -28444,20 +32232,21 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.4.tgz"; - sha512 = "08pa61nhkvmac5kwr61iqbw0251r6kwhix9l41rgxjinpi8p9s5anvy8a2zzfjrlkr93aqbbniy4qa095li7xn84vl8dv6aqxkpaba4"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.5.tgz"; + sha512 = "080s545iykbb70x7xm0nqs6s7qs0slprxcqslpv47ffyz6gx7gb8kaa1dlk9lxvkm8pfhdyyj0f6qsx7d1ydscnnl0x1wmkzagbpmzm"; }; dependencies = [ sources."chai-4.1.2" sources."chai-as-promised-7.1.1" sources."chalk-2.3.0" - sources."commander-2.12.1" + sources."commander-2.12.2" sources."fast-json-patch-2.0.6" sources."glob-7.1.2" sources."iterare-0.0.8" @@ -28470,7 +32259,7 @@ in sources."mz-2.7.0" sources."object-hash-1.2.0" sources."opentracing-0.14.1" - sources."rxjs-5.5.2" + sources."rxjs-5.5.6" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."typescript-2.4.2" @@ -28513,7 +32302,7 @@ in sources."object-assign-4.1.1" sources."thenify-all-1.6.0" sources."thenify-3.3.0" - sources."symbol-observable-1.0.4" + sources."symbol-observable-1.0.1" sources."vscode-uri-1.0.1" sources."vscode-languageserver-protocol-3.5.0" ]; @@ -28524,6 +32313,7 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; jayschema = nodeEnv.buildNodePackage { name = "jayschema"; @@ -28543,6 +32333,50 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; + }; + jsdoc = nodeEnv.buildNodePackage { + name = "jsdoc"; + packageName = "jsdoc"; + version = "3.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz"; + sha512 = "29bn095czjx533yyfcdg0ah2wfm3iyz4sckld2yzqfimzzq2h3jlgaax0mab6wjgrc4bl75yni4c6b27zzazwkcs678aly0jkml3z78"; + }; + dependencies = [ + sources."babylon-7.0.0-beta.19" + sources."bluebird-3.5.1" + (sources."catharsis-0.8.9" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."escape-string-regexp-1.0.5" + sources."js2xmlparser-3.0.0" + sources."klaw-2.0.0" + sources."marked-0.3.9" + sources."mkdirp-0.5.1" + (sources."requizzle-0.2.1" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."strip-json-comments-2.0.1" + sources."taffydb-2.6.2" + sources."underscore-1.8.3" + sources."underscore-contrib-0.3.0" + sources."xmlcreate-1.0.2" + sources."graceful-fs-4.1.11" + sources."minimist-0.0.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An API documentation generator for JavaScript."; + homepage = "https://github.com/jsdoc3/jsdoc#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; @@ -28570,11 +32404,19 @@ in sources."wrappy-1.0.2" sources."date-now-0.1.4" sources."domhandler-2.3.0" - sources."domutils-1.5.1" - sources."domelementtype-1.1.3" + (sources."domutils-1.5.1" // { + dependencies = [ + sources."entities-1.1.1" + ]; + }) + sources."domelementtype-1.3.0" sources."readable-stream-1.1.14" - sources."entities-1.1.1" - sources."dom-serializer-0.1.0" + sources."entities-1.0.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" @@ -28589,6 +32431,7 @@ in license = "(MIT AND JSON)"; }; production = true; + bypassCache = false; }; json = nodeEnv.buildNodePackage { name = "json"; @@ -28604,14 +32447,15 @@ in homepage = "https://github.com/trentm/json#readme"; }; production = true; + bypassCache = false; }; js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.4.tgz"; - sha512 = "0m3jydg8rd5is3021z595lfrm9qc6398r2nppar8xvx5m0y4q9dlac7hmm7rkyffn3ss5fn8s5zmz7d4fw1bi8q1z4lz5s8x61zb1g9"; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz"; + sha512 = "0x3s0bbw8f5d2i5jb08bd2dsxnf7w38fp7fj652cvp558b45mxyvy42zmghrmlyrmbk5d84d8maw4pqq3228jq0l7hkxb4fl415zs7l"; }; dependencies = [ sources."config-chain-1.1.11" @@ -28621,7 +32465,7 @@ in sources."proto-list-1.2.4" sources."ini-1.3.5" sources."bluebird-3.5.1" - sources."commander-2.12.1" + sources."commander-2.12.2" sources."lru-cache-3.2.0" sources."semver-5.4.1" sources."sigmund-1.0.1" @@ -28636,6 +32480,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; jsonlint = nodeEnv.buildNodePackage { name = "jsonlint"; @@ -28660,6 +32505,7 @@ in homepage = http://zaach.github.com/jsonlint/; }; production = true; + bypassCache = false; }; jsontool = nodeEnv.buildNodePackage { name = "jsontool"; @@ -28675,18 +32521,19 @@ in homepage = https://github.com/trentm/json; }; production = true; + bypassCache = false; }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.2.tgz"; - sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5"; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.3.tgz"; + sha512 = "3wagfrcaaj3vscma48jj349wbf838vi5fy0c02xfxd4k57qhf05mfw0i0624fvxfil9gfhx3sl35py85lfjx74hfkw6ra7kqw91p5cw"; }; dependencies = [ - sources."commander-2.12.1" - sources."graphlib-2.1.1" + sources."commander-2.11.0" + sources."graphlib-2.1.5" sources."js-yaml-3.10.0" sources."lodash-4.17.4" sources."native-promise-only-0.8.1" @@ -28696,7 +32543,7 @@ in sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - sources."superagent-3.8.1" + sources."superagent-3.8.2" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" @@ -28729,6 +32576,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; json-server = nodeEnv.buildNodePackage { name = "json-server"; @@ -28745,8 +32593,17 @@ in sources."connect-pause-0.1.1" sources."cors-2.8.4" sources."errorhandler-1.5.0" - sources."express-4.16.2" - sources."express-urlrewrite-1.2.0" + (sources."express-4.16.2" // { + dependencies = [ + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" + ]; + }) + (sources."express-urlrewrite-1.2.0" // { + dependencies = [ + sources."path-to-regexp-1.7.0" + ]; + }) sources."json-parse-helpfulerror-1.0.3" sources."lodash-4.17.4" sources."lodash-id-0.14.0" @@ -28760,7 +32617,12 @@ in sources."request-2.83.0" sources."server-destroy-1.0.1" sources."update-notifier-2.3.0" - sources."yargs-10.0.3" + (sources."yargs-10.1.0" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."ansi-regex-2.1.1" + ]; + }) sources."bytes-3.0.0" sources."content-type-1.0.4" sources."debug-2.6.9" @@ -28773,8 +32635,8 @@ in sources."type-is-1.6.15" sources."ms-2.0.0" sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -28804,7 +32666,7 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.2" - sources."path-to-regexp-1.7.0" + sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" sources."send-0.16.1" @@ -28841,15 +32703,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -28866,7 +32732,7 @@ in sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" - sources."boxen-1.2.2" + sources."boxen-1.3.0" sources."configstore-3.1.1" sources."import-lazy-2.1.0" sources."is-installed-globally-0.1.0" @@ -28877,9 +32743,9 @@ in sources."ansi-align-2.0.0" sources."camelcase-4.1.0" sources."cli-boxes-1.0.0" - sources."string-width-1.0.2" + sources."string-width-2.1.1" sources."term-size-1.2.0" - sources."widest-line-1.0.0" + sources."widest-line-2.0.0" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -28899,8 +32765,6 @@ in sources."shebang-regex-1.0.0" sources."isexe-2.0.0" sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" sources."dot-prop-4.2.0" sources."make-dir-1.1.0" sources."unique-string-1.0.0" @@ -28910,7 +32774,7 @@ in sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."ini-1.3.5" sources."path-is-inside-1.0.2" sources."package-json-4.0.1" @@ -28932,7 +32796,7 @@ in sources."deep-extend-0.4.2" sources."minimist-1.2.0" sources."strip-json-comments-2.0.1" - sources."cliui-3.2.0" + sources."cliui-4.0.0" sources."decamelize-1.2.0" sources."find-up-2.1.0" sources."get-caller-file-1.0.2" @@ -28942,12 +32806,20 @@ in sources."set-blocking-2.0.0" sources."which-module-2.0.0" sources."y18n-3.2.1" - sources."yargs-parser-8.0.0" - sources."wrap-ansi-2.1.0" + sources."yargs-parser-8.1.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."code-point-at-1.1.0" + sources."number-is-nan-1.0.1" sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."lcid-1.0.0" sources."mem-1.1.0" sources."invert-kv-1.0.0" @@ -28960,6 +32832,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; @@ -28981,50 +32854,107 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.7.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz"; - sha512 = "0g4s1b3k1485yxia2b8703zyw8dxjz9npijnkapv7q9jfw1piyaa2p4hsyqiajnc4n1djri6xk76q6y0jw0n9y7a5d4g6p1f26436lk"; + url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz"; + sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib"; }; dependencies = [ sources."bluebird-3.5.1" sources."body-parser-1.18.2" - sources."chokidar-1.7.0" - sources."colors-1.1.2" - (sources."combine-lists-1.0.1" // { + (sources."browserify-14.5.0" // { dependencies = [ - sources."lodash-4.17.4" + sources."source-map-0.5.7" + sources."hash-base-2.0.2" + sources."isarray-0.0.1" + sources."acorn-5.3.0" ]; }) - sources."connect-3.6.5" - sources."core-js-2.5.1" + sources."chokidar-1.7.0" + sources."colors-1.1.2" + sources."combine-lists-1.0.1" + (sources."connect-3.6.5" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + sources."core-js-2.5.3" sources."di-0.0.1" sources."dom-serialize-2.2.1" - sources."expand-braces-0.1.2" + (sources."expand-braces-0.1.2" // { + dependencies = [ + sources."braces-0.1.5" + sources."expand-range-0.1.1" + sources."is-number-0.1.1" + sources."repeat-string-0.2.2" + ]; + }) sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."http-proxy-1.16.2" sources."isbinaryfile-3.0.2" - sources."lodash-3.10.1" - sources."log4js-0.6.38" + sources."lodash-4.17.4" + (sources."log4js-2.4.1" // { + dependencies = [ + sources."debug-3.1.0" + sources."minimist-0.0.8" + sources."request-2.75.0" + sources."aws-sign2-0.6.0" + sources."caseless-0.11.0" + sources."form-data-2.0.0" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."qs-6.2.3" + sources."tunnel-agent-0.4.3" + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."ms-0.7.1" + sources."isarray-0.0.1" + sources."co-3.0.6" + sources."source-map-0.5.7" + sources."ip-1.1.5" + sources."socks-1.1.9" + sources."iconv-lite-0.4.15" + ]; + }) sources."mime-1.6.0" sources."minimatch-3.0.4" - sources."optimist-0.6.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + ]; + }) sources."qjobs-1.1.5" sources."range-parser-1.2.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."socket.io-1.7.3" - sources."source-map-0.5.7" - sources."tmp-0.0.31" - sources."useragent-2.2.1" + (sources."socket.io-2.0.4" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."source-map-0.6.1" + sources."tmp-0.0.33" + (sources."useragent-2.2.1" // { + dependencies = [ + sources."lru-cache-2.2.4" + ]; + }) sources."bytes-3.0.0" sources."content-type-1.0.4" - sources."debug-2.2.0" + sources."debug-2.6.9" sources."depd-1.1.1" sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" @@ -29032,15 +32962,152 @@ in sources."qs-6.5.1" sources."raw-body-2.3.2" sources."type-is-1.6.15" - sources."ms-0.7.1" + sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" sources."mime-types-2.1.17" sources."mime-db-1.30.0" + sources."JSONStream-1.3.2" + sources."assert-1.4.1" + sources."browser-pack-6.0.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."buffer-5.0.8" + sources."cached-path-relative-1.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" + ]; + }) + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."crypto-browserify-3.12.0" + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."domain-browser-1.1.7" + sources."duplexer2-0.1.4" + sources."events-1.1.1" + sources."has-1.0.1" + sources."htmlescape-1.1.1" + sources."https-browserify-1.0.0" + sources."insert-module-globals-7.0.1" + sources."labeled-stream-splicer-2.0.0" + sources."module-deps-4.1.1" + sources."os-browserify-0.3.0" + sources."parents-1.0.1" + sources."path-browserify-0.0.0" + sources."process-0.11.10" + sources."punycode-1.4.1" + sources."querystring-es3-0.2.1" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."resolve-1.5.0" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."stream-browserify-2.0.1" + sources."stream-http-2.7.2" + sources."string_decoder-1.0.3" + sources."subarg-1.0.0" + (sources."syntax-error-1.3.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."through2-2.0.3" + sources."timers-browserify-1.4.2" + sources."tty-browserify-0.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."vm-browserify-0.0.4" + sources."xtend-4.0.1" + sources."jsonparse-1.3.1" + sources."through-2.3.8" + sources."combine-source-map-0.7.2" + sources."umd-3.0.1" + sources."convert-source-map-1.1.3" + sources."inline-source-map-0.6.2" + sources."lodash.memoize-3.0.4" + sources."pako-1.0.6" + sources."base64-js-1.2.1" + sources."ieee754-1.1.8" + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."date-now-0.1.4" + sources."browserify-cipher-1.0.0" + sources."browserify-sign-4.0.4" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + sources."diffie-hellman-5.0.2" + sources."pbkdf2-3.0.14" + sources."public-encrypt-4.0.0" + sources."randombytes-2.0.5" + sources."randomfill-1.0.3" + sources."browserify-aes-1.1.1" + sources."browserify-des-1.0.0" + sources."evp_bytestokey-1.0.3" + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.4" + sources."des.js-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."md5.js-1.3.4" + sources."hash-base-3.0.4" + sources."bn.js-4.11.8" + sources."browserify-rsa-4.0.1" + sources."elliptic-6.4.0" + sources."parse-asn1-5.1.0" + sources."brorand-1.1.0" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."asn1.js-4.9.2" + sources."ripemd160-2.0.1" + sources."sha.js-2.4.9" + sources."miller-rabin-4.0.1" + sources."function-bind-1.1.1" + sources."is-buffer-1.1.6" + sources."lexical-scope-1.2.0" + sources."astw-2.2.0" + sources."acorn-4.0.13" + sources."stream-splicer-2.0.0" + sources."detective-4.7.1" + sources."stream-combiner2-1.1.1" + sources."path-platform-0.11.15" + sources."path-parse-1.0.5" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."array-filter-0.0.1" + sources."array-reduce-0.0.0" + sources."array-map-0.0.0" + sources."builtin-status-codes-3.0.0" + sources."to-arraybuffer-1.0.1" + sources."minimist-1.2.0" + sources."querystring-0.2.0" + sources."indexof-0.0.1" sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -29053,7 +33120,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-0.1.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -29063,16 +33134,22 @@ in sources."parse-glob-3.0.4" sources."regex-cache-0.4.4" sources."arr-flatten-1.1.0" - sources."expand-range-0.1.1" + sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-0.1.1" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-0.2.2" - sources."isarray-0.0.1" - sources."is-buffer-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -29083,12 +33160,7 @@ in sources."is-primitive-2.0.0" sources."remove-trailing-separator-1.1.0" sources."binary-extensions-1.11.0" - sources."readable-stream-1.0.34" sources."set-immediate-shim-1.0.1" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" sources."nan-2.8.0" sources."finalhandler-1.0.6" sources."parseurl-1.3.2" @@ -29106,50 +33178,198 @@ in sources."wrappy-1.0.2" sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" - sources."semver-4.3.6" + sources."circular-json-0.4.0" + sources."date-format-1.2.0" + sources."semver-5.4.1" + sources."streamroller-0.7.0" + sources."hipchat-notifier-1.1.0" + sources."loggly-1.1.1" + (sources."mailgun-js-0.7.15" // { + dependencies = [ + sources."debug-2.2.0" + sources."form-data-2.1.4" + sources."semver-5.0.3" + ]; + }) + sources."nodemailer-2.7.2" + sources."redis-2.8.0" + sources."slack-node-0.2.0" + (sources."axios-0.15.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."mkdirp-0.5.1" + sources."request-2.83.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-5.5.2" + sources."har-schema-2.0.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."json-schema-traverse-0.3.1" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."timespan-2.3.0" + sources."bl-1.1.2" + sources."node-uuid-1.4.8" + sources."chalk-1.1.3" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."async-2.1.5" + sources."inflection-1.10.0" + sources."is-stream-1.1.0" + (sources."path-proxy-1.0.0" // { + dependencies = [ + sources."inflection-1.3.8" + ]; + }) + sources."proxy-agent-2.0.0" + sources."q-1.4.1" + sources."tsscmp-1.0.5" + sources."agent-base-2.1.1" + sources."http-proxy-agent-1.0.0" + sources."https-proxy-agent-1.0.0" + sources."lru-cache-2.6.5" + sources."pac-proxy-agent-1.1.0" + sources."socks-proxy-agent-2.1.1" + sources."get-uri-2.0.1" + sources."pac-resolver-2.0.0" + sources."data-uri-to-buffer-1.2.0" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."xregexp-2.0.0" + sources."netmask-1.0.6" + sources."degenerator-1.0.4" + sources."thunkify-2.1.2" + sources."ip-1.0.1" + sources."esprima-3.1.3" + sources."escodegen-1.9.0" + sources."ast-types-0.10.1" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."optionator-0.8.2" + sources."prelude-ls-1.1.2" + sources."deep-is-0.1.3" + sources."wordwrap-1.0.0" + sources."type-check-0.3.2" + sources."levn-0.3.0" + sources."fast-levenshtein-2.0.6" + sources."socks-1.1.10" + sources."smart-buffer-1.1.15" + sources."libmime-3.0.0" + sources."mailcomposer-4.0.1" + sources."nodemailer-direct-transport-3.3.2" + sources."nodemailer-shared-1.1.0" + sources."nodemailer-smtp-pool-2.8.2" + sources."nodemailer-smtp-transport-2.7.2" + sources."libbase64-0.1.0" + sources."libqp-1.1.0" + sources."buildmail-4.0.1" + sources."addressparser-1.0.1" + sources."nodemailer-fetch-1.6.0" + sources."smtp-connection-2.12.0" + sources."httpntlm-1.6.1" + sources."httpreq-0.4.24" + sources."underscore-1.7.0" + sources."nodemailer-wellknown-0.1.10" + sources."double-ended-queue-2.1.0-0" + sources."redis-commands-1.3.1" + sources."redis-parser-2.6.0" + sources."requestretry-1.12.2" + sources."when-3.7.8" + sources."follow-redirects-1.0.0" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."engine.io-1.8.3" - sources."has-binary-0.1.7" - sources."object-assign-4.1.0" - sources."socket.io-adapter-0.5.0" - sources."socket.io-client-1.7.3" - sources."socket.io-parser-2.3.1" + sources."engine.io-3.1.4" + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.0.4" + sources."socket.io-parser-3.1.2" sources."accepts-1.3.3" sources."base64id-1.0.0" - sources."engine.io-parser-1.3.2" - sources."ws-1.1.2" + sources."engine.io-parser-2.1.2" + sources."ws-3.3.3" sources."cookie-0.3.1" + sources."uws-0.14.5" sources."negotiator-0.6.1" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" - sources."wtf-8-1.0.0" - sources."options-0.0.6" - sources."ultron-1.0.2" + sources."has-binary2-1.0.2" + sources."async-limiter-1.0.0" + sources."ultron-1.1.1" sources."backo2-1.0.2" sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."engine.io-client-1.8.3" - sources."indexof-0.0.1" + sources."component-emitter-1.2.1" + sources."engine.io-client-3.1.4" + sources."has-cors-1.1.0" sources."object-component-0.0.3" + sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."to-array-0.1.4" sources."component-inherit-0.0.3" - sources."has-cors-1.1.0" - sources."parsejson-0.0.3" - sources."parseqs-0.0.5" - sources."xmlhttprequest-ssl-1.5.3" + sources."xmlhttprequest-ssl-1.5.4" sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" - sources."json3-3.3.2" sources."os-tmpdir-1.0.2" - sources."lru-cache-2.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -29158,6 +33378,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; "kibana-authentication-proxy-git://github.com/fangli/kibana-authentication-proxy.git" = nodeEnv.buildNodePackage { name = "kibana-authentication-proxy"; @@ -29169,19 +33390,45 @@ in sha256 = "a282e834ff67715017f299468ff0d7e496d2bc0f1f7b075b557568b7feb3dba7"; }; dependencies = [ - sources."express-3.21.2" - sources."passport-0.4.0" + (sources."express-3.21.2" // { + dependencies = [ + sources."accepts-1.3.4" + sources."negotiator-0.6.1" + sources."uid-safe-2.0.0" + sources."ms-2.0.0" + sources."statuses-1.2.1" + sources."destroy-1.0.3" + ]; + }) + (sources."passport-0.4.0" // { + dependencies = [ + sources."pause-0.0.1" + ]; + }) sources."passport-google-oauth-1.0.0" sources."connect-restreamer-1.0.3" sources."xml2js-0.4.19" sources."basic-auth-1.0.4" - sources."connect-2.30.2" + (sources."connect-2.30.2" // { + dependencies = [ + sources."escape-html-1.0.3" + sources."vary-1.1.2" + sources."ms-0.7.2" + sources."accepts-1.2.13" + sources."negotiator-0.5.3" + sources."send-0.13.2" + ]; + }) sources."content-disposition-0.5.0" sources."content-type-1.0.4" sources."commander-2.6.0" sources."cookie-0.1.3" sources."cookie-signature-1.0.6" - sources."debug-2.2.0" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."depd-1.0.1" sources."escape-html-1.0.2" sources."etag-1.7.0" @@ -29192,9 +33439,13 @@ in sources."parseurl-1.3.2" sources."proxy-addr-1.0.10" sources."range-parser-1.0.3" - sources."send-0.13.2" + (sources."send-0.13.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."utils-merge-1.0.0" - sources."vary-1.1.2" + sources."vary-1.0.1" sources."basic-auth-connect-1.0.0" sources."body-parser-1.13.3" sources."bytes-2.1.0" @@ -29204,23 +33455,45 @@ in sources."csurf-1.8.3" sources."errorhandler-1.4.3" sources."express-session-1.11.3" - sources."finalhandler-0.4.0" + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + ]; + }) sources."http-errors-1.3.1" - sources."method-override-2.3.10" + (sources."method-override-2.3.10" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."morgan-1.6.1" sources."multiparty-3.3.2" sources."on-headers-1.0.1" - sources."pause-0.0.1" + sources."pause-0.1.0" sources."qs-4.0.0" - sources."response-time-2.3.2" + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."serve-favicon-2.3.2" sources."serve-index-1.7.3" - sources."serve-static-1.10.3" + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."depd-1.1.1" + sources."ms-0.7.1" + ]; + }) sources."type-is-1.6.15" sources."vhost-3.0.2" - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.11" sources."on-finished-2.3.0" - sources."raw-body-2.1.7" + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" + ]; + }) sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" @@ -29232,19 +33505,19 @@ in sources."csrf-3.0.6" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - sources."uid-safe-2.0.0" + sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" sources."crc-3.3.0" sources."base64-url-1.2.1" sources."inherits-2.0.3" - sources."statuses-1.2.1" + sources."statuses-1.4.0" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."batch-0.5.3" - sources."destroy-1.0.3" + sources."destroy-1.0.4" sources."mime-1.3.4" sources."media-typer-0.3.0" sources."minimist-0.0.8" @@ -29266,6 +33539,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; lerna = nodeEnv.buildNodePackage { name = "lerna"; @@ -29285,48 +33559,93 @@ in dependencies = [ sources."read-pkg-1.1.0" sources."yargs-3.10.0" + sources."wordwrap-0.0.2" sources."load-json-file-1.1.0" sources."find-up-1.1.2" sources."path-exists-2.1.0" + sources."minimist-1.2.0" + sources."camelcase-2.1.1" ]; }) - sources."conventional-recommended-bump-1.0.3" + sources."conventional-recommended-bump-1.1.0" sources."dedent-0.7.0" sources."execa-0.8.0" sources."find-up-2.1.0" - sources."fs-extra-4.0.2" + sources."fs-extra-4.0.3" sources."get-port-3.2.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" sources."globby-6.1.0" sources."graceful-fs-4.1.11" sources."hosted-git-info-2.5.0" - sources."inquirer-3.3.0" - sources."is-ci-1.0.10" - sources."load-json-file-3.0.0" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."is-ci-1.1.0" + (sources."load-json-file-3.0.0" // { + dependencies = [ + sources."parse-json-3.0.0" + sources."strip-bom-3.0.0" + ]; + }) sources."lodash-4.17.4" sources."minimatch-3.0.4" - sources."npmlog-4.1.2" + (sources."npmlog-4.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) sources."p-finally-1.0.0" - sources."package-json-4.0.1" + (sources."package-json-4.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."path-exists-3.0.0" sources."read-cmd-shim-1.0.1" (sources."read-pkg-2.0.0" // { dependencies = [ sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."strip-bom-3.0.0" ]; }) sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."semver-5.4.1" sources."signal-exit-3.0.2" - sources."strong-log-transformer-1.0.6" - sources."temp-write-3.3.0" + (sources."strong-log-transformer-1.0.6" // { + dependencies = [ + sources."minimist-0.1.0" + ]; + }) + (sources."temp-write-3.4.0" // { + dependencies = [ + sources."pify-3.0.0" + sources."uuid-3.1.0" + ]; + }) sources."write-file-atomic-2.3.0" - sources."write-json-file-2.3.0" + (sources."write-json-file-2.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."write-pkg-3.1.0" (sources."yargs-8.0.2" // { dependencies = [ + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."read-pkg-up-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."execa-0.7.0" ]; }) @@ -29337,21 +33656,21 @@ in sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."mkdirp-0.5.1" - sources."minimist-0.1.0" - sources."strip-ansi-4.0.0" + sources."minimist-0.0.8" + sources."strip-ansi-3.0.1" sources."wcwidth-1.0.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-2.1.1" sources."defaults-1.0.3" sources."clone-1.0.3" sources."add-stream-1.0.0" sources."conventional-changelog-1.1.7" sources."meow-3.7.0" sources."tempfile-1.1.1" - sources."conventional-changelog-angular-1.5.2" + sources."conventional-changelog-angular-1.6.0" sources."conventional-changelog-atom-0.1.2" sources."conventional-changelog-codemirror-0.2.1" - sources."conventional-changelog-core-1.9.3" - sources."conventional-changelog-ember-0.2.9" + sources."conventional-changelog-core-1.9.5" + sources."conventional-changelog-ember-0.2.10" sources."conventional-changelog-eslint-0.2.1" sources."conventional-changelog-express-0.2.1" sources."conventional-changelog-jquery-0.1.0" @@ -29362,30 +33681,34 @@ in sources."array-ify-1.0.0" sources."dot-prop-3.0.0" sources."is-obj-1.0.1" - sources."conventional-changelog-writer-2.0.2" - sources."conventional-commits-parser-2.0.1" + sources."conventional-changelog-writer-2.0.3" + sources."conventional-commits-parser-2.1.0" sources."dateformat-1.0.12" sources."get-pkg-repo-1.4.0" sources."git-raw-commits-1.3.0" sources."git-remote-origin-url-2.0.0" sources."git-semver-tags-1.2.3" sources."normalize-package-data-2.4.0" - sources."read-pkg-up-2.0.0" + sources."read-pkg-up-1.0.1" sources."through2-2.0.3" - sources."conventional-commits-filter-1.1.0" + sources."conventional-commits-filter-1.1.1" sources."handlebars-4.0.11" sources."json-stringify-safe-5.0.1" sources."split-1.0.1" sources."is-subset-0.1.1" sources."modify-values-1.0.0" sources."optimist-0.6.1" - sources."source-map-0.5.7" - sources."uglify-js-2.8.29" - sources."wordwrap-0.0.2" + sources."source-map-0.4.4" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."wordwrap-0.0.3" sources."amdefine-1.0.1" sources."uglify-to-browserify-1.0.2" - sources."camelcase-4.1.0" - sources."cliui-3.2.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" sources."decamelize-1.2.0" sources."window-size-0.1.0" sources."center-align-0.1.3" @@ -29397,7 +33720,7 @@ in sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" sources."through-2.3.8" - sources."JSONStream-1.3.1" + sources."JSONStream-1.3.2" sources."is-text-path-1.0.1" sources."split2-2.2.0" sources."trim-off-newlines-1.0.1" @@ -29411,7 +33734,7 @@ in sources."lodash._reinterpolate-3.0.0" sources."lodash.templatesettings-4.1.0" sources."gitconfiglocal-1.0.0" - sources."pify-3.0.0" + sources."pify-2.3.0" sources."ini-1.3.5" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -29419,10 +33742,10 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."path-type-2.0.0" + sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pinkie-promise-2.0.1" - sources."strip-bom-3.0.0" + sources."strip-bom-2.0.0" sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."pinkie-2.0.4" @@ -29448,7 +33771,7 @@ in sources."repeating-2.0.1" sources."is-finite-1.0.2" sources."os-tmpdir-1.0.2" - sources."uuid-3.1.0" + sources."uuid-2.0.3" sources."concat-stream-1.6.0" sources."typedarray-0.0.6" sources."cross-spawn-5.1.0" @@ -29466,7 +33789,8 @@ in sources."path-key-2.0.1" sources."locate-path-2.0.0" sources."p-locate-2.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."jsonfile-4.0.0" sources."universalify-0.1.1" sources."fs.realpath-1.0.0" @@ -29488,7 +33812,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."string-width-1.0.2" + sources."string-width-2.1.1" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."mimic-fn-1.1.0" @@ -29528,7 +33852,7 @@ in sources."strip-json-comments-2.0.1" sources."byline-5.0.0" sources."duplexer-0.1.1" - sources."moment-2.19.2" + sources."moment-2.20.1" sources."make-dir-1.1.0" sources."temp-dir-1.0.0" sources."imurmurhash-0.1.4" @@ -29554,6 +33878,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; @@ -29568,7 +33893,10 @@ in sources."vinyl-1.2.0" (sources."vinyl-fs-2.4.4" // { dependencies = [ - sources."through2-0.6.5" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."readable-stream-2.3.3" @@ -29584,13 +33912,14 @@ in sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" sources."duplexify-3.5.1" - sources."glob-stream-5.3.5" - sources."graceful-fs-4.1.11" - (sources."gulp-sourcemaps-1.6.0" // { + (sources."glob-stream-5.3.5" // { dependencies = [ - sources."through2-2.0.3" + sources."through2-0.6.5" + sources."readable-stream-1.0.34" ]; }) + sources."graceful-fs-4.1.11" + sources."gulp-sourcemaps-1.6.0" sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" sources."lodash.isequal-4.5.0" @@ -29599,11 +33928,7 @@ in sources."object-assign-4.1.1" sources."strip-bom-2.0.0" sources."strip-bom-stream-1.0.0" - (sources."through2-filter-2.0.0" // { - dependencies = [ - sources."through2-2.0.3" - ]; - }) + sources."through2-filter-2.0.0" sources."vali-date-1.0.0" sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" @@ -29611,8 +33936,12 @@ in sources."wrappy-1.0.2" sources."extend-3.0.1" sources."glob-5.0.15" - sources."glob-parent-2.0.0" - sources."micromatch-2.3.11" + sources."glob-parent-3.1.0" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."glob-parent-2.0.0" + ]; + }) sources."ordered-read-streams-0.3.0" sources."to-absolute-glob-0.1.1" sources."unique-stream-2.2.1" @@ -29622,12 +33951,16 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."is-glob-2.0.1" + sources."is-glob-3.1.0" sources."path-dirname-1.0.2" - sources."is-extglob-1.0.0" + sources."is-extglob-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -29641,9 +33974,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" @@ -29671,6 +34012,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; livedown = nodeEnv.buildNodePackage { name = "livedown"; @@ -29683,15 +34025,25 @@ in dependencies = [ sources."body-parser-1.18.2" sources."chokidar-1.7.0" - sources."express-4.16.2" + (sources."express-4.16.2" // { + dependencies = [ + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" + ]; + }) sources."markdown-it-8.4.0" sources."markdown-it-emoji-1.4.0" sources."markdown-it-github-headings-1.1.0" - sources."markdown-it-task-checkbox-1.0.4" + sources."markdown-it-task-checkbox-1.0.6" sources."minimist-1.2.0" sources."opn-5.1.0" sources."request-2.83.0" - sources."socket.io-2.0.4" + (sources."socket.io-2.0.4" // { + dependencies = [ + sources."accepts-1.3.3" + sources."isarray-2.0.1" + ]; + }) sources."bytes-3.0.0" sources."content-type-1.0.4" sources."debug-2.6.9" @@ -29704,8 +34056,8 @@ in sources."type-is-1.6.15" sources."ms-2.0.0" sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -29723,7 +34075,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -29737,11 +34093,19 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" - sources."isarray-2.0.1" + sources."isarray-1.0.0" sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" @@ -29766,7 +34130,7 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.8.0" - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."cookie-0.3.1" @@ -29823,15 +34187,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -29852,11 +34220,11 @@ in sources."socket.io-client-2.0.4" sources."socket.io-parser-3.1.2" sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" - sources."ws-3.3.2" + sources."engine.io-parser-2.1.2" + sources."ws-3.3.3" sources."uws-0.14.5" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" sources."has-binary2-1.0.2" @@ -29885,6 +34253,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; live-server = nodeEnv.buildNodePackage { name = "live-server"; @@ -29902,12 +34271,27 @@ in sources."event-stream-3.3.4" sources."faye-websocket-0.11.1" sources."http-auth-3.1.3" - sources."morgan-1.9.0" + (sources."morgan-1.9.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."object-assign-4.1.1" sources."opn-5.1.0" sources."proxy-middleware-0.15.0" - sources."send-0.16.1" - sources."serve-index-1.9.1" + (sources."send-0.16.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -29921,7 +34305,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -29935,9 +34323,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-buffer-1.1.6" @@ -29964,11 +34360,11 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.8.0" - sources."debug-2.6.9" + sources."debug-2.2.0" sources."finalhandler-0.5.1" sources."parseurl-1.3.2" sources."utils-merge-1.0.0" - sources."ms-2.0.0" + sources."ms-0.7.1" sources."escape-html-1.0.3" sources."on-finished-2.3.0" sources."statuses-1.3.1" @@ -30015,6 +34411,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; meat = nodeEnv.buildNodePackage { name = "meat"; @@ -30050,14 +34447,15 @@ in homepage = https://bitbucket.org/aahmed/meat; }; production = true; + bypassCache = false; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz"; - sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s"; + url = "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz"; + sha512 = "0s6517vczlh2vm9syq4kpwkwrr7panih1cip6aq8qjn9cw2gvbl14lql0y81dh10ims8p1f2qm4vkbifcrs2hw1v7cca9j71n76f5fi"; }; dependencies = [ sources."browser-stdout-1.3.0" @@ -30091,6 +34489,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; multi-file-swagger = nodeEnv.buildNodePackage { name = "multi-file-swagger"; @@ -30101,19 +34500,19 @@ in sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; }; dependencies = [ - sources."commander-2.12.1" + sources."commander-2.12.2" sources."js-yaml-3.10.0" sources."json-refs-2.1.7" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - sources."graphlib-2.1.1" + sources."graphlib-2.1.5" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" sources."slash-1.0.0" sources."uri-js-3.0.2" sources."lodash-4.17.4" - sources."superagent-3.8.1" + sources."superagent-3.8.2" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" @@ -30145,6 +34544,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; nijs = nodeEnv.buildNodePackage { name = "nijs"; @@ -30165,14 +34565,15 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.4.0.tgz"; - sha1 = "f5fc42590aedb8934e8e7fb6641a91c05fcd9337"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.0.tgz"; + sha512 = "2nywjjmihrnbpbm29ipgxb3jbl2lbdnmm53vpr9b151k41xvfv74z43ldc79p15b58gdadh5gh3ilsgxxa6hqs6mbizfh4a3nkzj87i"; }; dependencies = [ sources."optparse-1.0.5" @@ -30180,12 +34581,17 @@ in sources."npm-registry-client-8.4.0" (sources."npmconf-2.1.2" // { dependencies = [ + sources."once-1.3.3" sources."semver-4.3.6" ]; }) sources."tar-3.1.15" sources."temp-0.8.3" - sources."fs.extra-1.3.2" + (sources."fs.extra-1.3.2" // { + dependencies = [ + sources."mkdirp-0.3.5" + ]; + }) sources."findit-2.0.0" sources."base64-js-1.2.1" sources."slasp-0.0.4" @@ -30194,7 +34600,7 @@ in sources."graceful-fs-4.1.11" sources."normalize-package-data-2.4.0" sources."npm-package-arg-5.1.2" - sources."once-1.3.3" + sources."once-1.4.0" sources."request-2.83.0" sources."retry-0.10.1" sources."slide-1.1.6" @@ -30245,15 +34651,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -30288,14 +34698,14 @@ in sources."ansi-regex-2.1.1" sources."config-chain-1.1.11" sources."ini-1.3.5" - sources."mkdirp-0.3.5" + sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."uid-number-0.0.5" sources."proto-list-1.2.4" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."minipass-2.2.1" - sources."minizlib-1.0.4" + sources."minizlib-1.1.0" sources."yallist-3.0.2" sources."rimraf-2.2.8" sources."fs-extra-0.6.4" @@ -30311,6 +34721,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; @@ -30393,15 +34804,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -30428,6 +34843,24 @@ in license = "MIT"; }; production = true; + bypassCache = false; + }; + node-gyp-build = nodeEnv.buildNodePackage { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; + sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Build tool and bindings loader for node-gyp that supports prebuilds"; + homepage = https://github.com/mafintosh/node-gyp-build; + license = "MIT"; + }; + production = true; + bypassCache = false; }; node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; @@ -30454,7 +34887,9 @@ in sources."strong-data-uri-1.0.4" (sources."v8-debug-1.0.1" // { dependencies = [ + sources."rimraf-2.6.2" sources."semver-5.4.1" + sources."qs-6.4.0" sources."glob-7.1.2" ]; }) @@ -30462,17 +34897,25 @@ in sources."which-1.3.0" sources."ws-1.1.5" sources."yargs-3.32.0" - sources."browser-launcher2-0.4.6" + (sources."browser-launcher2-0.4.6" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."minimist-1.2.0" sources."x-default-browser-0.3.1" sources."headless-0.1.7" - sources."lodash-3.10.1" + sources."lodash-2.4.2" sources."mkdirp-0.5.1" sources."osenv-0.1.4" - sources."plist-1.2.0" + (sources."plist-1.2.0" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) sources."win-detect-browsers-1.0.2" sources."uid-0.0.2" - sources."rimraf-2.6.2" + sources."rimraf-2.2.8" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."base64-js-0.0.8" @@ -30529,7 +34972,11 @@ in sources."ms-2.0.0" sources."accepts-1.3.4" sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -30546,12 +34993,12 @@ in sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.2" - sources."qs-6.4.0" + sources."qs-6.5.1" sources."range-parser-1.2.0" sources."safe-buffer-5.1.1" sources."send-0.16.1" sources."serve-static-1.13.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" sources."type-is-1.6.15" sources."utils-merge-1.0.1" @@ -30635,9 +35082,17 @@ in sources."co-4.6.0" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -30675,6 +35130,7 @@ in homepage = http://github.com/node-inspector/node-inspector; }; production = true; + bypassCache = false; }; node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; @@ -30688,7 +35144,11 @@ in sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" - sources."rc-1.2.2" + (sources."rc-1.2.2" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."request-2.81.0" sources."hawk-3.1.3" sources."rimraf-2.6.2" @@ -30696,7 +35156,7 @@ in sources."detect-libc-1.0.3" sources."tar-2.2.1" sources."tar-pack-3.4.1" - sources."minimist-1.2.0" + sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -30755,9 +35215,17 @@ in sources."co-4.6.0" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -30799,23 +35267,22 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.12.1"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.12.1.tgz"; - sha1 = "996a56dc49d9f16bbf1b78a4de08f13634b3878d"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.7.tgz"; + sha512 = "1p1rk5nr91gr6dcg6v3njabi8i74i8cgqia8hhv67jgn5mkwwiivd1k0b7rs8ccn36kpcizw6l0gff3dw1v6z2p9lw8jh7yv8n2wj5q"; }; dependencies = [ sources."chokidar-1.7.0" sources."debug-2.6.9" - sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" - sources."lodash.defaults-3.1.2" sources."minimatch-3.0.4" - sources."ps-tree-1.1.0" + sources."pstree.remy-1.1.0" sources."touch-3.1.0" sources."undefsafe-0.0.3" sources."update-notifier-2.3.0" @@ -30832,7 +35299,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -30846,9 +35317,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-buffer-1.1.6" @@ -30872,20 +35351,10 @@ in sources."util-deprecate-1.0.2" sources."nan-2.8.0" sources."ms-2.0.0" - sources."lodash.assign-3.2.0" - sources."lodash.restparam-3.6.1" - sources."lodash._baseassign-3.2.0" - sources."lodash._createassigner-3.1.1" - sources."lodash.keys-3.1.2" - sources."lodash._basecopy-3.0.1" - sources."lodash._bindcallback-3.0.1" - sources."lodash._isiterateecall-3.0.9" - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" + sources."ps-tree-1.1.0" sources."event-stream-3.3.4" sources."through-2.3.8" sources."duplexer-0.1.1" @@ -30896,7 +35365,7 @@ in sources."stream-combiner-0.0.4" sources."nopt-1.0.10" sources."abbrev-1.1.1" - sources."boxen-1.2.2" + sources."boxen-1.3.0" sources."chalk-2.3.0" sources."configstore-3.1.1" sources."import-lazy-2.1.0" @@ -30908,12 +35377,12 @@ in sources."ansi-align-2.0.0" sources."camelcase-4.1.0" sources."cli-boxes-1.0.0" - sources."string-width-1.0.2" + sources."string-width-2.1.1" sources."term-size-1.2.0" - sources."widest-line-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" + sources."widest-line-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" sources."execa-0.7.0" sources."cross-spawn-5.1.0" sources."get-stream-3.0.0" @@ -30930,8 +35399,6 @@ in sources."shebang-regex-1.0.0" sources."isexe-2.0.0" sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" sources."supports-color-4.5.0" @@ -30947,7 +35414,7 @@ in sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."ini-1.3.5" sources."path-is-inside-1.0.2" sources."package-json-4.0.1" @@ -30977,6 +35444,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; node-red = nodeEnv.buildNodePackage { name = "node-red"; @@ -30990,14 +35458,27 @@ in sources."basic-auth-1.1.0" sources."bcryptjs-2.4.3" sources."body-parser-1.17.2" - sources."cheerio-0.22.0" + (sources."cheerio-0.22.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) sources."clone-2.1.1" sources."cookie-0.3.1" sources."cookie-parser-1.4.3" sources."cors-2.8.3" sources."cron-1.2.1" - sources."express-4.15.3" - sources."express-session-1.15.2" + (sources."express-4.15.3" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + (sources."express-session-1.15.2" // { + dependencies = [ + sources."debug-2.6.3" + sources."ms-0.7.2" + ]; + }) sources."follow-redirects-1.2.4" sources."fs-extra-1.0.0" sources."fs.notify-0.0.4" @@ -31010,10 +35491,18 @@ in sources."media-typer-0.3.0" (sources."mqtt-2.9.0" // { dependencies = [ - sources."ws-3.3.2" + sources."ws-3.3.3" + ]; + }) + (sources."multer-1.3.0" // { + dependencies = [ + sources."object-assign-3.0.0" + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."minimist-0.0.8" ]; }) - sources."multer-1.3.0" sources."mustache-2.3.0" sources."nopt-3.0.6" sources."oauth2orize-1.8.0" @@ -31026,41 +35515,103 @@ in sources."sentiment-2.1.0" sources."uglify-js-3.0.20" sources."when-3.7.8" - sources."ws-1.1.1" - sources."xml2js-0.4.17" - sources."node-red-node-feedparser-0.1.8" - (sources."node-red-node-email-0.1.24" // { + (sources."ws-1.1.1" // { dependencies = [ - sources."clone-1.0.3" + sources."ultron-1.0.2" ]; }) - sources."node-red-node-twitter-0.1.12" - sources."node-red-node-rbe-0.1.13" + sources."xml2js-0.4.17" + (sources."node-red-node-feedparser-0.1.8" // { + dependencies = [ + sources."sax-0.6.1" + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."bl-1.1.2" + sources."qs-6.2.3" + sources."async-2.6.0" + ]; + }) + (sources."node-red-node-email-0.1.24" // { + dependencies = [ + sources."addressparser-0.3.2" + sources."clone-1.0.3" + sources."minimist-0.0.10" + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + (sources."node-red-node-twitter-0.1.12" // { + dependencies = [ + sources."request-2.83.0" + sources."aws-sign2-0.7.0" + sources."caseless-0.12.0" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."qs-6.5.1" + sources."tunnel-agent-0.6.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" + ]; + }) + sources."node-red-node-rbe-0.1.14" (sources."bcrypt-1.0.3" // { dependencies = [ sources."nopt-4.0.1" + sources."request-2.83.0" + sources."aws-sign2-0.7.0" + sources."caseless-0.12.0" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."qs-6.5.1" + sources."tunnel-agent-0.6.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" ]; }) sources."bytes-2.4.0" sources."content-type-1.0.4" - sources."debug-2.6.3" + sources."debug-2.6.7" sources."depd-1.1.1" sources."http-errors-1.6.2" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.5.1" + sources."qs-6.4.0" sources."type-is-1.6.15" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."mime-types-2.1.17" sources."mime-db-1.30.0" sources."css-select-1.2.0" sources."dom-serializer-0.1.0" sources."entities-1.1.1" - sources."htmlparser2-3.9.2" + (sources."htmlparser2-3.9.2" // { + dependencies = [ + sources."domelementtype-1.3.0" + ]; + }) sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" sources."lodash.defaults-4.2.0" @@ -31090,14 +35641,18 @@ in sources."object-assign-4.1.1" sources."vary-1.1.2" sources."moment-timezone-0.5.14" - sources."moment-2.19.2" + sources."moment-2.20.1" sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."finalhandler-1.0.6" + (sources."finalhandler-1.0.6" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -31120,7 +35675,7 @@ in sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" - sources."async-2.6.0" + sources."async-0.1.22" sources."retry-0.6.1" sources."cookies-0.7.1" sources."i18next-client-1.10.3" @@ -31154,7 +35709,7 @@ in sources."ordered-read-streams-1.0.1" sources."pumpify-1.3.5" sources."remove-trailing-separator-1.1.0" - sources."to-absolute-glob-2.0.1" + sources."to-absolute-glob-2.0.2" sources."unique-stream-2.2.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -31168,19 +35723,17 @@ in sources."is-extglob-2.1.1" sources."duplexify-3.5.1" sources."stream-shift-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-absolute-0.2.6" - sources."is-extendable-0.1.1" - sources."is-relative-0.2.1" - sources."is-windows-0.2.0" - sources."is-unc-path-0.1.2" + sources."is-absolute-1.0.0" + sources."is-relative-1.0.0" + sources."is-windows-1.0.1" + sources."is-unc-path-1.0.0" sources."unc-path-regex-0.1.2" sources."json-stable-stringify-1.0.1" sources."through2-filter-2.0.0" sources."jsonify-0.0.0" - sources."bl-1.1.2" + sources."bl-1.2.1" sources."async-limiter-1.0.0" - sources."ultron-1.0.2" + sources."ultron-1.1.1" sources."append-field-0.1.0" sources."busboy-0.2.14" sources."mkdirp-0.5.1" @@ -31194,32 +35747,37 @@ in sources."source-map-0.5.7" sources."graceful-readlink-1.0.1" sources."options-0.0.6" - sources."sax-0.6.1" + sources."sax-1.2.4" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" sources."feedparser-1.1.3" - sources."request-2.83.0" - sources."addressparser-1.0.1" + (sources."request-2.74.0" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."addressparser-0.1.3" sources."array-indexofobject-0.0.1" - sources."aws-sign2-0.7.0" + sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.12.0" + sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" + sources."form-data-1.0.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."node-uuid-1.4.8" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" + sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."is-my-json-valid-2.16.1" + sources."is-my-json-valid-2.17.1" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -31232,13 +35790,21 @@ in sources."jsonpointer-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -31252,11 +35818,19 @@ in sources."punycode-1.4.1" sources."nodemailer-1.11.0" sources."poplib-0.1.7" - sources."mailparser-0.6.2" + (sources."mailparser-0.6.2" // { + dependencies = [ + sources."addressparser-1.0.1" + ]; + }) sources."imap-0.8.19" sources."libmime-1.2.0" - sources."mailcomposer-2.1.0" - sources."needle-0.10.0" + (sources."mailcomposer-2.1.0" // { + dependencies = [ + sources."needle-0.10.0" + ]; + }) + sources."needle-0.11.0" sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" sources."libbase64-0.1.0" @@ -31275,7 +35849,7 @@ in sources."performance-now-2.1.0" sources."uuid-3.1.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -31319,6 +35893,7 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; "node-uptime-https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = nodeEnv.buildNodePackage { name = "node-uptime"; @@ -31332,7 +35907,11 @@ in dependencies = [ sources."mongoose-3.6.7" sources."mongoose-lifecycle-1.0.0" - sources."express-3.2.0" + (sources."express-3.2.0" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."express-partials-0.0.6" sources."connect-flash-0.1.0" sources."ejs-0.8.3" @@ -31342,26 +35921,42 @@ in ]; }) sources."async-0.1.22" - sources."socket.io-0.9.14" + (sources."socket.io-0.9.14" // { + dependencies = [ + sources."commander-2.1.0" + ]; + }) sources."semver-1.1.0" sources."moment-2.1.0" sources."nodemailer-0.3.35" - sources."net-ping-1.1.7" + (sources."net-ping-1.1.7" // { + dependencies = [ + sources."nan-2.3.5" + ]; + }) sources."js-yaml-2.1.0" sources."hooks-0.2.1" sources."mongodb-1.2.14" - sources."ms-2.0.0" - sources."sliced-0.0.4" + sources."ms-0.1.0" + sources."sliced-0.0.3" sources."muri-0.3.1" - sources."mpromise-0.2.1" + (sources."mpromise-0.2.1" // { + dependencies = [ + sources."sliced-0.0.4" + ]; + }) sources."mpath-0.1.1" sources."bson-0.1.8" - sources."connect-2.7.6" - sources."commander-2.1.0" + (sources."connect-2.7.6" // { + dependencies = [ + sources."buffer-crc32-0.1.1" + ]; + }) + sources."commander-0.6.1" sources."range-parser-0.0.4" sources."mkdirp-0.3.5" sources."cookie-0.0.5" - sources."buffer-crc32-0.1.1" + sources."buffer-crc32-0.2.13" sources."fresh-0.1.0" sources."methods-0.0.1" sources."send-0.1.0" @@ -31381,7 +35976,7 @@ in sources."inherits-2.0.3" sources."minimatch-1.0.0" sources."once-1.4.0" - sources."natives-1.1.0" + sources."natives-1.1.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" sources."wrappy-1.0.2" @@ -31393,7 +35988,7 @@ in sources."ws-0.4.32" sources."xmlhttprequest-1.4.2" sources."active-x-obfuscator-0.0.1" - sources."nan-2.3.5" + sources."nan-1.0.0" sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" @@ -31425,14 +36020,15 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.5.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz"; - sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik"; + url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; + sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; }; buildInputs = globalBuildInputs; meta = { @@ -31441,6 +36037,7 @@ in license = "Artistic-2.0"; }; production = true; + bypassCache = false; }; "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { name = "npm2nix"; @@ -31461,22 +36058,39 @@ in }) (sources."npmconf-0.1.1" // { dependencies = [ + sources."inherits-1.0.2" + sources."once-1.1.1" sources."semver-2.3.2" ]; }) - sources."tar-0.1.17" - sources."temp-0.6.0" - sources."fs.extra-1.3.2" + (sources."tar-0.1.17" // { + dependencies = [ + sources."inherits-1.0.2" + sources."graceful-fs-3.0.11" + sources."mkdirp-0.5.1" + ]; + }) + (sources."temp-0.6.0" // { + dependencies = [ + sources."rimraf-2.1.4" + sources."graceful-fs-1.2.3" + ]; + }) + (sources."fs.extra-1.3.2" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) sources."findit-1.2.0" sources."coffee-script-1.12.7" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.83.0" - sources."graceful-fs-1.2.3" + sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" sources."mkdirp-0.3.5" - sources."rimraf-2.2.8" + sources."rimraf-2.6.2" sources."retry-0.6.0" sources."couch-login-0.1.20" sources."npmlog-4.1.2" @@ -31504,15 +36118,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -31535,7 +36153,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."minimatch-3.0.4" - sources."once-1.1.1" + sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.8" @@ -31562,15 +36180,27 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.1.1" - sources."config-chain-1.1.11" + (sources."config-chain-1.1.11" // { + dependencies = [ + sources."ini-1.3.5" + ]; + }) sources."osenv-0.0.3" sources."nopt-2.2.1" - sources."ini-1.3.5" + sources."ini-1.1.0" sources."proto-list-1.2.4" sources."abbrev-1.1.1" - sources."block-stream-0.0.9" - sources."fstream-0.1.31" - sources."natives-1.1.0" + (sources."block-stream-0.0.9" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + (sources."fstream-0.1.31" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."natives-1.1.1" sources."minimist-0.0.8" sources."fs-extra-0.6.4" sources."walk-2.3.9" @@ -31584,21 +36214,22 @@ in homepage = https://github.com/NixOS/npm2nix; }; production = true; + bypassCache = false; }; npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.13.0.tgz"; - sha512 = "3gqr04g6asacfpr7bmz0mqn3mga6vyq106wmjiyz7p4z1m58ia6zk3541s35hpf5g6wmkv52pmal8wnzxair9286jsr722lxrnn78f2"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.0.tgz"; + sha512 = "1yk2hf3npvf7kjmiapbq8np5dsb9sx8iiinnfm69vabh55ahzxdv3m14s2sbbsx5q0n269jyz3qhiqx5krhvmbpgqpihas5nvwwlras"; }; dependencies = [ sources."bluebird-3.5.1" sources."chalk-1.1.3" sources."cint-8.2.1" sources."cli-table-0.3.1" - sources."commander-2.12.1" + sources."commander-2.12.2" sources."fast-diff-1.1.2" sources."find-up-1.1.2" sources."get-stdin-5.0.1" @@ -31611,92 +36242,152 @@ in sources."semver-4.3.6" ]; }) + sources."rc-config-loader-2.0.1" sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.51.0" // { + (sources."snyk-1.65.1" // { dependencies = [ sources."update-notifier-0.5.0" + sources."minimist-1.2.0" + sources."async-0.9.2" + sources."lazy-cache-0.2.7" + sources."for-in-0.1.8" + sources."yargs-4.8.1" + sources."cliui-3.2.0" + sources."window-size-0.2.0" + sources."camelcase-3.0.0" + sources."latest-version-1.0.1" + sources."repeating-1.1.3" + sources."package-json-1.2.0" + sources."got-3.3.1" + sources."object-assign-3.0.0" + sources."timed-out-2.0.0" ]; }) sources."spawn-please-0.3.0" (sources."update-notifier-2.3.0" // { dependencies = [ + sources."boxen-1.3.0" sources."chalk-2.3.0" + sources."configstore-3.1.1" + sources."latest-version-3.1.0" + sources."xdg-basedir-3.0.0" + sources."camelcase-4.1.0" + sources."string-width-2.1.1" + sources."widest-line-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + sources."dot-prop-4.2.0" + sources."write-file-atomic-2.3.0" + sources."pify-3.0.0" + sources."package-json-4.0.1" + sources."got-6.7.1" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" ]; }) - sources."ansi-styles-3.2.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" - sources."ansi-regex-3.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" sources."colors-1.0.3" sources."path-exists-2.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."jju-1.3.0" + sources."debug-2.6.9" + sources."js-yaml-3.10.0" + sources."json5-0.5.1" + sources."object-assign-4.1.1" + sources."object-keys-1.0.11" + sources."require-from-string-2.0.1" + sources."ms-2.0.0" + sources."argparse-1.0.9" + sources."esprima-4.0.0" + sources."sprintf-js-1.0.3" sources."abbrev-1.1.1" sources."ansi-escapes-1.4.0" - sources."configstore-3.1.1" - sources."debug-2.6.9" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."es6-promise-3.3.1" sources."hasbin-1.2.3" sources."inquirer-1.0.3" - sources."needle-2.0.1" + sources."needle-2.1.0" sources."open-0.0.5" sources."os-name-1.0.3" sources."proxy-from-env-1.0.0" sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.3.8" + sources."snyk-go-plugin-1.4.5" sources."snyk-gradle-plugin-1.2.0" sources."snyk-module-1.8.1" sources."snyk-mvn-plugin-1.1.0" - sources."snyk-nuget-plugin-1.3.2" - sources."snyk-php-plugin-1.1.2" - sources."snyk-policy-1.7.1" - sources."snyk-python-plugin-1.4.0" + (sources."snyk-nuget-plugin-1.3.7" // { + dependencies = [ + sources."debug-3.1.0" + sources."es6-promise-4.2.2" + ]; + }) + (sources."snyk-php-plugin-1.3.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."snyk-policy-1.10.1" + sources."snyk-python-plugin-1.4.1" sources."snyk-recursive-readdir-2.0.0" sources."snyk-resolve-1.0.0" (sources."snyk-resolve-deps-1.7.0" // { dependencies = [ sources."update-notifier-0.6.3" + sources."configstore-2.1.0" + sources."uuid-2.0.3" ]; }) sources."snyk-sbt-plugin-1.2.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.2.0" - sources."tempfile-1.1.1" + (sources."tempfile-1.1.1" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."then-fs-2.0.0" sources."undefsafe-0.0.3" sources."url-0.11.0" - sources."uuid-2.0.3" + sources."uuid-3.1.0" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" - sources."object-assign-3.0.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.4" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" - sources."minimist-1.2.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."minimist-0.0.8" sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" sources."slide-1.1.6" - sources."ms-2.0.0" - sources."async-0.9.2" + sources."async-1.5.2" sources."cli-cursor-1.0.2" sources."cli-width-2.2.0" sources."figures-1.7.0" sources."mute-stream-0.0.6" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."string-width-2.1.1" + sources."string-width-1.0.2" sources."through-2.3.8" sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" sources."is-promise-2.1.0" sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."iconv-lite-0.4.19" sources."osx-release-1.1.0" @@ -31704,27 +36395,31 @@ in sources."nconf-0.7.2" sources."path-is-absolute-1.0.1" sources."ini-1.3.5" - sources."yargs-4.8.1" - sources."camelcase-4.1.0" - sources."cliui-3.2.0" + sources."yargs-3.15.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" sources."decamelize-1.2.0" - sources."window-size-0.2.0" + sources."window-size-0.1.4" sources."center-align-0.1.3" sources."right-align-0.1.3" sources."wordwrap-0.0.2" sources."align-text-0.1.4" - sources."lazy-cache-0.2.7" - sources."kind-of-2.0.1" + sources."lazy-cache-1.0.4" + sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" - sources."graphlib-2.1.1" + sources."graphlib-2.1.5" sources."toml-2.3.3" sources."clone-deep-0.3.0" sources."for-own-1.0.0" sources."is-plain-object-2.0.4" - sources."shallow-clone-0.1.2" - sources."for-in-0.1.8" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + ]; + }) + sources."for-in-1.0.2" sources."isobject-3.0.1" sources."is-extendable-0.1.1" sources."mixin-object-2.0.1" @@ -31736,11 +36431,8 @@ in sources."bops-0.1.1" sources."base64-js-0.0.2" sources."to-utf8-0.0.1" - sources."js-yaml-3.10.0" + sources."email-validator-1.1.1" sources."lodash.clonedeep-4.5.0" - sources."argparse-1.0.9" - sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" sources."minimatch-3.0.2" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" @@ -31751,18 +36443,18 @@ in sources."lodash.defaults-4.2.0" sources."lodash.defaultsdeep-4.6.0" sources."lodash.mergewith-4.6.0" - sources."boxen-1.2.2" + sources."boxen-0.3.1" sources."is-npm-1.0.0" - sources."latest-version-3.1.0" + sources."latest-version-2.0.0" sources."semver-diff-2.1.0" sources."filled-array-1.1.0" - sources."repeating-1.1.3" + sources."repeating-2.0.1" sources."widest-line-1.0.0" sources."is-finite-1.0.2" - sources."dot-prop-4.2.0" + sources."dot-prop-3.0.0" sources."is-obj-1.0.1" - sources."package-json-4.0.1" - sources."got-6.7.1" + sources."package-json-2.4.0" + sources."got-5.7.1" sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" @@ -31775,8 +36467,8 @@ in sources."parse-json-2.2.0" sources."read-all-stream-3.1.0" sources."readable-stream-2.3.3" - sources."timed-out-4.0.1" - sources."unzip-response-2.0.1" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."error-ex-1.3.1" @@ -31809,7 +36501,7 @@ in sources."load-json-file-1.1.0" sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" - sources."pify-3.0.0" + sources."pify-2.3.0" sources."strip-bom-2.0.0" sources."is-utf8-0.2.1" sources."is-builtin-module-1.0.0" @@ -31857,7 +36549,7 @@ in sources."unique-string-1.0.0" sources."crypto-random-string-1.0.0" sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."path-is-inside-1.0.2" sources."duplexer3-0.1.4" ]; @@ -31868,6 +36560,7 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; nsp = nodeEnv.buildNodePackage { name = "nsp"; @@ -31881,19 +36574,34 @@ in sources."chalk-2.3.0" sources."cli-table2-0.2.0" sources."cvss-1.0.2" - sources."https-proxy-agent-2.1.0" - sources."inquirer-3.3.0" + sources."https-proxy-agent-2.1.1" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."lodash-4.17.4" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."nodesecurity-npm-utils-6.0.0" sources."semver-5.4.1" sources."wreck-12.5.1" - sources."yargs-9.0.1" + (sources."yargs-9.0.1" // { + dependencies = [ + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" sources."supports-color-4.5.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."has-flag-2.0.0" - sources."lodash-4.17.4" + sources."lodash-3.10.1" sources."string-width-1.0.2" sources."colors-1.1.2" sources."code-point-at-1.1.0" @@ -31902,9 +36610,9 @@ in sources."number-is-nan-1.0.1" sources."ansi-regex-2.1.1" sources."agent-base-4.1.2" - sources."debug-2.6.9" + sources."debug-3.1.0" sources."es6-promisify-5.0.0" - sources."es6-promise-4.1.1" + sources."es6-promise-4.2.2" sources."ms-2.0.0" sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" @@ -31928,7 +36636,11 @@ in sources."boom-5.2.0" sources."hoek-4.2.0" sources."camelcase-4.1.0" - sources."cliui-3.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" sources."os-locale-2.1.0" @@ -31963,7 +36675,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."load-json-file-2.0.0" sources."normalize-package-data-2.4.0" sources."path-type-2.0.0" @@ -31988,14 +36701,15 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.14"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.14.tgz"; - sha512 = "29fqx01qg82gmlmq2x6akj2i9kg9qpwss9lrrpfd3m34lcp15ak8dbzhh0szv28laafhrfqzzsi4nvmd0p1g284xadw2afk1pg539x3"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.16.tgz"; + sha512 = "2f63gvm5x3c7dxp8fpaxhvjlha7isdfrbq7pqpkj0n33zndhi4925qkmzgrgn7qhrff6dhiqb3j1a3m1jjwq1k5kff910rrxd1622jd"; }; dependencies = [ sources."async-2.6.0" @@ -32006,7 +36720,7 @@ in sources."vscode-jsonrpc-3.5.0" sources."vscode-languageclient-3.5.0" sources."vscode-languageserver-3.5.0" - sources."vscode-languageserver-types-3.5.0" + sources."vscode-languageserver-protocol-3.5.0" sources."vscode-uri-1.0.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -32018,7 +36732,7 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."vscode-languageserver-protocol-3.5.0" + sources."vscode-languageserver-types-3.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -32027,6 +36741,7 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; parsoid = nodeEnv.buildNodePackage { name = "parsoid"; @@ -32047,22 +36762,29 @@ in sources."compression-1.7.1" sources."connect-busboy-0.0.2" sources."content-type-git+https://github.com/wikimedia/content-type.git#master" - sources."core-js-2.5.1" + sources."core-js-2.5.3" sources."diff-1.4.0" sources."domino-1.0.30" sources."entities-1.1.1" (sources."express-4.16.2" // { dependencies = [ sources."content-type-1.0.4" + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" ]; }) (sources."express-handlebars-3.0.0" // { dependencies = [ sources."async-1.5.2" sources."yargs-3.10.0" + sources."wordwrap-0.0.2" + ]; + }) + (sources."finalhandler-1.1.0" // { + dependencies = [ + sources."statuses-1.3.1" ]; }) - sources."finalhandler-1.1.0" sources."js-yaml-3.10.0" sources."mediawiki-title-0.6.5" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" @@ -32071,10 +36793,23 @@ in sources."request-2.83.0" sources."semver-5.4.1" sources."serve-favicon-2.4.5" - sources."service-runner-2.4.4" + (sources."service-runner-2.4.8" // { + dependencies = [ + sources."minimist-0.0.8" + sources."readable-stream-2.3.3" + sources."ms-0.7.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."simplediff-0.1.1" sources."uuid-3.1.0" - sources."yargs-7.1.0" + (sources."yargs-7.1.0" // { + dependencies = [ + sources."camelcase-3.0.0" + sources."cliui-3.2.0" + ]; + }) sources."asap-2.0.6" sources."is-arguments-1.0.2" sources."bytes-3.0.0" @@ -32086,10 +36821,10 @@ in sources."qs-6.5.1" sources."raw-body-2.3.2" sources."type-is-1.6.15" - sources."ms-0.7.3" + sources."ms-2.0.0" sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -32102,11 +36837,11 @@ in sources."vary-1.1.2" sources."busboy-0.2.14" sources."dicer-0.2.5" - sources."readable-stream-2.3.3" + sources."readable-stream-1.1.14" sources."streamsearch-0.1.2" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."cookie-0.3.1" @@ -32131,7 +36866,7 @@ in sources."glob-6.0.4" sources."graceful-fs-4.1.11" sources."handlebars-4.0.11" - sources."object.assign-4.0.4" + sources."object.assign-4.1.0" sources."promise-7.3.1" sources."inflight-1.0.6" sources."minimatch-3.0.4" @@ -32142,14 +36877,18 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."optimist-0.6.1" - sources."source-map-0.5.7" - sources."uglify-js-2.8.29" - sources."wordwrap-0.0.2" - sources."minimist-0.0.8" + sources."source-map-0.4.4" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" sources."amdefine-1.0.1" sources."uglify-to-browserify-1.0.2" - sources."camelcase-3.0.0" - sources."cliui-3.2.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" sources."decamelize-1.2.0" sources."window-size-0.1.0" sources."center-align-0.1.3" @@ -32160,9 +36899,10 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" - sources."function-bind-1.1.1" - sources."object-keys-1.0.11" sources."define-properties-1.1.2" + sources."function-bind-1.1.1" + sources."has-symbols-1.0.0" + sources."object-keys-1.0.11" sources."foreach-2.0.5" sources."argparse-1.0.9" sources."esprima-4.0.0" @@ -32187,15 +36927,19 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -32221,7 +36965,7 @@ in sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" - sources."moment-2.19.2" + sources."moment-2.20.1" sources."nan-2.8.0" sources."mkdirp-0.5.1" sources."ncp-2.0.0" @@ -32290,6 +37034,7 @@ in license = "GPL-2.0+"; }; production = true; + bypassCache = false; }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; @@ -32302,20 +37047,45 @@ in dependencies = [ sources."airplayer-2.0.0" sources."clivas-0.2.0" - sources."inquirer-1.2.3" + (sources."inquirer-1.2.3" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) sources."keypress-0.2.1" sources."mime-1.6.0" sources."network-address-1.1.2" sources."numeral-1.5.6" sources."open-0.0.5" - sources."optimist-0.6.1" - sources."parse-torrent-5.8.3" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."parse-torrent-5.8.3" // { + dependencies = [ + sources."get-stdin-5.0.1" + ]; + }) sources."pump-1.0.3" sources."range-parser-1.2.0" sources."rc-1.2.2" (sources."torrent-stream-1.0.3" // { dependencies = [ + sources."end-of-stream-0.1.5" sources."parse-torrent-4.1.0" + sources."once-1.3.3" + sources."thunky-1.0.2" + sources."minimist-0.0.8" + sources."magnet-uri-4.2.3" + sources."parse-torrent-file-2.1.4" + sources."thirty-two-0.0.2" + sources."bencode-0.7.0" + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."safe-buffer-5.0.1" + sources."ultron-1.0.2" ]; }) sources."winreg-1.2.3" @@ -32339,15 +37109,15 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" - sources."lodash-4.17.4" + sources."lodash-3.10.1" sources."consume-http-header-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."consume-until-1.0.0" sources."http-headers-3.0.2" sources."buffer-indexof-1.1.1" @@ -32372,7 +37142,7 @@ in sources."multicast-dns-6.2.1" sources."multicast-dns-service-types-1.1.0" sources."dns-packet-1.2.2" - sources."thunky-1.0.2" + sources."thunky-0.1.0" sources."ip-1.1.5" sources."meow-3.7.0" sources."camelcase-keys-2.1.0" @@ -32414,7 +37184,7 @@ in sources."strip-indent-1.0.1" sources."repeating-2.0.1" sources."is-finite-1.0.2" - sources."get-stdin-5.0.1" + sources."get-stdin-4.0.1" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" sources."cli-width-2.2.0" @@ -32435,31 +37205,47 @@ in sources."is-promise-2.1.0" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-4.2.3" - sources."parse-torrent-file-2.1.4" + sources."magnet-uri-5.1.7" + sources."parse-torrent-file-4.0.3" sources."simple-get-2.7.0" - sources."thirty-two-0.0.2" + sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.8.0" + sources."bencode-1.0.0" sources."simple-sha1-2.1.0" - sources."rusha-0.8.7" + sources."rusha-0.8.11" sources."decompress-response-3.3.0" sources."simple-concat-1.0.0" sources."mimic-response-1.0.0" - sources."end-of-stream-0.1.5" + sources."end-of-stream-1.4.0" sources."deep-extend-0.4.2" sources."ini-1.3.5" sources."strip-json-comments-2.0.1" sources."bitfield-0.1.0" - sources."bncode-0.2.3" - sources."fs-chunk-store-1.6.5" + sources."bncode-0.5.3" + (sources."fs-chunk-store-1.6.5" // { + dependencies = [ + sources."mkdirp-0.5.1" + ]; + }) sources."hat-0.0.3" sources."immediate-chunk-store-1.0.8" sources."ip-set-1.0.1" - sources."mkdirp-0.5.1" - sources."peer-wire-swarm-0.12.1" + sources."mkdirp-0.3.5" + (sources."peer-wire-swarm-0.12.1" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) sources."rimraf-2.6.2" - sources."torrent-discovery-5.4.0" + (sources."torrent-discovery-5.4.0" // { + dependencies = [ + sources."bencode-0.8.0" + sources."minimist-1.2.0" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."torrent-piece-1.1.1" sources."random-access-file-1.8.1" sources."randombytes-2.0.5" @@ -32485,22 +37271,31 @@ in sources."bittorrent-tracker-7.7.0" sources."re-emitter-1.1.3" sources."buffer-equals-1.0.4" - sources."k-bucket-2.0.1" - sources."k-rpc-3.7.0" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."k-bucket-2.0.1" + sources."bencode-1.0.0" + ]; + }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.1" + sources."k-rpc-socket-1.7.2" sources."bn.js-4.11.8" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" sources."simple-peer-6.4.4" - sources."simple-websocket-4.3.1" + (sources."simple-websocket-4.3.1" // { + dependencies = [ + sources."ws-2.3.1" + ]; + }) sources."string2compact-1.2.2" - sources."ws-2.3.1" + sources."ws-1.1.5" sources."ipaddr.js-1.5.4" sources."get-browser-rtc-1.0.2" - sources."ultron-1.0.2" + sources."ultron-1.1.1" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" ]; @@ -32511,6 +37306,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; @@ -32525,23 +37321,56 @@ in (sources."express-3.21.2" // { dependencies = [ sources."range-parser-1.0.3" + sources."multiparty-3.3.2" + sources."qs-4.0.0" + sources."accepts-1.3.4" + sources."negotiator-0.6.1" + sources."uid-safe-2.0.0" + sources."ms-2.0.0" + sources."statuses-1.2.1" + sources."destroy-1.0.3" ]; }) sources."lodash-2.4.2" sources."mkdirp-0.5.1" sources."pump-1.0.3" sources."range-parser-1.2.0" - sources."read-torrent-1.3.0" - sources."socket.io-1.7.4" + (sources."read-torrent-1.3.0" // { + dependencies = [ + sources."mime-1.2.11" + sources."qs-0.5.6" + ]; + }) + (sources."socket.io-1.7.4" // { + dependencies = [ + sources."debug-2.3.3" + sources."ms-0.7.2" + sources."accepts-1.3.3" + sources."cookie-0.3.1" + sources."negotiator-0.6.1" + sources."component-emitter-1.1.2" + ]; + }) (sources."torrent-stream-1.0.3" // { dependencies = [ + sources."end-of-stream-0.1.5" sources."mkdirp-0.3.5" + sources."once-1.3.3" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."bencode-0.8.0" + sources."minimist-1.2.0" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + sources."safe-buffer-5.0.1" + sources."ultron-1.1.1" ]; }) sources."fluent-ffmpeg-2.1.2" - sources."multiparty-3.3.2" + sources."multiparty-4.1.3" sources."on-finished-2.3.0" - sources."qs-0.5.6" + sources."qs-6.5.1" sources."type-is-1.6.15" sources."fd-slicer-1.0.1" sources."pend-1.2.0" @@ -32550,13 +37379,26 @@ in sources."mime-types-2.1.17" sources."mime-db-1.30.0" sources."basic-auth-1.0.4" - sources."connect-2.30.2" + (sources."connect-2.30.2" // { + dependencies = [ + sources."escape-html-1.0.3" + sources."vary-1.1.2" + sources."ms-0.7.2" + sources."accepts-1.2.13" + sources."negotiator-0.5.3" + sources."send-0.13.2" + ]; + }) sources."content-disposition-0.5.0" sources."content-type-1.0.4" sources."commander-2.6.0" - sources."cookie-0.3.1" + sources."cookie-0.1.3" sources."cookie-signature-1.0.6" - sources."debug-2.6.9" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."depd-1.0.1" sources."escape-html-1.0.2" sources."etag-1.7.0" @@ -32565,9 +37407,13 @@ in sources."methods-1.1.2" sources."parseurl-1.3.2" sources."proxy-addr-1.0.10" - sources."send-0.13.2" + (sources."send-0.13.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."utils-merge-1.0.0" - sources."vary-1.1.2" + sources."vary-1.0.1" sources."basic-auth-connect-1.0.0" sources."body-parser-1.13.3" sources."bytes-2.1.0" @@ -32577,57 +37423,83 @@ in sources."csurf-1.8.3" sources."errorhandler-1.4.3" sources."express-session-1.11.3" - sources."finalhandler-0.4.0" + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + ]; + }) sources."http-errors-1.3.1" - sources."method-override-2.3.10" + (sources."method-override-2.3.10" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."morgan-1.6.1" sources."on-headers-1.0.1" sources."pause-0.1.0" - sources."response-time-2.3.2" + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."serve-favicon-2.3.2" sources."serve-index-1.7.3" - sources."serve-static-1.10.3" + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."depd-1.1.1" + sources."ms-0.7.1" + ]; + }) sources."vhost-3.0.2" - sources."iconv-lite-0.4.13" - sources."raw-body-2.1.7" + sources."iconv-lite-0.4.11" + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" + ]; + }) sources."unpipe-1.0.0" - sources."accepts-1.3.3" + sources."accepts-1.2.13" sources."compressible-2.0.12" - sources."negotiator-0.6.1" - sources."ms-2.0.0" + sources."negotiator-0.5.3" + sources."ms-0.7.1" sources."csrf-3.0.6" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - sources."uid-safe-2.0.0" + sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" sources."crc-3.3.0" sources."base64-url-1.2.1" sources."inherits-2.0.3" - sources."statuses-1.2.1" - sources."readable-stream-2.3.3" + sources."statuses-1.4.0" + sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" sources."batch-0.5.3" - sources."destroy-1.0.3" - sources."mime-1.2.11" + sources."destroy-1.0.4" + sources."mime-1.3.4" sources."forwarded-0.1.2" sources."ipaddr.js-1.0.5" - sources."minimist-1.2.0" - sources."end-of-stream-0.1.5" - sources."once-1.3.3" + sources."minimist-0.0.8" + sources."end-of-stream-1.4.0" + sources."once-1.4.0" sources."wrappy-1.0.2" - sources."magnet-uri-4.2.3" - sources."parse-torrent-4.1.0" + sources."magnet-uri-2.0.1" + (sources."parse-torrent-4.1.0" // { + dependencies = [ + sources."magnet-uri-4.2.3" + ]; + }) sources."request-2.16.6" sources."xtend-4.0.1" sources."thirty-two-0.0.2" sources."parse-torrent-file-2.1.4" sources."flatten-0.0.1" - sources."bencode-0.8.0" + sources."bencode-0.7.0" sources."simple-sha1-2.1.0" - sources."rusha-0.8.7" + sources."rusha-0.8.11" sources."form-data-0.0.10" sources."hawk-0.10.2" sources."node-uuid-1.4.8" @@ -32644,26 +37516,31 @@ in sources."boom-0.3.8" sources."cryptiles-0.1.3" sources."sntp-0.1.4" - sources."engine.io-1.8.4" + sources."engine.io-1.8.5" sources."has-binary-0.1.7" sources."object-assign-4.1.0" sources."socket.io-adapter-0.5.0" sources."socket.io-client-1.7.4" - sources."socket.io-parser-2.3.1" + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."base64id-1.0.0" sources."engine.io-parser-1.3.2" - sources."ws-2.3.1" + sources."ws-1.1.5" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" sources."wtf-8-1.0.0" sources."options-0.0.6" - sources."ultron-1.1.1" + sources."ultron-1.0.2" sources."backo2-1.0.2" sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."engine.io-client-1.8.4" + sources."component-emitter-1.2.1" + sources."engine.io-client-1.8.5" sources."indexof-0.0.1" sources."object-component-0.0.3" sources."parseuri-0.0.5" @@ -32678,7 +37555,7 @@ in sources."callsite-1.0.0" sources."json3-3.3.2" sources."bitfield-0.1.0" - sources."bncode-0.2.3" + sources."bncode-0.5.3" (sources."fs-chunk-store-1.6.5" // { dependencies = [ sources."mkdirp-0.5.1" @@ -32687,7 +37564,11 @@ in sources."hat-0.0.3" sources."immediate-chunk-store-1.0.8" sources."ip-set-1.0.1" - sources."peer-wire-swarm-0.12.1" + (sources."peer-wire-swarm-0.12.1" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) sources."rimraf-2.6.2" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" @@ -32696,7 +37577,7 @@ in sources."run-parallel-1.1.6" sources."thunky-1.0.2" sources."buffer-alloc-unsafe-1.0.0" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."ip-1.1.5" sources."fifo-0.1.4" sources."peer-wire-protocol-0.7.0" @@ -32715,18 +37596,27 @@ in sources."bittorrent-tracker-7.7.0" sources."re-emitter-1.1.3" sources."buffer-equals-1.0.4" - sources."k-bucket-2.0.1" - sources."k-rpc-3.7.0" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."k-bucket-2.0.1" + sources."bencode-1.0.0" + ]; + }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.1" + sources."k-rpc-socket-1.7.2" sources."bn.js-4.11.8" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" sources."simple-get-2.7.0" sources."simple-peer-6.4.4" - sources."simple-websocket-4.3.1" + (sources."simple-websocket-4.3.1" // { + dependencies = [ + sources."ws-2.3.1" + ]; + }) sources."string2compact-1.2.2" sources."uniq-1.0.1" sources."decompress-response-3.3.0" @@ -32746,6 +37636,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; phantomjs = nodeEnv.buildNodePackage { name = "phantomjs"; @@ -32819,9 +37710,17 @@ in sources."async-2.6.0" sources."lodash-4.17.4" sources."mime-db-1.30.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -32838,8 +37737,8 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.12.1" - sources."is-my-json-valid-2.16.1" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -32861,14 +37760,15 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.8.2"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.8.2.tgz"; - sha512 = "1kfhb09w2kr32afpzpvvjk005z04jf41d7gghcvfddsryvvis2gvvj4ig55yjs1876c3mj7pjmygv58hsrkzjxvsv7hhrhi185s6xbw"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.9.2.tgz"; + sha512 = "1pvilmcyqqmcfmdawrcjkg09bylz68l4lkvm7k9g2554f2migg337d51m95rk4p2xylbj84i5a8j2wlc1ynvhdkdxbchkwnvpsg29d6"; }; buildInputs = globalBuildInputs; meta = { @@ -32877,6 +37777,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; pulp = nodeEnv.buildNodePackage { name = "pulp"; @@ -32889,16 +37790,29 @@ in dependencies = [ (sources."browserify-13.3.0" // { dependencies = [ - sources."concat-stream-1.5.2" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."hash-base-2.0.2" + sources."isarray-0.0.1" + sources."acorn-5.3.0" + ]; + }) + (sources."browserify-incremental-3.1.1" // { + dependencies = [ + sources."JSONStream-0.10.0" + sources."jsonparse-0.0.5" ]; }) - sources."browserify-incremental-3.1.1" sources."concat-stream-1.6.0" sources."glob-7.1.2" sources."minimatch-3.0.4" (sources."node-static-0.7.10" // { dependencies = [ sources."wordwrap-0.0.3" + sources."minimist-0.0.10" ]; }) sources."read-1.0.7" @@ -32906,13 +37820,21 @@ in sources."temp-0.8.3" sources."through-2.3.8" sources."tree-kill-1.2.0" - sources."watchpack-1.4.0" + (sources."watchpack-1.4.0" // { + dependencies = [ + sources."async-2.6.0" + ]; + }) sources."which-1.3.0" sources."wordwrap-1.0.0" - sources."JSONStream-0.10.0" + sources."JSONStream-1.3.2" sources."assert-1.4.1" sources."browser-pack-6.0.2" - sources."browser-resolve-1.11.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" sources."cached-path-relative-1.0.1" @@ -32935,26 +37857,43 @@ in sources."parents-1.0.1" sources."path-browserify-0.0.0" sources."process-0.11.10" - sources."punycode-1.3.2" + sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.3.3" - sources."resolve-1.1.7" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + sources."resolve-1.5.0" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" sources."stream-http-2.7.2" - sources."string_decoder-1.0.3" + sources."string_decoder-0.10.31" sources."subarg-1.0.0" - sources."syntax-error-1.3.0" + (sources."syntax-error-1.3.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" - sources."url-0.11.0" - sources."util-0.10.3" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" - sources."jsonparse-0.0.5" + sources."jsonparse-1.3.1" sources."combine-source-map-0.7.2" sources."umd-3.0.1" sources."convert-source-map-1.1.3" @@ -32989,7 +37928,7 @@ in sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."md5.js-1.3.4" - sources."hash-base-2.0.2" + sources."hash-base-3.0.4" sources."bn.js-4.11.8" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" @@ -33008,7 +37947,7 @@ in sources."astw-2.2.0" sources."acorn-4.0.13" sources."stream-splicer-2.0.0" - sources."detective-4.6.0" + sources."detective-4.7.1" sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" sources."path-parse-1.0.5" @@ -33019,11 +37958,11 @@ in sources."array-map-0.0.0" sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" - sources."minimist-0.0.10" + sources."minimist-1.2.0" sources."querystring-0.2.0" sources."indexof-0.0.1" sources."browserify-cache-api-3.0.1" - sources."async-2.6.0" + sources."async-1.5.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" @@ -33052,7 +37991,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -33066,9 +38009,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" @@ -33091,6 +38042,7 @@ in license = "LGPL-3.0+"; }; production = true; + bypassCache = false; }; quassel-webserver = nodeEnv.buildNodePackage { name = "quassel-webserver"; @@ -33102,20 +38054,44 @@ in }; dependencies = [ sources."body-parser-1.18.2" - sources."commander-2.12.1" + sources."commander-2.12.2" sources."cookie-parser-1.4.3" - sources."express-4.16.2" - sources."less-2.7.3" + (sources."express-4.16.2" // { + dependencies = [ + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" + ]; + }) + (sources."less-2.7.3" // { + dependencies = [ + sources."qs-6.4.0" + ]; + }) sources."less-middleware-2.2.1" sources."libquassel-2.1.9" sources."morgan-1.9.0" - sources."net-browserify-alt-1.1.0" + (sources."net-browserify-alt-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."tunnel-agent-0.4.3" + sources."safe-buffer-5.0.1" + ]; + }) (sources."pug-2.0.0-rc.4" // { dependencies = [ sources."commander-2.8.1" + sources."source-map-0.4.4" + sources."is-expression-3.0.0" + sources."acorn-4.0.13" + ]; + }) + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."ms-0.7.2" ]; }) - sources."serve-favicon-2.3.2" sources."httpolyglot-0.1.2" sources."bytes-3.0.0" sources."content-type-1.0.4" @@ -33124,13 +38100,13 @@ in sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.4.0" + sources."qs-6.5.1" sources."raw-body-2.3.2" sources."type-is-1.6.15" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -33143,16 +38119,16 @@ in sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" + sources."etag-1.8.1" sources."finalhandler-1.1.0" - sources."fresh-0.3.0" + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."send-0.16.1" sources."serve-static-1.13.1" sources."utils-merge-1.0.1" @@ -33162,15 +38138,15 @@ in sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" sources."mime-1.4.1" - sources."errno-0.1.4" + sources."errno-0.1.6" sources."graceful-fs-4.1.11" sources."image-size-0.5.5" sources."mkdirp-0.5.1" sources."promise-7.3.1" sources."source-map-0.5.7" sources."request-2.81.0" - sources."prr-0.0.0" - sources."minimist-1.2.0" + sources."prr-1.0.1" + sources."minimist-0.0.8" sources."asap-2.0.6" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -33189,7 +38165,7 @@ in sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" @@ -33202,9 +38178,17 @@ in sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -33221,7 +38205,7 @@ in sources."is-3.2.1" sources."eventemitter2-3.0.2" sources."qtdatastream-0.7.1" - sources."int64-buffer-0.1.9" + sources."int64-buffer-0.1.10" sources."basic-auth-2.0.0" sources."on-headers-1.0.1" sources."bufferutil-2.0.1" @@ -33274,7 +38258,11 @@ in sources."bl-1.2.1" sources."ultron-1.1.1" sources."pug-code-gen-2.0.0" - sources."pug-filters-2.1.5" + (sources."pug-filters-2.1.5" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."pug-lexer-3.1.0" sources."pug-linker-3.0.3" sources."pug-load-2.0.9" @@ -33288,9 +38276,13 @@ in sources."pug-error-1.3.2" sources."void-elements-2.0.1" sources."with-5.1.1" - sources."acorn-4.0.13" - sources."is-expression-3.0.0" - sources."acorn-globals-3.1.0" + sources."acorn-3.3.0" + sources."is-expression-2.1.0" + (sources."acorn-globals-3.1.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) sources."clean-css-3.4.28" sources."pug-walk-1.1.5" sources."jstransformer-1.0.0" @@ -33328,6 +38320,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; @@ -33339,9 +38332,13 @@ in }; dependencies = [ sources."commoner-0.10.8" - sources."jstransform-10.1.0" - sources."commander-2.12.1" - sources."detective-4.6.0" + (sources."jstransform-10.1.0" // { + dependencies = [ + sources."source-map-0.1.31" + ]; + }) + sources."commander-2.12.2" + sources."detective-4.7.1" sources."glob-5.0.15" sources."graceful-fs-4.1.11" sources."iconv-lite-0.4.19" @@ -33349,7 +38346,7 @@ in sources."private-0.1.8" sources."q-1.5.1" sources."recast-0.11.23" - sources."acorn-5.2.1" + sources."acorn-5.3.0" sources."defined-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -33363,7 +38360,7 @@ in sources."minimist-0.0.8" sources."ast-types-0.9.6" sources."esprima-3.1.3" - sources."source-map-0.1.31" + sources."source-map-0.5.7" sources."base62-0.1.1" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."amdefine-1.0.1" @@ -33375,6 +38372,7 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; s3http = nodeEnv.buildNodePackage { name = "s3http"; @@ -33393,7 +38391,18 @@ in sources."commander-1.3.2" ]; }) - sources."everyauth-0.4.5" + (sources."everyauth-0.4.5" // { + dependencies = [ + sources."connect-2.3.9" + sources."debug-0.5.0" + sources."qs-0.4.2" + sources."cookie-0.0.4" + sources."bytes-0.1.0" + sources."send-0.0.3" + sources."fresh-0.1.0" + sources."mime-1.2.6" + ]; + }) sources."string-1.6.1" sources."util-0.4.9" sources."crypto-0.0.3" @@ -33402,18 +38411,22 @@ in sources."sax-1.2.4" sources."coffee-script-1.6.3" sources."node-uuid-1.4.1" - sources."connect-2.3.9" + (sources."connect-2.11.0" // { + dependencies = [ + sources."methods-0.0.1" + ]; + }) sources."range-parser-0.0.4" sources."mkdirp-0.3.5" - sources."cookie-0.0.4" + sources."cookie-0.1.0" sources."buffer-crc32-0.2.1" - sources."fresh-0.1.0" - sources."methods-0.0.1" - sources."send-0.0.3" + sources."fresh-0.2.0" + sources."methods-0.1.0" + sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-0.5.0" - sources."qs-6.5.1" - sources."bytes-0.1.0" + sources."debug-3.1.0" + sources."qs-0.6.5" + sources."bytes-0.2.1" sources."pause-0.0.1" sources."uid2-0.0.3" sources."raw-body-0.0.3" @@ -33426,11 +38439,16 @@ in sources."string_decoder-0.10.31" sources."inherits-2.0.3" sources."keypress-0.1.0" - sources."mime-1.2.6" + sources."mime-1.2.11" sources."ms-2.0.0" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."request-2.83.0" - sources."openid-2.0.6" + sources."request-2.9.203" + (sources."openid-2.0.6" // { + dependencies = [ + sources."request-2.83.0" + sources."qs-6.5.1" + ]; + }) sources."node-swt-0.1.1" sources."node-wsfederation-0.1.1" sources."formidable-1.0.11" @@ -33458,15 +38476,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -33489,6 +38511,7 @@ in meta = { }; production = true; + bypassCache = false; }; semver = nodeEnv.buildNodePackage { name = "semver"; @@ -33505,42 +38528,64 @@ in license = "ISC"; }; production = true; + bypassCache = false; }; serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.4.1"; + version = "6.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.4.1.tgz"; - sha512 = "385jwid220bqcnr46ck6vz22ic9kxmxghcpy4m15lvzcl7r3g8f6jyigwmjvdfypf8jaiv1shrfwj2fsgq7wsg6mh7q9hc3pkfk99x0"; + url = "https://registry.npmjs.org/serve/-/serve-6.4.3.tgz"; + sha512 = "037w1bp1q8k6vpswkrpkmcngz1rj1bqq5migw33qxr9x1r7p0r4sfhq1kcs024lwmqf1iynrjavsmr466zh6r37hkilpriasxwsqgd0"; }; dependencies = [ - (sources."args-3.0.7" // { + (sources."args-3.0.8" // { dependencies = [ sources."chalk-2.1.0" ]; }) sources."basic-auth-2.0.0" sources."bluebird-3.5.1" - sources."boxen-1.2.2" + sources."boxen-1.3.0" sources."chalk-2.3.0" - sources."clipboardy-1.1.4" + (sources."clipboardy-1.2.2" // { + dependencies = [ + sources."execa-0.8.0" + ]; + }) sources."dargs-5.1.0" - sources."detect-port-1.2.1" + sources."detect-port-1.2.2" sources."filesize-3.5.11" - sources."fs-extra-4.0.2" - sources."handlebars-4.0.11" + sources."fs-extra-5.0.0" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."camelcase-1.2.1" + sources."wordwrap-0.0.2" + ]; + }) sources."ip-1.1.5" - sources."micro-9.0.0" + sources."micro-9.0.2" sources."micro-compress-1.0.0" - sources."mime-types-2.1.17" + (sources."mime-types-2.1.17" // { + dependencies = [ + sources."mime-db-1.30.0" + ]; + }) sources."node-version-1.1.0" sources."openssl-self-signed-certificate-1.1.6" sources."opn-5.1.0" sources."path-type-3.0.0" - sources."send-0.16.1" - sources."update-notifier-2.3.0" - sources."camelcase-1.2.1" + (sources."send-0.16.1" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + (sources."update-notifier-2.3.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."camelcase-4.1.0" sources."mri-1.1.0" sources."pkginfo-0.4.1" sources."string-similarity-1.2.0" @@ -33554,13 +38599,13 @@ in sources."safe-buffer-5.1.1" sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" - sources."string-width-1.0.2" + sources."string-width-2.1.1" sources."term-size-1.2.0" - sources."widest-line-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" - sources."execa-0.6.3" + sources."widest-line-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + sources."execa-0.7.0" sources."cross-spawn-5.1.0" sources."get-stream-3.0.0" sources."is-stream-1.1.0" @@ -33576,8 +38621,7 @@ in sources."shebang-regex-1.0.0" sources."isexe-2.0.0" sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" + sources."arch-2.1.0" sources."address-1.0.3" sources."debug-2.6.9" sources."ms-2.0.0" @@ -33586,10 +38630,14 @@ in sources."universalify-0.1.1" sources."async-1.5.2" sources."optimist-0.6.1" - sources."source-map-0.5.7" - sources."uglify-js-2.8.29" - sources."wordwrap-0.0.2" - sources."minimist-1.2.0" + sources."source-map-0.4.4" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" sources."amdefine-1.0.1" sources."yargs-3.10.0" sources."uglify-to-browserify-1.0.2" @@ -33604,7 +38652,7 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" - sources."media-typer-0.3.0" + sources."content-type-1.0.4" sources."raw-body-2.3.2" sources."bytes-3.0.0" sources."http-errors-1.6.2" @@ -33613,14 +38661,14 @@ in sources."depd-1.1.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."compression-1.7.1" sources."accepts-1.3.4" sources."compressible-2.0.12" sources."on-headers-1.0.1" sources."vary-1.1.2" sources."negotiator-0.6.1" - sources."mime-db-1.30.0" + sources."mime-db-1.32.0" sources."is-wsl-1.1.0" sources."pify-3.0.0" sources."destroy-1.0.4" @@ -33647,7 +38695,7 @@ in sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."ini-1.3.5" sources."path-is-inside-1.0.2" sources."package-json-4.0.1" @@ -33676,6 +38724,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; shout = nodeEnv.buildNodePackage { name = "shout"; @@ -33687,8 +38736,13 @@ in }; dependencies = [ sources."bcrypt-nodejs-0.0.3" - sources."cheerio-0.17.0" - sources."commander-2.12.1" + (sources."cheerio-0.17.0" // { + dependencies = [ + sources."domutils-1.5.1" + sources."domelementtype-1.1.3" + ]; + }) + sources."commander-2.12.2" sources."event-stream-3.3.4" sources."express-4.16.2" sources."lodash-2.4.2" @@ -33699,16 +38753,22 @@ in sources."slate-irc-0.7.3" (sources."socket.io-1.0.6" // { dependencies = [ + sources."debug-0.7.4" sources."commander-0.6.1" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" ]; }) sources."CSSselect-0.4.1" sources."entities-1.1.1" - sources."htmlparser2-3.7.3" + (sources."htmlparser2-3.7.3" // { + dependencies = [ + sources."entities-1.0.0" + ]; + }) sources."dom-serializer-0.0.1" sources."CSSwhat-0.4.7" - sources."domutils-1.5.1" - sources."domelementtype-1.1.3" + sources."domutils-1.4.3" + sources."domelementtype-1.3.0" sources."domhandler-2.2.1" sources."readable-stream-1.1.14" sources."core-util-is-1.0.2" @@ -33724,12 +38784,16 @@ in sources."stream-combiner-0.0.4" sources."accepts-1.3.4" sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."debug-0.7.4" + sources."debug-2.6.9" sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" @@ -33747,7 +38811,7 @@ in sources."safe-buffer-5.1.1" sources."send-0.16.1" sources."serve-static-1.13.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" sources."type-is-1.6.15" sources."utils-merge-1.0.1" @@ -33790,15 +38854,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -33815,12 +38883,24 @@ in sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."irc-replies-2.0.1" - sources."slate-irc-parser-0.0.2" + (sources."slate-irc-parser-0.0.2" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) sources."linewise-0.0.3" - sources."engine.io-1.3.1" - sources."socket.io-parser-2.1.2" + (sources."engine.io-1.3.1" // { + dependencies = [ + sources."debug-0.6.0" + ]; + }) + sources."socket.io-parser-2.2.0" sources."socket.io-client-1.0.6" - sources."socket.io-adapter-0.2.0" + (sources."socket.io-adapter-0.2.0" // { + dependencies = [ + sources."socket.io-parser-2.1.2" + ]; + }) sources."has-binary-data-0.1.1" sources."ws-0.4.31" sources."engine.io-parser-1.0.6" @@ -33858,6 +38938,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; sinopia = nodeEnv.buildNodePackage { name = "sinopia"; @@ -33870,12 +38951,27 @@ in dependencies = [ sources."express-5.0.0-alpha.6" sources."express-json5-0.1.0" - sources."body-parser-1.18.2" - sources."compression-1.7.1" - sources."commander-2.12.1" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."bytes-3.0.0" + sources."iconv-lite-0.4.19" + sources."qs-6.5.1" + sources."raw-body-2.3.2" + ]; + }) + (sources."compression-1.7.1" // { + dependencies = [ + sources."bytes-3.0.0" + ]; + }) + sources."commander-2.12.2" sources."js-yaml-3.10.0" sources."cookies-0.7.1" - sources."request-2.83.0" + (sources."request-2.83.0" // { + dependencies = [ + sources."qs-6.5.1" + ]; + }) sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" @@ -33895,14 +38991,20 @@ in (sources."render-readme-1.3.1" // { dependencies = [ sources."readable-stream-2.3.3" + sources."source-map-0.6.1" ]; }) sources."jju-1.3.0" - sources."JSONStream-1.3.1" + sources."JSONStream-1.3.2" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" sources."http-errors-1.6.2" - sources."readable-stream-1.1.14" + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) sources."fs-ext-0.6.0" sources."crypt3-0.2.0" sources."accepts-1.3.4" @@ -33925,15 +39027,20 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" - sources."qs-6.5.1" + sources."qs-6.5.0" sources."range-parser-1.2.0" - sources."router-1.3.2" + (sources."router-1.3.2" // { + dependencies = [ + sources."setprototypeof-1.1.0" + sources."utils-merge-1.0.1" + ]; + }) sources."send-0.15.6" sources."serve-static-1.12.6" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."type-is-1.6.15" - sources."utils-merge-1.0.1" + sources."utils-merge-1.0.0" sources."vary-1.1.2" sources."mime-types-2.1.17" sources."negotiator-0.6.1" @@ -33946,9 +39053,9 @@ in sources."destroy-1.0.4" sources."mime-1.3.4" sources."media-typer-0.3.0" - sources."raw-body-2.3.2" - sources."bytes-3.0.0" - sources."iconv-lite-0.4.19" + sources."raw-body-1.3.4" + sources."bytes-1.0.0" + sources."iconv-lite-0.4.8" sources."compressible-2.0.12" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" @@ -33977,15 +39084,19 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -34007,7 +39118,7 @@ in sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" - sources."moment-2.19.2" + sources."moment-2.20.1" sources."nan-2.8.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -34022,10 +39133,10 @@ in sources."optimist-0.3.7" sources."uglify-js-2.3.6" sources."wordwrap-0.0.3" - sources."source-map-0.6.1" + sources."source-map-0.1.43" sources."amdefine-1.0.1" sources."markdown-it-4.4.0" - sources."sanitize-html-1.16.1" + sources."sanitize-html-1.16.3" sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" @@ -34033,21 +39144,28 @@ in sources."htmlparser2-3.9.2" sources."lodash.clonedeep-4.5.0" sources."lodash.escaperegexp-4.1.2" - sources."lodash.isarray-4.0.0" sources."lodash.mergewith-4.6.0" - sources."postcss-6.0.14" + sources."postcss-6.0.15" sources."srcset-1.0.0" sources."xtend-4.0.1" - sources."domelementtype-1.1.3" + sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.6.2" - sources."dom-serializer-0.1.0" - sources."isarray-0.0.1" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."chalk-2.3.0" - sources."supports-color-4.5.0" + (sources."chalk-2.3.0" // { + dependencies = [ + sources."supports-color-4.5.0" + ]; + }) + sources."supports-color-5.1.0" sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" sources."color-convert-1.9.1" @@ -34069,6 +39187,7 @@ in }; }; production = true; + bypassCache = false; }; sloc = nodeEnv.buildNodePackage { name = "sloc"; @@ -34108,6 +39227,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; smartdc = nodeEnv.buildNodePackage { name = "smartdc"; @@ -34124,8 +39244,11 @@ in (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" - sources."vasync-1.6.3" - sources."assert-plus-1.0.0" + (sources."vasync-1.6.3" // { + dependencies = [ + sources."verror-1.6.0" + ]; + }) ]; }) sources."bunyan-1.5.1" @@ -34135,46 +39258,66 @@ in sources."assert-plus-0.1.2" sources."clone-0.1.5" sources."dashdash-1.10.1" - sources."vasync-1.4.3" - ]; - }) - (sources."cmdln-3.2.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + (sources."http-signature-1.2.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."once-1.3.0" + (sources."vasync-1.4.3" // { + dependencies = [ + sources."extsprintf-1.0.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."asn1-0.2.3" + (sources."jsprim-0.3.0" // { + dependencies = [ + sources."verror-1.3.3" + ]; + }) + sources."verror-1.1.0" + sources."json-schema-0.2.2" ]; }) + sources."cmdln-3.2.1" sources."dashdash-1.7.3" - sources."vasync-1.6.2" + (sources."vasync-1.6.2" // { + dependencies = [ + sources."verror-1.1.0" + sources."extsprintf-1.0.0" + ]; + }) sources."abbrev-1.1.1" sources."backoff-2.5.0" sources."csv-0.4.6" sources."escape-regexp-component-1.0.2" sources."formidable-1.1.1" - (sources."http-signature-1.2.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."http-signature-0.11.0" sources."keep-alive-agent-0.0.1" sources."mime-1.6.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" - sources."once-1.3.0" + sources."once-1.4.0" sources."qs-3.1.0" sources."semver-4.3.6" sources."spdy-1.32.5" sources."tunnel-agent-0.4.3" - sources."verror-1.1.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" sources."csv-parse-1.3.3" sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" - sources."asn1-0.2.3" + sources."asn1-0.1.11" sources."ctype-0.5.3" sources."wrappy-1.0.2" - sources."extsprintf-1.0.0" + sources."extsprintf-1.2.0" sources."core-util-is-1.0.2" sources."nan-2.8.0" sources."mv-2.1.1" @@ -34201,8 +39344,8 @@ in sources."assert-plus-0.2.0" ]; }) - sources."jsprim-0.3.0" - sources."json-schema-0.2.2" + sources."jsprim-1.4.1" + sources."json-schema-0.2.3" sources."readable-stream-2.3.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -34220,6 +39363,7 @@ in homepage = "https://github.com/joyent/node-smartdc#readme"; }; production = true; + bypassCache = false; }; "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -34238,15 +39382,15 @@ in sources."ms-2.0.0" sources."accepts-1.3.3" sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" - sources."ws-3.3.2" + sources."engine.io-parser-2.1.2" + sources."ws-3.3.3" sources."cookie-0.3.1" sources."uws-0.14.5" sources."mime-types-2.1.17" sources."negotiator-0.6.1" sources."mime-db-1.30.0" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" sources."has-binary2-1.0.2" @@ -34277,6 +39421,24 @@ in license = "MIT"; }; production = true; + bypassCache = false; + }; + stackdriver-statsd-backend = nodeEnv.buildNodePackage { + name = "stackdriver-statsd-backend"; + packageName = "stackdriver-statsd-backend"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; + sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Send metric data from statsd to Stackdriver"; + homepage = https://www.stackdriver.com/; + license = "MIT"; + }; + production = true; + bypassCache = false; }; statsd = nodeEnv.buildNodePackage { name = "statsd"; @@ -34305,6 +39467,44 @@ in license = "MIT"; }; production = true; + bypassCache = false; + }; + statsd-influxdb-backend = nodeEnv.buildNodePackage { + name = "statsd-influxdb-backend"; + packageName = "statsd-influxdb-backend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; + sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "InfluxDB backend for StatsD"; + homepage = https://github.com/bernd/statsd-influxdb-backend; + license = "BSD"; + }; + production = true; + bypassCache = false; + }; + statsd-librato-backend = nodeEnv.buildNodePackage { + name = "statsd-librato-backend"; + packageName = "statsd-librato-backend"; + version = "2.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-2.0.16.tgz"; + sha1 = "6c6a0d14684f0341e5ba013eed30302545532bc6"; + }; + dependencies = [ + sources."extend-3.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A StatsD backend for Librato Metrics"; + homepage = https://github.com/librato/statsd-librato-backend; + license = "MIT"; + }; + production = true; + bypassCache = false; }; stylus = nodeEnv.buildNodePackage { name = "stylus"; @@ -34342,6 +39542,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; svgo = nodeEnv.buildNodePackage { name = "svgo"; @@ -34355,7 +39556,7 @@ in sources."coa-2.0.0" sources."colors-1.1.2" sources."css-url-regex-1.1.0" - sources."unquote-1.1.0" + sources."unquote-1.1.1" sources."mkdirp-0.5.1" sources."css-select-1.3.0-rc0" sources."css-select-base-adapter-0.1.0" @@ -34372,8 +39573,12 @@ in sources."css-what-2.1.0" sources."domutils-1.5.1" sources."nth-check-1.0.1" - sources."dom-serializer-0.1.0" - sources."domelementtype-1.1.3" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" sources."entities-1.1.1" sources."mdn-data-1.0.0" sources."source-map-0.5.7" @@ -34400,6 +39605,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; tern = nodeEnv.buildNodePackage { name = "tern"; @@ -34419,9 +39625,9 @@ in sources."memory-fs-0.3.0" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" - sources."errno-0.1.4" + sources."errno-0.1.6" sources."readable-stream-2.3.3" - sources."prr-0.0.0" + sources."prr-1.0.1" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" @@ -34445,14 +39651,168 @@ in license = "MIT"; }; production = true; + bypassCache = false; + }; + titanium = nodeEnv.buildNodePackage { + name = "titanium"; + packageName = "titanium"; + version = "5.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz"; + sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b"; + }; + dependencies = [ + sources."adm-zip-0.4.7" + sources."async-2.1.2" + sources."colors-1.1.2" + (sources."fields-0.1.24" // { + dependencies = [ + sources."colors-0.6.2" + ]; + }) + sources."humanize-0.0.9" + sources."longjohn-0.2.11" + sources."moment-2.16.0" + (sources."node-appc-0.2.41" // { + dependencies = [ + sources."async-2.1.4" + sources."source-map-0.5.7" + sources."wordwrap-0.0.2" + ]; + }) + sources."request-2.79.0" + sources."semver-5.3.0" + sources."sprintf-0.1.5" + sources."temp-0.8.3" + (sources."winston-1.1.2" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) + sources."fs-extra-2.1.2" + sources."lodash-4.17.4" + sources."keypress-0.2.1" + sources."source-map-support-0.3.2" + sources."source-map-0.1.32" + sources."amdefine-1.0.1" + sources."diff-3.2.0" + sources."node-uuid-1.4.7" + sources."optimist-0.6.1" + sources."wrench-1.5.9" + (sources."uglify-js-2.7.5" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."xmldom-0.1.27" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.2.2" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.6" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."qs-6.3.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.4.3" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."core-util-is-1.0.2" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + sources."os-tmpdir-1.0.2" + sources."rimraf-2.2.8" + sources."cycle-1.0.3" + sources."eyes-0.1.8" + sources."pkginfo-0.3.1" + sources."stack-trace-0.0.10" + sources."graceful-fs-4.1.11" + sources."jsonfile-2.4.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Appcelerator Titanium Command line"; + homepage = "https://github.com/appcelerator/titanium#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; - sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; + sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; }; buildInputs = globalBuildInputs; meta = { @@ -34461,6 +39821,7 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; typings = nodeEnv.buildNodePackage { name = "typings"; @@ -34474,7 +39835,12 @@ in sources."archy-1.0.0" sources."bluebird-3.5.1" sources."chalk-1.1.3" - sources."cli-truncate-1.1.0" + (sources."cli-truncate-1.1.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."columnify-1.5.4" sources."elegant-spinner-1.0.1" sources."has-unicode-2.0.1" @@ -34484,25 +39850,28 @@ in sources."promise-finally-3.0.0" (sources."typings-core-2.3.3" // { dependencies = [ - sources."minimist-1.2.0" + sources."minimist-0.0.8" ]; }) (sources."update-notifier-2.3.0" // { dependencies = [ sources."chalk-2.3.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + sources."semver-5.4.1" ]; }) sources."wordwrap-1.0.0" sources."xtend-4.0.1" - sources."ansi-styles-3.2.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" - sources."supports-color-4.5.0" + sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."slice-ansi-1.0.0" - sources."string-width-1.0.2" - sources."is-fullwidth-code-point-1.0.0" + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.3" @@ -34530,7 +39899,11 @@ in sources."popsicle-retry-3.2.1" sources."popsicle-rewrite-1.0.0" sources."popsicle-status-2.0.1" - sources."rc-1.2.2" + (sources."rc-1.2.2" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."rimraf-2.6.2" sources."sort-keys-1.1.2" sources."string-template-1.0.0" @@ -34538,7 +39911,7 @@ in sources."thenify-3.3.0" sources."throat-3.2.0" sources."touch-1.0.0" - sources."typescript-2.6.1" + sources."typescript-2.6.2" sources."zip-object-0.1.0" sources."dot-prop-4.2.0" sources."make-dir-1.1.0" @@ -34559,7 +39932,7 @@ in sources."is-unc-path-0.1.2" sources."unc-path-regex-0.1.2" sources."any-promise-1.3.0" - sources."make-error-1.3.0" + sources."make-error-1.3.2" sources."isobject-3.0.1" sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" @@ -34585,7 +39958,7 @@ in sources."https-proxy-agent-1.0.0" sources."agent-base-2.1.1" sources."extend-3.0.1" - sources."semver-5.4.1" + sources."semver-5.0.3" sources."deep-extend-0.4.2" sources."ini-1.3.5" sources."strip-json-comments-2.0.1" @@ -34602,7 +39975,7 @@ in sources."is-plain-obj-1.1.0" sources."nopt-1.0.10" sources."abbrev-1.1.1" - sources."boxen-1.2.2" + sources."boxen-1.3.0" sources."import-lazy-2.1.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -34612,7 +39985,7 @@ in sources."camelcase-4.1.0" sources."cli-boxes-1.0.0" sources."term-size-1.2.0" - sources."widest-line-1.0.0" + sources."widest-line-2.0.0" sources."execa-0.7.0" sources."cross-spawn-5.1.0" sources."get-stream-3.0.0" @@ -34628,13 +40001,11 @@ in sources."shebang-regex-1.0.0" sources."isexe-2.0.0" sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."path-is-inside-1.0.2" sources."package-json-4.0.1" sources."got-6.7.1" @@ -34658,17 +40029,18 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.2.0"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.0.tgz"; - sha512 = "2vgdxdcacmfv1079k2pbqi0cmgyg2xha1l1h91dnjb80wym2krmbq4i3kwk0ivknhj3mxm7iq584kx0rjyscz31cjkz38117fah7prg"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz"; + sha512 = "2xnm5j27ds49pw0jxr30vj79ib0l0g4sbpdy7l3jvcjxdrwy0g4g8w9h69fk7fr45bs0mm9xj9pv0d1jvcva53x7xbxkr880jw31wl5"; }; dependencies = [ - sources."commander-2.12.1" + sources."commander-2.12.2" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -34678,14 +40050,15 @@ in license = "BSD-2-Clause"; }; production = true; + bypassCache = false; }; ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.3.0.tgz"; - sha512 = "06zgy1ilw44nwvz1vdxa067j95gmpswcr0fa5r57vmb3s0v6bmw0kwblgd3cridr88rlm4aidb7gvb6z9972897cya191mm97g6xr5r"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.1.tgz"; + sha512 = "0cwk2hmqfs9j3h1r7x8sq83bca1p9njjk54m8wi70srb43lsvn1jisdcmcwdiw929m66savxbvyp37shzwmnb1dcm53czc86wbyrj61"; }; dependencies = [ sources."async-2.5.0" @@ -34700,8 +40073,17 @@ in sources."mkdirp-0.3.0" ]; }) - sources."express-4.15.5" - sources."express-session-1.15.6" + (sources."express-4.15.5" // { + dependencies = [ + sources."qs-6.5.0" + sources."statuses-1.3.1" + ]; + }) + (sources."express-session-1.15.6" // { + dependencies = [ + sources."utils-merge-1.0.1" + ]; + }) sources."getmac-1.2.1" sources."hasher-1.2.0" sources."ignore-3.3.7" @@ -34709,31 +40091,75 @@ in (sources."keen.io-0.1.3" // { dependencies = [ sources."superagent-0.21.0" + sources."qs-1.2.0" + sources."mime-1.2.11" + sources."methods-1.0.1" sources."async-0.9.2" ]; }) sources."knockout-3.4.2" sources."lodash-4.17.4" - sources."memorystore-1.6.0" + (sources."memorystore-1.6.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."mkdirp-0.5.1" sources."moment-2.18.1" sources."node-cache-4.1.1" sources."npm-5.4.2" - sources."npm-registry-client-8.4.0" + (sources."npm-registry-client-8.4.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."form-data-2.3.1" + sources."delayed-stream-1.0.0" + ]; + }) sources."octicons-3.5.0" sources."open-0.0.5" sources."os-homedir-1.0.2" sources."passport-0.4.0" sources."passport-local-1.0.0" - sources."raven-2.1.2" - sources."rc-1.2.2" + (sources."raven-2.1.2" // { + dependencies = [ + sources."uuid-3.0.0" + ]; + }) + (sources."rc-1.2.2" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."rimraf-2.6.2" sources."semver-5.4.1" sources."serve-static-1.12.6" sources."signals-1.0.0" sources."snapsvg-0.5.1" - sources."socket.io-2.0.4" - sources."superagent-3.5.2" + (sources."socket.io-2.0.4" // { + dependencies = [ + sources."accepts-1.3.3" + sources."isarray-2.0.1" + sources."component-emitter-1.2.1" + ]; + }) + (sources."superagent-3.5.2" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."extend-3.0.1" + sources."form-data-2.3.1" + sources."formidable-1.1.1" + sources."readable-stream-2.3.3" + sources."combined-stream-1.0.5" + sources."delayed-stream-1.0.0" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) (sources."temp-0.8.3" // { dependencies = [ sources."rimraf-2.2.8" @@ -34744,7 +40170,15 @@ in sources."async-1.0.0" ]; }) - sources."yargs-9.0.1" + (sources."yargs-9.0.1" // { + dependencies = [ + sources."string-width-2.1.1" + sources."is-arrayish-0.2.1" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."bytes-3.0.0" sources."content-type-1.0.4" sources."debug-2.6.9" @@ -34758,7 +40192,7 @@ in sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -34768,7 +40202,7 @@ in sources."color-string-1.5.2" sources."color-name-1.1.3" sources."simple-swizzle-0.2.2" - sources."is-arrayish-0.2.1" + sources."is-arrayish-0.3.1" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."diff-3.4.0" @@ -34776,7 +40210,7 @@ in sources."whatwg-fetch-2.0.3" sources."nopt-1.0.10" sources."abbrev-1.1.1" - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" @@ -34791,13 +40225,13 @@ in sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" sources."send-0.15.6" - sources."utils-merge-1.0.1" + sources."utils-merge-1.0.0" sources."vary-1.1.2" sources."negotiator-0.6.1" sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" - sources."mime-1.6.0" + sources."mime-1.3.4" sources."crc-3.4.4" sources."on-headers-1.0.1" sources."uid-safe-2.1.5" @@ -34807,22 +40241,22 @@ in sources."editions-1.3.3" sources."typechecker-4.4.1" sources."underscore-1.5.2" - sources."formidable-1.1.1" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" + sources."formidable-1.0.14" + sources."component-emitter-1.1.2" + sources."cookiejar-2.0.1" sources."reduce-component-1.0.1" - sources."extend-3.0.1" - sources."form-data-2.3.1" - sources."readable-stream-2.3.3" - sources."combined-stream-1.0.5" - sources."delayed-stream-1.0.0" + sources."extend-1.2.1" + sources."form-data-0.1.3" + sources."readable-stream-1.0.27-1" + sources."combined-stream-0.0.7" + sources."delayed-stream-0.0.5" sources."core-util-is-1.0.2" - sources."isarray-2.0.1" - sources."string_decoder-1.0.3" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" sources."lru-cache-4.1.1" sources."pseudomap-1.0.2" sources."yallist-2.1.2" - sources."minimist-1.2.0" + sources."minimist-0.0.8" sources."clone-2.1.1" sources."concat-stream-1.6.0" sources."graceful-fs-4.1.11" @@ -34865,17 +40299,21 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" sources."tunnel-agent-0.6.0" - sources."uuid-3.0.0" + sources."uuid-3.1.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -34901,12 +40339,12 @@ in sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" - sources."strip-ansi-4.0.0" + sources."strip-ansi-3.0.1" sources."wide-align-1.1.2" sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-2.1.1" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" @@ -34929,11 +40367,11 @@ in sources."socket.io-client-2.0.4" sources."socket.io-parser-3.1.2" sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" - sources."ws-3.3.2" + sources."engine.io-parser-2.1.2" + sources."ws-3.3.3" sources."uws-0.14.5" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" sources."has-binary2-1.0.2" @@ -34957,7 +40395,11 @@ in sources."cycle-1.0.3" sources."eyes-0.1.8" sources."camelcase-4.1.0" - sources."cliui-3.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" sources."os-locale-2.1.0" @@ -34989,7 +40431,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."load-json-file-2.0.0" sources."path-type-2.0.0" sources."parse-json-2.2.0" @@ -35001,9 +40444,10 @@ in meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; - license = "SEE LICENSE IN LICENSE.md"; + license = "MIT"; }; production = true; + bypassCache = false; }; webdrvr = nodeEnv.buildNodePackage { name = "webdrvr"; @@ -35026,13 +40470,17 @@ in }) sources."tmp-0.0.33" sources."follow-redirects-0.0.3" - sources."config-chain-1.1.11" + (sources."config-chain-1.1.11" // { + dependencies = [ + sources."ini-1.3.5" + ]; + }) sources."inherits-2.0.3" sources."once-1.3.3" sources."osenv-0.0.3" sources."nopt-2.2.1" sources."semver-2.3.2" - sources."ini-1.3.5" + sources."ini-1.1.0" sources."proto-list-1.2.4" sources."wrappy-1.0.2" sources."abbrev-1.1.1" @@ -35094,9 +40542,17 @@ in sources."async-2.6.0" sources."lodash-4.17.4" sources."mime-db-1.30.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."json-schema-0.2.3" sources."verror-1.10.0" @@ -35113,8 +40569,8 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.12.1" - sources."is-my-json-valid-2.16.1" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -35138,35 +40594,41 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "3.8.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz"; - sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz"; + sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; }; dependencies = [ - sources."acorn-5.2.1" + sources."acorn-5.3.0" (sources."acorn-dynamic-import-2.0.2" // { dependencies = [ sources."acorn-4.0.13" ]; }) - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."ajv-keywords-2.1.1" sources."async-2.6.0" sources."enhanced-resolve-3.4.1" sources."escope-3.6.0" - sources."interpret-1.0.4" + sources."interpret-1.1.0" sources."json-loader-0.5.7" sources."json5-0.5.1" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" - sources."node-libs-browser-2.1.0" + (sources."node-libs-browser-2.1.0" // { + dependencies = [ + sources."hash-base-2.0.2" + sources."inherits-2.0.1" + ]; + }) sources."source-map-0.5.7" sources."supports-color-4.5.0" sources."tapable-0.2.8" @@ -35181,7 +40643,19 @@ in sources."source-map-0.6.1" ]; }) - sources."yargs-8.0.2" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" @@ -35201,11 +40675,11 @@ in sources."event-emitter-0.3.5" sources."big.js-3.2.0" sources."emojis-list-2.1.0" - sources."errno-0.1.4" + sources."errno-0.1.6" sources."readable-stream-2.3.3" - sources."prr-0.0.0" + sources."prr-1.0.1" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."safe-buffer-5.1.1" @@ -35224,13 +40698,17 @@ in sources."os-browserify-0.3.0" sources."path-browserify-0.0.0" sources."process-0.11.10" - sources."punycode-1.3.2" + sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."stream-browserify-2.0.1" sources."stream-http-2.7.2" sources."timers-browserify-2.0.4" sources."tty-browserify-0.0.0" - sources."url-0.11.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) sources."util-0.10.3" sources."vm-browserify-0.0.4" sources."pako-1.0.6" @@ -35255,7 +40733,7 @@ in sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."md5.js-1.3.4" - sources."hash-base-2.0.2" + sources."hash-base-3.0.4" sources."bn.js-4.11.8" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" @@ -35277,8 +40755,8 @@ in sources."has-flag-2.0.0" sources."uglify-js-2.8.29" sources."uglify-to-browserify-1.0.2" - sources."camelcase-4.1.0" - sources."cliui-3.2.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" sources."decamelize-1.2.0" sources."window-size-0.1.0" sources."center-align-0.1.3" @@ -35303,7 +40781,11 @@ in sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -35316,9 +40798,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -35342,16 +40832,16 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."set-blocking-2.0.0" - sources."string-width-1.0.2" + sources."string-width-2.1.1" sources."which-module-2.0.0" sources."y18n-3.2.1" sources."yargs-parser-7.0.0" - sources."strip-ansi-4.0.0" + sources."strip-ansi-3.0.1" sources."wrap-ansi-2.1.0" sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-2.1.1" sources."execa-0.7.0" sources."lcid-1.0.0" sources."mem-1.1.0" @@ -35377,7 +40867,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."load-json-file-2.0.0" sources."normalize-package-data-2.4.0" sources."path-type-2.0.0" @@ -35402,6 +40893,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; web-ext = nodeEnv.buildNodePackage { name = "web-ext"; @@ -35414,29 +40906,84 @@ in dependencies = [ (sources."addons-linter-0.27.0" // { dependencies = [ - sources."yargs-8.0.2" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."string-width-2.1.1" + ]; + }) sources."babel-runtime-6.26.0" - sources."source-map-support-0.4.18" - sources."regenerator-runtime-0.11.0" + sources."regenerator-runtime-0.11.1" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + sources."domelementtype-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + sources."debug-3.1.0" sources."tmp-0.0.33" + sources."inquirer-0.12.0" + sources."pluralize-1.2.1" + sources."progress-1.1.8" + sources."table-3.8.3" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."figures-1.7.0" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."string-width-1.0.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" + sources."mute-stream-0.0.5" + sources."ajv-keywords-1.5.1" + sources."slice-ansi-0.0.4" + sources."punycode-2.1.0" ]; }) sources."babel-polyfill-6.20.0" sources."babel-runtime-6.25.0" - sources."bunyan-1.8.10" + (sources."bunyan-1.8.10" // { + dependencies = [ + sources."rimraf-2.4.5" + sources."glob-6.0.4" + ]; + }) sources."camelcase-4.1.0" sources."debounce-1.0.2" sources."decamelize-1.2.0" sources."es6-error-4.0.2" sources."es6-promisify-5.0.0" sources."event-to-promise-0.8.0" - sources."firefox-profile-0.5.0" - sources."fx-runner-1.0.8" - sources."git-rev-sync-1.9.1" + (sources."firefox-profile-0.5.0" // { + dependencies = [ + sources."async-2.1.5" + ]; + }) + (sources."fx-runner-1.0.8" // { + dependencies = [ + sources."commander-2.9.0" + sources."lodash-3.10.1" + sources."which-1.2.4" + sources."isexe-1.1.2" + ]; + }) + (sources."git-rev-sync-1.9.1" // { + dependencies = [ + sources."shelljs-0.7.7" + ]; + }) sources."minimatch-3.0.4" - sources."mkdirp-0.5.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."mz-2.6.0" - sources."node-firefox-connect-1.2.0" + (sources."node-firefox-connect-1.2.0" // { + dependencies = [ + sources."es6-promise-2.3.0" + sources."traverse-0.4.6" + ]; + }) sources."open-0.0.5" sources."node-notifier-5.1.2" sources."parse-json-2.2.0" @@ -35447,43 +40994,138 @@ in sources."babel-polyfill-6.16.0" sources."es6-error-4.0.0" sources."mz-2.5.0" + sources."request-2.79.0" sources."source-map-support-0.4.6" sources."regenerator-runtime-0.9.6" + sources."ms-0.7.3" + sources."hoek-2.16.3" + sources."aws-sign2-0.6.0" + sources."caseless-0.11.0" + sources."form-data-2.1.4" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."qs-6.3.2" + sources."tunnel-agent-0.4.3" + sources."chalk-1.1.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + ]; + }) + (sources."source-map-support-0.5.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."stream-to-promise-2.2.0" // { + dependencies = [ + sources."end-of-stream-1.1.0" + sources."once-1.3.3" ]; }) - sources."source-map-support-0.5.0" - sources."stream-to-promise-2.2.0" sources."tmp-0.0.30" sources."watchpack-1.3.0" - sources."update-notifier-2.2.0" + (sources."update-notifier-2.2.0" // { + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."supports-color-2.0.0" + ]; + }) + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + sources."pify-3.0.0" + ]; + }) (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."string-width-1.0.2" + sources."which-module-1.0.0" + sources."yargs-parser-4.2.1" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."strip-bom-2.0.0" + ]; + }) + (sources."zip-dir-1.0.2" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + sources."ajv-5.2.3" + (sources."babel-register-6.26.0" // { + dependencies = [ + sources."source-map-support-0.4.18" + sources."chalk-1.1.3" + ]; + }) + sources."chalk-2.1.0" + (sources."cheerio-1.0.0-rc.2" // { + dependencies = [ + sources."domelementtype-1.3.0" ]; }) - sources."zip-dir-1.0.2" - sources."ajv-4.11.8" - sources."babel-register-6.26.0" - sources."chalk-2.3.0" - sources."cheerio-1.0.0-rc.2" sources."columnify-1.5.4" sources."common-tags-1.4.0" sources."crx-parser-0.1.2" sources."doctoc-1.3.0" (sources."dispensary-0.10.19" // { dependencies = [ - sources."source-map-support-0.5.0" sources."yargs-9.0.1" ]; }) - sources."eslint-3.19.0" - sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" - sources."esprima-4.0.0" + (sources."eslint-4.8.0" // { + dependencies = [ + sources."esprima-4.0.0" + ]; + }) + (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { + dependencies = [ + (sources."eslint-3.19.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."chalk-1.1.3" + sources."debug-2.6.9" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."ajv-4.11.8" + sources."string-width-2.1.1" + ]; + }) + sources."esprima-3.1.3" sources."first-chunk-stream-2.0.0" sources."jed-1.1.1" - sources."pino-4.10.2" + (sources."pino-4.10.3" // { + dependencies = [ + sources."chalk-2.3.0" + ]; + }) sources."postcss-6.0.11" - sources."relaxed-json-1.0.1" + (sources."relaxed-json-1.0.1" // { + dependencies = [ + sources."chalk-1.1.3" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + ]; + }) sources."semver-5.4.1" sources."strip-bom-stream-3.0.0" sources."whatwg-url-6.3.0" @@ -35495,9 +41137,9 @@ in sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" sources."babel-core-6.26.0" - sources."core-js-2.5.1" + sources."core-js-2.5.3" sources."home-or-tmp-2.0.0" - sources."lodash-3.10.1" + sources."lodash-4.17.4" sources."babel-code-frame-6.26.0" sources."babel-generator-6.26.0" sources."babel-helpers-6.24.1" @@ -35512,14 +41154,14 @@ in sources."path-is-absolute-1.0.1" sources."private-0.1.8" sources."slash-1.0.0" - sources."source-map-0.6.1" + sources."source-map-0.5.7" sources."esutils-2.0.2" sources."js-tokens-3.0.2" - sources."ansi-styles-3.2.0" + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" - sources."supports-color-4.5.0" + sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."detect-indent-4.0.0" sources."jsesc-1.3.0" @@ -35531,7 +41173,7 @@ in sources."invariant-2.2.2" sources."loose-envify-1.3.1" sources."to-fast-properties-1.0.3" - sources."ms-0.7.3" + sources."ms-2.0.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."color-convert-1.9.1" @@ -35556,7 +41198,7 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."@types/node-8.0.53" + sources."@types/node-8.5.5" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.3" @@ -35568,7 +41210,7 @@ in sources."emoji-regex-6.1.3" sources."remark-5.1.0" sources."structured-source-3.0.2" - sources."traverse-0.4.6" + sources."traverse-0.6.6" sources."remark-parse-1.1.0" sources."remark-stringify-1.1.0" sources."unified-4.2.1" @@ -35589,7 +41231,7 @@ in sources."is-hexadecimal-1.0.1" sources."is-alphabetical-1.0.1" sources."xtend-4.0.1" - sources."unist-util-visit-1.2.0" + sources."unist-util-visit-1.3.0" sources."unist-util-is-2.1.1" sources."ccount-1.0.2" sources."longest-streak-1.0.0" @@ -35598,45 +41240,49 @@ in sources."character-entities-html4-1.1.1" sources."bail-1.0.2" sources."has-1.0.1" - sources."once-1.3.3" + sources."once-1.4.0" sources."trough-1.0.1" sources."vfile-1.4.0" sources."function-bind-1.1.1" sources."wrappy-1.0.2" sources."boundary-1.0.1" sources."array-from-2.1.1" - sources."async-1.5.2" + sources."async-2.6.0" sources."natural-compare-lite-1.4.0" - sources."request-2.79.0" + sources."request-2.83.0" sources."sha.js-2.4.9" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-2.0.6" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" sources."performance-now-2.1.0" - sources."qs-6.3.2" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."har-schema-2.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" sources."extsprintf-1.3.0" @@ -35650,18 +41296,22 @@ in sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.30.0" - sources."punycode-2.1.0" - sources."cliui-3.2.0" + sources."punycode-1.4.1" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) sources."get-caller-file-1.0.2" - sources."os-locale-1.4.0" - sources."read-pkg-up-1.0.1" + sources."os-locale-2.1.0" + sources."read-pkg-up-2.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."set-blocking-2.0.0" - sources."string-width-1.0.2" - sources."which-module-1.0.0" + sources."string-width-2.1.1" + sources."which-module-2.0.0" sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" + sources."yargs-parser-7.0.0" sources."wrap-ansi-2.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -35685,18 +41335,19 @@ in sources."path-key-2.0.1" sources."invert-kv-1.0.0" sources."mimic-fn-1.1.0" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" sources."locate-path-2.0.0" sources."p-locate-2.0.0" - sources."path-exists-2.1.0" - sources."p-limit-1.1.0" - sources."load-json-file-1.1.0" + sources."path-exists-3.0.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" + sources."load-json-file-2.0.0" sources."normalize-package-data-2.4.0" - sources."path-type-1.1.0" + sources."path-type-2.0.0" sources."graceful-fs-4.1.11" sources."pify-2.3.0" - sources."strip-bom-2.0.0" + sources."strip-bom-3.0.0" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -35715,23 +41366,27 @@ in sources."glob-7.1.2" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" - sources."inquirer-0.12.0" - sources."is-resolvable-1.0.0" + sources."inquirer-3.3.0" + sources."is-resolvable-1.0.1" sources."js-yaml-3.10.0" sources."levn-0.3.0" sources."natural-compare-1.4.0" sources."optionator-0.8.2" sources."path-is-inside-1.0.2" - sources."pluralize-1.2.1" - sources."progress-1.1.8" + sources."pluralize-7.0.0" + sources."progress-2.0.0" sources."strip-json-comments-2.0.1" - sources."table-3.8.3" + sources."table-4.0.2" sources."text-table-0.2.0" sources."typedarray-0.0.6" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" + sources."acorn-5.3.0" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) sources."flat-cache-1.3.0" sources."circular-json-0.3.3" sources."del-2.2.2" @@ -35740,30 +41395,29 @@ in sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.0" sources."pinkie-promise-2.0.1" - sources."rimraf-2.4.5" + sources."rimraf-2.6.2" sources."array-union-1.0.2" sources."arrify-1.0.1" sources."array-uniq-1.0.3" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."pinkie-2.0.4" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" + sources."ansi-escapes-3.0.0" + sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."external-editor-2.1.0" - sources."figures-1.7.0" - sources."mute-stream-0.0.5" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" + sources."figures-2.0.0" + sources."mute-stream-0.0.7" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."onetime-1.1.0" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" sources."chardet-0.4.2" sources."iconv-lite-0.4.19" sources."is-promise-2.1.0" - sources."tryit-1.0.3" sources."argparse-1.0.9" sources."sprintf-js-1.0.3" sources."prelude-ls-1.1.2" @@ -35771,11 +41425,11 @@ in sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."fast-levenshtein-2.0.6" - sources."ajv-keywords-1.5.1" - sources."slice-ansi-0.0.4" + sources."ajv-keywords-2.1.1" + sources."slice-ansi-1.0.0" sources."escope-3.6.0" - sources."is-my-json-valid-2.16.1" - sources."shelljs-0.7.7" + sources."is-my-json-valid-2.17.1" + sources."shelljs-0.7.8" sources."user-home-2.0.0" sources."es6-map-0.1.5" sources."es6-weak-map-2.0.2" @@ -35791,19 +41445,19 @@ in sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" sources."is-property-1.0.2" - sources."interpret-1.0.4" + sources."interpret-1.1.0" sources."rechoir-0.6.2" sources."resolve-1.5.0" sources."path-parse-1.0.5" sources."fast-json-parse-1.0.3" sources."fast-safe-stringify-1.2.1" sources."flatstr-1.0.5" - sources."pump-1.0.3" + sources."pump-2.0.0" sources."quick-format-unescaped-1.1.1" sources."split2-2.2.0" - sources."end-of-stream-1.1.0" + sources."end-of-stream-1.4.0" sources."through2-2.0.3" - sources."commander-2.9.0" + sources."commander-2.12.2" sources."strip-bom-buf-1.0.0" sources."is-utf8-0.2.1" sources."lodash.sortby-4.7.0" @@ -35815,10 +41469,10 @@ in sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" - sources."moment-2.19.2" + sources."moment-2.20.1" sources."nan-2.8.0" sources."ncp-2.0.0" - sources."es6-promise-2.3.0" + sources."es6-promise-4.2.2" sources."adm-zip-0.4.7" sources."archiver-1.3.0" sources."fs-extra-2.1.2" @@ -35890,7 +41544,11 @@ in sources."micromatch-2.3.11" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.1" @@ -35904,9 +41562,17 @@ in sources."preserve-0.2.0" sources."repeat-element-1.1.2" sources."fill-range-2.2.3" - sources."is-number-3.0.0" + sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.7" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" @@ -35918,7 +41584,11 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.11.0" sources."set-immediate-shim-1.0.1" - sources."boxen-1.2.2" + (sources."boxen-1.3.0" // { + dependencies = [ + sources."chalk-2.3.0" + ]; + }) sources."configstore-3.1.1" sources."import-lazy-2.1.0" sources."is-npm-1.0.0" @@ -35928,7 +41598,7 @@ in sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" sources."term-size-1.2.0" - sources."widest-line-1.0.0" + sources."widest-line-2.0.0" sources."dot-prop-4.2.0" sources."make-dir-1.1.0" sources."unique-string-1.0.0" @@ -35961,6 +41631,7 @@ in license = "MPL-2.0"; }; production = true; + bypassCache = false; }; wring = nodeEnv.buildNodePackage { name = "wring"; @@ -35977,6 +41648,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; yarn = nodeEnv.buildNodePackage { name = "yarn"; @@ -35993,6 +41665,7 @@ in license = "BSD-2-Clause"; }; production = true; + bypassCache = false; }; yo = nodeEnv.buildNodePackage { name = "yo"; @@ -36009,81 +41682,155 @@ in sources."configstore-3.1.1" sources."cross-spawn-5.1.0" sources."figures-2.0.0" - sources."fullname-3.3.0" + (sources."fullname-3.3.0" // { + dependencies = [ + sources."pify-2.3.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + ]; + }) sources."got-6.7.1" sources."humanize-string-1.0.1" (sources."inquirer-3.3.0" // { dependencies = [ sources."chalk-2.3.0" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + sources."ansi-regex-3.0.0" ]; }) (sources."insight-0.8.4" // { dependencies = [ sources."async-1.5.2" - sources."configstore-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."inquirer-0.10.1" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."minimist-0.0.8" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" sources."figures-1.7.0" sources."lodash-3.10.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.5" ]; }) sources."lodash-4.17.4" (sources."meow-3.7.0" // { dependencies = [ sources."read-pkg-up-1.0.1" + sources."pify-2.3.0" + sources."indent-string-2.1.0" ]; }) (sources."npm-keyword-4.2.0" // { dependencies = [ sources."got-5.7.1" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" ]; }) sources."opn-4.0.2" (sources."package-json-2.4.0" // { dependencies = [ sources."got-5.7.1" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" ]; }) sources."parse-help-0.1.1" - sources."read-pkg-up-2.0.0" + (sources."read-pkg-up-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" + sources."path-exists-3.0.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."pify-2.3.0" + sources."strip-bom-3.0.0" + ]; + }) sources."root-check-1.0.0" sources."sort-on-2.0.0" sources."string-length-1.0.1" (sources."tabtab-1.3.2" // { dependencies = [ sources."inquirer-1.2.3" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."external-editor-1.1.1" sources."figures-1.7.0" + sources."mute-stream-0.0.6" + sources."string-width-1.0.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" + sources."tmp-0.0.29" + sources."is-fullwidth-code-point-1.0.0" ]; }) sources."titleize-1.0.0" (sources."update-notifier-2.3.0" // { dependencies = [ sources."chalk-2.3.0" + sources."camelcase-4.1.0" + sources."execa-0.7.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" sources."package-json-4.0.1" ]; }) sources."user-home-2.0.0" - sources."yeoman-character-1.1.0" - sources."yeoman-doctor-2.1.0" + (sources."yeoman-character-1.1.0" // { + dependencies = [ + sources."supports-color-3.2.3" + sources."has-flag-1.0.0" + ]; + }) + (sources."yeoman-doctor-2.1.0" // { + dependencies = [ + sources."onetime-1.1.0" + ]; + }) (sources."yeoman-environment-2.0.5" // { dependencies = [ sources."chalk-2.3.0" + sources."debug-3.1.0" + sources."log-symbols-2.1.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + sources."pify-2.3.0" ]; }) - sources."yosay-2.0.1" - sources."ansi-styles-3.2.0" + (sources."yosay-2.0.1" // { + dependencies = [ + sources."ansi-styles-3.2.0" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" - sources."supports-color-4.5.0" + sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."dot-prop-4.2.0" sources."graceful-fs-4.1.11" sources."make-dir-1.1.0" sources."unique-string-1.0.0" - sources."write-file-atomic-1.3.4" + sources."write-file-atomic-2.3.0" sources."xdg-basedir-3.0.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."signal-exit-3.0.2" @@ -36094,12 +41841,16 @@ in sources."yallist-2.1.2" sources."shebang-regex-1.0.0" sources."isexe-2.0.0" - sources."execa-0.7.0" + sources."execa-0.6.3" sources."filter-obj-1.1.0" sources."mem-1.1.0" sources."p-any-1.1.0" sources."p-try-1.0.0" - sources."passwd-user-2.1.0" + (sources."passwd-user-2.1.0" // { + dependencies = [ + sources."execa-0.4.0" + ]; + }) sources."rc-1.2.2" sources."get-stream-3.0.0" sources."is-stream-1.1.0" @@ -36108,10 +41859,10 @@ in sources."strip-eof-1.0.0" sources."path-key-2.0.1" sources."mimic-fn-1.1.0" - sources."p-some-2.0.0" + sources."p-some-2.0.1" sources."aggregate-error-1.0.0" sources."clean-stack-1.3.0" - sources."indent-string-2.1.0" + sources."indent-string-3.2.0" sources."cross-spawn-async-2.2.5" sources."object-assign-4.1.1" sources."deep-extend-0.4.2" @@ -36124,35 +41875,39 @@ in sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" sources."safe-buffer-5.1.1" - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."prepend-http-1.0.4" sources."decamelize-1.2.0" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" + sources."ansi-escapes-3.0.0" + sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."external-editor-1.1.1" - sources."mute-stream-0.0.6" + sources."external-editor-2.1.0" + sources."mute-stream-0.0.7" sources."run-async-2.3.0" - sources."rx-lite-3.1.2" + sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."string-width-1.0.2" + sources."string-width-2.1.1" sources."through-2.3.8" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."has-flag-2.0.0" - sources."restore-cursor-1.0.1" - sources."onetime-1.1.0" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" sources."chardet-0.4.2" sources."iconv-lite-0.4.19" - sources."tmp-0.0.29" + sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."lodash.debounce-3.1.1" - sources."os-name-1.0.3" + (sources."os-name-1.0.3" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."request-2.83.0" sources."tough-cookie-2.3.3" sources."uuid-3.1.0" @@ -36191,15 +41946,19 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.5.0" + sources."ajv-5.5.2" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" @@ -36223,7 +41982,7 @@ in sources."normalize-package-data-2.4.0" sources."redent-1.0.0" sources."trim-newlines-1.0.0" - sources."camelcase-4.1.0" + sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" sources."hosted-git-info-2.5.0" @@ -36233,13 +41992,13 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."find-up-2.1.0" - sources."read-pkg-2.0.0" - sources."path-exists-3.0.0" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" - sources."load-json-file-2.0.0" - sources."path-type-2.0.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."strip-bom-2.0.0" sources."error-ex-1.3.1" @@ -36266,14 +42025,14 @@ in sources."is-supported-regexp-flag-1.0.0" sources."locate-path-2.0.0" sources."p-locate-2.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" sources."downgrade-root-1.2.2" sources."sudo-block-1.2.0" sources."default-uid-1.0.0" sources."is-root-1.0.0" sources."is-docker-1.1.0" sources."arrify-1.0.1" - sources."debug-3.1.0" + sources."debug-2.6.9" sources."npmlog-2.0.4" sources."ms-2.0.0" sources."rx-4.1.0" @@ -36289,7 +42048,7 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - sources."boxen-1.2.2" + sources."boxen-1.3.0" sources."import-lazy-2.1.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -36298,17 +42057,25 @@ in sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" sources."term-size-1.2.0" - sources."widest-line-1.0.0" + sources."widest-line-2.0.0" sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.0" + sources."is-path-inside-1.0.1" sources."path-is-inside-1.0.2" - sources."bin-version-check-2.1.0" + (sources."bin-version-check-2.1.0" // { + dependencies = [ + sources."semver-4.3.6" + ]; + }) sources."each-async-1.1.1" - sources."log-symbols-2.1.0" + sources."log-symbols-1.0.2" sources."object-values-1.0.0" sources."twig-0.8.9" sources."bin-version-1.0.4" - sources."semver-truncate-1.1.2" + (sources."semver-truncate-1.1.2" // { + dependencies = [ + sources."semver-5.4.1" + ]; + }) sources."find-versions-1.2.1" sources."array-uniq-1.0.3" sources."semver-regex-1.0.0" @@ -36343,7 +42110,11 @@ in sources."first-chunk-stream-2.0.0" sources."pad-component-0.0.1" sources."taketalk-1.0.0" - sources."wrap-ansi-2.1.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -36352,5 +42123,6 @@ in license = "BSD-2-Clause"; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json new file mode 100644 index 000000000000..d7f054569895 --- /dev/null +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -0,0 +1,13 @@ +[ + "bower" +, "coffee-script" +, "dat" +, "grunt-cli" +, "mocha" +, "nijs" +, "node-gyp" +, "node-gyp-build" +, "node-pre-gyp" +, "semver" +, "sloc" +] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix new file mode 100644 index 000000000000..a035e0921f0e --- /dev/null +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -0,0 +1,4513 @@ +# This file has been generated by node2nix 1.5.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "chalk-2.3.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; + sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; + }; + }; + "cli-truncate-1.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; + sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; + }; + }; + "dat-doctor-1.3.1" = { + name = "dat-doctor"; + packageName = "dat-doctor"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; + sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; + }; + }; + "dat-encoding-4.0.2" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-4.0.2.tgz"; + sha1 = "b01068fe0d080f3d3e4985a0c4ad21b7c14675f6"; + }; + }; + "dat-json-1.0.1" = { + name = "dat-json"; + packageName = "dat-json"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; + sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; + }; + }; + "dat-link-resolve-1.1.1" = { + name = "dat-link-resolve"; + packageName = "dat-link-resolve"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-1.1.1.tgz"; + sha512 = "3a3rmwv687r07qnzdp4k15ng7xbbgibssjiqjvhhhrxq5mc22m34g7hi1h15rqjs3zzlajn291j3xv9af22j3fynpygky13zzvxj367"; + }; + }; + "dat-log-1.1.1" = { + name = "dat-log"; + packageName = "dat-log"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; + sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; + }; + }; + "dat-node-3.5.6" = { + name = "dat-node"; + packageName = "dat-node"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; + sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; + }; + }; + "dat-registry-4.0.0" = { + name = "dat-registry"; + packageName = "dat-registry"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz"; + sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + }; + }; + "neat-log-1.1.2" = { + name = "neat-log"; + packageName = "neat-log"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; + sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; + }; + }; + "prettier-bytes-1.0.4" = { + name = "prettier-bytes"; + packageName = "prettier-bytes"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-bytes/-/prettier-bytes-1.0.4.tgz"; + sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; + }; + }; + "progress-string-1.2.2" = { + name = "progress-string"; + packageName = "progress-string"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz"; + sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; + }; + }; + "prompt-1.0.0" = { + name = "prompt"; + packageName = "prompt"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz"; + sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; + }; + }; + "pump-1.0.3" = { + name = "pump"; + packageName = "pump"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; + sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; + }; + }; + "rimraf-2.6.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; + }; + }; + "speedometer-1.0.0" = { + name = "speedometer"; + packageName = "speedometer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz"; + sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; + }; + }; + "subcommand-2.1.0" = { + name = "subcommand"; + packageName = "subcommand"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subcommand/-/subcommand-2.1.0.tgz"; + sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; + }; + }; + "throttle-1.0.3" = { + name = "throttle"; + packageName = "throttle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/throttle/-/throttle-1.0.3.tgz"; + sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; + }; + }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; + "ansi-styles-3.2.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; + sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "supports-color-4.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; + sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; + }; + }; + "color-convert-1.9.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz"; + sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs"; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + }; + }; + "slice-ansi-1.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; + sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "datland-swarm-defaults-1.0.2" = { + name = "datland-swarm-defaults"; + packageName = "datland-swarm-defaults"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; + sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + }; + }; + "discovery-swarm-4.4.2" = { + name = "discovery-swarm"; + packageName = "discovery-swarm"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; + sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; + }; + }; + "dns-discovery-5.6.1" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "5.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; + sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "thunky-1.0.2" = { + name = "thunky"; + packageName = "thunky"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; + sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "buffer-equals-1.0.4" = { + name = "buffer-equals"; + packageName = "buffer-equals"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; + }; + }; + "connections-1.4.2" = { + name = "connections"; + packageName = "connections"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connections/-/connections-1.4.2.tgz"; + sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; + }; + }; + "discovery-channel-5.4.6" = { + name = "discovery-channel"; + packageName = "discovery-channel"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.6.tgz"; + sha1 = "1b0f25e58124507e861b6dc3ecb744366bb53cad"; + }; + }; + "length-prefixed-message-3.0.3" = { + name = "length-prefixed-message"; + packageName = "length-prefixed-message"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.3.tgz"; + sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; + }; + }; + "to-buffer-1.1.0" = { + name = "to-buffer"; + packageName = "to-buffer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; + sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + }; + }; + "utp-native-1.6.2" = { + name = "utp-native"; + packageName = "utp-native"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; + sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + }; + }; + "bittorrent-dht-7.8.2" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "7.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.8.2.tgz"; + sha512 = "33jcwf8rh9r7m810lw75s1ij9k0bv1kjmnc24488i6nd1ri9a1p2gmci5z1xdfriyb8j7x8h1ch3aj5a1chdglwn6pbsll7cx4j6wd4"; + }; + }; + "pretty-hash-1.0.1" = { + name = "pretty-hash"; + packageName = "pretty-hash"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-hash/-/pretty-hash-1.0.1.tgz"; + sha1 = "16e0579188def56bdb565892bcd05a5d65324807"; + }; + }; + "thunky-0.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"; + sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e"; + }; + }; + "bencode-1.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; + sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "k-bucket-3.3.1" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz"; + sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; + }; + }; + "k-rpc-4.2.1" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; + sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; + }; + }; + "lru-3.1.0" = { + name = "lru"; + packageName = "lru"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz"; + sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; + }; + }; + "randombytes-2.0.5" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz"; + sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi"; + }; + }; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + }; + }; + "simple-sha1-2.1.0" = { + name = "simple-sha1"; + packageName = "simple-sha1"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz"; + sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; + }; + }; + "k-rpc-socket-1.7.2" = { + name = "k-rpc-socket"; + packageName = "k-rpc-socket"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; + sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; + }; + }; + "rusha-0.8.11" = { + name = "rusha"; + packageName = "rusha"; + version = "0.8.11"; + src = fetchurl { + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.11.tgz"; + sha1 = "caa8963b1dbfd229d90626dd3f2a784430d6058d"; + }; + }; + "varint-3.0.1" = { + name = "varint"; + packageName = "varint"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-3.0.1.tgz"; + sha1 = "9d3f53e036c0ab12000a74bc2d24cbf093a581d9"; + }; + }; + "nan-2.8.0" = { + name = "nan"; + packageName = "nan"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; + sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; + }; + }; + "node-gyp-build-3.2.2" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; + sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + }; + }; + "readable-stream-2.3.3" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; + sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "string_decoder-1.0.3" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "dns-socket-1.6.2" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.2.tgz"; + sha512 = "0ibd2ndmlqbk96vdcimsl4w1njplh9gplvqa5f7653km79f9kqpd6d7f0f3lq1sz548lqcbjfcgcr7fc9159b4gzzk1g86kjxzxmmk6"; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "lru-2.0.1" = { + name = "lru"; + packageName = "lru"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz"; + sha1 = "f979871e162e3f5ca254be46844c53d4c5364544"; + }; + }; + "multicast-dns-6.2.1" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; + sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; + }; + }; + "network-address-1.1.2" = { + name = "network-address"; + packageName = "network-address"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; + sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; + }; + }; + "unordered-set-1.1.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-1.1.0.tgz"; + sha1 = "2ba7ef316edd0b9590cc547c74f76a2f164fecca"; + }; + }; + "dns-packet-1.2.2" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz"; + sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh"; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; + }; + }; + "toiletdb-1.4.0" = { + name = "toiletdb"; + packageName = "toiletdb"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.0.tgz"; + sha1 = "6c6f871834b22178c5490f9f832b58c3c7cba852"; + }; + }; + "last-one-wins-1.0.4" = { + name = "last-one-wins"; + packageName = "last-one-wins"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/last-one-wins/-/last-one-wins-1.0.4.tgz"; + sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; + }; + }; + "dat-dns-1.3.2" = { + name = "dat-dns"; + packageName = "dat-dns"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-1.3.2.tgz"; + sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; + }; + }; + "nets-3.2.0" = { + name = "nets"; + packageName = "nets"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nets/-/nets-3.2.0.tgz"; + sha1 = "d511fbab7af11da013f21b97ee91747d33852d38"; + }; + }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + }; + "concat-stream-1.6.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; + sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "request-2.83.0" = { + name = "request"; + packageName = "request"; + version = "2.83.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; + sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + }; + }; + "xhr-2.4.1" = { + name = "xhr"; + packageName = "xhr"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz"; + sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.6.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.1" = { + name = "extend"; + packageName = "extend"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; + sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; + sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; + }; + }; + "har-validator-5.0.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + }; + }; + "hawk-6.0.2" = { + name = "hawk"; + packageName = "hawk"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; + sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "mime-types-2.1.17" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; + sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "qs-6.5.1" = { + name = "qs"; + packageName = "qs"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "tough-cookie-2.3.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; + sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "uuid-3.1.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; + sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "ajv-5.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "fast-deep-equal-1.0.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; + sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "json-schema-traverse-0.3.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; + "hoek-4.2.0" = { + name = "hoek"; + packageName = "hoek"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; + sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; + }; + }; + "boom-4.3.1" = { + name = "boom"; + packageName = "boom"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; + }; + }; + "cryptiles-3.1.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; + sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; + }; + }; + "sntp-2.1.0" = { + name = "sntp"; + packageName = "sntp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; + sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; + }; + }; + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "sshpk-1.13.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; + sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.1" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + }; + }; + "mime-db-1.30.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; + sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "global-4.3.2" = { + name = "global"; + packageName = "global"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz"; + sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + }; + }; + "is-function-1.0.1" = { + name = "is-function"; + packageName = "is-function"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + }; + }; + "parse-headers-2.0.1" = { + name = "parse-headers"; + packageName = "parse-headers"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"; + sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; + }; + }; + "min-document-2.19.0" = { + name = "min-document"; + packageName = "min-document"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + }; + }; + "process-0.5.2" = { + name = "process"; + packageName = "process"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }; + }; + "dom-walk-0.1.1" = { + name = "dom-walk"; + packageName = "dom-walk"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"; + sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + }; + }; + "for-each-0.3.2" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; + sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + }; + }; + "trim-0.0.1" = { + name = "trim"; + packageName = "trim"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + }; + "random-access-memory-2.4.0" = { + name = "random-access-memory"; + packageName = "random-access-memory"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; + sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; + }; + }; + "dat-ignore-2.0.0" = { + name = "dat-ignore"; + packageName = "dat-ignore"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; + sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + }; + }; + "dat-link-resolve-2.1.0" = { + name = "dat-link-resolve"; + packageName = "dat-link-resolve"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.0.tgz"; + sha512 = "0dzpf71lpzr1z3g6m3v29xvcs9r12sgjpzzmg2viy3azkgpscl7p2v8im2ibsa22q64abifkibb4nc3nshs19wvai67m3gdqx15qzvn"; + }; + }; + "dat-storage-1.0.3" = { + name = "dat-storage"; + packageName = "dat-storage"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; + sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; + }; + }; + "dat-swarm-defaults-1.0.0" = { + name = "dat-swarm-defaults"; + packageName = "dat-swarm-defaults"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; + sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; + }; + }; + "hyperdrive-9.12.0" = { + name = "hyperdrive"; + packageName = "hyperdrive"; + version = "9.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.0.tgz"; + sha512 = "285nxd3xfdr51r8av9d7dal8hqa3lfrac1m46gn9b73ljwivlhhsxpbrqyhdf80v7bnmw8vpy61x77gm8cfmwv5z8pffmmnla2p8l5y"; + }; + }; + "hyperdrive-http-4.2.2" = { + name = "hyperdrive-http"; + packageName = "hyperdrive-http"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; + sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; + }; + }; + "hyperdrive-network-speed-2.0.1" = { + name = "hyperdrive-network-speed"; + packageName = "hyperdrive-network-speed"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; + sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; + }; + }; + "mirror-folder-2.1.1" = { + name = "mirror-folder"; + packageName = "mirror-folder"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; + sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + }; + }; + "multicb-1.2.2" = { + name = "multicb"; + packageName = "multicb"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz"; + sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; + }; + }; + "random-access-file-1.8.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; + sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; + }; + }; + "sparse-bitfield-3.0.3" = { + name = "sparse-bitfield"; + packageName = "sparse-bitfield"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; + sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; + }; + }; + "stream-each-1.2.2" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; + }; + }; + "untildify-3.0.2" = { + name = "untildify"; + packageName = "untildify"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; + sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; + }; + }; + "anymatch-1.3.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; + sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; + }; + }; + "micromatch-2.3.11" = { + name = "micromatch"; + packageName = "micromatch"; + version = "2.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "arr-diff-2.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + }; + "array-unique-0.2.1" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + }; + "braces-1.8.5" = { + name = "braces"; + packageName = "braces"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + }; + "expand-brackets-0.1.5" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + }; + "extglob-0.3.2" = { + name = "extglob"; + packageName = "extglob"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + }; + "filename-regex-2.0.1" = { + name = "filename-regex"; + packageName = "filename-regex"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + }; + "is-extglob-1.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + }; + "is-glob-2.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + }; + "parse-glob-3.0.4" = { + name = "parse-glob"; + packageName = "parse-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + }; + "regex-cache-0.4.4" = { + name = "regex-cache"; + packageName = "regex-cache"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; + sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; + }; + }; + "expand-range-1.8.2" = { + name = "expand-range"; + packageName = "expand-range"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + }; + "preserve-0.2.0" = { + name = "preserve"; + packageName = "preserve"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + }; + "repeat-element-1.1.2" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; + sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; + }; + }; + "fill-range-2.2.3" = { + name = "fill-range"; + packageName = "fill-range"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; + sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; + }; + }; + "is-number-2.1.0" = { + name = "is-number"; + packageName = "is-number"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "randomatic-1.1.7" = { + name = "randomatic"; + packageName = "randomatic"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + }; + }; + "is-posix-bracket-0.1.1" = { + name = "is-posix-bracket"; + packageName = "is-posix-bracket"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + }; + "for-own-0.1.5" = { + name = "for-own"; + packageName = "for-own"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "glob-base-0.3.0" = { + name = "glob-base"; + packageName = "glob-base"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + }; + "is-dotfile-1.0.3" = { + name = "is-dotfile"; + packageName = "is-dotfile"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + }; + "glob-parent-2.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + }; + "is-equal-shallow-0.1.3" = { + name = "is-equal-shallow"; + packageName = "is-equal-shallow"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + }; + "is-primitive-2.0.0" = { + name = "is-primitive"; + packageName = "is-primitive"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "dat-encoding-5.0.1" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz"; + sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; + }; + }; + "append-tree-2.4.0" = { + name = "append-tree"; + packageName = "append-tree"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.0.tgz"; + sha512 = "1ym9wsmz3fjv0wf675xclbnjp825cyvxp3a9x8af96yms45dbk8c79jrx5vgdii1zimcnr2pg305g9sw79k5yqah9267k71lsz5vv35"; + }; + }; + "dat-secret-storage-4.0.0" = { + name = "dat-secret-storage"; + packageName = "dat-secret-storage"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; + sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; + }; + }; + "multi-random-access-2.1.1" = { + name = "multi-random-access"; + packageName = "multi-random-access"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multi-random-access/-/multi-random-access-2.1.1.tgz"; + sha1 = "6462f1b204109ccc644601650110a828443d66e2"; + }; + }; + "array-lru-1.1.1" = { + name = "array-lru"; + packageName = "array-lru"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-lru/-/array-lru-1.1.1.tgz"; + sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; + }; + }; + "brfs-1.4.3" = { + name = "brfs"; + packageName = "brfs"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/brfs/-/brfs-1.4.3.tgz"; + sha1 = "db675d6f5e923e6df087fca5859c9090aaed3216"; + }; + }; + "codecs-1.2.0" = { + name = "codecs"; + packageName = "codecs"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; + sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "mutexify-1.2.0" = { + name = "mutexify"; + packageName = "mutexify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; + sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; + }; + }; + "protocol-buffers-3.2.1" = { + name = "protocol-buffers"; + packageName = "protocol-buffers"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-3.2.1.tgz"; + sha1 = "37258e17e24a082f06ebb17731e92851d1c76889"; + }; + }; + "varint-5.0.0" = { + name = "varint"; + packageName = "varint"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz"; + sha1 = "d826b89f7490732fabc0c0ed693ed475dcb29ebf"; + }; + }; + "quote-stream-1.0.2" = { + name = "quote-stream"; + packageName = "quote-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz"; + sha1 = "84963f8c9c26b942e153feeb53aae74652b7e0b2"; + }; + }; + "resolve-1.5.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; + sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; + }; + }; + "static-module-1.5.0" = { + name = "static-module"; + packageName = "static-module"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz"; + sha1 = "27da9883c41a8cd09236f842f0c1ebc6edf63d86"; + }; + }; + "through2-2.0.3" = { + name = "through2"; + packageName = "through2"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + }; + }; + "buffer-equal-0.0.1" = { + name = "buffer-equal"; + packageName = "buffer-equal"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + }; + }; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + }; + }; + "duplexer2-0.0.2" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; + sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + }; + }; + "escodegen-1.3.3" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; + sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + }; + }; + "falafel-2.1.0" = { + name = "falafel"; + packageName = "falafel"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; + sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; + }; + }; + "has-1.0.1" = { + name = "has"; + packageName = "has"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + }; + }; + "object-inspect-0.4.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; + sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; + }; + }; + "quote-stream-0.0.0" = { + name = "quote-stream"; + packageName = "quote-stream"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz"; + sha1 = "cde29e94c409b16e19dc7098b89b6658f9721d3b"; + }; + }; + "readable-stream-1.0.34" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + }; + }; + "shallow-copy-0.0.1" = { + name = "shallow-copy"; + packageName = "shallow-copy"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; + sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; + }; + }; + "static-eval-0.2.4" = { + name = "static-eval"; + packageName = "static-eval"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz"; + sha1 = "b7d34d838937b969f9641ca07d48f8ede263ea7b"; + }; + }; + "through2-0.4.2" = { + name = "through2"; + packageName = "through2"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; + sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "esutils-1.0.0" = { + name = "esutils"; + packageName = "esutils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; + }; + }; + "estraverse-1.5.1" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + }; + }; + "esprima-1.1.1" = { + name = "esprima"; + packageName = "esprima"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + }; + }; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "acorn-5.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; + sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; + }; + }; + "foreach-2.0.5" = { + name = "foreach"; + packageName = "foreach"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + }; + }; + "object-keys-1.0.11" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; + sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "escodegen-0.0.28" = { + name = "escodegen"; + packageName = "escodegen"; + version = "0.0.28"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; + sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; + }; + }; + "esprima-1.0.4" = { + name = "esprima"; + packageName = "esprima"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + }; + }; + "estraverse-1.3.2" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; + sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; + }; + }; + "xtend-2.1.2" = { + name = "xtend"; + packageName = "xtend"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; + sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; + }; + }; + "object-keys-0.4.0" = { + name = "object-keys"; + packageName = "object-keys"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; + sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336"; + }; + }; + "generate-function-2.0.0" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + }; + "generate-object-property-1.2.0" = { + name = "generate-object-property"; + packageName = "generate-object-property"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + }; + "protocol-buffers-schema-3.3.2" = { + name = "protocol-buffers-schema"; + packageName = "protocol-buffers-schema"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz"; + sha512 = "3rvq2xsb9y9vfy8vgf6ja08362bjcg132kxcwcfdik1j6j17dvlk535agpwiqzj47g1d7shcwq5h6zk5jy1ny25n4z6bzh1rfkv5mjx"; + }; + }; + "signed-varint-2.0.1" = { + name = "signed-varint"; + packageName = "signed-varint"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/signed-varint/-/signed-varint-2.0.1.tgz"; + sha1 = "50a9989da7c98c2c61dad119bc97470ef8528129"; + }; + }; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "abstract-random-access-1.1.2" = { + name = "abstract-random-access"; + packageName = "abstract-random-access"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-random-access/-/abstract-random-access-1.1.2.tgz"; + sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; + }; + }; + "sorted-array-functions-1.1.0" = { + name = "sorted-array-functions"; + packageName = "sorted-array-functions"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; + sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; + }; + }; + "duplexify-3.5.1" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; + sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g"; + }; + }; + "hypercore-6.11.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.11.0.tgz"; + sha512 = "0q0972kpj73qndhwb3msk3xkfpx1zldfw1ld815kncb0lbr7mdhawjz701y230zji0lamnznrv61cmcnx2zlqjhvcyrf9fyyr93r6ds"; + }; + }; + "sodium-universal-2.0.0" = { + name = "sodium-universal"; + packageName = "sodium-universal"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz"; + sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; + }; + }; + "stream-collector-1.0.1" = { + name = "stream-collector"; + packageName = "stream-collector"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz"; + sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; + }; + }; + "uint64be-2.0.1" = { + name = "uint64be"; + packageName = "uint64be"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; + sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + }; + }; + "unixify-1.0.0" = { + name = "unixify"; + packageName = "unixify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz"; + sha1 = "3a641c8c2ffbce4da683a5c70f03a462940c2090"; + }; + }; + "end-of-stream-1.4.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; + sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; + }; + }; + "stream-shift-1.0.0" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; + sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "atomic-batcher-1.0.2" = { + name = "atomic-batcher"; + packageName = "atomic-batcher"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-batcher/-/atomic-batcher-1.0.2.tgz"; + sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; + }; + }; + "bitfield-rle-2.1.0" = { + name = "bitfield-rle"; + packageName = "bitfield-rle"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield-rle/-/bitfield-rle-2.1.0.tgz"; + sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; + }; + }; + "bulk-write-stream-1.1.3" = { + name = "bulk-write-stream"; + packageName = "bulk-write-stream"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; + sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + }; + }; + "flat-tree-1.6.0" = { + name = "flat-tree"; + packageName = "flat-tree"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-tree/-/flat-tree-1.6.0.tgz"; + sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; + }; + }; + "hypercore-protocol-6.4.2" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "6.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.4.2.tgz"; + sha512 = "07lwyavmways0q0ljrvpgvdii96f96a692m4x8dwmdwlfgh604gjz47vs95zk2ryfs9qm5j9msvy955bgyqns2az3ypysi76k51n7y7"; + }; + }; + "memory-pager-1.1.0" = { + name = "memory-pager"; + packageName = "memory-pager"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz"; + sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri"; + }; + }; + "merkle-tree-stream-3.0.3" = { + name = "merkle-tree-stream"; + packageName = "merkle-tree-stream"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/merkle-tree-stream/-/merkle-tree-stream-3.0.3.tgz"; + sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; + }; + }; + "unordered-array-remove-1.0.2" = { + name = "unordered-array-remove"; + packageName = "unordered-array-remove"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz"; + sha1 = "c546e8f88e317a0cf2644c97ecb57dba66d250ef"; + }; + }; + "unordered-set-2.0.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.0.tgz"; + sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; + }; + }; + "varint-4.0.1" = { + name = "varint"; + packageName = "varint"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-4.0.1.tgz"; + sha1 = "490829b942d248463b2b35097995c3bf737198e9"; + }; + }; + "sorted-indexof-1.0.0" = { + name = "sorted-indexof"; + packageName = "sorted-indexof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-indexof/-/sorted-indexof-1.0.0.tgz"; + sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; + }; + }; + "sodium-javascript-0.5.4" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; + sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + }; + }; + "sodium-native-2.1.4" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; + sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + }; + }; + "blake2b-2.1.2" = { + name = "blake2b"; + packageName = "blake2b"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b/-/blake2b-2.1.2.tgz"; + sha1 = "6880eddca35cfede92c4fb2724221334f989145a"; + }; + }; + "nanoassert-1.1.0" = { + name = "nanoassert"; + packageName = "nanoassert"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; + sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; + }; + }; + "siphash24-1.1.0" = { + name = "siphash24"; + packageName = "siphash24"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz"; + sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; + }; + }; + "xsalsa20-1.0.2" = { + name = "xsalsa20"; + packageName = "xsalsa20"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz"; + sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; + }; + }; + "blake2b-wasm-1.1.4" = { + name = "blake2b-wasm"; + packageName = "blake2b-wasm"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.4.tgz"; + sha512 = "3hgcz1c3h2hxgavmlf5r4dwk0wy2sg9y4lfs5ifj4spdlwyy3ki9i1i4hjaw0029c896d6yw424mw2j1nf4qyibkz2lbh1ws6z6rdlg"; + }; + }; + "base64-to-uint8array-1.0.0" = { + name = "base64-to-uint8array"; + packageName = "base64-to-uint8array"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-to-uint8array/-/base64-to-uint8array-1.0.0.tgz"; + sha512 = "01a4ip2ivflpjsx4flnww5fqvdcsy2sqnjgp2cii6b2gnkkccr02vbf2y8r2wlcab4pb8x47qb3jpahca61v584bmz9xcwyqx0xdf3n"; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + }; + }; + "corsify-2.1.0" = { + name = "corsify"; + packageName = "corsify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/corsify/-/corsify-2.1.0.tgz"; + sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; + }; + }; + "directory-index-html-2.1.0" = { + name = "directory-index-html"; + packageName = "directory-index-html"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/directory-index-html/-/directory-index-html-2.1.0.tgz"; + sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + }; + }; + "range-parser-1.2.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; + sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + }; + }; + "http-methods-0.1.0" = { + name = "http-methods"; + packageName = "http-methods"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-methods/-/http-methods-0.1.0.tgz"; + sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; + }; + }; + "content-types-0.1.0" = { + name = "content-types"; + packageName = "content-types"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/content-types/-/content-types-0.1.0.tgz"; + sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; + }; + }; + "body-0.1.0" = { + name = "body"; + packageName = "body"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body/-/body-0.1.0.tgz"; + sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; + }; + }; + "iterators-0.1.0" = { + name = "iterators"; + packageName = "iterators"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iterators/-/iterators-0.1.0.tgz"; + sha1 = "d03f666ca4e6130138565997cacea54164203156"; + }; + }; + "ap-0.1.0" = { + name = "ap"; + packageName = "ap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ap/-/ap-0.1.0.tgz"; + sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; + }; + }; + "fd-read-stream-1.1.0" = { + name = "fd-read-stream"; + packageName = "fd-read-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-read-stream/-/fd-read-stream-1.1.0.tgz"; + sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; + }; + }; + "recursive-watch-1.1.2" = { + name = "recursive-watch"; + packageName = "recursive-watch"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; + sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; + }; + }; + "ttl-1.3.1" = { + name = "ttl"; + packageName = "ttl"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz"; + sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr"; + }; + }; + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "township-client-1.3.2" = { + name = "township-client"; + packageName = "township-client"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz"; + sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; + }; + }; + "is-string-1.0.4" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz"; + sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; + }; + }; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + }; + }; + "nanobus-3.3.0" = { + name = "nanobus"; + packageName = "nanobus"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; + sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; + }; + }; + "status-logger-3.1.1" = { + name = "status-logger"; + packageName = "status-logger"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; + sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; + }; + }; + "nanotiming-1.0.1" = { + name = "nanotiming"; + packageName = "nanotiming"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; + sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; + }; + }; + "ansi-diff-stream-1.2.0" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; + sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + }; + }; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + }; + "wrap-ansi-3.0.1" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; + sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + }; + "pkginfo-0.4.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; + sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; + }; + }; + "read-1.0.7" = { + name = "read"; + packageName = "read"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + }; + }; + "revalidator-0.1.8" = { + name = "revalidator"; + packageName = "revalidator"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + }; + }; + "utile-0.3.0" = { + name = "utile"; + packageName = "utile"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz"; + sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; + }; + }; + "winston-2.1.1" = { + name = "winston"; + packageName = "winston"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; + sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + }; + }; + "mute-stream-0.0.7" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "deep-equal-0.2.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + }; + }; + "i-0.3.6" = { + name = "i"; + packageName = "i"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; + sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; + }; + }; + "ncp-1.0.1" = { + name = "ncp"; + packageName = "ncp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; + sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; + }; + }; + "async-1.0.0" = { + name = "async"; + packageName = "async"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; + sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + }; + }; + "colors-1.0.3" = { + name = "colors"; + packageName = "colors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + }; + "cycle-1.0.3" = { + name = "cycle"; + packageName = "cycle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + }; + "eyes-0.1.8" = { + name = "eyes"; + packageName = "eyes"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + }; + "pkginfo-0.3.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + }; + }; + "stack-trace-0.0.10" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + }; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "brace-expansion-1.1.8" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "cliclopts-1.1.1" = { + name = "cliclopts"; + packageName = "cliclopts"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cliclopts/-/cliclopts-1.1.1.tgz"; + sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; + }; + }; + "stream-parser-0.3.1" = { + name = "stream-parser"; + packageName = "stream-parser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz"; + sha1 = "1618548694420021a1182ff0af1911c129761773"; + }; + }; + "findup-sync-0.3.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; + sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; + }; + }; + "grunt-known-options-1.1.0" = { + name = "grunt-known-options"; + packageName = "grunt-known-options"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; + sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + }; + }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + }; + }; + "diff-3.3.1" = { + name = "diff"; + packageName = "diff"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; + sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + }; + }; + "growl-1.10.3" = { + name = "growl"; + packageName = "growl"; + version = "1.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; + sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + }; + }; + "he-1.1.1" = { + name = "he"; + packageName = "he"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; + sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + }; + }; + "supports-color-4.4.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; + sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + }; + }; + "optparse-1.0.5" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; + }; + }; + "slasp-0.0.4" = { + name = "slasp"; + packageName = "slasp"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; + sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; + }; + }; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; + }; + }; + "osenv-0.1.4" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; + sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "tar-2.2.1" = { + name = "tar"; + packageName = "tar"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; + sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; + }; + }; + "which-1.3.0" = { + name = "which"; + packageName = "which"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; + sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; + }; + }; + "are-we-there-yet-1.1.4" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; + sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "wide-align-1.1.2" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; + sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; + "rc-1.2.2" = { + name = "rc"; + packageName = "rc"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz"; + sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"; + }; + }; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "semver-5.4.1" = { + name = "semver"; + packageName = "semver"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + }; + }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "tar-pack-3.4.1" = { + name = "tar-pack"; + packageName = "tar-pack"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; + sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; + }; + }; + "deep-extend-0.4.2" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; + sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "form-data-2.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + }; + }; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + }; + }; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + }; + }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + }; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "fstream-ignore-1.0.5" = { + name = "fstream-ignore"; + packageName = "fstream-ignore"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; + sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; + }; + }; + "uid-number-0.0.6" = { + name = "uid-number"; + packageName = "uid-number"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; + sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + }; + }; + "async-2.1.5" = { + name = "async"; + packageName = "async"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + }; + }; + "cli-table-0.3.1" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "readdirp-2.1.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; + sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + }; + }; + "lodash-4.17.4" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "set-immediate-shim-1.0.1" = { + name = "set-immediate-shim"; + packageName = "set-immediate-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + }; + }; +in +{ + bower = nodeEnv.buildNodePackage { + name = "bower"; + packageName = "bower"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; + sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The browser package manager"; + homepage = http://bower.io/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + coffee-script = nodeEnv.buildNodePackage { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Unfancy JavaScript"; + homepage = http://coffeescript.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + dat = nodeEnv.buildNodePackage { + name = "dat"; + packageName = "dat"; + version = "13.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat/-/dat-13.9.2.tgz"; + sha512 = "05x3ij83al1f0r7fiaq788q4k81vlbmydsa1g829pq0q6795p57b12mmmx8nvc8khbbv1iphr065c7h3d7kc9ylps39xn1qdg64jz90"; + }; + dependencies = [ + sources."bytes-3.0.0" + sources."chalk-2.3.0" + sources."cli-truncate-1.1.0" + (sources."dat-doctor-1.3.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."lru-2.0.1" + ]; + }) + sources."dat-encoding-4.0.2" + (sources."dat-json-1.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."dat-link-resolve-1.1.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."dat-log-1.1.1" + (sources."dat-node-3.5.6" // { + dependencies = [ + (sources."dat-link-resolve-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."dat-encoding-5.0.1" + sources."varint-5.0.0" + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."minimist-0.0.8" + sources."esprima-1.0.4" + sources."estraverse-1.3.2" + sources."object-keys-0.4.0" + sources."unordered-set-2.0.0" + ]; + }) + sources."dat-registry-4.0.0" + sources."debug-3.1.0" + (sources."neat-log-1.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."prettier-bytes-1.0.4" + sources."progress-string-1.2.2" + (sources."prompt-1.0.0" // { + dependencies = [ + sources."async-1.0.0" + ]; + }) + sources."pump-1.0.3" + sources."rimraf-2.6.2" + sources."speedometer-1.0.0" + (sources."subcommand-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."throttle-1.0.3" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."xtend-4.0.1" + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.5.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."slice-ansi-1.0.0" + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + sources."datland-swarm-defaults-1.0.2" + (sources."discovery-swarm-4.4.2" // { + dependencies = [ + sources."thunky-0.1.0" + ]; + }) + (sources."dns-discovery-5.6.1" // { + dependencies = [ + sources."thunky-0.1.0" + ]; + }) + sources."minimist-1.2.0" + sources."thunky-1.0.2" + sources."ms-2.0.0" + sources."buffer-equals-1.0.4" + sources."connections-1.4.2" + sources."discovery-channel-5.4.6" + sources."length-prefixed-message-3.0.3" + sources."to-buffer-1.1.0" + sources."utp-native-1.6.2" + (sources."bittorrent-dht-7.8.2" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."pretty-hash-1.0.1" + sources."bencode-1.0.0" + sources."inherits-2.0.3" + sources."k-bucket-3.3.1" + sources."k-rpc-4.2.1" + sources."lru-3.1.0" + sources."randombytes-2.0.5" + sources."safe-buffer-5.1.1" + sources."simple-sha1-2.1.0" + sources."k-rpc-socket-1.7.2" + sources."rusha-0.8.11" + sources."varint-3.0.1" + sources."nan-2.8.0" + sources."node-gyp-build-3.2.2" + sources."readable-stream-2.3.3" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."dns-socket-1.6.2" + sources."dns-txt-2.0.2" + sources."multicast-dns-6.2.1" + sources."network-address-1.1.2" + sources."unordered-set-1.1.0" + sources."dns-packet-1.2.2" + sources."ip-1.1.5" + sources."buffer-indexof-1.1.1" + sources."toiletdb-1.4.0" + sources."last-one-wins-1.0.4" + sources."dat-dns-1.3.2" + sources."nets-3.2.0" + sources."call-me-maybe-1.0.1" + sources."concat-stream-1.6.0" + sources."typedarray-0.0.6" + sources."request-2.83.0" + sources."xhr-2.4.1" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-5.5.2" + sources."har-schema-2.0.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."json-schema-traverse-0.3.1" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + sources."global-4.3.2" + sources."is-function-1.0.1" + sources."parse-headers-2.0.1" + sources."min-document-2.19.0" + sources."process-0.5.2" + sources."dom-walk-0.1.1" + sources."for-each-0.3.2" + sources."trim-0.0.1" + sources."random-access-memory-2.4.0" + sources."dat-ignore-2.0.0" + (sources."dat-storage-1.0.3" // { + dependencies = [ + sources."xtend-2.1.2" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + sources."dat-swarm-defaults-1.0.0" + (sources."hyperdrive-9.12.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + sources."varint-4.0.1" + ]; + }) + sources."hyperdrive-http-4.2.2" + (sources."hyperdrive-network-speed-2.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."mirror-folder-2.1.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + sources."multicb-1.2.2" + (sources."random-access-file-1.8.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."sparse-bitfield-3.0.3" + sources."stream-each-1.2.2" + sources."untildify-3.0.2" + sources."anymatch-1.3.2" + sources."micromatch-2.3.11" + sources."normalize-path-2.1.1" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.4" + sources."arr-flatten-1.1.0" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.6" + sources."is-posix-bracket-0.1.1" + sources."for-own-0.1.5" + sources."is-extendable-0.1.1" + sources."for-in-1.0.2" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.3" + sources."glob-parent-2.0.0" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."remove-trailing-separator-1.1.0" + (sources."append-tree-2.4.0" // { + dependencies = [ + sources."xtend-4.0.1" + ]; + }) + sources."dat-secret-storage-4.0.0" + sources."multi-random-access-2.1.1" + sources."array-lru-1.1.1" + sources."brfs-1.4.3" + sources."codecs-1.2.0" + sources."from2-2.3.0" + sources."mutexify-1.2.0" + sources."protocol-buffers-3.2.1" + sources."quote-stream-1.0.2" + sources."resolve-1.5.0" + (sources."static-module-1.5.0" // { + dependencies = [ + sources."quote-stream-0.0.0" + sources."through2-0.4.2" + ]; + }) + sources."through2-2.0.3" + sources."buffer-equal-0.0.1" + sources."path-parse-1.0.5" + (sources."duplexer2-0.0.2" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."escodegen-1.3.3" + sources."falafel-2.1.0" + sources."has-1.0.1" + sources."object-inspect-0.4.0" + sources."shallow-copy-0.0.1" + (sources."static-eval-0.2.4" // { + dependencies = [ + sources."escodegen-0.0.28" + ]; + }) + sources."esutils-1.0.0" + sources."estraverse-1.5.1" + sources."esprima-1.1.1" + sources."source-map-0.1.43" + sources."amdefine-1.0.1" + sources."acorn-5.3.0" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."function-bind-1.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."protocol-buffers-schema-3.3.2" + sources."signed-varint-2.0.1" + sources."is-property-1.0.2" + sources."os-homedir-1.0.2" + sources."abstract-random-access-1.1.2" + sources."sorted-array-functions-1.1.0" + sources."duplexify-3.5.1" + (sources."hypercore-6.11.0" // { + dependencies = [ + sources."varint-5.0.0" + ]; + }) + sources."sodium-universal-2.0.0" + sources."stream-collector-1.0.1" + sources."uint64be-2.0.1" + sources."unixify-1.0.0" + sources."end-of-stream-1.4.0" + sources."stream-shift-1.0.0" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."atomic-batcher-1.0.2" + sources."bitfield-rle-2.1.0" + sources."bulk-write-stream-1.1.3" + sources."flat-tree-1.6.0" + sources."hypercore-protocol-6.4.2" + sources."memory-pager-1.1.0" + sources."merkle-tree-stream-3.0.3" + sources."unordered-array-remove-1.0.2" + sources."sorted-indexof-1.0.0" + sources."sodium-javascript-0.5.4" + sources."sodium-native-2.1.4" + sources."blake2b-2.1.2" + sources."nanoassert-1.1.0" + sources."siphash24-1.1.0" + sources."xsalsa20-1.0.2" + sources."blake2b-wasm-1.1.4" + sources."base64-to-uint8array-1.0.0" + sources."ini-1.3.5" + sources."corsify-2.1.0" + sources."directory-index-html-2.1.0" + sources."mime-1.6.0" + sources."range-parser-1.2.0" + sources."http-methods-0.1.0" + sources."content-types-0.1.0" + sources."body-0.1.0" + sources."iterators-0.1.0" + sources."ap-0.1.0" + sources."fd-read-stream-1.1.0" + sources."recursive-watch-1.1.2" + sources."ttl-1.3.1" + sources."buffer-alloc-unsafe-1.0.0" + sources."mkdirp-0.5.1" + sources."township-client-1.3.2" + sources."is-string-1.0.4" + sources."lodash.throttle-4.1.1" + sources."nanobus-3.3.0" + sources."status-logger-3.1.1" + sources."nanotiming-1.0.1" + sources."ansi-diff-stream-1.2.0" + sources."lodash.flattendeep-4.4.0" + sources."wrap-ansi-3.0.1" + sources."colors-1.1.2" + sources."pkginfo-0.4.1" + sources."read-1.0.7" + sources."revalidator-0.1.8" + sources."utile-0.3.0" + (sources."winston-2.1.1" // { + dependencies = [ + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."mute-stream-0.0.7" + sources."async-0.9.2" + sources."deep-equal-0.2.2" + sources."i-0.3.6" + sources."ncp-1.0.1" + sources."cycle-1.0.3" + sources."eyes-0.1.8" + sources."stack-trace-0.0.10" + sources."glob-7.1.2" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.4" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."cliclopts-1.1.1" + sources."stream-parser-0.3.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Dat is the package manager for data. Easily share and version control data."; + homepage = https://datproject.org/; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + }; + grunt-cli = nodeEnv.buildNodePackage { + name = "grunt-cli"; + packageName = "grunt-cli"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; + sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; + }; + dependencies = [ + sources."findup-sync-0.3.0" + sources."grunt-known-options-1.1.0" + sources."nopt-3.0.6" + sources."resolve-1.1.7" + sources."glob-5.0.15" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."abbrev-1.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The grunt command line interface"; + homepage = "https://github.com/gruntjs/grunt-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz"; + sha512 = "0s6517vczlh2vm9syq4kpwkwrr7panih1cip6aq8qjn9cw2gvbl14lql0y81dh10ims8p1f2qm4vkbifcrs2hw1v7cca9j71n76f5fi"; + }; + dependencies = [ + sources."browser-stdout-1.3.0" + sources."commander-2.11.0" + sources."debug-3.1.0" + sources."diff-3.3.1" + sources."escape-string-regexp-1.0.5" + sources."glob-7.1.2" + sources."growl-1.10.3" + sources."he-1.1.1" + sources."mkdirp-0.5.1" + sources."supports-color-4.4.0" + sources."ms-2.0.0" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."minimist-0.0.8" + sources."has-flag-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + nijs = nodeEnv.buildNodePackage { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; + src = fetchurl { + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; + }; + dependencies = [ + sources."optparse-1.0.5" + sources."slasp-0.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An internal DSL for the Nix package manager in JavaScript"; + homepage = "https://github.com/svanderburg/nijs#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-gyp = nodeEnv.buildNodePackage { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; + sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; + }; + dependencies = [ + sources."fstream-1.0.11" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."minimatch-3.0.4" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-4.1.2" + sources."osenv-0.1.4" + sources."request-2.83.0" + sources."rimraf-2.6.2" + sources."semver-5.3.0" + sources."tar-2.2.1" + sources."which-1.3.0" + sources."inherits-2.0.3" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."minimist-0.0.8" + sources."abbrev-1.1.1" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + sources."gauge-2.7.4" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."readable-stream-2.3.3" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."aproba-1.2.0" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.2" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.1.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-5.5.2" + sources."har-schema-2.0.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."json-schema-traverse-0.3.1" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + sources."block-stream-0.0.9" + sources."isexe-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon build tool"; + homepage = "https://github.com/nodejs/node-gyp#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-gyp-build = nodeEnv.buildNodePackage { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; + sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Build tool and bindings loader for node-gyp that supports prebuilds"; + homepage = https://github.com/mafintosh/node-gyp-build; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.39"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; + sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; + }; + dependencies = [ + sources."mkdirp-0.5.1" + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + (sources."rc-1.2.2" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."request-2.81.0" + sources."hawk-3.1.3" + sources."rimraf-2.6.2" + sources."semver-5.4.1" + sources."detect-libc-1.0.3" + sources."tar-2.2.1" + sources."tar-pack-3.4.1" + sources."minimist-0.0.8" + sources."abbrev-1.1.1" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + sources."gauge-2.7.4" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."readable-stream-2.3.3" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."aproba-1.2.0" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.2" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.1.1" + sources."deep-extend-0.4.2" + sources."ini-1.3.5" + sources."strip-json-comments-2.0.1" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."glob-7.1.2" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."block-stream-0.0.9" + sources."fstream-1.0.11" + sources."graceful-fs-4.1.11" + sources."debug-2.6.9" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."ms-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + }; + semver = nodeEnv.buildNodePackage { + name = "semver"; + packageName = "semver"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The semantic version parser used by npm."; + homepage = "https://github.com/npm/node-semver#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + }; + sloc = nodeEnv.buildNodePackage { + name = "sloc"; + packageName = "sloc"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; + sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; + }; + dependencies = [ + sources."async-2.1.5" + sources."cli-table-0.3.1" + sources."commander-2.9.0" + sources."readdirp-2.1.0" + sources."lodash-4.17.4" + sources."colors-1.0.3" + sources."graceful-readlink-1.0.1" + sources."graceful-fs-4.1.11" + sources."minimatch-3.0.4" + sources."readable-stream-2.3.3" + sources."set-immediate-shim-1.0.1" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "sloc is a simple tool to count SLOC (source lines of code)"; + homepage = "https://github.com/flosse/sloc#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; +} \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 90ee8d905a6e..80e34ecd06ac 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, jbuilder +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, jbuilder , cmdliner, astring, fmt, result }: @@ -12,7 +12,7 @@ let param = } else { version = "0.7.2"; sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; - buildInputs = [ ocamlbuild opam topkg ]; + buildInputs = [ ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; }; in diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index feeb94a5c462..65a310c9cf04 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,6 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg, opam }: - -let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg }: buildOcaml rec { name = "asn1-combinators"; @@ -15,20 +13,17 @@ buildOcaml rec { sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; }; - buildInputs = [ ocaml findlib ounit topkg opam ]; + buildInputs = [ ocaml findlib ounit topkg ]; propagatedBuildInputs = [ result cstruct zarith ]; createFindlibDestdir = true; - buildPhase = "ocaml ${ocamlFlags} pkg/pkg.ml build --tests true"; + buildPhase = "${topkg.run} build --tests true"; - installPhase = '' - opam-installer --script --prefix=$out | sh - ln -s $out/lib/asn1-combinators $out/lib/ocaml/${ocaml.version}/site-lib - ''; + inherit (topkg) installPhase; doCheck = true; - checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; + checkPhase = "${topkg.run} test"; meta = { homepage = https://github.com/mirleft/ocaml-asn1-combinators; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index d172b0f74639..97c59d8581fb 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, opam}: +{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }: buildOcaml rec { version = "0.8.3"; @@ -11,16 +11,9 @@ buildOcaml rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build - ''; - - installPhase = '' - opam-installer --script --prefix=$out astring.install | sh - ln -s $out/lib/astring $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = { homepage = http://erratique.ch/software/astring; diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index f8590de2b155..3cb9b405d5a2 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg , astring, fmt, fpath, logs, rresult }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix similarity index 83% rename from pkgs/development/ocaml-modules/ocaml-cairo2/default.nix rename to pkgs/development/ocaml-modules/cairo2/default.nix index d9cab2a759da..b37dd413f693 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -6,17 +6,16 @@ let inherit (stdenv.lib) optionals; - pname = "ocaml-cairo2"; - version = "0.4.6"; + version = "0.5"; in stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "ocaml${ocaml.version}-cairo2-${version}"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1279/cairo2-0.4.6.tar.gz"; - sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; + url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz"; + sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj"; }; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +38,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; meta = with stdenv.lib; { - homepage = http://forge.ocamlcore.org/projects/cairo; + homepage = "https://github.com/Chris00/ocaml-cairo"; description = "Binding to Cairo, a 2D Vector Graphics Library"; longDescription = '' This is a binding to Cairo, a 2D graphics library with support for diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 2e2abe897e0f..4b055a130fd2 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: let pname = "cmdliner"; @@ -17,20 +17,11 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - nativeBuildInputs = [ ocamlbuild opam topkg ]; + nativeBuildInputs = [ ocamlbuild topkg ]; buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ result ]; - createFindlibDestdir = true; - - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build - ''; - - installPhase = '' - opam-installer --script --prefix=$out | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { homepage = http://erratique.ch/software/cmdliner; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 3e571dd791ad..ef92a005c773 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.99.0"; + version = "1.0.0"; name = "ocaml${ocaml.version}-cohttp-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0y8qhzfwrc6486apmp2rsj822cnfhnz4w8rsb52w5wqmsgjxx1bj"; + sha256 = "0h9ak2bvhmcdxickvybpg45il33xszh2ksacpjgqrnnslxnh81ig"; }; buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index eaf07818aeb9..4832f5c39af3 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib -, ocamlbuild, topkg, opam +, ocamlbuild, topkg , uri, xmlm, omd, ezjsonm }: stdenv.mkDerivation rec { @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2"; }; - createFindlibDestdir = true; - - buildInputs = [ ocaml opam ocamlbuild findlib topkg ]; + buildInputs = [ ocaml ocamlbuild findlib topkg ]; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 07909d1a465a..dc6cf491eb44 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.coherentpdf.com/; + homepage = https://www.coherentpdf.com/; platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix index 1bdf70e86c5a..37400856f1ae 100644 --- a/pkgs/development/ocaml-modules/cpuid/default.nix +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ocb-stubblr }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpuid-0.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 834b810183ba..4fd75e7aac53 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; - broken = true; }; } diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 389a136aae6b..70ec7fd34ae1 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, opam +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg }: if !stdenv.lib.versionAtLeast ocaml.version "4.03" @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix new file mode 100644 index 000000000000..cf8b5335d594 --- /dev/null +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.3" +then throw "digestif is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-digestif-${version}"; + version = "0.5"; + + src = fetchurl { + url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz"; + sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd"; + }; + + unpackCmd = "tar -xjf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Simple hash algorithms in OCaml"; + homepage = "https://github.com/mirage/digestif"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix new file mode 100644 index 000000000000..9b6e56266143 --- /dev/null +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ocaml, findlib, jbuilder }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; + +stdenv.mkDerivation rec { + pname = "dtoa"; + name = "ocaml-${pname}-${version}"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib jbuilder ]; + + buildPhase = "jbuilder build -p dtoa"; + + inherit (jbuilder) installPhase; + + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + + meta = with stdenv.lib; { + homepage = https://github.com/flowtype/ocaml-dtoa; + description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm."; + license = licenses.mit; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.eqyiel ]; + }; +} diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh index 096d8f8bf635..9868ab93f791 100644 --- a/pkgs/development/ocaml-modules/eliom/setup-hook.sh +++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh @@ -2,4 +2,4 @@ addOcsigenDistilleryTemplate() { addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates } -envHooks+=(addOcsigenDistilleryTemplate) +addEnvHooks "$hostOffset" addOcsigenDistilleryTemplate diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix new file mode 100644 index 000000000000..e8553ebf812e --- /dev/null +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, ocaml, findlib }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-facile-${version}"; + + version = "1.1.3"; + + src = fetchurl { + url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz"; + sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw"; + }; + + dontAddPrefix = 1; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + installFlags = [ "FACILEDIR=$(OCAMLFIND_DESTDIR)/facile" ]; + + postInstall = '' + cat > $OCAMLFIND_DESTDIR/facile/META < Makefile.config + cat Makefile.config.model >> Makefile.config sed -i Makefile.config \ -e 's|^MLGMPIDL_PREFIX.*$|MLGMPIDL_PREFIX = $out|' \ -e 's|^GMP_PREFIX.*$|GMP_PREFIX = ${gmp.dev}|' \ diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 534bb4de48ca..69921537f5b5 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, js_of_ocaml +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml , jsooSupport ? true }: @@ -25,7 +25,7 @@ stdenv.mkDerivation { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ] + buildInputs = [ ocaml findlib ocamlbuild topkg ] ++ stdenv.lib.optional jsooSupport js_of_ocaml; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 3fa8e9d46b40..5482d7ac87cd 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, mysql }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -26,7 +26,14 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - propagatedBuildInputs = [ mysql.client ]; + propagatedBuildInputs = [ mysql.connector-c ]; + + patches = [ + (fetchpatch { + url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch"; + sha256 = "0018s2wcrvbsw9yaqmwq500qmikwffrgdp5xg9b8v7ixhd4gi6hn"; + }) + ]; meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index a7fa59e14469..cfe3f37800de 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg , cpuid, ocb-stubblr , cstruct, zarith, ppx_sexp_conv, sexplib , cstruct-lwt ? null @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg opam cpuid ocb-stubblr + buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ppx_sexp_conv ]; propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt cstruct-lwt; @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { ''; inherit (topkg) installPhase; - createFindlibDestdir = true; - meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 950395bd7eaa..2dffb472f3e8 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,30 +1,27 @@ -{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, opam, ocb-stubblr +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: with stdenv.lib; +if !versionAtLeast ocaml.version "4.03" +then throw "notty is not available for OCaml ${ocaml.version}" +else + let withLwt = lwt != null; in -buildOcaml rec { - version = "0.1.1a"; - name = "notty"; +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "ocaml${ocaml.version}-notty-${version}"; - minimumSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "pqwy"; - repo = "notty"; - rev = "53f5946653490fce980dc5d8cadf8b122cff4f19"; - sha256 = "0qmwb1hrp04py2i5spy0yd6c5jqxyss3wzvlkgxyl9r07kvsx6xf"; + src = fetchurl { + url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; + sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0"; }; - patches = [ (fetchpatch { - url = https://github.com/dbuenzli/notty/commit/b0e12930acc26d030a74d6d63d622ae220b12c92.patch; - sha256 = "0pklplbnjbsjriqj73pc8fsadg404px534w7zknz2617zb44m6x6"; - })]; + unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ findlib opam topkg ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; @@ -34,7 +31,8 @@ buildOcaml rec { inherit (topkg) installPhase; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/pqwy/notty"; + inherit (ocaml.meta) platforms; description = "Declarative terminal graphics for OCaml"; license = licenses.isc; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh index a93a7250bebb..6d9504370165 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh +++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh @@ -2,4 +2,4 @@ addOcamlMakefile () { export OCAMLMAKEFILE="@out@/include/OCamlMakefile" } -envHooks+=(addOcamlMakefile) +addEnvHooks "$targetOffset" addOcamlMakefile diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 5de3993d9619..573de26096cd 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,20 +1,14 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip -, gnutls, nettle_3_3 }: +, gnutls, nettle }: -# These overrides are just temporary, until ocamlnet supports nettle-3.4. -let gnutls_orig = gnutls; in -let gnutls = gnutls_orig.override { nettle = nettle_3_3; }; - nettle = nettle_3_3; -in - -let version = "4.1.4"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocamlnet-${version}"; src = fetchurl { url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; + sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index bb4b24cec67d..4071cb8a639d 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, astring }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./pkg-config.patch ]; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ astring ]; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index f1668160df19..57e3c9bfa745 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "octavius is not available for OCaml ${ocaml.version}" else @@ -12,7 +12,7 @@ stdenv.mkDerivation { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 94c2e1208839..73ffd7f41ea9 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,19 +1,19 @@ -{ stdenv, ocaml, findlib, fetchurl, curl, ncurses }: +{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: stdenv.mkDerivation rec { - name = "ocurl-0.7.8"; + name = "ocurl-0.8.0"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2"; - sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr"; + url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; + sha256 = "0292knvm9g038br0dc03lcsnbjqycyiqha256dp4bxkz3vmmz4wr"; }; - buildInputs = [ ocaml findlib ncurses ]; + buildInputs = [ pkgconfig ocaml findlib ncurses ]; propagatedBuildInputs = [ curl ]; createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; - license = stdenv.lib.licenses.bsd3; - homepage = http://ocurl.forge.ocamlcore.org/; + license = stdenv.lib.licenses.mit; + homepage = "http://ygrek.org.ua/p/ocurl/"; maintainers = with stdenv.lib.maintainers; [ bennofs ]; platforms = ocaml.meta.platforms or []; }; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 5deef60520bd..05c25c81d5a0 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uutf, result }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: let pname = "otfm"; @@ -17,12 +17,10 @@ stdenv.mkDerivation rec { sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ uutf result ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index 39e7ce754d27..ac853c94094b 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,40 +1,35 @@ -{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam, - ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, result, nocrypto, astring}: +{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, findlib, topkg +, ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, rresult, nocrypto +, astring +}: -let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "otr is not available for OCaml ${ocaml.version}" +else -buildOcaml rec { - name = "otr"; - version = "0.3.3"; - - minimumSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-otr-${version}"; + version = "0.3.4"; src = fetchFromGitHub { owner = "hannesm"; repo = "ocaml-otr"; rev = "${version}"; - sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr"; + sha256 = "0ixf0jvccmcbhk5mhzqakfzimvz200wkdkq3z2d0bdzyggslbdl4"; }; - buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ppx_cstruct ]; - propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ]; + buildInputs = [ ocaml ocamlbuild findlib topkg ppx_tools ppx_sexp_conv ppx_cstruct ]; + propagatedBuildInputs = [ cstruct sexplib rresult nocrypto astring ]; - buildPhase = '' - ocaml ${ocamlFlags} pkg/pkg.ml build \ - --tests true - ''; + buildPhase = "${topkg.run} build --tests true"; - installPhase = '' - opam-installer --prefix=$out --script | sh - ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib - ''; + inherit (topkg) installPhase; doCheck = true; - checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; - - createFindlibDestdir = true; + checkPhase = "${topkg.run} test"; meta = with stdenv.lib; { + inherit (ocaml.meta) platforms; homepage = https://github.com/hannesm/ocaml-otr; description = "Off-the-record messaging protocol, purely in OCaml"; license = licenses.bsd2; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 10f9df04f38c..fb06fd7f935f 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, cppo +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo , ppx_import, ppx_deriving, yojson, ounit }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_import ]; propagatedBuildInputs = [ ppx_deriving yojson ]; diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix new file mode 100644 index 000000000000..fc3fa81a02a9 --- /dev/null +++ b/pkgs/development/ocaml-modules/psq/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "psq is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-psq-${version}"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz"; + sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp"; + }; + + unpackCmd = "tar -xjf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Functional Priority Search Queues for OCaml"; + homepage = "https://github.com/pqwy/psq"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.isc; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index bb4bbef516c8..2e3a627a3d1c 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam, js_of_ocaml }: +{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: buildOcaml rec { version = "0.8.3"; @@ -11,13 +11,11 @@ buildOcaml rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam js_of_ocaml ]; + buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ]; propagatedBuildInputs = [ result ]; - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml true - ''; + buildPhase = "${topkg.run} build --with-js_of_ocaml true"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index 7dda38620309..91b0d22a8528 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, obuild }: -let version = "2.0.2"; in +let version = "2.0.3"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ptmap-${version}"; src = fetchzip { url = "https://github.com/backtracking/ptmap/archive/v${version}.tar.gz"; - sha256 = "093qax4lhpv1vcgwqh5b3pmy769hv5d8pqj1kjynh1z1xibv2qxc"; + sha256 = "19xykhqk7q25r1pj8rpfj53j2r9ls8mxi1w5m2wqshrf20gf078h"; }; buildInputs = [ ocaml findlib obuild ]; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 5a720aead806..920ee05244a1 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-react-1.2.1"; @@ -9,9 +9,7 @@ stdenv.mkDerivation { }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib topkg ocamlbuild opam ]; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib topkg ocamlbuild ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index f9951b56da2d..d1a796a58e51 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-rresult-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index ecd806ecadc9..9a655e055131 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,9 +1,25 @@ +/* Topkg is a packager for distributing OCaml software. This derivation +provides facilities to describe derivations for OCaml libraries +using topkg. +The `buildPhase` and `installPhase` attributes can be reused directly +in many cases. When more fine-grained control on how to run the “topkg” +build system is required, the attribute `run` can be used. +*/ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: if !stdenv.lib.versionAtLeast ocaml.version "4.01" then throw "topkg is not available for OCaml ${ocaml.version}" else +let +/* This command allows to run the “topkg” build system. + * It is usually called with `build` or `test` as argument. + * Packages that use `topkg` may call this command as part of + * their `buildPhase` or `checkPhase`. +*/ + run = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml"; +in + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-topkg-${version}"; version = "0.9.1"; @@ -13,14 +29,15 @@ stdenv.mkDerivation rec { sha256 = "1slrzbmyp81xhgsfwwqs2d6gxzvqx0gcp34rq00h5iblhcq7myx6"; }; - nativeBuildInputs = [ opam ]; buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ result ]; unpackCmd = "tar xjf ${src}"; - buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build"; + buildPhase = "${run} build"; createFindlibDestdir = true; - installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + + passthru = { inherit run; }; meta = { homepage = http://erratique.ch/software/topkg; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 1b90a539ac8c..4230d098e0da 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, opam, ocb-stubblr }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -19,11 +19,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild topkg result opam ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ]; propagatedBuildInputs = [ SDL2 ctypes ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; preConfigure = '' diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index fa26b305da2d..ed868c30a442 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }: let pname = "ulex"; + param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "1.2"; + sha256 = "08yf2x9a52l2y4savjqfjd2xy4pjd1rpla2ylrr9qrz1drpfw4ic"; + } else { + version = "1.1"; + sha256 = "0cmscxcmcxhlshh4jd0lzw5ffzns12x3bj7h27smbc8waxkwffhl"; + }; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.1"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + inherit (param) version; - src = fetchurl { - url = "http://www.cduce.org/download/${pname}-${version}.tar.gz"; - sha256 = "0fjlkwps14adfgxdrbb4yg65fhyimplvjjs1xqj5np197cig67x0"; + src = fetchFromGitHub { + owner = "whitequark"; + repo = pname; + rev = "v${version}"; + inherit (param) sha256; }; createFindlibDestdir = true; @@ -21,7 +31,7 @@ stdenv.mkDerivation rec { buildFlags = "all all.opt"; meta = { - homepage = http://www.cduce.org/download.html; + inherit (src.meta) homepage; description = "A lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 89d9d545e57d..60429ca4b401 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, xmlm, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, xmlm, topkg }: let pname = "uucd"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cdyg6vaic4n58w80qriwvaq1c40ng3fh74ilxrwajbq163k055q"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index cf5b05492330..66f1ebeba949 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, uunf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }: let pname = "uucp"; @@ -17,12 +17,10 @@ stdenv.mkDerivation { sha256 = "0qgbrx3lnrzii8a9f0hv4kp73y57q6fr79hskxxxs70q68j2xpfm"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf uunf ]; + buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; propagatedBuildInputs = [ uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; buildPhase = "${topkg.buildPhase} --with-cmdliner false"; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 5a1689eaeebd..b295143c0bc3 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: stdenv.mkDerivation rec { version = "0.9.6"; @@ -10,12 +10,10 @@ stdenv.mkDerivation rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; inherit (topkg) buildPhase installPhase; - createFindlibDestdir = true; - meta = with stdenv.lib; { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; homepage = http://erratique.ch/software/uuidm; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index d65f002ebef3..e70a539302f0 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }: let pname = "uunf"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0c5lwica5668ybsffllk6x4p921nw4pljimgqikhf17k5hvyjsbr"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; propagatedBuildInputs = [ uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index f55b757eb268..f27612510c38 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }: let pname = "uuseg"; @@ -15,11 +15,9 @@ stdenv.mkDerivation rec { sha256 = "01q8ljjgi7d73x7ms489b5my83xds4jax1vbjhwwjdai01friscc"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ]; + buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; propagatedBuildInputs = [ uucp uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 93e3fd9c9d2e..95ec93d8584b 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner , topkg, uchar }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; @@ -13,11 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; propagatedBuildInputs = [ uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 0ef3ef4939b9..8a8668df74ee 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , uchar, result, gg, uutf, otfm , js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, pdfBackend ? true, # depends on uutf and otfm @@ -26,14 +26,12 @@ stdenv.mkDerivation rec { sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; buildPhase = topkg.buildPhase diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix new file mode 100644 index 000000000000..4cde95c0c4cc --- /dev/null +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ocaml, findlib, jbuilder }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; + +stdenv.mkDerivation rec { + pname = "wtf8"; + name = "ocaml-${pname}-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib jbuilder ]; + + buildPhase = "jbuilder build -p wtf8"; + + inherit (jbuilder) installPhase; + + createFindLibDestdir = true; + + 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; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.eqyiel ]; + }; +} diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 7f5bcb03ad6c..9d3a0b1bb4d0 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: let pname = "xmlm"; webpage = "http://erratique.ch/software/${pname}"; @@ -30,19 +30,12 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild opam ] ++ param.buildInputs; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs; unpackCmd = "tar xjf $src"; inherit (param) buildPhase; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) installPhase; meta = with stdenv.lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 7302516d5429..12ddcf166e25 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -8,7 +8,7 @@ buildPerlPackage rec { sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7"; }; - buildInputs = [ mysql.lib ] ; + buildInputs = [ mysql.connector-c ] ; propagatedBuildInputs = [ DBI ]; doCheck = false; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 09b50e564110..1b8888dd3ceb 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -17,10 +17,7 @@ preConfigure() { first=$(dd if="$fn" count=2 bs=1 2> /dev/null) if test "$first" = "#!"; then echo "patching $fn..." - sed < "$fn" > "$fn".tmp \ - -e "s|^#\!\(.*/perl.*\)$|#\! \1$perlFlags|" - if test -x "$fn"; then chmod +x "$fn".tmp; fi - mv "$fn".tmp "$fn" + sed -i "$fn" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|" fi fi done diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 74fa75e7aa56..b72b1851024a 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { else if stdenv.isLinux && stdenv.isx86_64 then "linux64x64" else if stdenv.isDarwin && stdenv.isi686 then "macos32x86" else if stdenv.isDarwin && stdenv.isx86_64 then "macos64x64" - else abort "Unsupported platform: only Linux/Darwin x86/x64 are supported."; + else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported."; # Shared data (for the sources file) pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; - meta = { + meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source @@ -122,8 +122,8 @@ stdenv.mkDerivation rec { packaging (ppa:pharo/stable)' project. ''; homepage = http://pharo.org; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lukego ]; - platforms = [ "i686-linux" "x86_64-linux" "i686-darwin" "x86_64-darwin" ]; + license = licenses.mit; + maintainers = [ maintainers.lukego ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 4927ac445f44..e86f08b57ca9 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }: + pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; glpkWithExtras = lib.overrideDerivation glpk (attrs: { - propagatedBuildInputs = [ gmp libtool libmysql libiodbc ]; + propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ]; CPPFLAGS = "-I${gmp.dev}/include"; preConfigure = '' substituteInPlace configure \ - --replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql + --replace /usr/include/mysql ${mysql.connector-c}/include/mysql ''; configureFlags = [ "--enable-dl" "--enable-odbc" diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 5acb6cd5785d..931239c09872 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.4.0"; + version = "3.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316"; + sha256 = "1ce44d5132b7951f4614067c88ca34cfee1ff97f6f0892581d79b636d83eab89"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 2f72f7c16a7a..cd9d8ee46d8a 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, dns, pycountry, nose }: +{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose }: buildPythonPackage rec { pname = "FormEncode"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md"; }; - buildInputs = [ dns pycountry nose ]; + buildInputs = [ dnspython pycountry nose ]; patchPhase = '' # dnspython3 has been superseded, see its PyPI page diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix new file mode 100644 index 000000000000..f3f1eed265d0 --- /dev/null +++ b/pkgs/development/python-modules/Mako/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markupsafe +, nose +, mock +, pytest +, isPyPy +}: + +buildPythonPackage rec { + pname = "Mako"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; + }; + + checkInputs = [ markupsafe nose mock pytest ]; + propagatedBuildInputs = [ markupsafe ]; + + doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 + + meta = { + description = "Super-fast templating language"; + homepage = http://www.makotemplates.org; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 56e2cf501eda..b5d202af50a4 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -1,5 +1,5 @@ { fetchPypi, buildPythonPackage, lib -, requests, beautifulsoup4, six +, requests, beautifulsoup4, six, lxml , pytestrunner, requests-mock, pytestcov, pytest }: @@ -7,23 +7,23 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "MechanicalSoup"; - version = "0.8.0"; + version = "0.9.0.post4"; src = fetchPypi { inherit pname version; - sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da"; + sha256 = "ce8f822afbc9bef1499be417e8d5deecd0cd32606420165700e89477955f03ab"; }; checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; - propagatedBuildInputs = [ requests beautifulsoup4 six ]; + propagatedBuildInputs = [ lxml requests beautifulsoup4 six ]; # Requires network doCheck = false; postPatch = '' # Is in setup_requires but not used in setup.py... - substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace "'pytest-runner'" "" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index f281a02d49b6..8f8d91c64d2f 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Nikola"; - version = "7.8.10"; + version = "7.8.11"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -47,7 +47,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537"; + sha256 = "10d95b3af84e61496ef729665eafa2235fd0fd4cc6c57644dd0f2c19a968dd0f"; }; meta = { diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index e0ff839ce1b7..03dc825218e2 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -35,13 +35,13 @@ let in buildPythonPackage rec { name = "${pname}-${version}"; pname = "Theano"; - version = "0.9.0"; + version = "1.0.1"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = fetchPypi { inherit pname version; - sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; + sha256 = "88d8aba1fe2b6b75eacf455d01bc7e31e838c5a0fb8c13dde2d9472495ff4662"; }; postPatch = '' diff --git a/pkgs/development/python-modules/TurboCheetah/default.nix b/pkgs/development/python-modules/TurboCheetah/default.nix new file mode 100644 index 000000000000..45c42a7b43f9 --- /dev/null +++ b/pkgs/development/python-modules/TurboCheetah/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cheetah +, nose +}: + +buildPythonPackage rec { + pname = "TurboCheetah"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c"; + }; + + propagatedBuildInputs = [ cheetah ]; + + checkInputs = [ nose ]; + + meta = { + description = "TurboGears plugin to support use of Cheetah templates"; + homepage = http://docs.turbogears.org/TurboCheetah; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix new file mode 100644 index 000000000000..c512b17332fc --- /dev/null +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -0,0 +1,19 @@ +{lib, buildPythonPackage, fetchPypi}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "XlsxWriter"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mpq4l1jfghdqx2vzbzl9v28vw69lkx5vz9gb77gzaw8zypvnsx2"; + }; + + meta = { + description = "A Python module for creating Excel XLSX files"; + homepage = https://xlsxwriter.readthedocs.io/; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 1c9fa3d786fb..ca43e122a307 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.1.5"; + version = "0.1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "94943ed0cd77077fe2d18e79b2f28d3e92f585f7d1c6edc75e640121f3c5d580"; + sha256 = "4ea22ae860f3a556511291e7f1284942199c81377f47ec4248163defb1b9e6ee"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index d1cb1180358f..9d7b1148146c 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package for acousticians"; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = https://github.com/python-acoustics/python-acoustics; }; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 3aa03aaa5993..45e7f8915acf 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.0.8"; + version = "2.0.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d"; + sha256 = "d98bc55136d696fcf323760c3db0de489da9e41fd51283fa6f90205deb85bf6a"; }; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 9139c62618a6..d0808a1cc310 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "File support for asyncio"; homepage = https://github.com/Tinche/aiofiles; license = with lib.licenses; [ asl20 ]; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix index 78ed435504cf..ab9595ec2b9c 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp/cors.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-cors"; - version = "0.5.3"; + version = "0.6.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; + sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4"; }; # Requires network access diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 53443b3b32fa..44e19072057f 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "2.3.3"; + version = "2.3.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0a2e33e90560dacb819b095b9d9611597925d75d1b93dd9490055d3826d98a82"; + sha256 = "fe294df38e9c67374263d783a7a29c79372030f5962bd5734fa51c6f4bbfee3b"; }; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix new file mode 100644 index 000000000000..a79de55d2eb0 --- /dev/null +++ b/pkgs/development/python-modules/ansi/default.nix @@ -0,0 +1,15 @@ +{ buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ansi"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "06y6470bzvlqys3zi2vc68rmk9n05v1ibral14gbfpgfa8fzy7pg"; + }; + + checkPhase = '' + python -c "import ansi.color" + ''; +} diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix new file mode 100644 index 000000000000..80985f868c7a --- /dev/null +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -0,0 +1,31 @@ +{ lib +, cffi +, six +, hypothesis +, pytest +, wheel +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "argon2_cffi"; + version = "16.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ap3il3j1pjyprrhpfyhc21izpmhzhfb5s69vlzc65zvd1nj99cr"; + }; + + propagatedBuildInputs = [ cffi six ]; + checkInputs = [ hypothesis pytest wheel ]; + checkPhase = '' + pytest tests + ''; + + meta = { + description = "Secure Password Hashes for Python"; + homepage = https://argon2-cffi.readthedocs.io/; + }; +} diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index a85987a95b16..374b82225a1a 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,23 +1,26 @@ { stdenv, buildPythonPackage, fetchPypi -, nose, chai, simplejson +, nose, chai, simplejson, backports_functools_lru_cache , dateutil }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "arrow"; - version = "0.10.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; + sha256 = "a15ecfddf334316e3ac8695e48c15d1be0d6038603b33043930dcf0e675c86ee"; }; checkPhase = '' nosetests --cover-package=arrow ''; - buildInputs = [ nose chai simplejson ]; - propagatedBuildInputs = [ dateutil ]; + checkInputs = [ nose chai simplejson ]; + propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; + + postPatch = '' + substituteInPlace setup.py --replace "==1.2.1" "" + ''; meta = with stdenv.lib; { description = "Python library for date manipulation"; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 1b5112fb3358..fedd4b81a9d4 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - version = "1.1.2"; + version = "2.0.1"; pname = "asgiref"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c"; + sha256 = "c3d70c473a2b7e525e18e68504630943e107f5b32f440c00c8543f94f565c855"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index eedaac50fac9..5f512fcd6f8b 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "0.23.0"; + version = "0.24.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70"; + sha256 = "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"; }; # No tests included diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 965bf37d5200..6f50b7157e5d 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "astor"; - version = "0.5"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa"; + sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 86a0daa04560..862157f686a3 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.5.3"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35"; + sha256 = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 12f00be0cb74..514762b7a37d 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "2.0.2"; + version = "2.0.3"; name = "${pname}-${version}"; doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. src = fetchPypi { inherit pname version; - sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d"; + sha256 = "fdfc0248f6250798ed6d1327be609cb901db89ae01fc768cfbc9e263bdf56f4f"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index e58bf3846dc9..8ef2b5989f45 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -2,17 +2,16 @@ , pympler, coverage, six, clang }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "attrs"; - version = "17.2.0"; + version = "17.4.0"; src = fetchPypi { inherit pname version; - sha256 = "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax"; + sha256 = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9"; }; # macOS needs clang for testing - buildInputs = [ + checkInputs = [ pytest hypothesis zope_interface pympler coverage six ] ++ lib.optionals (stdenv.isDarwin) [ clang ]; @@ -20,6 +19,9 @@ buildPythonPackage rec { py.test ''; + # To prevent infinite recursion with pytest + doCheck = false; + meta = with lib; { description = "Python attributes without boilerplate"; homepage = https://github.com/hynek/attrs; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix new file mode 100644 index 000000000000..dae88b34900e --- /dev/null +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonpickle +, wrapt +, requests +}: + +buildPythonPackage rec { + pname = "aws-xray-sdk"; + version = "0.95"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943"; + }; + + propagatedBuildInputs = [ + jsonpickle wrapt requests + ]; + + meta = { + description = "AWS X-Ray SDK for the Python programming language"; + license = lib.licenses.asl20; + homepage = https://github.com/aws/aws-xray-sdk-python; + }; + + doCheck = false; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix new file mode 100644 index 000000000000..ab34d376de08 --- /dev/null +++ b/pkgs/development/python-modules/backports_abc/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "backports_abc"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = { + homepage = https://github.com/cython/backports_abc; + license = lib.licenses.psfl; + description = "A backport of recent additions to the 'collections.abc' module"; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix new file mode 100644 index 000000000000..2442e132f1b9 --- /dev/null +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "backports.functools_lru_cache"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f"; + }; + + buildInputs = [ setuptools_scm ]; + doCheck = false; # No proper test + + meta = { + description = "Backport of functools.lru_cache"; + homepage = https://github.com/jaraco/backports.functools_lru_cache; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix new file mode 100644 index 000000000000..9b622eb6b065 --- /dev/null +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, lzma +, python +}: + +buildPythonPackage rec { + pname = "backports.lzma"; + version = "0.0.8"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3"; + }; + + buildInputs = [ lzma ]; + + # Needs the compiled module in $out + checkPhase = '' + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -m unittest discover -s test + ''; + + meta = { + description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; + homepage = https://github.com/peterjc/backports.lzma; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix new file mode 100644 index 000000000000..7f4faa8a8b47 --- /dev/null +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pythonOlder +}: + +if !(pythonOlder "3.3") then null else buildPythonPackage rec { + pname = "backports.shutil_get_terminal_size"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80"; + }; + + checkInputs = [ + pytest + ]; + + meta = { + description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; + homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; + license = with lib.licenses; [ mit ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index b7f508cdda25..99c3346a4fbe 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -7,6 +7,7 @@ , python , pexpect }: + buildPythonPackage rec { pname = "bash_kernel"; version = "0.7.1"; @@ -28,11 +29,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel pexpect ]; + # no tests doCheck = false; preBuild = '' - mkdir tmp - export HOME=$PWD/tmp + export HOME=$TMPDIR ''; postInstall = '' diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 0f624a145e01..74b1062cea44 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Bibtex parser for python 2.7 and 3.3 and newer"; homepage = https://github.com/sciunto-org/python-bibtexparser; license = with lib.licenses; [ gpl3 bsd3 ]; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix new file mode 100644 index 000000000000..ea09a003c66e --- /dev/null +++ b/pkgs/development/python-modules/biopython/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + pname = "biopython"; + version = "1.70"; + + src = fetchPypi { + inherit pname version; + sha256 = "4a7c5298f03d1a45523f32bae1fffcff323ea9dce007fb1241af092f5ab2e45b"; + }; + + propagatedBuildInputs = [ numpy ]; + # Checks try to write to $HOME, which does not work with nix + doCheck = false; + meta = { + description = "Python library for bioinformatics"; + longDescription = '' + Biopython is a set of freely available tools for biological computation + written in Python by an international team of developers. It is a + distributed collaborative effort to develop Python libraries and + applications which address the needs of current and future work in + bioinformatics. + ''; + homepage = http://biopython.org/wiki/Documentation; + maintainers = with lib.maintainers; [ luispedro ]; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix new file mode 100644 index 000000000000..b012fd24aa01 --- /dev/null +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }: + +let ext = if stdenv.isDarwin then "dylib" else "so"; +in buildPythonPackage rec { + pname = "bitcoinlib"; + version = "0.9.0"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "petertodd"; + rev = "7a8a47ec6b722339de1d0a8144e55b400216f90f"; + repo = "python-bitcoinlib"; + sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z"; + }; + + postPatch = '' + substituteInPlace bitcoin/core/key.py --replace \ + "ctypes.util.find_library('ssl') or 'libeay32'" \ + "'${openssl.out}/lib/libssl.${ext}'" + ''; + + meta = { + homepage = src.meta.homepage; + description = "Easy interface to the Bitcoin data structures and protocol"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ jb55 ]; + }; +} diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix index 017b85cacc7c..74e327fd3423 100644 --- a/pkgs/development/python-modules/blaze/default.nix +++ b/pkgs/development/python-modules/blaze/default.nix @@ -25,12 +25,11 @@ buildPythonPackage rec { pname = "blaze"; - version = "0.11.0"; - name = "${pname}-${version}"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/blaze/blaze/archive/${version}.tar.gz"; - sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a"; + sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww"; }; checkInputs = [ pytest ]; @@ -56,13 +55,8 @@ buildPythonPackage rec { toolz ]; - # Failing test - # ERROR collecting blaze/tests/test_interactive.py - # E networkx.exception.NetworkXNoPath: node not - # reachable from - doCheck = false; - checkPhase = '' + rm pytest.ini # Not interested in coverage py.test blaze/tests ''; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 2d1ac11f3b54..d3ea1f151d34 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -1,4 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth }: +{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth, pytest, mock +, glibcLocales }: buildPythonPackage rec { name = "${pname}-${version}"; @@ -10,6 +11,12 @@ buildPythonPackage rec { sha256 = "0fv9f0074kxy1849h0kwwxw12sifpq3bv63pcz900zzjsigi4hi3"; }; + checkInputs = [ pytest mock glibcLocales ]; + + checkPhase = '' + LANG=en_US.utf-8 py.test blessed/tests + ''; + propagatedBuildInputs = [ wcwidth six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 244ee43d0aab..e3c77fa65cf4 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.10"; + version = "0.12.13"; src = fetchPypi { inherit pname version; - sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393"; + sha256 = "6e28cbfd88de0c459435278b75f9982591ec0aaa3d37a195052645e1c62e89e3"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 9ff0b144f100..1a20639c2dea 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,9 +9,9 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "36.7.1"; + version = "38.2.5"; format = "wheel"; - sha256 = "eaacfa35eb11199d0b017df416421781a75209817bff3f94820556e36c49bd77"; + sha256 = "bcf0d4f3e2f7890e658db11e218b8643afffb905a0e2f2a7d5a6a3e949bb87e6"; }; # TODO: Shouldn't be necessary anymore for pip > 9.0.1! diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix new file mode 100644 index 000000000000..eaab00312055 --- /dev/null +++ b/pkgs/development/python-modules/boto3/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, botocore +, jmespath +, s3transfer +, futures +, docutils +, nose +, mock +, isPy3k +}: + +buildPythonPackage rec { + pname = "boto3"; + version = "1.4.8"; + + src = fetchFromGitHub { + owner = "boto"; + repo = "boto3"; + rev = version; + sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi"; + }; + + propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ docutils nose mock ]; + + checkPhase = '' + runHook preCheck + # This method is not in mock. It might have appeared in some versions. + sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ + tests/unit/resources/test_factory.py + nosetests -d tests/unit --verbose + runHook postCheck + ''; + + # Network access + doCheck = false; + + meta = { + homepage = https://github.com/boto/boto3; + license = lib.licenses.asl20; + description = "AWS SDK for Python"; + longDescription = '' + Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for + Python, which allows Python developers to write software that makes use of + services like Amazon S3 and Amazon EC2. + ''; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index a7fe8620a8a8..f8dd16499491 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.7.43"; + version = "1.8.21"; src = fetchPypi { inherit pname version; - sha256 = "0wyyj7sk7dh9v7i1g5jc5maqdadvbs4khi7srz0095cywkjqpysc"; + sha256 = "e4513a02f68e7efd7494ee56db201d87620218ca879aae361abbb71bcde3aa5f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix new file mode 100644 index 000000000000..1dd2a070480f --- /dev/null +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, enum34 +, construct +, pytest +, hypothesis +}: + +buildPythonPackage rec { + pname = "brotlipy"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df"; + }; + + propagatedBuildInputs = [ cffi enum34 construct ]; + + checkInputs = [ pytest hypothesis ]; + + checkPhase = '' + py.test + ''; + + # Missing test files + doCheck = false; + + meta = { + description = "Python bindings for the reference Brotli encoder/decoder"; + homepage = "https://github.com/python-hyper/brotlipy/"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 70c6f3baaf1a..43a0a42f8e93 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.9.5"; + version = "2.10.0"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "dce840ea379e2ff10bae27465778708704e0a4287cde92eb6c7961f5b0277cfa"; + sha256 = "00wi0f6wpfl2gywr02x2yqvx6i1k0ll5w4lhdl0khijk4g7mk8dq"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix new file mode 100644 index 000000000000..6ab5015a1e79 --- /dev/null +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, freezegun +}: + +buildPythonPackage rec { + pname = "cached-property"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3"; + }; + + checkInputs = [ freezegun ]; + + meta = { + description = "A decorator for caching properties in classes"; + homepage = https://github.com/pydanny/cached-property; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ericsagnes ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index edf7f0596c5f..c5d643da79d5 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, krb5Full, nose, GitPython, mock, git }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: buildPythonPackage rec { pname = "CCColUtils"; @@ -9,9 +9,11 @@ buildPythonPackage rec { inherit pname version; sha256 = "1gwcq4xan9as1j3q9k2zqrywxp46qx0ljwxbck9id2fvilds6ck3"; }; + buildInputs = [ krb5Full ]; propagatedBuildInputs = [ nose GitPython mock git ]; - doCheck = false; + + doCheck = isPy3k; # needs unpackaged module to run tests on python2 meta = with stdenv.lib; { description = "Python Kerberos 5 Credential Cache Collection Utilities"; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix new file mode 100644 index 000000000000..06a455176a2a --- /dev/null +++ b/pkgs/development/python-modules/chainer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, python +, buildPythonPackage, fetchPypi, isPy3k +, filelock, protobuf, numpy, pytest, mock +, cupy, cudaSupport ? false +}: + +buildPythonPackage rec { + pname = "chainer"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mbc8kwk7pvg03bf0j57a48gr6rsdg4lzmyj0dak8y2l4lmyskpw"; + }; + + checkInputs = [ + pytest + mock + ]; + + propagatedBuildInputs = [ + filelock + protobuf + numpy + ] ++ lib.optionals cudaSupport [ cupy ]; + + # In python3, test was failed... + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "A flexible framework of neural networks for deep learning"; + homepage = https://chainer.org/; + license = licenses.mit; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/cheetah/default.nix b/pkgs/development/python-modules/cheetah/default.nix new file mode 100644 index 000000000000..98af2f10a0bb --- /dev/null +++ b/pkgs/development/python-modules/cheetah/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markdown +, isPy3k +, TurboCheetah +}: + +buildPythonPackage rec { + pname = "cheetah"; + version = "2.4.4"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; + }; + + propagatedBuildInputs = [ markdown ]; + + doCheck = false; # Circular dependency + + checkInputs = [ + TurboCheetah + ]; + + meta = { + homepage = http://www.cheetahtemplate.org/; + description = "A template engine and code generation tool"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 8447f7fea50c..d1ecfcc5c89c 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchPypi, buildPythonPackage -, six +, more-itertools, six , coverage, codecov, pytest, pytestcov, pytest-sugar, portend , backports_unittest-mock, setuptools_scm }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "cheroot"; - version = "5.8.3"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5c0531fd732700b1fb3e6e7079dc3aefbdf29e9136925633d93f009cb87d70a3"; + sha256 = "10s67wxymk4xg45l7ca59n4l6m6rnj8b9l52pg1angxh958lwixs"; }; - propagatedBuildInputs = [ six ]; - buildInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock setuptools_scm ]; + propagatedBuildInputs = [ more-itertools six ]; + + buildInputs = [ setuptools_scm ]; + + checkInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock ]; checkPhase = '' py.test cheroot diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index cffffde8e3d1..5711cdba2b5b 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,23 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k -, pytest, setuptools_scm, pytestrunner -, six, cheroot, portend }: +{ lib, buildPythonPackage, fetchPypi +, cheroot, portend, routes, six +, setuptools_scm +, backports_unittest-mock, codecov, coverage, objgraph, pathpy, pytest, pytest-sugar, pytestcov +}: buildPythonPackage rec { name = "${pname}-${version}"; pname = "CherryPy"; - version = "11.0.0"; + version = "13.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan"; + sha256 = "0pb9mfmhns33jq4nrd38mv88ha74fj3q0y2mm8qsjh7ywphvk9ap"; }; - # wsgiserver.ssl_pyopenssl is broken on py3k. - doCheck = !isPy3k; - buildInputs = [ pytest setuptools_scm pytestrunner ]; - propagatedBuildInputs = [ six cheroot portend ]; + propagatedBuildInputs = [ cheroot portend routes six ]; - meta = with stdenv.lib; { + buildInputs = [ setuptools_scm ]; + + checkInputs = [ backports_unittest-mock codecov coverage objgraph pathpy pytest pytest-sugar pytestcov ]; + + checkPhase = '' + LANG=en_US.UTF-8 pytest + ''; + + meta = with lib; { homepage = "http://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix new file mode 100644 index 000000000000..a240ea21e3e4 --- /dev/null +++ b/pkgs/development/python-modules/conda/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pycosat +, requests +, ruamel_yaml +, isPy3k +, enum34 +}: + +# Note: this installs conda as a library. The application cannot be used. +# This is likely therefore NOT what you're looking for. + +buildPythonPackage rec { + pname = "conda"; + version = "4.3.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953"; + }; + + propagatedBuildInputs = [ pycosat requests ruamel_yaml ] ++ lib.optional (!isPy3k) enum34; + + # No tests + doCheck = false; + + meta = { + description = "OS-agnostic, system-level binary package manager"; + homepage = https://github.com/conda/conda; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 9d84400667a9..9540b0599315 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "A drop-in replacement for argparse"; homepage = https://github.com/zorro3/ConfigArgParse; license = licenses.mit; - maintainer = [ maintainers.willibutz ]; + maintainers = [ maintainers.willibutz ]; }; } diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index cadaa8914b21..a056ba450a88 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, unittest2 }: buildPythonPackage rec { @@ -13,9 +14,11 @@ buildPythonPackage rec { sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; }; + checkInputs = [ unittest2 ]; + meta = { description = "Backports and enhancements for the contextlib module"; homepage = http://contextlib2.readthedocs.org/; license = lib.licenses.psfl; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 810a6a7bd8e3..6a9e1240b864 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "credstash"; - version = "1.13.4"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81"; + sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d"; }; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index a9aad8d40e5f..8d0e7a58e76a 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "csscompressor"; - version = "0.9.4"; + version = "0.9.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b"; + sha256 = "afa22badbcf3120a4f392e4d22f9fff485c044a1feda4a950ecc5eba9dd31a05"; }; doCheck = false; # No tests diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix new file mode 100644 index 000000000000..6ac91c0aa255 --- /dev/null +++ b/pkgs/development/python-modules/cupy/default.nix @@ -0,0 +1,46 @@ +{ stdenv, python, buildPythonPackage +, fetchPypi, isPy3k, linuxPackages, gcc5 +, fastrlock, numpy, six, wheel, pytest, mock +, cudatoolkit, cudnn, nccl +}: + +buildPythonPackage rec { + pname = "cupy"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0si0ri8azxvxh3lpm4l4g60jf4nwzibi53yldbdbzb1svlqq060r"; + }; + + checkInputs = [ + pytest + mock + ]; + + nativeBuildInputs = [ + gcc5 + ]; + + propagatedBuildInputs = [ + cudatoolkit + cudnn + linuxPackages.nvidia_x11 + nccl + fastrlock + numpy + six + wheel + ]; + + # In python3, test was failed... + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "A NumPy-compatible matrix library accelerated by CUDA"; + homepage = https://cupy.chainer.org/; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 3d937debe58b..69a5e8c11d48 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "5.0.2"; + version = "5.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0zbx9j5z5l06bvwvlqvvn7h9dm7zjcjgxm7agbb625nymkq6cd15"; + sha256 = "2eadddde670f5c5f6cf88638a0ac4e5d5fe181292a31063275fa56c7bf22426b"; }; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index dcb4e9474c3b..83b1c893719d 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.8.2"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + sha256 = "5ebb55855a8bb7800afa58e52408763935527e0305f35600c71b43c86013dec2"; }; # Extension types diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 70647b6377fc..c3b45dc3c867 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.4"; + version = "0.16.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea"; + sha256 = "40d150b73e3366c9521e9dde206046a66906330074f87be901b1e1013ce6cb73"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix new file mode 100644 index 000000000000..b73a1e9ec7fc --- /dev/null +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k +, nose +, nose-parameterized +, mock +, glibcLocales +, six +, jdatetime +, pyyaml +, dateutil +, umalqurra +, pytz +, tzlocal +, regex +, ruamel_yaml }: +buildPythonPackage rec { + pname = "dateparser"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "scrapinghub"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y"; + }; + + # Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364 + disabled = isPy3k; + + checkInputs = [ nose nose-parameterized mock glibcLocales ]; + preCheck ='' + # skip because of missing convertdate module, which is an extra requirement + rm tests/test_jalali.py + ''; + + propagatedBuildInputs = [ six jdatetime pyyaml dateutil + umalqurra pytz tzlocal regex ruamel_yaml ]; + + meta = with stdenv.lib;{ + description = "Date parsing library designed to parse dates from HTML pages"; + homepage = https://github.com/scrapinghub/dateparser; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix new file mode 100644 index 000000000000..e3ee3117501b --- /dev/null +++ b/pkgs/development/python-modules/decorator/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "decorator"; + version = "4.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "7cb64d38cb8002971710c8899fbdfb859a23a364b7c99dab19d1f719c2ba16b5"; + }; + + meta = { + homepage = https://pypi.python.org/pypi/decorator; + description = "Better living through Python with decorators"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 67f8debc43a0..f2be8ec56381 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,20 +2,18 @@ with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; - version = "3.1.0"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd"; + sha256 = "0rh119iw5hk41gsvbjr0wixvl1i4f0b1vcnw9ym35rmcp517z0wb"; }; propagatedBuildInputs = [ requests py ]; checkInputs = [ pytest ]; checkPhase = '' - # Don't know why this test is failing! - substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env" py.test ''; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 49349839331d..36264921f64d 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "distro"; - version = "1.0.4"; + version = "1.2.0"; buildInputs = [ pytest pytestcov tox]; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954"; + sha256 = "d94370e43b676ac44fbe1ab68ca903a6147eaba3a9e8eff85b2c05556a455b76"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 13f35d110c7a..9d1161fca3b6 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A collection of custom extensions for the Django Framework"; homepage = https://github.com/django-extensions/django-extensions; - licenses = [ licenses.mit ]; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix new file mode 100644 index 000000000000..b2d28229d94b --- /dev/null +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python, + django_hijack, django_nose }: +buildPythonPackage rec { + pname = "django-hijack-admin"; + version = "2.1.5"; + name = "${pname}-${version}"; + + # the pypi packages don't include everything required for the tests + src = fetchFromGitHub { + owner = "arteria"; + repo = "django-hijack-admin"; + rev = "v${version}"; + sha256 = "02j75blvkjiz5mv5wc4jxl27rgmjsrl6l67a3p8342jwazzsm6jg"; + }; + + checkInputs = [ django_nose ]; + propagatedBuildInputs = [ django_hijack ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} runtests.py hijack_admin + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Admin integration for django-hijack"; + homepage = https://github.com/arteria/django-hijack; + license = licenses.mit; + maintainers = with maintainers; [ lsix ]; + }; +} diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index b779d01c9353..1634e676952b 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -3,7 +3,7 @@ }: buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.4"; + version = "2.1.5"; name = pname + "-" + version; # the pypi packages don't include everything required for the tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "arteria"; repo = "django-hijack"; rev = "v${version}"; - sha256 = "1wbm6l8mzpkj4wsj4fyfamzpzi3day2v1cva5j89v4dn4403jq21"; + sha256 = "1paiyxhc034336xcd9yzf3azpsapsv26j7w2baxiby71z2hhg0sj"; }; checkInputs = [ django_nose ]; diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index aabfecfcacc7..b8b632e1a182 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "django-jinja"; name = "${pname}-${version}"; - version = "2.2.2"; + version = "2.4.1"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "099b99iprkvlsndrjmw4v3i3i60i9gm1aq5r88z15r7vgmv6sigj"; + sha256 = "8a49d73de616a12075eee14c6d3bbab936261a463457d40348d8b8e2995cfbed"; }; buildInputs = [ django pytz tox ]; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 2fe45b7a1f62..9079fd86e1c2 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.7"; + version = "1.11.8"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "16ab3p6jj1da94wkz2b5fb128ycy4826bbsnbabcd3qdaf9f6649"; + sha256 = "04gphaarwj1yrhhpi9im6gsg77i2vv0iwyjc0pmxba53nndyglzy"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix new file mode 100644 index 000000000000..c1f935e51c61 --- /dev/null +++ b/pkgs/development/python-modules/django/2_0.nix @@ -0,0 +1,44 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + name = "${pname}-${version}"; + version = "2.0.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0by1gswkrzxn594fa26llkzsc410999fq8s0b5d1598jwi5q0syr"; + }; + + patches = stdenv.lib.optionals withGdal [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + # patch only $out/bin to avoid problems with starter templates (see #3134) + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + propagatedBuildInputs = [ pytz ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell ]; + }; +} diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index e83076674e8a..a92a7038cd31 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Per object permissions for Django"; homepage = https://github.com/django-guardian/django-guardian; - licenses = [ licenses.mit licenses.bsd2 ]; + license = [ licenses.mit licenses.bsd2 ]; }; } diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index e2c8acd1a0b1..b11847beaa92 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.7.3"; + version = "3.7.7"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "067960e5e9e5586d3b2d53a1d626c4800dc33cd8309487d404fc63355674556f"; + sha256 = "9f9e94e8d22b100ed3a43cee8c47a7ff7b185e778a1f2da9ec5c73fc4e081b87"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 91d5a17960d8..177e697aab9f 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, makeWrapper, buildPythonApplication -, pytest, dns }: +, pytest, dnspython }: buildPythonApplication rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ buildPythonApplication rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ openssl dns ]; + propagatedBuildInputs = [ openssl dnspython ]; patchPhase = '' substituteInPlace dknewkey.py --replace \ diff --git a/pkgs/development/python-modules/dns/default.nix b/pkgs/development/python-modules/dnspython/default.nix similarity index 100% rename from pkgs/development/python-modules/dns/default.nix rename to pkgs/development/python-modules/dnspython/default.nix diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 88d85dad91aa..4ce013ac7976 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,13 +3,13 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.5.1"; + version = "2.7.0"; pname = "docker"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880"; + sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 91a0c4183c9b..e6be57c8b52d 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -3,21 +3,20 @@ , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32 +, enum34, functools32, }: buildPythonApplication rec { - version = "1.15.0"; + version = "1.18.0"; pname = "docker-compose"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg"; + sha256 = "2930cbfe2685018fbb75377600ab6288861d9955717b3f14212f63950351d379"; }; # lots of networking and other fails doCheck = false; - buildInputs = [ mock pytest nose ]; + checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client @@ -26,7 +25,7 @@ buildPythonApplication rec { stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; - patchPhase = '' + postPatch = '' # Remove upper bound on requires, see also # https://github.com/docker/compose/issues/4431 sed -i "s/, < .*',$/',/" setup.py @@ -41,7 +40,6 @@ buildPythonApplication rec { homepage = https://docs.docker.com/compose/; description = "Multi-container orchestration for Docker"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 38e201849c19..fbe5c02771db 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; name = "${pname}-${version}"; - version = "2.4.2"; + version = "2.5"; meta = { description = "Easy thumbnails for Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4"; + sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix new file mode 100644 index 000000000000..bbd2904fd9ee --- /dev/null +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, click +, certifi +, voluptuous +, pyyaml +, elasticsearch +, nosexcover +, coverage +, nose +, mock +, funcsigs +} : + +buildPythonPackage rec { + pname = "elasticsearch-curator"; + version = "5.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bhiqa61h6bbrfp0aygwwchr785x281hnwk8qgnjhb8g4r8ppr3s"; + }; + + # The integration tests require a running elasticsearch cluster. + postUnpackPhase = '' + rm -r test/integration + ''; + + propagatedBuildInputs = [ + click + certifi + voluptuous + pyyaml + elasticsearch + ]; + + checkInputs = [ + nosexcover + coverage + nose + mock + funcsigs + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/elastic/curator; + description = "Curate, or manage, your Elasticsearch indices and snapshots"; + license = licenses.asl20; + longDescription = '' + Elasticsearch Curator helps you curate, or manage, your Elasticsearch + indices and snapshots by: + + * Obtaining the full list of indices (or snapshots) from the cluster, as the + actionable list + + * Iterate through a list of user-defined filters to progressively remove + indices (or snapshots) from this actionable list as needed. + + * Perform various actions on the items which remain in the actionable list. + ''; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 4fc78d8bd1e1..cf03a02129d4 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dns, idna, ipaddress }: +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: buildPythonPackage rec { pname = "email_validator"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - dns + dnspython idna ] ++ (if isPy3k then [ ] else [ ipaddress ]); diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix new file mode 100644 index 000000000000..250a2f559325 --- /dev/null +++ b/pkgs/development/python-modules/evdev/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }: + +buildPythonPackage rec { + pname = "evdev"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "188ahmqnh5y1f46m7pyjdmi9zfxswaggn6xga65za554d72azvap"; + }; + + buildInputs = [ linuxHeaders ]; + + patchPhase = '' + substituteInPlace setup.py --replace /usr/include/linux ${linuxHeaders}/include/linux + ''; + + doCheck = false; + + disabled = isPy34; # see http://bugs.python.org/issue21121 + + meta = with lib; { + description = "Provides bindings to the generic input event interface in Linux"; + homepage = http://pythonhosted.org/evdev; + license = licenses.bsd3; + maintainers = with maintainers; [ goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 1a9b684a9f34..d77b912fe0de 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.7.4"; + version = "0.7.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0xihl5w2m4vkp0515qjibiy88pk380n5jmj8n9hh7q40b1vx1kwb"; + sha256 = "dd4ffbc4725220ffdc8e32f8566c8870efaecdc238d0f96b18e1e83227eca55d"; }; patches = [ diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix new file mode 100644 index 000000000000..adcc43f26509 --- /dev/null +++ b/pkgs/development/python-modules/extras/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "extras"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; + homepage = https://code.google.com/p/mimeparse/; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 3c95a26881e8..2d459d625d0a 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.7"; + version = "0.8.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bf7dabcd6807c8829da28a4de491adf7998af506b8571db6a6eb58161157248a"; + sha256 = "e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index ee1048ec5fac..44f7bcdab068 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, python, fetchurl }: +{ stdenv, buildPythonPackage, python, fetchPypi}: buildPythonPackage rec { - name = "fastimport-${version}"; + pname = "fastimport"; version = "0.9.6"; - src = fetchurl { - url = "mirror://pypi/f/fastimport/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"; }; diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix new file mode 100644 index 000000000000..848f01d6e16b --- /dev/null +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "fastrlock"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "00mr9b15d539z89ng5nf89s2ryhk90xwx95jal77ma0wslixrk5d"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/scoder/fastrlock; + description = "A fast RLock implementation for CPython"; + license = licenses.mit; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index f8d877f0655b..ee2a65e981ca 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "faulthandler"; - version = "2.6"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r"; + sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a"; }; meta = { diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix new file mode 100644 index 000000000000..a22e1581b68d --- /dev/null +++ b/pkgs/development/python-modules/filelock/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "filelock"; + version = "2.0.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee355eb66e4c2e5d95689e1253515aad5b3177c274abdd00a57d5ab1aa6d071a"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/benediktschmitt/py-filelock; + description = "A platform independent file lock for Python"; + license = licenses.unlicense; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 5c150844c845..1fc7ae5aa582 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.10.post1"; + version = "1.7.11"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8"; + sha256 = "5e9c68ea71e9d79fcfb68c9a101c0b133301e233c9bcca7b7c65f33cc7636ef5"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/fix_swiftclient_mocking.patch b/pkgs/development/python-modules/fix_swiftclient_mocking.patch deleted file mode 100644 index 027ef56b317c..000000000000 --- a/pkgs/development/python-modules/fix_swiftclient_mocking.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f37947a7e083532676a9f2ed079dff6bdc19a8e9 Mon Sep 17 00:00:00 2001 -From: Sabari Kumar Murugesan -Date: Tue, 15 Sep 2015 14:22:11 -0700 -Subject: [PATCH] Fix swift store tests for latest swiftclient - -The latest swiftclient (2.6.0) breaks some of the swift store -tests as a mock function's parameters got changed. - -Change-Id: I36512fbe642f4f12cf1382fdf0e37eccbf1acba4 ---- - glance_store/tests/unit/test_swift_store.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py -index f738cf9..3fe4699 100644 ---- a/glance_store/tests/unit/test_swift_store.py -+++ b/glance_store/tests/unit/test_swift_store.py -@@ -92,7 +92,7 @@ def fake_head_container(url, token, container, **kwargs): - def fake_put_container(url, token, container, **kwargs): - fixture_containers.append(container) - -- def fake_post_container(url, token, container, headers, http_conn=None): -+ def fake_post_container(url, token, container, headers, **kwargs): - for key, value in six.iteritems(headers): - fixture_container_headers[key] = value - diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index c00bf0c85512..aab914330880 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "flake8-debugger"; name = "${pname}-${version}"; - version = "1.4.0"; + version = "3.0.0"; src = fetchurl { url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; - sha256 = "0chjfa6wvnqjnx778qzahhwvjx1j0rc8ax0ipp5bn70gf47lj62r"; + sha256 = "e5c8ac980d819db2f3fbb89fe0e43a2fe6c127edd6ce4984a3f7e0bbdac3d2d4"; }; buildInputs = [ nose ]; propagatedBuildInputs = [ flake8 ]; diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 178e000a32ed..5f843138eae0 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; buildPythonPackage rec { name = "${pname}-${version}"; pname = "Flask-Testing"; - version = "0.6.2"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1w0dpwvrcpffm8ychyxpm8s5blm7slik9kplh9jb3sgwcv9gyppj"; + sha256 = "dc076623d7d850653a018cb64f500948334c8aeb6b10a5a842bf1bcfb98122bc"; }; postPatch = '' diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 2154feeebb7c..3a73b464a46f 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -11,6 +11,7 @@ , pytest , testpath , responses +, pytoml }: # Flit is actually an application to build universal wheels. @@ -20,31 +21,28 @@ buildPythonPackage rec { pname = "flit"; - version = "0.11.4"; - name = "${pname}-${version}"; - -# format = "wheel"; + version = "0.13"; src = fetchPypi { inherit pname version; -# url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; - sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb"; + sha256 = "8f558351bf4bb82b872d3bdbea7055cbb2e33ed2bdf809284bf927d4c78bf0ee"; }; disabled = !isPy3k; - propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36; + propagatedBuildInputs = [ docutils requests requests_download pytoml ] ++ lib.optional (pythonOlder "3.6") zipfile36; checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. + # Disable test that wants hg checkPhase = '' - py.test -k "not test_invalid_classifier" + py.test -k "not test_invalid_classifier and not test_build_sdist" ''; meta = { description = "A simple packaging tool for simple packages"; homepage = https://github.com/takluyver/flit; license = lib.licenses.bsd3; - maintainer = lib.maintainers.fridh; + maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 1dfc22f769b4..f7dfb5a8edf5 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.17.0"; + version = "3.21.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24"; + sha256 = "1whama3bm34xp9l7f543sz2h9dms77ci820sdbxi5dl9krs4xkxb"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index b1ba77ab868c..e54531017f4c 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ftfy"; # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "5.1.1"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78"; + sha256 = "b9f84a1437f68ad0bb964fd9da9f6b88d090113ec9e78f290f6d6d0221468e38"; }; propagatedBuildInputs = [ html5lib wcwidth]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index ea5fc12e4321..4edd9ac3e551 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "3.0.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650"; + sha256 = "db00b68c6567ba0598d400b917c889e8801adf249170ce0a80ec38187d1b0797"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 6fe4b7fcab87..9eb8e3b2d6ce 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -2,16 +2,14 @@ buildPythonPackage rec { version = "3.1.2"; - pname = "gflags"; - name = pname + "-" + version; + pname = "python-gflags"; src = fetchPypi { - inherit version; - pname = "python-gflags"; + inherit pname version; sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix new file mode 100644 index 000000000000..c4275c47a424 --- /dev/null +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, google_auth, protobuf, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }: + +buildPythonPackage rec { + pname = "google-api-core"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "03bc4b1ab69c0e113af07e706edee50f583abe8219fe1e1d529dee191cb8e0bf"; + }; + + propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ]; + checkInputs = [ setuptools mock pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix new file mode 100644 index 000000000000..04dfd26a0e8c --- /dev/null +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, mock, oauth2client, flask, requests, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }: + +buildPythonPackage rec { + pname = "google-auth"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "041qpwlvpawggasvbfpkx39mkg4dgvivj831x7kinidayrf46w3i"; + }; + + checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; + propagatedBuildInputs = [ six pyasn1-modules cachetools rsa ]; + + # The removed test tests the working together of google_auth and google's https://pypi.python.org/pypi/oauth2client + # but the latter is deprecated. Since it is not currently part of the nixpkgs collection and deprecated it will + # probably never be. We just remove the test to make the tests work again. + postPatch = ''rm tests/test__oauth2client.py''; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs."; + homepage = "https://google-auth.readthedocs.io/en/latest/"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix new file mode 100644 index 000000000000..c0ccef3c9591 --- /dev/null +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, google_api_core, grpcio, pytest, mock }: + +buildPythonPackage rec { + pname = "google-cloud-core"; + version = "0.28.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h8bx99ksla48zkb7bhkqy66b8prg49dp15alh851vzi9ii2zii7"; + }; + + propagatedBuildInputs = [ google_api_core grpcio ]; + checkInputs = [ pytest mock ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "API Client library for Google Cloud: Core Helpers"; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix new file mode 100644 index 000000000000..796bd26febd0 --- /dev/null +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }: + +buildPythonPackage rec { + pname = "google-cloud-speech"; + version = "0.30.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ckigh6bfzhflhllqdnfygm8w0r6ncp0myf1midifx7sn880g4pa"; + }; + + propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; + checkInputs = [ pytest mock ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Cloud Speech API enables integration of Google speech recognition into applications."; + homepage = "https://googlecloudplatform.github.io/google-cloud-python/latest/speech/"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix new file mode 100644 index 000000000000..24000161338c --- /dev/null +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, google_auth, ply, protobuf, grpcio, requests, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: + +buildPythonPackage rec { + pname = "google-gax"; + version = "0.15.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "0p1ribd2xy7a04wnjv12agkcdi6f9cpj838884hayx07p5g8v3ji"; + }; + + propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; + checkInputs = [ pytest mock unittest2 ]; + + # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where + # that file would be is unclear to me so I just remove the test. + postPatch = ''rm tests/test__grpc_google_auth.py''; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Google API Extensions for Python (gax-python) tools based on gRPC and Google API conventions."; + homepage = "http://gax-python.readthedocs.io/en/latest/"; + license = licenses.bsd3; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix new file mode 100644 index 000000000000..28e84f4846e7 --- /dev/null +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, protobuf, pytest }: + +buildPythonPackage rec { + pname = "googleapis-common-protos"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0"; + }; + + propagatedBuildInputs = [ protobuf ]; + checkInputs = [ pytest ]; + + doCheck = false; # there are no tests + + meta = with stdenv.lib; { + description = "Common protobufs used in Google APIs"; + homepage = "https://github.com/googleapis/googleapis"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index bc48a7490aa9..bb39746d2967 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.8.4"; + version = "1.8.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1"; + sha256 = "1562e34629192f209273f454e41614a127c6ef04144cd0eb5992d484721d55d3"; }; # running tests produces "ImportError: cannot import name 'linalg_cython'" diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 36181bfb3f95..99fe4b73cb98 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { homepage = http://graph-tool.skewed.de/; license = licenses.gpl3; platforms = platforms.all; - maintainer = [ stdenv.lib.maintainers.joelmo ]; + maintainers = [ stdenv.lib.maintainers.joelmo ]; }; src = fetchurl { diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix new file mode 100644 index 000000000000..eeb51fb58434 --- /dev/null +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, lib +, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }: + +buildPythonPackage rec { + pname = "grpcio"; + version = "1.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ea1336f0d1158c4e00e96a94df84b75f6bbff9816abb6cc68cbdc9442a9ac55"; + }; + + propagatedBuildInputs = [ six protobuf ] + ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] + ++ lib.optionals (isPy26 || isPy27) [ futures ]; + + meta = with stdenv.lib; { + description = "HTTP/2-based RPC framework"; + license = lib.licenses.bsd3; + homepage = "https://grpc.io/grpc/python/"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix new file mode 100644 index 000000000000..b075db5ae987 --- /dev/null +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -0,0 +1,34 @@ +{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, +nose, shouldbe, gss, krb5Full, which, darwin }: + +buildPythonPackage rec { + pname = "gssapi"; + version = "1.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "765205082a9490c8e8be88ac16a6249d124396a671665edeec9927a7f244d712"; + }; + + # It's used to locate headers + postPatch = '' + substituteInPlace setup.py \ + --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'" + ''; + + LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib"; + + buildInputs = [ krb5Full which nose shouldbe ] + ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] ); + + propagatedBuildInputs = [ decorator enum34 six ]; + + doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/gssapi; + description = "Python GSSAPI Wrapper"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 71d77c283b84..393d00a8176a 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "gst-python"; - version = "1.12.2"; + version = "1.12.3"; name = "${pname}-${version}"; src = fetchurl { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l"; + sha256 = "19rb06x2m7103zwfm0plxx95gb8bp01ng04h4q9k6ii9q7g2kxf3"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/python-modules/gurobipy/darwin.nix b/pkgs/development/python-modules/gurobipy/darwin.nix new file mode 100644 index 000000000000..65bec7d8b12e --- /dev/null +++ b/pkgs/development/python-modules/gurobipy/darwin.nix @@ -0,0 +1,32 @@ +{ fetchurl, python, xar, cpio, cctools, insert_dylib }: +assert python.pkgs.isPy27 && python.ucsEncoding == 2; +python.pkgs.buildPythonPackage + { name = "gurobipy-7.5.2"; + src = fetchurl + { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_mac64.pkg"; + sha256 = "10zgn8741x48xjdiknj59x66mwj1azhihi1j5a1ajxi2n5fsak2h"; + }; + buildInputs = [ xar cpio cctools insert_dylib ]; + unpackPhase = + '' + xar -xf $src + zcat gurobi*mac64tar.pkg/Payload | cpio -i + tar xf gurobi*_mac64.tar.gz + sourceRoot=$(echo gurobi*/*64) + runHook postUnpack + ''; + patches = [ ./no-clever-setup.patch ]; + postInstall = "mv lib/lib*.so $out/lib"; + postFixup = + '' + install_name_tool -change \ + /System/Library/Frameworks/Python.framework/Versions/2.7/Python \ + ${python}/lib/libpython2.7.dylib \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + install_name_tool -change /Library/gurobi752/mac64/lib/libgurobi75.so \ + $out/lib/libgurobi75.so \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + insert_dylib --inplace $out/lib/libaes75.so \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + ''; + } diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix new file mode 100644 index 000000000000..d78eff0b47a0 --- /dev/null +++ b/pkgs/development/python-modules/gurobipy/linux.nix @@ -0,0 +1,23 @@ +{ fetchurl, python }: +assert python.pkgs.isPy27; +let utf = + if python.ucsEncoding == 2 then "16" + else if python.ucsEncoding == 4 then "32" + else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; +in python.pkgs.buildPythonPackage + { name = "gurobipy-7.5.2"; + src = fetchurl + { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_linux64.tar.gz"; + sha256 = "13i1dl22lnmg7z9mb48zl3hy1qnpwdpr0zl2aizda0qnb7my5rnj"; + }; + setSourceRoot = "sourceRoot=$(echo gurobi*/*64)"; + patches = [ ./no-clever-setup.patch ]; + postInstall = "mv lib/libaes*.so* lib/libgurobi*.so* $out/lib"; + postFixup = + '' + patchelf --set-rpath $out/lib \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + patchelf --add-needed libaes75.so \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + ''; + } diff --git a/pkgs/development/python-modules/gurobipy/no-clever-setup.patch b/pkgs/development/python-modules/gurobipy/no-clever-setup.patch new file mode 100644 index 000000000000..c71ac7d68632 --- /dev/null +++ b/pkgs/development/python-modules/gurobipy/no-clever-setup.patch @@ -0,0 +1,55 @@ +diff -Naur a/setup.py b/setup.py +--- a/setup.py 2017-12-22 10:52:43.730264611 -0500 ++++ b/setup.py 2017-12-22 10:53:27.660104199 -0500 +@@ -15,30 +15,6 @@ + from distutils.command.install import install + import os,sys,shutil + +-class GurobiClean(Command): +- description = "remove the build directory" +- user_options = [] +- def initialize_options(self): +- self.cwd = None +- def finalize_options(self): +- self.cwd = os.path.dirname(os.path.realpath(__file__)) +- def run(self): +- assert os.getcwd() == self.cwd, 'Must be run from setup.py directory: %s' % self.cwd +- build_dir = os.path.join(os.getcwd(), "build") +- if os.path.exists(build_dir): +- print('removing %s' % build_dir) +- shutil.rmtree(build_dir) +- +-class GurobiInstall(install): +- +- # Calls the default run command, then deletes the build area +- # (equivalent to "setup clean --all"). +- def run(self): +- install.run(self) +- c = GurobiClean(self.distribution) +- c.finalize_options() +- c.run() +- + License = """ + This software is covered by the Gurobi End User License Agreement. + By completing the Gurobi installation process and using the software, +@@ -79,20 +55,4 @@ + packages = ['gurobipy'], + package_dir={'gurobipy' : srcpath }, + package_data = {'gurobipy' : [srcfile] }, +- cmdclass={'install' : GurobiInstall, +- 'clean' : GurobiClean } + ) +- +-if os.name == 'posix' and sys.platform == 'darwin': # update Mac paths +- verstr = sys.version[:3] +- default = '/Library/Frameworks/Python.framework/Versions/%s/Python' % verstr +- default = '/System'+default if verstr == '2.7' else default +- modified = sys.prefix + '/Python' +- if default != modified: +- import subprocess +- from distutils.sysconfig import get_python_lib +- sitelib = get_python_lib() + '/gurobipy/gurobipy.so' +- if not os.path.isfile(modified): # Anaconda +- libver = verstr if verstr == '2.7' else verstr+'m' +- modified = sys.prefix + '/lib/libpython%s.dylib' % libver # For Anaconda +- subprocess.call(('install_name_tool', '-change', default, modified, sitelib)) diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix new file mode 100644 index 000000000000..97d2854ca226 --- /dev/null +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, pytest +, pytest-expect +, mock +, six +, webencodings +}: + +buildPythonPackage rec { + pname = "html5lib"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"; + }; + + checkInputs = [ flake8 pytest pytest-expect mock ]; + propagatedBuildInputs = [ + six webencodings + ]; + + checkPhase = '' + py.test + ''; + + meta = { + homepage = https://github.com/html5lib/html5lib-python; + downloadPage = https://github.com/html5lib/html5lib-python/releases; + description = "HTML parser based on WHAT-WG HTML5 specification"; + longDescription = '' + html5lib is a pure-python library for parsing HTML. It is designed to + conform to the WHATWG HTML specification, as is implemented by all + major web browsers. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ domenkozar prikhi ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index 2206b3559bae..8df4b3813c41 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "htmlmin"; - version = "0.1.11"; + version = "0.1.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e"; + sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178"; }; # Tests run fine in a normal source checkout, but not when being built by nix. diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index d11d6b3668f6..2f24a1ab72bd 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "httpbin"; - version = "0.5.0"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054"; + sha256 = "0afa0486a76305cac441b5cc80d5d4ccd82b20875da7c5119ecfe616cefef45f"; }; propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix new file mode 100644 index 000000000000..635f8b33d3c6 --- /dev/null +++ b/pkgs/development/python-modules/idna/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "idna"; + version = "2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f"; + }; + + meta = { + homepage = "http://github.com/kjd/idna/"; + description = "Internationalized Domain Names in Applications (IDNA)"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix new file mode 100644 index 000000000000..bccf49c56adf --- /dev/null +++ b/pkgs/development/python-modules/inflection/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, buildPythonPackage, pytest } : + +buildPythonPackage rec { + pname = "inflection"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jhnxgnw8y3mbzjssixh6qkc7a3afc4fygajhqrqalnilyvpzshq"; + }; + + checkInputs = [ pytest ]; + # Suppress overly verbose output if tests run successfully + checkPhase = ''pytest >/dev/null || pytest''; + + meta = { + homepage = https://github.com/jpvanhal/inflection; + description = "A port of Ruby on Rails inflector to Python"; + maintainers = with lib.maintainers; [ NikolaMandic ilya-kolpakov ]; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index a77f6ac9c2f1..8547a3ef99e9 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "4.6.1"; + version = "4.7.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db"; + sha256 = "354986612a38f0555c43d5af2425e2a67506b63b313a0325e38904003b9d977b"; }; buildInputs = [ nose ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index b25039cc71e8..808853891e95 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "5.3.0"; + version = "5.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d"; + sha256 = "66469e894d1f09d14a1f23b971a410af131daa9ad2a19922082e02e0ddfd150f"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 3d1563234910..f77c3570c02f 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.0.5"; + version = "7.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "321be3dc48193130ba16e8080172bb5cd052eb65e3ad0ea7b5f80ff73e24bc54"; + sha256 = "3e2be7dea4f97c9a4df71ef065cad9f2e420dd901127bf7cb690fb56d2b34ea3"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix new file mode 100644 index 000000000000..4f9ff70556b4 --- /dev/null +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "iso8601"; + version = "0.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test iso8601 + ''; + + meta = { + homepage = https://bitbucket.org/micktwomey/pyiso8601/; + description = "Simple module to parse ISO 8601 dates"; + maintainers = with lib.maintainers; [ phreedom ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix new file mode 100644 index 000000000000..d3ed32c0882f --- /dev/null +++ b/pkgs/development/python-modules/jdcal/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "jdcal"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "b760160f8dc8cc51d17875c6b663fafe64be699e10ce34b6a95184b5aa0fdc9e"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "A module containing functions for converting between Julian dates and calendar dates"; + homepage = "https://github.com/phn/jdcal"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ lihop ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index bf9f9f9c0823..df8a287ea093 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.11.0"; + version = "0.11.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396"; + sha256 = "d6e799d04d1ade9459ed0f20de47c32f2285438956a677d083d3c98def59fa97"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix new file mode 100644 index 000000000000..db83e6cb2991 --- /dev/null +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, unicodecsv +}: + +buildPythonPackage rec { + pname = "jellyfish"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9"; + }; + + checkInputs = [ pytest unicodecsv ]; + + meta = { + homepage = https://github.com/sunlightlabs/jellyfish; + description = "Approximate and phonetic matching of strings"; + maintainers = with lib.maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ca286ae06aab..cb0eb130a2f2 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,20 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi -, markupsafe }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, pytest, markupsafe }: buildPythonPackage rec { pname = "Jinja2"; version = "2.9.6"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx"; + src = fetchFromGitHub { + owner = "pallets"; + repo = "jinja"; + rev = version; + sha256 = "1xxc5vdhz214aawmllv0fi4ak6d7zac662yb7gn1xfgqfz392pg5"; }; + checkInputs = [ pytest ]; propagatedBuildInputs = [ markupsafe ]; - # No tests included - doCheck = false; + checkPhase = '' + pytest -v + ''; meta = with stdenv.lib; { homepage = http://jinja.pocoo.org/; @@ -24,7 +28,7 @@ buildPythonPackage rec { Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. - ''; + ''; platforms = platforms.all; maintainers = with maintainers; [ pierron garbas sjourdois ]; }; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a2278566c6d7..19b1eeefa534 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.7.4"; + version = "1.7.5"; name = "${pname}-${version}"; propagatedBuildInputs = [ six ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchurl { url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e"; + sha256 = "78eb1e5c8535484f0d0b588aca38da3fb5e0e34de2d1ab53c077e71c55757473"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jsondate/default.nix b/pkgs/development/python-modules/jsondate/default.nix new file mode 100644 index 000000000000..7888a6df23cc --- /dev/null +++ b/pkgs/development/python-modules/jsondate/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildPythonPackage, six }: + +buildPythonPackage rec { + version = "0.1.3"; + pname = "jsondate"; + + src = fetchFromGitHub { + owner = "ilya-kolpakov"; + repo = "jsondate"; + rev = "refs/tags/v${version}"; + sha256 = "0nhvi48nc0bmad5ncyn6c9yc338krs3xf10bvv55xgz25c5gdgwy"; + fetchSubmodules = true; # Fetching by tag does not work otherwise + }; + + propagatedBuildInputs = [ six ]; + + meta = { + homepage = "https://github.com/ilya-kolpakov/jsondate"; + description = "JSON with datetime handling"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix new file mode 100644 index 000000000000..9d4331c8ea80 --- /dev/null +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsondiff"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2d0437782de9418efa34e694aa59f43d7adb1899bd9a793f063867ddba8f7893"; + }; + + # No tests + doCheck = false; + + meta = { + description = "Diff JSON and JSON-like structures in Python"; + homepage = https://github.com/ZoomerAnalytics/jsondiff; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 39f36b1d9494..8d238b4746df 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.16"; + version = "1.21"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a"; + sha256 = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153"; }; # test files are missing diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix new file mode 100644 index 000000000000..2d9f02a5affb --- /dev/null +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsonpickle"; + version = "0.9.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "cc25dc79571d4ad7db59d05ddb7de0d76a8d598cf6136e1dbeaa9361ebcfe749"; + }; + + doCheck = false; + + meta = { + description = "Python library for serializing any arbitrary object graph into JSON"; + homepage = http://jsonpickle.github.io/; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix new file mode 100644 index 000000000000..b331279042c0 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "jsonrpclib-pelix"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl"; + }; + + meta = with lib; { + description = "JSON RPC client library - Pelix compatible fork"; + homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/; + license = lib.licenses.asl20; + maintainers = with maintainers; [ moredread ]; + }; +} diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index b1053bbdaab1..7a6104aacf35 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Task-Based Parallelization Framework"; license = licenses.mit; - url = https://jug.readthedocs.io/; + homepage = https://jug.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; }; } diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 3782d313df89..e88b7f937a55 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, nose , traitlets , jupyter_core , pyzmq , dateutil , isPyPy , py +, ipykernel +, ipython +, mock +, pytest }: buildPythonPackage rec { pname = "jupyter_client"; - version = "5.1.0"; - name = "${pname}-${version}"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba"; + sha256 = "ca30cf1786047925ebacd6f6faa3a993efaa004b584f7d83bc8b807f7cd3f6bb"; }; - buildInputs = [ nose ]; + checkInputs = [ ipykernel ipython mock pytest ]; propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py; checkPhase = '' - nosetests -v + py.test ''; + patches = [ + ./wheel_workaround.patch + ]; + # Circular dependency with ipykernel doCheck = false; diff --git a/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch b/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch new file mode 100644 index 000000000000..926fcb26448b --- /dev/null +++ b/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 95d4774..ee72cbc 100644 +--- a/setup.py ++++ b/setup.py +@@ -86,7 +86,7 @@ setup_args = dict( + extras_require = { + 'test': ['ipykernel', 'ipython', 'mock'], + 'test:python_version == "3.3"': ['pytest<3.3.0'], +- 'test:python_version >= "3.4" or python_version == "2.7"': ['pytest'], ++ 'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'], + }, + cmdclass = { + 'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled, diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 4db36cf7b374..403f7c047d56 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.3.0"; + version = "4.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40"; + sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7"; }; - buildInputs = [ pytest mock glibcLocales ]; + checkInputs = [ pytest mock glibcLocales ]; propagatedBuildInputs = [ ipython traitlets ]; patches = [ ./tests_respect_pythonpath.patch ]; diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch index 61415b756abc..7e7e9ae93a09 100644 --- a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch +++ b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch @@ -1,24 +1,20 @@ ---- a/jupyter_core/tests/test_command.py 2016-09-13 15:22:49.000000000 +0200 -+++ b/jupyter_core/tests/test_command.py 2017-10-23 12:49:27.489527705 +0200 -@@ -113,7 +113,10 @@ - witness = a.join(witness_cmd) - witness.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')) - witness.chmod(0o700) -- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': ''}) -+ out = check_output( -+ [sys.executable, str(jupyter), 'witness'], -+ env={'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']} -+ ) - assert b'WITNESS' in out - - -@@ -136,5 +139,8 @@ - witness_b.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')) - witness_b.chmod(0o700) - -- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': str(b)}) -+ out = check_output( -+ [sys.executable, str(jupyter), 'witness'], -+ env={'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']} -+ ) - assert b'WITNESS A' in out +--- a/jupyter_core/tests/test_command.py ++++ b/jupyter_core/tests/test_command.py +@@ -131,7 +131,7 @@ def test_not_on_path(tmpdir): + witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")') + write_executable(witness, witness_src) + +- env = {'PATH': ''} ++ env = {'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']} + if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614 + env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT'] + if sys.platform == 'win32': +@@ -157,7 +157,7 @@ def test_path_priority(tmpdir): + witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")') + write_executable(witness_b, witness_b_src) + +- env = {'PATH': str(b)} ++ env = {'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']} + if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614 + env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT'] + if sys.platform == 'win32': diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix new file mode 100644 index 000000000000..f5392202d4da --- /dev/null +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "1.3.5"; + pname = "kafka-python"; + + src = fetchPypi { + inherit pname version; + sha256 = "19m9fdckxqngrgh0www7g8rgi7z0kq13wkhcqy1r8aa4sxad0f5j"; + }; + + checkInputs = [ pytest six mock ]; + + checkPhase = '' + py.test + ''; + + # Upstream uses tox but we don't on Nix. Running tests manually produces however + # from . import unittest + # E ImportError: cannot import name 'unittest' + doCheck = false; + + meta = with stdenv.lib; { + description = "Pure Python client for Apache Kafka"; + homepage = https://github.com/dpkp/kafka-python; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index d88b6e4999b2..b6c56cc8bc68 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.1.1"; + version = "2.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f0ca2458c60d9711edf4291230b31795307ad3781cb6232ff4792b53c8f55123"; + sha256 = "3ee56fc129d9d00b1916046e50056047836f97ada59df029e5661fb34442d5e8"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index ca7a518665ce..f88bdb84e0c3 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "keyring"; - version = "10.4.0"; + version = "10.5.1"; src = fetchPypi { inherit pname version; - sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh"; + sha256 = "f10674bb6ecbf82e2b713627c48ad0e84178e1c9d3dc1f0373261a0765402fb2"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix deleted file mode 100644 index 7405f7f74cd5..000000000000 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ buildPythonPackage, isPyPy, fetchPypi, python -, pbr, testtools, testresources, testrepository, mock -, pep8, fixtures, mox3, requests-mock -, iso8601, requests, six, stevedore, webob, oslo-config -, pyyaml, betamax, oauthlib -}: - -buildPythonPackage rec { - pname = "keystoneauth1"; - version = "3.2.0"; - name = "${pname}-${version}"; - disabled = isPyPy; # a test fails - - src = fetchPypi { - inherit pname version; - sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n"; - }; - - buildInputs = [ pbr ]; - checkInputs = [ pyyaml betamax oauthlib testtools testresources - testrepository mock pep8 fixtures mox3 requests-mock ]; - propagatedBuildInputs = [ iso8601 requests six stevedore webob ]; - - doCheck = true; - # 1. oslo-config - # 2. oslo-utils - # 3. requests-kerberos - preCheck = '' - rm keystoneauth1/tests/unit/loading/test_{session,conf,adapter}.py - rm keystoneauth1/tests/unit/access/test_v{2,3}_access.py - rm keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py - ''; - postPatch = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - substituteInPlace requirements.txt --replace "argparse" "" - ''; -} diff --git a/pkgs/development/python-modules/keystoneclient/default.nix b/pkgs/development/python-modules/keystoneclient/default.nix deleted file mode 100644 index a856f4db793f..000000000000 --- a/pkgs/development/python-modules/keystoneclient/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python - -, pbr, testtools, testresources, testrepository -, requests-mock, fixtures, openssl, oslotest, pep8 - -, oslo-serialization, oslo-config, oslo-i18n, oslo-utils -, Babel, prettytable, requests, six, iso8601, stevedore -, netaddr, debtcollector, bandit, webob, mock, pycrypto -}: - -buildPythonPackage rec { - pname = "keystoneclient"; - version = "1.8.1"; - name = pname + "-" + version; - - src = fetchFromGitHub { - owner = "openstack"; - repo = "python-keystoneclient"; - rev = version; - sha256 = "0yayn1hb3mncqb0isy8vy6d519xya7mhf5pcbn60fzdqjrkj2prq"; - }; - - PBR_VERSION = "${version}"; - - buildInputs = [ - pbr testtools testresources testrepository requests-mock fixtures openssl - oslotest pep8 - ]; - propagatedBuildInputs = [ - oslo-serialization oslo-config oslo-i18n oslo-utils - Babel prettytable requests six iso8601 stevedore - netaddr debtcollector bandit webob mock pycrypto - ]; - - postPatch = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - sed -ie '/argparse/d' requirements.txt - ''; - - doCheck = false; # The checkPhase below is broken - - checkPhase = '' - patchShebangs run_tests.sh - ./run_tests.sh - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/openstack/python-novaclient/; - description = "Client library and command line tool for the OpenStack Nova API"; - license = licenses.asl20; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix new file mode 100644 index 000000000000..a1b58a4eb05d --- /dev/null +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "lark-parser"; # PyPI name + version = "2017-12-18"; + + src = fetchFromGitHub { + owner = "erezsh"; + repo = "lark"; + rev = "9d6cde9b1ba971f02ea8106fa3b71a934e83d6fa"; + sha256 = "0nv6nxd8wx9dwhn37m94fkc10gknckrjs1hzajxygla3dpql455j"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + doCheck = false; # Requires js2py + + meta = { + description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; + homepage = https://github.com/erezsh/lark; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 635308f37607..32f25eeda42c 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,18 +1,18 @@ { lib, writeText, buildPythonPackage, isPy3k, fetchPypi -, openldap, cyrus_sasl, openssl, pytest }: +, openldap, cyrus_sasl, openssl, pytest, pyasn1 }: buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.45"; + version = "2.5.2"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e"; + sha256 = "b8c134dfedaef0e6ff4a4b94277708dcadb758b448905a83b8946df077356ed2"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest pyasn1 ]; checkPhase = '' # Needed by tests to setup a mockup ldap server. diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 895272f351de..202bceafae39 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }: buildPythonPackage rec { - version = "2.3"; + version = "2.4"; pname = "ldap3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0"; + sha256 = "888015f849eb33852583bbaf382f61593b03491cdac6098fd5d4d0252e0e7e66"; }; buildInputs = [ gssapi ]; diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix new file mode 100644 index 000000000000..4eab700ff140 --- /dev/null +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, twisted +, pycrypto +, pyopenssl +, pyparsing +, zope_interface +, isPy3k +}: + +buildPythonPackage rec { + pname = "ldaptor"; + version = "16.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6b9ebe5814e9e7091703c4e3bfeae73b46508b4678e2ff403cddaedf8213815d"; + }; + + propagatedBuildInputs = [ + twisted pycrypto pyopenssl pyparsing zope_interface + ]; + + disabled = isPy3k; + + # TypeError: None is neither bytes nor unicode + doCheck = false; + + meta = { + description = "A Pure-Python Twisted library for LDAP"; + homepage = https://github.com/twisted/ldaptor; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix new file mode 100644 index 000000000000..f3b48eaa5760 --- /dev/null +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, libusb1 }: + +buildPythonPackage rec { + pname = "libusb1"; + version = "1.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"; + }; + + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace usb1/libusb1.py --replace \ + "ctypes.util.find_library(base_name)" \ + "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + buildInputs = [ libusb1 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/vpelletier/python-libusb1; + description = "Python ctype-based wrapper around libusb1"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix new file mode 100644 index 000000000000..5dc33d2d93e1 --- /dev/null +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchurl, python, pkgconfig, lxml, libvirt, nose }: + +buildPythonPackage rec { + pname = "libvirt"; + version = "3.10.0"; + + src = assert version == libvirt.version; fetchurl { + url = "http://libvirt.org/sources/python/${pname}-python-${version}.tar.gz"; + sha256 = "1l0fgqjnx76pzkhq540x9sf5fgzlrn0dpay90j2m4iq8nkclcbpw"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt lxml ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = http://www.libvirt.org/; + description = "libvirt Python bindings"; + license = licenses.lgpl2; + maintainers = [ maintainers.fpletz ]; + }; +} diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 570bba2a8c42..26dfda613f75 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "2.0"; + version = "2.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381"; + sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 4c4c89d8f196..ef4d9fb5d020 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.0"; + version = "1.3.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + sha256 = "96252a286a2be25810904d969b330ef2a57c2b9c18c5b503bbfbae40feb2bb63"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 57deaf3caf36..d702d8f95b08 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , buildPythonPackage , python , llvm @@ -10,21 +10,20 @@ buildPythonPackage rec { pname = "llvmlite"; - name = "${pname}-${version}"; - version = "0.20.0"; + version = "0.21.0"; disabled = isPyPy; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29"; + src = fetchPypi { + inherit pname version; + sha256 = "3a5dd0695fdfb9fd47464cd71791b84935bf9642e11f4811d57aa1f2da8cdaa8"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 - patchPhase = '' + postPatch = '' substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix new file mode 100644 index 000000000000..9ad9ddb433f0 --- /dev/null +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "lmtpd"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "192d1j9lj9i6f4llwg51817am4jj8pjvlqmkx03spmsay6f832bm"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/moggers87/lmtpd; + description = "LMTP counterpart to smtpd in the Python standard library"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/ltc_scrypt/default.nix b/pkgs/development/python-modules/ltc_scrypt/default.nix deleted file mode 100644 index 273571c66e1f..000000000000 --- a/pkgs/development/python-modules/ltc_scrypt/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "ltc_scrypt"; - version = "1.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "1h90hh3iw4i7zs7jgskdjlk8gi97b3v2zqsxdfwdvhrrnhpvv856"; - }; - - meta = with stdenv.lib; { - description = "Bindings for scrypt proof of work used by Litecoin"; - homepage = https://pypi.python.org/pypi/ltc_scrypt; - maintainers = with maintainers; [ asymmetric ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix new file mode 100644 index 000000000000..bfd0c8227ee7 --- /dev/null +++ b/pkgs/development/python-modules/lxml/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, libxml2 +, libxslt +}: + +buildPythonPackage rec { + pname = "lxml"; + version = "4.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + }; + + buildInputs = [ libxml2 libxslt ]; + + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + + meta = { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = http://lxml.de; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sjourdois ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index fbdd13a7f385..f909974db6b3 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "marionette-harness"; - version = "4.1.0"; + version = "4.3.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983"; + sha256 = "a98bb65a0c63f60d9e3d7ef21dabc9c29676917dc2ec0d46851a3ed694c820cc"; }; propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index d3eab83eea86..4315b08e016f 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "marionette_driver"; - version = "2.3.0"; + version = "2.5.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ab9xxsp0zvckf32k84n52hpibw2c62sa2pmx821d3q0d67yv2vv"; + sha256 = "0axhdin9ys3i9lnwqqqw87wap9000bk6cdgrzpd2gqricc7l3v65"; }; propagatedBuildInputs = [ mozversion mozrunner ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix new file mode 100644 index 000000000000..515dee0e7662 --- /dev/null +++ b/pkgs/development/python-modules/markdown/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pyyaml +}: + +buildPythonPackage rec { + pname = "Markdown"; + version = "2.6.10"; + + src = fetchPypi { + extension = "zip"; + inherit pname version; + sha256 = "cfa536d1ee8984007fcecc5a38a493ff05c174cb74cb2341dafd175e6bc30851"; + }; + + # error: invalid command 'test' +# doCheck = false; + + checkInputs = [ nose pyyaml ]; + + meta = { + description = "A Python implementation of John Gruber’s Markdown with Extension support"; + homepage = https://github.com/Python-Markdown/markdown; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index afb60801dc94..a9db6ef1e84c 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow"; name = "${pname}-${version}"; - version = "2.14.0"; + version = "2.15.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "09943a460026b9a61c3f4cedd0e5ccfed7cfce3271debd19e3f97df561088718"; + sha256 = "d3f31fe7be2106b1d783cbd0765ef4e1c6615505514695f33082805f929dd584"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 345a21ecddfe..33505b5f6187 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -20,13 +20,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.0"; + version = "2.1.1"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387"; + sha256 = "659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 14aef5b00d12..7ab4a1842634 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mistune"; - version = "0.7.4"; + version = "0.8.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0byj9jg9ly7karf5sb1aqcw7avaim9sxl8ws7yw7p1fibjgsy5w5"; + sha256 = "bc10c33bfdcaa4e749b779f62f60d6e12f8215c46a292d05e486b869ae306619"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index cf74e1dc1342..d5c40c67b36b 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, requests, pytz -, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil }: +{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask +, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker +, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }: buildPythonPackage rec { pname = "moto"; - version = "0.4.31"; - name = "moto-${version}"; + version = "1.1.25"; + src = fetchPypi { inherit pname version; - sha256 = "19s8hfz4mzzzdksa0ddlvrga5mxdaqahk89p5l29a5id8127shr8"; + sha256 = "d427d6e1a81e926c2b6a071453807b05f4736d65068493e1f3055ac7ee24ea21"; }; propagatedBuildInputs = [ + aws-xray-sdk boto + boto3 dateutil flask httpretty @@ -21,6 +24,13 @@ buildPythonPackage rec { requests six xmltodict + mock + pyaml + backports_tempfile + cookies + jsondiff + botocore + docker ]; checkInputs = [ boto3 nose sure freezegun ]; diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix new file mode 100644 index 000000000000..097898a2d84f --- /dev/null +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }: + +buildPythonPackage rec { + pname = "mypgoclient"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "gpodder"; + repo = "mygpoclient"; + rev = version; + sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp"; + }; + + checkInputs = [ nose minimock ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + description = "A gpodder.net client library"; + longDescription = '' + The mygpoclient library allows developers to utilize a Pythonic interface + to the gpodder.net web services. + ''; + homepage = https://github.com/gpodder/mygpoclient; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ skeidel ]; + }; +} diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 964b42fe4eee..26525adb1c96 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0x495yb0abkdspyziw7dyyjwxx6ivnv5zznk92wa3mcind5s9757"; + sha256 = "10bfb12b083a7509779298c31b4b61e2ed7e78d1960cbcfb3de8d38f3b830991"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix new file mode 100644 index 000000000000..f6fc4139c858 --- /dev/null +++ b/pkgs/development/python-modules/networkx/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, decorator +, isPy36 +, isPyPy +}: + +buildPythonPackage rec { + pname = "networkx"; + version = "1.11"; + + # Currently broken on PyPy. + # https://github.com/networkx/networkx/pull/1361 + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ decorator ]; + + # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299 + doCheck = !(isPy36); + + meta = { + homepage = "https://networkx.github.io/"; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 16036a691791..6133abac7052 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.3.1"; + version = "0.4.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "0kkarh5cdcd2czs0bf0s1g51qas84mfxfq0dzd7k5h5l0qr4zy06"; + sha256 = "bb692254bde35d7e1d3d1534d9b3117810b35a744724625f150fbbc64d519c02"; }; checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 2a23ff4de78c..71261fb1f406 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.2.1"; + version = "5.2.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224"; + sha256 = "7bb54fb61b9c5426bc116f840541b973431198e00ea2896122d05fc122dbbd67"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index b0d7ae72c95b..97aad8c09285 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , python , buildPythonPackage , isPy27 @@ -14,13 +14,12 @@ }: buildPythonPackage rec { - version = "0.35.0"; + version = "0.36.2"; pname = "numba"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3"; + src = fetchPypi { + inherit pname version; + sha256 = "d61597808ce511e81b64e32da664f52beb7d947bf834dde8b8b60b29d205e5c2"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -29,7 +28,7 @@ buildPythonPackage rec { # Copy test script into $out and run the test suite. checkPhase = '' - python -m numba.runtests + ${python.interpreter} -m numba.runtests ''; # ImportError: cannot import name '_typeconv' doCheck = false; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix new file mode 100644 index 000000000000..e6fc5888feaf --- /dev/null +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, numpy +}: + +buildPythonPackage rec { + pname = "numexpr"; + version = "2.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "f0bef9a3a5407fb8d6344cf91b658bef7c13ec8a8eb13f423822d9d2ca5af6ce"; + }; + + propagatedBuildInputs = [ numpy ]; + + # Run the test suite. + # It requires the build path to be in the python search path. + checkPhase = '' + ${python}/bin/${python.executable} <=2" "" + ''; + # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Python wrapper for OpenCL"; homepage = https://github.com/pyopencl/pyopencl; - license = stdenv.lib.licenses.mit; - maintainer = stdenv.lib.maintainers.fridh; + license = licenses.mit; + maintainers = [ maintainers.fridh ]; }; } diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index dc5c964caf6d..053824ef8e95 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -6,7 +6,7 @@ let pname = "PyQt"; - version = "5.9"; + version = "5.9.2"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; in buildPythonPackage { @@ -25,7 +25,7 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb"; + sha256 = "15439gxari6azbfql20ksz8h4gv23k3kfyjyr89h2yy9k32xm461"; }; nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; diff --git a/pkgs/development/python-modules/pyrax/default.nix b/pkgs/development/python-modules/pyrax/default.nix deleted file mode 100644 index 1337b3c32ada..000000000000 --- a/pkgs/development/python-modules/pyrax/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring, - rackspace-novaclient, six, isPy3k, pytest, glibcLocales }: -buildPythonPackage rec { - pname = "pyrax"; - version = "1.9.8"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://pypi/p/pyrax/${name}.tar.gz"; - sha256 = "1x98jzyxnvha81pgx3jpfixljhs7zik89yfp8q06kwpx8ws99nz9"; - }; - - # no good reason given in commit why limited, and seems to work - patchPhase = '' - substituteInPlace "setup.py" \ - --replace "python-novaclient==2.27.0" "python-novaclient" - ''; - - disabled = isPy3k; - propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ]; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ]; - - checkPhase = '' - py.test tests/unit - ''; - - meta = { - homepage = https://github.com/rackspace/pyrax; - license = lib.licenses.asl20; - description = "Python API to interface with Rackspace"; - maintainers = with lib.maintainers; [ teh ]; - }; -} diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index a2dfd53b7951..89799988fa1f 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -18,8 +18,8 @@ }: buildPythonPackage rec { + pname = "PySC2"; version = "1.2"; - name = "PySC2-${version}"; src = fetchFromGitHub { owner = "deepmind"; diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix new file mode 100644 index 000000000000..85bcf56f0628 --- /dev/null +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pysigset"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ym44z3nwp8chfi7snmknkqnl2q9bghzv9p923r8w748i5hvyxx8"; + }; + + meta = with stdenv.lib; { + description = "Provides access to sigprocmask(2) and friends and convenience wrappers to python application developers wanting to SIG_BLOCK and SIG_UNBLOCK signals"; + homepage = https://github.com/ossobv/pysigset; + license = licenses.gpl3; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index e855b952f276..41b42bb63ec0 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,18 +2,16 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "unstable-69e4f4f"; + version = "20171102"; name = pname + "-" + version; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d"; - sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28"; + rev = "a2acbc820da419e308c5817998d2abe78a7b75e6"; + sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as"; }; - patches = [ ./pyslurm-dlfcn.patch ]; - buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; diff --git a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch deleted file mode 100644 index 2b3798a30706..000000000000 --- a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/pyslurm/__init__.py b/pyslurm/__init__.py -index 81643e1..e8b6836 100644 ---- a/pyslurm/__init__.py -+++ b/pyslurm/__init__.py -@@ -11,8 +11,11 @@ import sys - old_dlopen_flags = '' - if hasattr(sys, "setdlopenflags"): - old_dlopen_flags = sys.getdlopenflags() -- import DLFCN -- sys.setdlopenflags(old_dlopen_flags | DLFCN.RTLD_GLOBAL) -+ if sys.version_info >= (3,6): -+ from os import RTLD_GLOBAL -+ else: -+ from DLFCN import RTLD_GLOBAL -+ sys.setdlopenflags(old_dlopen_flags | RTLD_GLOBAL) - - from .pyslurm import * - diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix index ef67ed85cc03..aa7d23c5fcb5 100644 --- a/pkgs/development/python-modules/pysoundfile/default.nix +++ b/pkgs/development/python-modules/pysoundfile/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "PySoundFile"; - version = "0.8.1"; + version = "0.9.0.post1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + sha256 = "43dd46a2afc0484c26930a7e59eef9365cee81bce7a4aadc5699f788f60d32c3"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index 6df1792f884b..c31cd2ab6f63 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - website = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = https://pypi.python.org/pypi/pytest-catchlog/; description = "py.test plugin to create a 'tmpdir' containing predefined files/directories."; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index fdd1986c04fc..c98370ed9389 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-localserver"; name = "${pname}-${version}"; - version = "0.3.7"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1c11hn61n06ms0wmw6536vs5k4k9hlndxsb3p170nva56a9dfa6q"; + sha256 = "a72af60a1ec8f73668a7884c86baf1fbe48394573cb4fa36709887217736c021"; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix new file mode 100644 index 000000000000..6e8742ec2b8e --- /dev/null +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestflakes, pytestpep8, tox }: +buildPythonPackage rec { + pname = "pytest-quickcheck"; + version = "0.8.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "17vly6fg0s95lbg620g9dp9jjf12sj4hpbi7cg579kswabl6304g"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pytestflakes pytestpep8 tox ]; + + meta = with stdenv.lib; { + license = licenses.asl20; + homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; + description = "pytest plugin to generate random data inspired by QuickCheck"; + }; +} diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix new file mode 100644 index 000000000000..9c906fe2fa4a --- /dev/null +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }: + +buildPythonPackage rec { + pname = "pytest-rerunfailures"; + version = "4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "18lpy6d9b4ck8j3jwh4vmxj54is0fwanpmpg70qg4y0fycdqzwks"; + }; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "pytest plugin to re-run tests to eliminate flaky failures."; + homepage = https://github.com/pytest-dev/pytest-rerunfailures; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix new file mode 100644 index 000000000000..d3a4e375ec3a --- /dev/null +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pexpect +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-timeout"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8"; + }; + buildInputs = [ pytest ]; + checkInputs = [ pytest pexpect ]; + checkPhase = ''pytest -ra''; + + meta = with lib;{ + description = "py.test plugin to abort hanging tests"; + homepage = http://bitbucket.org/pytest-dev/pytest-timeout/; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index e993a67c49f1..2e2975e65968 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-xdist"; - version = "1.20.1"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712"; + sha256 = "0b8622435e3c0650a8d5a07b73a7f9c4f79b52d7ed060536a6041f0da423ba8e"; }; buildInputs = [ pytest setuptools_scm pytest-forked]; diff --git a/pkgs/development/python-modules/pytest/3_2.nix b/pkgs/development/python-modules/pytest/3_2.nix new file mode 100644 index 000000000000..d7a0b1bdad34 --- /dev/null +++ b/pkgs/development/python-modules/pytest/3_2.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py +, setuptools_scm, setuptools +}: +buildPythonPackage rec { + version = "3.2.5"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + }; + + checkInputs = [ hypothesis ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py setuptools ] + ++ (stdenv.lib.optional isPy26 argparse); + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + platforms = platforms.unix; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 8e280b8fd0d6..d45fe7deb124 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm, setuptools +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.3.1"; pname = "pytest"; preCheck = '' @@ -12,16 +12,18 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; }; checkInputs = [ hypothesis ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py setuptools ] + propagatedBuildInputs = [ attrs py setuptools six pluggy ] + ++ (stdenv.lib.optional (!isPy3k) funcsigs) ++ (stdenv.lib.optional isPy26 argparse); meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; platforms = platforms.unix; + description = "Framework for writing tests"; }; } diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix index d9debce6aecb..02b86b3b33a3 100644 --- a/pkgs/development/python-modules/python-fuse/default.nix +++ b/pkgs/development/python-modules/python-fuse/default.nix @@ -7,21 +7,21 @@ }: buildPythonPackage rec { - baseName = "fuse"; - version = "0.2.1"; - name = "${baseName}-${version}"; - disabled = isPy3k; + pname = "fuse"; + version = "0.2.1"; - src = fetchurl { - url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; - sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; - }; + disabled = isPy3k; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse ]; + src = fetchurl { + url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; + sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; + }; - meta = { - description = "Python bindings for FUSE"; - license = lib.licenses.lgpl21; - }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; + + meta = { + description = "Python bindings for FUSE"; + license = lib.licenses.lgpl21; + }; } diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix new file mode 100644 index 000000000000..dacc27c53a05 --- /dev/null +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, gcc7, nixUnstable, isPy3k }: + +assert isPy3k; + +stdenv.mkDerivation rec { + name = "pythonix-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "pythonix"; + rev = "v${version}"; + sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj"; + }; + + nativeBuildInputs = [ meson pkgconfig ninja gcc7 ]; + + buildInputs = [ nixUnstable ]; + + meta = with stdenv.lib; { + description = '' + Eval nix code from python. + ''; + maintainers = [ maintainers.mic92 ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index 55479e76dafd..91661a1fb510 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -1,18 +1,22 @@ -{ stdenv, buildPythonPackage, fetchgit -, python }: +{ stdenv +, buildPythonPackage +, fetchgit +, python +}: buildPythonPackage rec { pname = "pytoml"; - version = "0.1.11"; - name = "${pname}-${version}"; + version = "0.1.14"; - checkPhase = "${python.interpreter} test/test.py"; + checkPhase = '' + ${python.interpreter} test/test.py + ''; # fetchgit used to ensure test submodule is available src = fetchgit { url = "${meta.homepage}.git"; rev = "refs/tags/v${version}"; - sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j"; + sha256 = "1ip71yqxnyi4jhw5x1q7a0za61ndhpfh0vbx08jfv0w4ayng6rgv"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix new file mode 100644 index 000000000000..2bf7413c6005 --- /dev/null +++ b/pkgs/development/python-modules/pytools/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, decorator +, appdirs +, six +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "pytools"; + version = "2017.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "80f1bba4469d473c1b3969bc8e188c03bcc94d35807a889ceebbfc78e3208115"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ + decorator + appdirs + six + numpy + ]; + + checkPhase = '' + py.test -k 'not test_persistent_dict' + ''; + + meta = { + homepage = https://github.com/inducer/pytools/; + description = "Miscellaneous Python lifesavers."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ artuuge ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 8e10fbb22581..d09a9bbd6d80 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - name = "pywbem-${version}"; + pname = "pywbem"; version = "0.10.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index ecd46bb1ff57..10150259ef5c 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pywinrm"; - version = "0.2.2"; + version = "0.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h"; + sha256 = "799fc3e33fec8684443adf5778860388289102ea4fa1458f1bf307d167855573"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch new file mode 100644 index 000000000000..c4d14319a8b6 --- /dev/null +++ b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -18,7 +18,7 @@ from version import VERSION # NOQA + install_requires = [ + 'pandas >= 0.14', + 'numpy >= 1.8', +- 'requests >= 2.7.0, < 2.18', # Version 2.18 appears to break pulling data. ++ 'requests >= 2.7.0', # Works fine + 'inflection >= 0.3.1', + 'python-dateutil', + 'six', diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix new file mode 100644 index 000000000000..e85e9c4e0f8c --- /dev/null +++ b/pkgs/development/python-modules/quandl/default.nix @@ -0,0 +1,59 @@ +{ + lib, fetchFromGitHub, buildPythonPackage, isPy3k, + # runtime dependencies + pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, + # test suite dependencies + nose, unittest2, flake8, httpretty, mock, factory_boy, jsondate, + # additional runtime dependencies are required on Python 2.x + pyOpenSSL ? null, ndg-httpsclient ? null, pyasn1 ? null +}: + +buildPythonPackage rec { + pname = "quandl"; + version = "3.2.1"; + sha256 = "0vc0pzs2px9yaqkqcmd2m1b2bq1iils8fs0xbl0989hjq791a4jr"; + + patches = [ ./allow-requests-v2.18.patch ]; + + # Tests do not work with fetchPypi + src = fetchFromGitHub { + owner = pname; + repo = "quandl-python"; + rev = "refs/tags/v${version}"; + inherit sha256; + fetchSubmodules = true; # Fetching by tag does not work otherwise + }; + + doCheck = true; + + checkInputs = [ + nose + unittest2 + flake8 + httpretty + mock + factory_boy + jsondate + ]; + + propagatedBuildInputs = [ + pandas + numpy + requests + inflection + python-dateutil + six + more-itertools + ] ++ lib.optional (!isPy3k) [ + pyOpenSSL + ndg-httpsclient + pyasn1 + ]; + + meta = { + homepage = "https://github.com/quandl/quandl-python"; + description = "Quandl Python client library"; + maintainers = [ lib.maintainers.ilya-kolpakov ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/rackspace-novaclient/default.nix b/pkgs/development/python-modules/rackspace-novaclient/default.nix deleted file mode 100644 index 3993503e9562..000000000000 --- a/pkgs/development/python-modules/rackspace-novaclient/default.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }: -let -os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec { - pname = "os_virtual_interfacesv2_python_novaclient_ext"; - version = "0.20"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz"; - sha256 = "17a4r8psxmfikgmzh709absbn5jsh1005whibmwhysj9fi0zyfbd"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://github.com/rackerlabs/os_virtual_interfacesv2_ext; - license = lib.licenses.asl20; - description = "Adds Virtual Interfaces support to python-novaclient"; - }; -}; - -ip-associations-python-novaclient-ext = buildPythonPackage rec { - pname = "ip_associations_python_novaclient_ext"; - version = "0.2"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz"; - sha256 = "0dxfkfjhzskafmb01y8hzbcpvc4cd6fas1s50dzcmg29w4z6qmz4"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://github.com/rackerlabs/ip_associations_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Adds Rackspace ip_associations support to python-novaclient"; - }; -}; - -rackspace-auth-openstack = buildPythonPackage rec { - pname = "rackspace-auth-openstack"; - version = "1.3"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz"; - sha256 = "1kaiyvgwmavw2mh0s32yjk70xsziynjdhi01qn9a8kljn7p6kh64"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/rackspace-auth-openstack; - license = lib.licenses.asl20; - description = "Rackspace Auth Plugin for OpenStack Clients."; - }; -}; -rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec { - pname = "rax_default_network_flags_python_novaclient_ext"; - version = "0.4.0"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz"; - sha256 = "00b0csb58k6rr1is68bkkw358mms8mmb898bm8bbr8g7j2fz8aw5"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/simple/rax-default-network-flags-python-novaclient-ext; - license = lib.licenses.asl20; - description = "Novaclient Extension for Instance Default Network Flags"; - }; -}; -os-networksv2-python-novaclient-ext = buildPythonPackage rec { - pname = "os_networksv2_python_novaclient_ext"; - version = "0.26"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz"; - sha256 = "06dzqmyrwlq7hla6dk699z18c8v27qr1gxqknimwxlwqdlhpafk1"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/os_networksv2_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Adds rackspace networks support to python-novaclient"; - }; -}; - -rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec { - pname = "rax_scheduled_images_python_novaclient_ext"; - version = "0.3.1"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz"; - sha256 = "1nvwjgrkp1p1d27an393qf49pszm1nvqa2ychhbqmp0bnabwyw7i"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/rax_scheduled_images_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Extends python-novaclient to use RAX-SI, the Rackspace Nova API Scheduled Images extension"; - }; -}; - -os-diskconfig-python-novaclient-ext = buildPythonPackage rec { - pname = "os_diskconfig_python_novaclient_ext"; - version = "0.1.3"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz"; - sha256 = "0xayy5nlkgl9yr0inqkwirlmar8pv1id29r59lj70g5plwrr5lg7"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/os_diskconfig_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Disk Config extension for python-novaclient"; - }; -}; - -in -buildPythonPackage rec { - pname = "rackspace-novaclient"; - version = "2.1"; - name = pname + "-" + version; - - src = fetchurl { - url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz"; - sha256 = "1rzaa328hzm8hs9q99gvjr64x47fmcq4dv4656rzxq5s4gv49z12"; - }; - - disabled = isPy3k; - propagatedBuildInputs = [ - requests - novaclient - six - # extensions - ip-associations-python-novaclient-ext - os-diskconfig-python-novaclient-ext - os-networksv2-python-novaclient-ext - os-virtual-interfacesv2-python-novaclient-ext - rackspace-auth-openstack - rax-default-network-flags-python-novaclient-ext - rax-scheduled-images-python-novaclient-ext - ]; - - meta = { - homepage = https://pypi.python.org/pypi/rackspace-novaclient/; - license = lib.licenses.asl20; - description = "Metapackage to install python-novaclient and Rackspace extensions"; - maintainers = with lib.maintainers; [ teh ]; - }; -} diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index e7b56cb3f350..66e2595f8d2f 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "raven"; - version = "6.3.0"; + version = "6.4.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; + sha256 = "00m985w9fja2jf8dpvdhygcr26rwabxkgvcc2v5j6v7d6lrvpvdq"; }; # way too many dependencies to run tests diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix new file mode 100644 index 000000000000..a1349ae5c36d --- /dev/null +++ b/pkgs/development/python-modules/regex/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + + +buildPythonPackage rec { + pname = "regex"; + version = "2017.12.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee069308c2757e565cc2b6f417ba5288e76cfe4c1764b6826063f4fbd53219d7"; + }; + + meta = { + description = "Alternative regular expression module, to replace re"; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; + license = lib.licenses.psfl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index fa91184f1b7a..7899f86a8cb8 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -38,8 +38,8 @@ buildPythonPackage rec { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; homepage = https://github.com/fjarri/reikna; license = stdenv.lib.licenses.mit; - maintainer = stdenv.lib.maintainers.fridh; + maintainers = [ stdenv.lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 5e1ea8b46424..5c5f2578fbf1 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "relatorio"; name = "${pname}-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { url = "mirror://pypi/r/relatorio/${name}.tar.gz"; - sha256 = "744f1e39313f037a0ab52a154338ece151d83e5442a9278db1f8ce450ce6c2cd"; + sha256 = "bddf85d029c5c85a0f976d73907e14e4c3093065fe8527170c91abf0218546d9"; }; propagatedBuildInputs = [ genshi diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 4e2646eb6ab2..91ab82a7a30e 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Download files using requests and save them to a target path"; homepage = https://www.github.com/takluyver/requests_download; license = lib.licenses.mit; - maintainer = lib.maintainers.fridh; + maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 35d723836c95..0321f9abec2c 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/requestsexceptions"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; - patforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 0f2ce45c885c..3c61ea4ded24 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "restview"; name = "${pname}-${version}"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec"; + sha256 = "5f6f1523228eab3269f59dd03ac560f7d370cd81df6fdbcb4914b5e6bd896a11"; }; propagatedBuildInputs = [ docutils readme_renderer pygments ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 8f71bab9c250..72407131cb15 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "robomachine"; - version = "0.6"; + version = "0.8.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; - sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; + sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; propagatedBuildInputs = [ pyparsing argparse robotframework ]; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index f7ef16b02bbd..62ef3f8db19e 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -3,23 +3,25 @@ , fetchPypi , capstone , filebytes -, pytest }: +, pytest +}: buildPythonApplication rec { - name = "${pname}-${version}"; pname = "ropper"; - version = "1.10.10"; + version = "1.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; + sha256 = "2183feedfe8b01a27301eee07383b481ece01b2319bdba3afebe33e19ca14aa3"; }; # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise # workaround: sudo chmod 777 /dev/shm checkPhase = '' py.test testcases ''; - buildInputs = [pytest]; + doCheck = false; # Tests not included in archive + + checkInputs = [pytest]; propagatedBuildInputs = [ capstone filebytes ]; meta = with stdenv.lib; { homepage = https://scoding.de/ropper/; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 8e5b30c26b41..3311af5e8869 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.1.11"; + version = "0.1.12"; src = fetchPypi { inherit pname version; - sha256 = "0yfrfnf404cxzn3iswibqjxklsl0b1lwgqiml6pwiqj79a7zbwbn"; + sha256 = "07hjj1cy62sc3rh5lhna9mhylp7h7aak4v6mf6809q4nc8j1p28h"; }; foo = 1; diff --git a/pkgs/development/python-modules/salmon/default.nix b/pkgs/development/python-modules/salmon/default.nix new file mode 100644 index 000000000000..f9d7f79164ac --- /dev/null +++ b/pkgs/development/python-modules/salmon/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython +, chardet, lmtpd, pythondaemon, six, jinja2, mock }: + +buildPythonPackage rec { + pname = "salmon"; + # NOTE: The latest release version 2 is over 3 years old. So let's use some + # recent commit from master. There will be a new release at some point, then + # one can change this to use PyPI. See: + # https://github.com/moggers87/salmon/issues/52 + version = "bec795cdab744be4f103d8e35584dfee622ddab2"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "moggers87"; + repo = "salmon"; + rev = version; + sha256 = "0nx8pyxy7n42nsqqvhd85ycm1i5wlacsi7lwb4rrs9d416bpd300"; + }; + + checkInputs = [ nose jinja2 mock ]; + propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ]; + + meta = with stdenv.lib; { + homepage = http://salmon-mail.readthedocs.org/; + description = "Pythonic mail application server"; + license = licenses.gpl3; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 5b40c74a1819..005d02e60472 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "Scrapy"; name = "${pname}-${version}"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "04a08f027eef5d271342a016439533c81ba46f14bfcf230fecf602e99beaf233"; + sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 1647e6cfc143..20ad32b32613 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.7.1"; + version = "0.8.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; + sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index e6d96f7bcf21..9b64ce811ef7 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsdOriginal; - maintainer = with maintainers; [ teto ]; + maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 9a309d1e3b94..21aa41d80053 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "semver"; version = "2.7.9"; - src = fetchPypi { - inherit pname version; - sha256 = "1ffb55fb86a076cf7c161e6b5931f7da59f15abe217e0f24cea96cc8eec50f42"; + src = fetchFromGitHub { + owner = "k-bx"; + repo = "python-semver"; + rev = "2001c62d1a0361c44acc7076d8ce91e1d1c66141"; # not tagged in repository + sha256 = "01c05sv97dyr672sa0nr3fnh2aqbmvkfw19d6rkaj16h2sdsyg0i"; }; - # No tests in archive - doCheck = false; + checkInputs = [ pytest ]; + checkPhase = "pytest -v tests.py"; meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 2414b97e94ab..610a75fa3176 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "serpy"; name = "${pname}-${version}"; - version = "0.2.0"; + version = "0.3.1"; meta = { description = "ridiculously fast object serialization"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7e62e242321b208362966d5ab32b45df93b1cb88da4ce6260277da060b4f7475"; + sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5"; }; buildInputs = [ flake8 py pyflakes tox ]; diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index d27c4fe2975c..779e974f15e3 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , characteristic , pyasn1 , pyasn1-modules @@ -16,23 +16,23 @@ buildPythonPackage rec { name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab"; + src = fetchFromGitHub { + owner = "pyca"; + repo = pname; + rev = version; + sha256 = "1fn332fci776m5a7jx8c1jgbm27160ip5qvv8p01c242ag6by5g0"; }; propagatedBuildInputs = [ characteristic pyasn1 pyasn1-modules pyopenssl idna attrs ]; - checkInputs = [ - pytest - ]; + checkInputs = [ pytest ]; + checkPhase = "py.test"; - checkPhase = '' - py.test - ''; - - # Tests not included in archive - doCheck = false; -} \ No newline at end of file + meta = with lib; { + description = "Service identity verification for pyOpenSSL"; + license = licenses.mit; + homepage = "https://service-identity.readthedocs.io"; + }; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 3c919db42f4a..b185be62a693 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "36.7.1"; + version = "38.2.5"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "543becf5d33d8989dc5222403997488e9dc3872bdecdabb0f57184ca253ec1e8"; + sha256 = "b080f276cc868670540b2c03cee06cc14d2faf9da7bec0f15058d1b402c94507"; }; buildInputs = [ python wrapPython unzip ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index e8e92818ecf5..dab3542b809e 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.6.2.post1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899"; + sha256 = "14152f111c7711fc6756fd538ec12fc8cdde7419f869b244922f71f61b2a6c6b"; }; buildInputs = [ geos glibcLocales cython ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 846e8dc21a16..25dbecac9497 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.11.1"; + version = "3.13.2"; name = "${pname}-${version}"; doCheck = !stdenv.isDarwin; src = fetchPypi { inherit pname version; - sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7"; + sha256 = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a32d4f0a"; }; meta = { diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index af885fcf5a2a..77857df0764f 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,13 +2,13 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { pname = "sip"; - version = "4.19.3"; + version = "4.19.6"; name = "${pname}-${version}"; format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; + sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx"; }; configurePhase = '' diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 00fbbbc01eb8..6921b3590e4e 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { py.test test_six.py ''; + # To prevent infinite recursion with pytest + doCheck = false; + meta = { description = "A Python 2 and 3 compatibility library"; homepage = https://pypi.python.org/pypi/six/; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 436d85102d81..2e2020f61f09 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; name = "${pname}-${version}"; - version = "1.5.3"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s"; + sha256 = "8fd2de1c359bd0074bd6d334a5b9820ae1c5b6ba563970b95052bace4b71baeb"; }; propagatedBuildInputs = [ boto bz2file requests responses moto ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 40df45616e93..6c7c3c8400c1 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -19,23 +19,12 @@ , ftfy , thinc , pip +, regex }: -let - enableDebugging = true; - regexLocked = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "regex"; - version = "2017.04.05"; - src = fetchPypi { - inherit pname version; - sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq"; - }; - }; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "spacy"; version = "1.8.2"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "explosion"; @@ -56,7 +45,7 @@ in buildPythonPackage rec { ujson dill requests - regexLocked + regex ftfy thinc pytest diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix new file mode 100644 index 000000000000..abd9bd230d40 --- /dev/null +++ b/pkgs/development/python-modules/splinter/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, selenium +, flask +, coverage +}: + +buildPythonPackage rec { + pname = "splinter"; + version = "0.7.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "f97119f84d339067169451d56043f37f6b0a504a17a7ac6e48c91c012be72af6"; + }; + + propagatedBuildInputs = [ selenium ]; + + checkInputs = [ flask coverage ]; + + # No tests included + doCheck = false; + + meta = { + description = "Browser abstraction for web acceptance testing"; + homepage = https://github.com/cobrateam/splinter; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 258f84e8c72a..c2e454d08cda 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,20 +1,25 @@ -{ stdenv, buildPythonPackage, fetchurl, python, - unittest2, scripttest, pytz, pylint, tempest-lib, mock, testtools, - pbr, tempita, decorator, sqlalchemy, six, sqlparse +{ stdenv, buildPythonPackage, fetchPypi, python +, unittest2, scripttest, pytz, pylint, mock +, testtools, pbr, tempita, decorator, sqlalchemy +, six, sqlparse, testrepository }: buildPythonPackage rec { pname = "sqlalchemy-migrate"; - name = "${pname}-${version}"; version = "0.11.0"; - src = fetchurl { - url = "mirror://pypi/s/sqlalchemy-migrate/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; - checkInputs = [ unittest2 scripttest pytz pylint mock testtools tempest-lib ]; + checkInputs = [ unittest2 scripttest pytz pylint mock testtools testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; + prePatch = '' + sed -i -e /tempest-lib/d \ + -e /testtools/d \ + test-requirements.txt + ''; checkPhase = '' export PATH=$PATH:$out/bin echo sqlite:///__tmp__ > test_db.cfg diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9b3a5fa20396..488e78cb4ee4 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.1.15"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a"; + sha256 = "7dda3e0b1b12215e3bb05368d1abbf7d747112a43738e0a4e6deb466b83fd88e"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 2c85bdbe3d1c..e89abbd595a9 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.11"; + version = "1.1.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4"; + sha256 = "86a1078ceb1e79f891633c7e4c7b07949fd9135a0e4c0738abd5111e2e6b96c0"; }; # No tests in archive diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 1955320fd266..9639ce961948 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,18 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, oslosphinx, pbr, six, argparse }: +{ stdenv, buildPythonPackage, fetchPypi, pbr, six, argparse }: buildPythonPackage rec { pname = "stevedore"; - version = "1.27.1"; + version = "1.28.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0"; + sha256 = "f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b"; }; doCheck = false; - buildInputs = [ oslosphinx ]; propagatedBuildInputs = [ pbr six argparse ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 7edfb9c4f0e6..e2a88a9f10b5 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.70.0"; + version = "1.77.0"; name = "${pname}-${version}"; # Tests require network connectivity and there's no easy way to disable @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062"; + sha256 = "6503851d2309dd9c1307e3f0a1cb33ac1427fee25d38ecba1f8bf73a0d74defc"; }; buildInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix new file mode 100644 index 000000000000..2aab5b16aefa --- /dev/null +++ b/pkgs/development/python-modules/structlog/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pretend +, freezegun +, simplejson +}: + +buildPythonPackage rec { + pname = "structlog"; + version = "17.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; + }; + + checkInputs = [ pytest pretend freezegun ]; + propagatedBuildInputs = [ simplejson ]; + + checkPhase = '' + rm tests/test_twisted.py* + py.test + ''; + + meta = { + description = "Painless structural logging"; + homepage = http://www.structlog.org/; + license = lib.licenses.asl20; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 5b98aa3415b2..85f0106db65d 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "supervise_api"; - version = "0.1.5"; + version = "0.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pqqlw80cjdgrlpvdmydkyhsrr4s531mn6bfkshm68j9gk4kq6px"; + sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b"; }; propagatedBuildInputs = [ supervise ]; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index b1fe22df4767..1370c59ace84 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6"; + sha256 = "5bd7dd09eff68cbec9062e6950124fadfaaccbc0f50b23c1037f4d70ae86f0f1"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 9ddc2a0e08b3..db7f43c1ea46 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.7.7"; + version = "0.8.2"; pname = "tabulate"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; + sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index e786cb843296..eb6a6694b05c 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -12,19 +12,18 @@ , pyrsistent }: -# testtools 2.0.0 and up has a circular run-time dependency on futures + buildPythonPackage rec { pname = "testtools"; - version = "1.9.0"; - name = "${pname}-${version}"; + version = "2.3.0"; # Python 2 only judging from SyntaxError # disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644"; + sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"; }; propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; @@ -33,6 +32,11 @@ buildPythonPackage rec { # No tests in archive doCheck = false; + # testtools 2.0.0 and up has a circular run-time dependency on futures + postPatch = '' + substituteInPlace requirements.txt --replace "fixtures>=1.3.0" "" + ''; + meta = { description = "A set of extensions to the Python standard library's unit testing framework"; homepage = https://pypi.python.org/pypi/testtools; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 1647b837d976..333c4825f0f9 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "textacy"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "04wf3a7zgzz83nmgkh488wkl50zm9yfdpv3sl12sm2zj685plqcz"; + sha256 = "6fc4603fd52c386081b063ef7aa15ca77e5e937a3064b197359659fccfdeb406"; }; disabled = isPy27; # 2.7 requires backports.csv diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix new file mode 100644 index 000000000000..38cffcee2963 --- /dev/null +++ b/pkgs/development/python-modules/texttable/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "texttable"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "44674d1d470a9fc264c4d1eba44b74463ca0066d7b954453dd5a4f8057779c9c"; + }; + + meta = { + description = "A module to generate a formatted text table, using ASCII characters"; + homepage = http://foutaise.org/code/; + license = lib.licenses.lgpl2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 7a6ff3cc53d1..df118470e920 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.8.3"; + version = "3.9.0"; pname = "thespian"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vvwsh3waxd5ldrayr86kdcshv07bp361fl7p16g9i044vklwly4"; + sha256 = "e698e3c5369d7b06de5c4ce7b877ea65991c99f7b0fabd09f29e91bc981c7d22"; }; # Do not run the test suite: it takes a long type and uses diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 36b85bce3acd..0fc14024903e 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec{ pname = "toolz"; - version = "0.8.2"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; + sha256 = "929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix new file mode 100644 index 000000000000..bc70d65cc1f8 --- /dev/null +++ b/pkgs/development/python-modules/tox/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, py +, virtualenv +, pluggy +, setuptools_scm +, six +}: + +buildPythonPackage rec { + pname = "tox"; + version = "2.9.1"; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py virtualenv pluggy six ]; + + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8"; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 2392a4a9968c..209ee8ccd6bb 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.19.4"; + version = "4.19.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1"; + sha256 = "df32e6f127dc0ccbc675eadb33f749abbcb8f174c5cb9ec49c0cdb73aa737377"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index a3f0df8ca2ce..63f8c3b90554 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Collection of utilities for interacting with PyPI"; homepage = https://github.com/pypa/twine; license = lib.licenses.asl20; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 2277cb7c4ca4..1c61d0afab3b 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "tzlocal"; - version = "1.4"; + version = "1.5.1"; propagatedBuildInputs = [ pytz ]; src = fetchPypi { inherit pname version; - sha256 = "0n9hw4kqblyc0avzwi26rqmvyk9impb608rvy11qifmigy7r18h5"; + sha256 = "4ebeb848845ac898da6519b9b31879cf13b6626f7184c496037b818e238f2c4e"; }; # test fail (timezone test fail) diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 5151ee638482..e60ed958223b 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://pythonhosted.org/uncertainties/; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; - maintainer = with maintainers; [ rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 1b9819c035db..4274abf3b329 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "take version numbers from version control"; homepage = https://github.com/habnabit/vcversioner; - licenses = licenses.isc; + license = licenses.isc; }; } diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix new file mode 100644 index 000000000000..250a0951d96c --- /dev/null +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "voluptuous"; + version = "0.10.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s"; + }; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Voluptuous is a Python data validation library"; + homepage = http://alecthomas.github.io/voluptuous/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 8c980cf2b2cf..f2b5e06baaa2 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { pname = "vowpalwabbit"; name = "${pname}-${version}"; - version = "8.3.2"; + version = "8.4.0"; src = fetchurl{ url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; + sha256 = "abd22bfae99fb102cf8a6aec49e8c278cb7317d3a7eb60f70cd102be9c336fd5"; }; # vw tries to write some explicit things to home # python installed: The directory '/homeless-shelter/.cache/pip/http' diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 488036552583..f24f10675f80 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -6,13 +6,13 @@ let pname = "websockets"; - version = "3.4"; + version = "4.0.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5"; + sha256 = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 5979d895a747..78380900416d 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -1,21 +1,23 @@ { stdenv, buildPythonPackage, fetchPypi -, itsdangerous +, itsdangerous, hypothesis , pytest, requests, glibcLocales }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "Werkzeug"; - version = "0.12.2"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "09mv4cya3lywkn4mi3qrqmjgwiw99kdk03dk912j8da6ny3pnflh"; + sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c"; }; - LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ itsdangerous ]; - buildInputs = [ pytest requests glibcLocales ]; + checkInputs = [ pytest requests glibcLocales hypothesis ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test + ''; meta = with stdenv.lib; { homepage = http://werkzeug.pocoo.org/; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index b9ab1dfbc1d2..ab63b444af6d 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.0.8"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "a57e29e733b989e68fdd0f3d6927a3691763b39792591d573b95a89a5a12ec15"; + sha256 = "67fc28c3b9fede955d69bccbd92784e3f0c6d0dee3a71532cd3367c257feb178"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 648ab1cff083..5e65940e8468 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ws4py"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; + sha256 = "ee12b58384bab8bfdcd1c76dcd6852047aec163af17175fc0f73e255d107dd7a"; }; checkInputs = [ pytest mock git ]; diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index ab7b44019c54..abce4cf44e0c 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -43,6 +43,9 @@ buildPythonPackage rec { # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch substituteInPlace config.py \ --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" + # set the WXPREFIX to $out instead of the storepath of wxwidgets + substituteInPlace config.py \ + --replace "WXPREFIX = getWxConfigValue('--prefix')" "WXPREFIX = '$out'" # this check is supposed to only return false on older systems running non-framework python substituteInPlace src/osx_cocoa/_core_wrap.cpp \ --replace "return wxPyTestDisplayAvailable();" "return true;" @@ -62,7 +65,7 @@ buildPythonPackage rec { buildPhase = ""; installPhase = '' - ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out wrapPythonPrograms ''; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 1215e613f6fa..afde3f3b45b0 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,30 +10,23 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.9.6"; - name = "${pname}-${version}"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; + sha256 = "af1449e8df84a6eb09eb1d56c1dc5ac7f24a9563d4f2b9391ff364dc0c62344c"; }; - # Temporary patch until next release (later than 0.9.6) to fix - # a broken test case. - patches = [ - (fetchurl { - url = "https://github.com/pydata/xarray/commit/726c6a3638ecf95889c541d84e892a106c2f2f92.patch"; - sha256 = "1i2hsj5v5qlvqfj48vyn9931yndsf4k4wrk3qpqpywh32s7r007b"; - }) - ]; - - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [numpy pandas]; checkPhase = '' py.test $out/${python.sitePackages} ''; + # There always seem to be broken tests... + doCheck = false; + meta = { description = "N-D labeled arrays and datasets in Python"; homepage = https://github.com/pydata/xarray; diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix new file mode 100644 index 000000000000..be1651caf8a4 --- /dev/null +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, coverage +, nose +}: + +buildPythonPackage rec { + pname = "xmltodict"; + version = "0.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df"; + }; + + checkInputs = [ coverage nose ]; + + checkPhase = '' + nosetests + ''; + + meta = { + description = "Makes working with XML feel like you are working with JSON"; + homepage = https://github.com/martinblech/xmltodict; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 2ded73d5250a..d7617ae1551b 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.19.0"; + version = "0.20.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052"; + sha256 = "ff28f8839a9a105854a099026a33f4cbec8bd933554bfed658aec359bfc88ae8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 1275178d5d0b..cf95803d5af4 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,24 +1,23 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , multidict , pytestrunner , pytest +, idna }: -let +buildPythonPackage rec { pname = "yarl"; - version = "0.13.0"; -in buildPythonPackage rec { + version = "0.17.0"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "25fe681a982f2cec567df8abac7cbd2ac27016e4aec89193945cab0643bfdb42"; + src = fetchPypi { + inherit pname version; + sha256 = "2e4e1aec650ad80e73e7063941cd8aadb48e72487ec680a093ad364cc61efe64"; }; - buildInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ multidict ]; - + checkInputs = [ pytest pytestrunner ]; + propagatedBuildInputs = [ multidict idna ]; meta = { description = "Yet another URL library"; diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix new file mode 100644 index 000000000000..305928c1846d --- /dev/null +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zope_interface +, zope_location +, zope_schema +}: + + +buildPythonPackage rec { + pname = "zope_copy"; + version = "4.0.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; + }; + + propagatedBuildInputs = [ zope_interface ]; + + checkInputs = [ zope_location zope_schema ]; + + meta = { + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index fdf1745f9f2c..0b3cf3b53f89 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -6,8 +6,8 @@ with stdenv.lib; let - baseVersion = "4.4"; - revision = "1"; + baseVersion = "4.5"; + revision = "0"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "0kn1k2zvc93xin4kdp2fpiz21i5j0qymyx6jjzkqp7r3x8yxwr06"; + sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.qt.io/Category:Tools::QtCreator; license = "LGPL"; maintainers = [ maintainers.akaWolf ]; - platforms = platforms.all; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 76c0e5227773..a435ee65e52c 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -320,7 +320,7 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql.lib pkgs.mariadb pkgs.openssl.dev ]; + RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -798,10 +798,10 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.mysql.lib}"; + MYSQL_DIR="${pkgs.mysql.connector-c}"; preConfigure = '' patchShebangs configure - ''; + ''; }); devEMF = old.devEMF.overrideDerivation (attrs: { diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 64a88d8f7b83..1f31aec886a6 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -29,7 +29,9 @@ with import ./functions.nix { inherit lib gemConfig; }; let gemFiles = bundlerFiles args; - importedGemset = import gemFiles.gemset; + importedGemset = if builtins.typeOf gemFiles.gemset == "path" + then import gemFiles.gemset + else gemFiles.gemset; filteredGemset = filterGemset { inherit ruby groups; } importedGemset; diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index b17a4639e779..85e93959e4b5 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -67,8 +67,10 @@ rec { }; in res; - composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // { + composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["platforms"]) // { inherit ruby; + inherit (attrs.source) type; + source = removeAttrs attrs.source ["type"]; gemName = name; gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); }); diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 2e2653621a76..5d1489ba2005 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -1,7 +1,4 @@ -{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib -, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv -, linkFarm, git, makeWrapper, bundler, tree -}@defs: +{ ruby, lib, callPackage, defaultGemConfig, buildEnv, bundler }@defs: { name ? null , pname ? null diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 9251c4d2a415..6ba1d5f10ec1 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundler"; version = "1.14.6"; - sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; + source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 05415b889680..5361c3ce65eb 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -31,8 +31,7 @@ let rainbow_rake = buildRubyGem { name = "rake"; gemName = "rake"; - remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + source.sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; type = "gem"; version = "12.0.0"; }; @@ -109,7 +108,7 @@ in gio2 = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre gobjectIntrospection ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -167,11 +166,11 @@ in }; mysql = attrs: { - buildInputs = [ mysql.lib zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; mysql2 = attrs: { - buildInputs = [ mysql.lib zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; ncursesw = attrs: { diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 62a9d60686f3..5bde59eab04d 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -41,7 +41,6 @@ lib.makeOverridable ( , patches ? [] , gemPath ? [] , dontStrip ? true -, remotes ? ["https://rubygems.org"] # Assume we don't have to build unless strictly necessary (e.g. the source is a # git checkout). # If you need to apply patches, make sure to set `dontBuild = false`; @@ -56,14 +55,18 @@ let src = attrs.src or ( if type == "gem" then fetchurl { - urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes; - inherit (attrs) sha256; + urls = map ( + remote: "${remote}/gems/${gemName}-${version}.gem" + ) (attrs.source.remotes or [ "https://rubygems.org" ]); + inherit (attrs.source) sha256; } else if type == "git" then fetchgit { - inherit (attrs) url rev sha256 fetchSubmodules; + inherit (attrs.source) url rev sha256 fetchSubmodules; leaveDotGit = true; } + else if type == "url" then + fetchurl attrs.source else throw "buildRubyGem: don't know how to build a gem of type \"${type}\"" ); @@ -74,7 +77,7 @@ let in -stdenv.mkDerivation (attrs // { +stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit doCheck; inherit dontBuild; @@ -83,7 +86,8 @@ stdenv.mkDerivation (attrs // { buildInputs = [ ruby makeWrapper - ] ++ lib.optionals (type == "git") [ git bundler ] + ] ++ lib.optionals (type == "git") [ git ] + ++ lib.optionals (type != "gem") [ bundler ] ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; @@ -158,14 +162,22 @@ stdenv.mkDerivation (attrs // { echo "buildFlags: $buildFlags" + ${lib.optionalString (type == "url") '' + ruby ${./nix-bundle-install.rb} \ + "path" \ + '${gemName}' \ + '${version}' \ + '${lib.escapeShellArgs buildFlags}' + ''} ${lib.optionalString (type == "git") '' ruby ${./nix-bundle-install.rb} \ - ${gemName} \ - ${attrs.url} \ - ${src} \ - ${attrs.rev} \ - ${version} \ - ${lib.escapeShellArgs buildFlags} + "git" \ + '${gemName}' \ + '${version}' \ + '${lib.escapeShellArgs buildFlags}' \ + '${attrs.source.url}' \ + '${src}' \ + '${attrs.source.rev}' ''} ${lib.optionalString (type == "gem") '' diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 8eac766554e1..142d2da9bee2 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -13,31 +13,46 @@ end # Options: # +# type - installation type, either "git" or "path" # name - the gem name +# version - gem version +# build-flags - build arguments +# +# Git-only options: +# # uri - git repo uri # repo - path to local checkout # ref - the commit hash -# version - gem version -# build-flags - build arguments ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name']) out = ENV["out"] bin_dir = File.join(ENV["out"], "bin") -name = ARGV[0] -uri = ARGV[1] -REPO = ARGV[2] -ref = ARGV[3] -version = ARGV[4] -build_flags = ARGV[5] +type = ARGV[0] +name = ARGV[1] +version = ARGV[2] +build_flags = ARGV[3] +if type == "git" + uri = ARGV[4] + REPO = ARGV[5] + ref = ARGV[6] +end # options to pass to bundler options = { - "name" => name, - "uri" => uri, - "ref" => ref, + "name" => name, "version" => version, } +if type == "path" + options.merge!({ + "path" => Dir.pwd, + }) +elsif type == "git" + options.merge!({ + "uri" => uri, + "ref" => ref, + }) +end # Monkey-patch Bundler to use our local checkout. # I wish we didn't have to do this, but bundler does not expose an API to do @@ -63,26 +78,28 @@ Bundler.module_eval do end end -Bundler::Source::Git.class_eval do - def allow_git_ops? - true - end -end - -Bundler::Source::Git::GitProxy.class_eval do - def checkout - unless path.exist? - FileUtils.mkdir_p(path.dirname) - FileUtils.cp_r(File.join(REPO, ".git"), path) - system("chmod -R +w #{path}") +if type == "git" + Bundler::Source::Git.class_eval do + def allow_git_ops? + true end end - def copy_to(destination, submodules=false) - unless File.exist?(destination.join(".git")) - FileUtils.mkdir_p(destination.dirname) - FileUtils.cp_r(REPO, destination) - system("chmod -R +w #{destination}") + Bundler::Source::Git::GitProxy.class_eval do + def checkout + unless path.exist? + FileUtils.mkdir_p(path.dirname) + FileUtils.cp_r(File.join(REPO, ".git"), path) + system("chmod -R +w #{path}") + end + end + + def copy_to(destination, submodules=false) + unless File.exist?(destination.join(".git")) + FileUtils.mkdir_p(destination.dirname) + FileUtils.cp_r(REPO, destination) + system("chmod -R +w #{destination}") + end end end end @@ -94,7 +111,11 @@ Bundler.ui = Bundler::UI::Shell.new({"no-color" => no_color}) Bundler.ui.level = "debug" if verbose # Install -source = Bundler::Source::Git.new(options) +if type == "git" + source = Bundler::Source::Git.new(options) +else + source = Bundler::Source::Path.new(options) +end spec = source.specs.search_all(name).first Bundler.rubygems.with_build_args [build_flags] do source.install(spec) @@ -139,8 +160,10 @@ FileUtils.ln_s(spec.loaded_from.to_s, "#{meta}/spec") File.open("#{meta}/name", "w") do |f| f.write spec.name end -File.open("#{meta}/install-path", "w") do |f| - f.write source.install_path.to_s +if type == "git" + File.open("#{meta}/install-path", "w") do |f| + f.write source.install_path.to_s + end end File.open("#{meta}/require-paths", "w") do |f| f.write spec.require_paths.join(" ") @@ -150,8 +173,10 @@ File.open("#{meta}/executables", "w") do |f| end # make the lib available during bundler/git installs -File.open("#{out}/nix-support/setup-hook", "a") do |f| - spec.require_paths.each do |dir| - f.puts("addToSearchPath RUBYLIB #{source.install_path}/#{dir}") +if type == "git" + File.open("#{out}/nix-support/setup-hook", "a") do |f| + spec.require_paths.each do |dir| + f.puts("addToSearchPath RUBYLIB #{source.install_path}/#{dir}") + end end end diff --git a/pkgs/development/stm32/betaflight/default.nix b/pkgs/development/stm32/betaflight/default.nix new file mode 100644 index 000000000000..8d4d0d7f4a2b --- /dev/null +++ b/pkgs/development/stm32/betaflight/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchFromGitHub +, gcc-arm-embedded, python2 +, skipTargets ? [ + # These targets do not build for various unexplored reasons + # TODO ... fix them + "AFROMINI" + "ALIENWHOOP" + "BEEBRAIN" + "CJMCU" + "FRSKYF3" +]}: + +let + + version = "3.2.3"; + +in stdenv.mkDerivation rec { + + name = "betaflight-${version}"; + + src = fetchFromGitHub { + owner = "betaflight"; + repo = "betaflight"; + rev = "v${version}"; + sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428"; + }; + + buildInputs = [ + gcc-arm-embedded + python2 + ]; + + postPatch = '' + sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell + sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + ''; + + enableParallelBuilding = true; + + preBuild = '' + buildFlagsArray=( + "SKIP_TARGETS=${toString skipTargets}" + "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)" + all + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp obj/*.hex $out + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; + homepage = https://github.com/betaflight/betaflight; + license = licenses.gpl3; + maintainers = with maintainers; [ elitak ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index f0a9837ce481..1393229333d3 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://www.lihaoyi.com/Ammonite/; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainer = [ lib.maintainers.nequissimus ]; + maintainers = [ lib.maintainers.nequissimus ]; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2f794c583e53..1ae8a4ff4043 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild }: +{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, + findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }: with lib; stdenv.mkDerivation rec { - version = "0.59.0"; + version = "0.63.1"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1i47k9dg3pawwkdccb57n6882q92jsmclk5ip2y6dv5hhv4s5z49"; + sha256 = "1djcyf1c88xw5mv1gh4wggy16d2gi84ndj31n11y5qh99hh3lmfl"; }; installPhase = '' @@ -18,8 +19,9 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ] - ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; + buildInputs = [ + ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt wtf8 dtoa + ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { description = "A static type checker for JavaScript"; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 33ce0531e3b0..c950228907a0 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20170501"; - slang = "Phosphorus"; + version = "20171101"; + slang = "Sulfur"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1"; + sha256 = "1vwjfqmm1r36gkybsy3a7m89q5zicf4rnz5vlsn9imnpjpl9gjw1"; }; why2 = fetchurl { diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 9468842f0c4d..49f6aeb72799 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,24 +13,16 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "2.0.1"; + version = "2.2.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "031ndvinsypagpkdszxjq0hj91ijq9zx4dzk53sz7il7s3zn65c7"; + sha256 = "0rd1dfgwdpn3x1pzi67sw040vxywbg5h6yw0mj317p0p1cvlyihl"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15385.patch"; - url = https://github.com/radare/radare2/commit/21a6f570ba33fa9f52f1bba87f07acc4e8c178f4.patch; - sha256 = "19qg5j9yr5r62nrq2b6mscxsz0wyyfah2z5jz8dvj9kqxq186d43"; - }) - ]; - postPatch = let cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile capstone = fetchurl { @@ -44,6 +36,8 @@ stdenv.mkDerivation rec { ''; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] @@ -51,13 +45,6 @@ stdenv.mkDerivation rec { ++ optional pythonBindings [python] ++ optional luaBindings [lua]; - postInstall = '' - # replace symlinks pointing into the build directory with the files they point to - rm $out/bin/{r2-docker,r2-indent} - cp sys/r2-docker.sh $out/bin/r2-docker - cp sys/indent.sh $out/bin/r2-indent - ''; - meta = { description = "unix-like reverse engineering framework and commandline tools"; homepage = http://radare.org/; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix new file mode 100644 index 000000000000..adcda4c83241 --- /dev/null +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -0,0 +1,113 @@ +{ stdenv, fetchFromGitHub, fetchurl, +# Native build inputs +cmake, +autoconf, automake, libtool, +pkgconfig, +bison, flex, +groff, +perl, +python, +# Runtime tools +time, +upx, +# Build inputs +ncurses, +libffi, +libxml2, +zlib, +}: + +let + release = "3.0"; + + rapidjson = fetchFromGitHub { + owner = "Tencent"; + repo = "rapidjson"; + rev = "v1.1.0"; + sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; + }; + jsoncpp = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = "1.8.3"; + sha256 = "05gkmg6r94q8a0qdymarcjlnlvmy9s365m9jhz3ysvi71cr31lkz"; + }; + googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "release-1.8.0"; + sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399"; + }; + tinyxml2 = fetchFromGitHub { + owner = "leethomason"; + repo = "tinyxml2"; + rev = "5.0.1"; + sha256 = "015g8520a0c55gwmv7pfdsgfz2rpdmh3d1nq5n9bd65n35492s3q"; + }; + yara = fetchurl { + url = "https://github.com/avast-tl/yara/archive/v1.0-retdec.zip"; + sha256 = "1bjrkgp1sgld2y7gvwrlrz5fs16521ink6xyq72v7yxj3vfa9gps"; + }; + openssl = fetchurl { + url = "https://www.openssl.org/source/openssl-1.1.0f.tar.gz"; + sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; + }; + + retdec-support = fetchurl { + url = "https://github.com/avast-tl/retdec-support/releases/download/2017-12-12/retdec-support_2017-12-12.tar.xz"; + sha256 = "6376af57a77147f1363896963d8c1b3745ddb9a6bcec83d63a5846c3f78aeef9"; + }; +in stdenv.mkDerivation rec { + name = "retdec-${version}"; + version = "${release}.0"; + + src = fetchFromGitHub { + owner = "avast-tl"; + repo = "retdec"; + name = "retdec-${release}"; + rev = "refs/tags/v${release}"; + sha256 = "0cpc5lxg8qphdzl3gg9dx992ar35r8ik8wyysr91l2qvfhx93wks"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake autoconf automake libtool pkgconfig bison flex groff perl python ]; + + buildInputs = [ ncurses libffi libxml2 zlib ]; + + prePatch = '' + find . -wholename "*/deps/rapidjson/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${rapidjson}|' + find . -wholename "*/deps/jsoncpp/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${jsoncpp}|' + find . -wholename "*/deps/googletest/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${googletest}|' + find . -wholename "*/deps/tinyxml2/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${tinyxml2}|' + + find . -wholename "*/yaracpp/deps/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|URL .*|URL ${yara}|' + + find . -wholename "*/deps/openssl/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|OPENSSL_URL .*)|OPENSSL_URL ${openssl})|' + + chmod +x cmake/*.sh + patchShebangs cmake/*.sh + + sed -i cmake/install-share.sh \ + -e 's|WGET_PARAMS.*|cp ${retdec-support} "$INSTALL_PATH/$ARCH_NAME"|' \ + -e '/echo "RUN: wget/,+7d' + + substituteInPlace scripts/unpack.sh --replace ' upx -d' ' ${upx}/bin/upx -d' + substituteInPlace scripts/config.sh --replace /usr/bin/time ${time}/bin/time + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A retargetable machine-code decompiler based on LLVM"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 4cbc3e626768..84bcac18b0fd 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb, capnproto }: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "1cc1dbq129qlmrysk7cmaihcd9c93csi79dv3kqsnnprbz480z9i"; + sha256 = "16v08irycb295jjw5yrcjdagvkgcgg4hl5qz215hrw1ff4g7sazy"; }; postPatch = '' @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { license = "custom"; maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 2caadfc62667..907e44420e95 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -6,13 +6,13 @@ assert qtbase != null -> qt4 == null; stdenv.mkDerivation rec { name = "snowman-${version}"; - version = "2017-08-13"; + version = "2017-11-19"; src = fetchFromGitHub { owner = "yegord"; repo = "snowman"; - rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03"; - sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n"; + rev = "d03c2d6ffbf262c0011584df59d6bd69c020e08e"; + sha256 = "0bzqp3zc100dzvybf57bj4dvnybvds0lmn1w2xjb19wkzm9liskn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 94960e1b74da..5bda2d945eb6 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,17 +1,19 @@ -{ fetchFromGitHub, makeWrapper, pythonPackages, stdenv }: +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +, arrow, futures, logfury, requests, six, tqdm +}: -pythonPackages.buildPythonApplication rec { - name = "backblaze-b2-${version}"; - version = "0.6.2"; +buildPythonApplication rec { + pname = "backblaze-b2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; - rev = "3a4cd3f0b5309f79f98c2e0d51afc19fb2fe4201"; - sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1"; + rev = "v${version}"; + sha256 = "0697rcdsmxz51p4b8m8klx2mf5xnx6vx56vcf5jmzidh8mc38a6z"; }; - propagatedBuildInputs = with pythonPackages; [ futures requests six tqdm ]; + propagatedBuildInputs = [ arrow futures logfury requests six tqdm ]; checkPhase = '' python test_b2_command_line.py test @@ -27,7 +29,7 @@ pythonPackages.buildPythonApplication rec { cp contrib/bash_completion/b2 "$out/etc/bash_completion.d/backblaze-b2" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = https://github.com/Backblaze/B2_Command_Line_Tool; license = licenses.mit; diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index e61b7f78302b..0dbe1aa78c50 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/bloaty.cc \ --replace "c++filt" \ - "${stdenv.lib.getBin binutils}/bin/c++filt" + "${binutils.bintools}/bin/c++filt" ''; doCheck = true; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 41861a6142e5..67d186c5a257 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.9.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0y50fhwh135fim39ra4szwzzgyb4ibls3i0hpv3d7asns0hh715a"; + sha256 = "0aiifrp6g1d3ilhg8111wdhsrjy41x8gcmq67rjyxypw9znqzcpg"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 331f907ae612..a92d54b3f144 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -51,10 +51,19 @@ cmakeConfigurePhase() { # And build always Release, to ensure optimisation flags cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + if [ "$buildPhase" = ninjaBuildPhase ]; then + cmakeFlags="-GNinja $cmakeFlags" + fi + echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}" + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "cmake: enabled parallel building" + fi + runHook postConfigure } @@ -63,11 +72,7 @@ if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then configurePhase=cmakeConfigurePhase fi -if [ -n "$crossConfig" ]; then - crossEnvHooks+=(addCMakeParams) -else - envHooks+=(addCMakeParams) -fi +addEnvHooks "$targetOffset" addCMakeParams makeCmakeFindLibs(){ isystem_seen= diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 007ce5b07cde..15e801c1dffa 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,65 +1,99 @@ { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: -stdenv.mkDerivation rec { - name = "dub-${version}"; - version = "1.5.0"; +let - src = fetchFromGitHub { - owner = "dlang"; - repo = "dub"; - rev = "v${version}"; - sha256 = "0kmirx4ijhzirjwdqmnwqhngg38zdaydpvny2p0yj3afqgkj6vq5"; + dubBuild = stdenv.mkDerivation rec { + name = "dubBuild-${version}"; + version = "1.6.0"; + + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "dlang"; + repo = "dub"; + rev = "v${version}"; + sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk"; + }; + + postPatch = '' + # Avoid that the version file is overwritten + substituteInPlace build.sh \ + --replace source/dub/version_.d /dev/null + + patchShebangs . + ''; + + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; + + buildPhase = '' + export DMD=${dmd.out}/bin/dmd + ./build.sh + ''; + + installPhase = '' + mkdir $out + mkdir $out/bin + cp bin/dub $out/bin + ''; + + meta = with stdenv.lib; { + description = "Package and build manager for D applications and libraries"; + homepage = http://code.dlang.org/; + license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; }; - postPatch = '' - # Avoid that the version file is overwritten - substituteInPlace build.sh \ - --replace source/dub/version_.d /dev/null + # Need to test in a fixed-output derivation, otherwise the + # network tests would fail if sandbox mode is enabled. + dubUnittests = stdenv.mkDerivation rec { + name = "dubUnittests-${version}"; + version = dubBuild.version; - substituteInPlace build.sh \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + enableParallelBuilding = dubBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = dubBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; - patchShebangs build.sh - patchShebangs test + src = dubBuild.src; - # Remove unittest which is not working for now (upstream already fixed: https://github.com/dlang/dub/issues/1224) - rm test/interactive-remove.sh + postPatch = dubBuild.postPatch; - # Fix test as long as there is no upstream solution. (see https://github.com/dlang/dub/pull/1227) - substituteInPlace test/issue884-init-defer-file-creation.sh \ - --replace "< /dev/stdin" "<(while :; do sleep 1; done)" \ - --replace "sleep 1" "" - ''; + nativeBuildInputs = dubBuild.nativeBuildInputs; + buildInputs = dubBuild.buildInputs; - nativeBuildInputs = [ dmd libevent rsync ]; - buildInputs = [ curl ]; - - buildPhase = '' - export DMD=${dmd.out}/bin/dmd - ./build.sh - ''; - - doCheck = false; - - checkPhase = '' - export DUB=$PWD/bin/dub + buildPhase = '' + # Can't use dub from dubBuild directly because one unittest + # (issue895-local-configuration) needs to generate a config + # file under ../etc relative to the dub location. + cp ${dubBuild}/bin/dub bin/ + export DUB=$NIX_BUILD_TOP/source/bin/dub export DC=${dmd.out}/bin/dmd export HOME=$TMP ./test/run-unittest.sh - ''; + ''; + + installPhase = '' + echo -n $inputString > $out + ''; + }; + +in + +stdenv.mkDerivation rec { + inherit dubUnittests; + name = "dub-${dubBuild.version}"; + phases = "installPhase"; + buildInputs = dubBuild.buildInputs; installPhase = '' mkdir $out - mkdir $out/bin - cp bin/dub $out/bin + cp -r --symbolic-link ${dubBuild}/* $out/ ''; - meta = with stdenv.lib; { - description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; - license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; - platforms = platforms.unix; - }; + meta = dubBuild.meta; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 8568b218f37e..77f2e561317b 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.3.1"; + name = "gradle-4.4"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1irsv5c4g0c8iln5hiikjr78rj1w2hjgyar5dp8a54h3rscf1sqm"; + sha256 = "0bqaksrxrshqjwba0wj72gbcxvcchjavlj39xh18qpkz5jp76j7s"; }; }; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 11caff8ddab5..ac9bfee815e7 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.03"; + version = "9.02.04"; src = fetchFromGitHub { - sha256 = "1g3pdcd2i8n29rqwrdg6bd7qnsii55hi0rnma86hy0pm5cshpwi5"; + sha256 = "0dkqdm7nc3l9kgwkkf545hfbxj7ibkxl7n49wz9m1rcq9pvpmrw3"; rev = version; repo = "icmake"; owner = "fbb-git"; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 8092e9b16f1a..5db0bce21f79 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.43.0"; + version = "0.44.0"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0qn5hyzvam3rimn7g3671s1igj7fbkwdnf5nc8jr4d5swy25mq61"; + sha256 = "1rpqp9iwbvr4xvfdh3iyfh1ha274hbb66jbgw3pa5a73x4d4ilqn"; }; postFixup = '' diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index dacad017ede0..25e2e69ef315 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -13,6 +13,11 @@ mesonConfigurePhase() { meson build $mesonFlags "${mesonFlagsArray[@]}" cd build + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "meson: enabled parallel building" + fi + runHook postConfigure } diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh index 9ea6549a8243..d9ad74609316 100644 --- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh +++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh @@ -4,9 +4,16 @@ ninjaBuildPhase() { if [[ -z "$ninjaFlags" && ! ( -e build.ninja ) ]]; then echo "no build.ninja, doing nothing" else + local buildCores=1 + + # Parallel building is enabled by default. + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + # shellcheck disable=SC2086 local flagsArray=( \ - ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ + -j"$buildCores" -l"$NIX_BUILD_CORES" \ $ninjaFlags "${ninjaFlagsArray[@]}" \ $buildFlags "${buildFlagsArray[@]}") diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 8ce495557e7f..abb32f257607 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -32,7 +32,7 @@ in buildPythonApplication rec { meta = { description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; + homepage = "https://www.pantsbuild.org/"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index fbbca9a0cfe4..d501a7953841 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, which, curl, makeWrapper }: +{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "77686b3dfa20a34270cc52377c8e37c3a461e484"; + rev = "3c8fcadc3376edfd8e4b08b35f174935bf97bbac"; version = stdenv.lib.strings.substring 0 7 rev; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1bhqigm0clv3i1gvn4gsllywcnwfsa73xvqp8m7pbvn8g7i2ws6x"; + sha256 = "0r79w4kgdrsdnm4ma9rmb9k115rvidpaha7sr9rsxv68jpagwgrj"; }; dontBuild = true; @@ -21,9 +21,12 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin + + substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"' + install bin/sbt $out/bin - wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl]} + wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl ]} ''; meta = { diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index abfa578f3879..4ea85eca2138 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "0gz2akifi842y8av2hh7w2z6fd6z400nvk8ip87rkyhx3gw7cdw1"; + sha256 = "1mz2aiwb3ha8dnx9fzbykz1y5ax01l2x6xml956fs1vm555v534x"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index b7d75999fdf6..36d9ddfb8ea1 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shards-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; - sha256 = "31de819c66518479682ec781a39ef42c157a1a8e6e865544194534e2567cb110"; + sha256 = "1qiv9zzpccf6i5r2qrzbl84wgvqapbs0csazayhcpzfjfhg6i8wp"; }; buildInputs = [ crystal libyaml which ]; diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile index 7d974e498910..4d9640c8e9f9 100644 --- a/pkgs/development/tools/chefdk/Gemfile +++ b/pkgs/development/tools/chefdk/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'chef-dk' +gem 'chef-dk', '2.4.17' gem 'pry' gem 'test-kitchen' gem 'inspec' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 94ee9feb78db..139649b78f14 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -71,7 +71,7 @@ GEM fuzzyurl mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-dk (2.3.4) + chef-dk (2.4.17) addressable (>= 2.3.5, < 2.6) chef (~> 13.0) chef-provisioning (~> 2.0) @@ -103,7 +103,7 @@ GEM cheffish (13.1.0) chef-zero (~> 13.0) net-ssh - chefspec (7.1.0) + chefspec (7.1.1) chef (>= 12.14.89) fauxhai (>= 4, < 6) rspec (~> 3.0) @@ -112,11 +112,11 @@ GEM concurrent-ruby (1.0.5) cookbook-omnifetch (0.8.0) mixlib-archive (~> 0.4) - cucumber-core (3.0.0) + cucumber-core (3.1.0) backports (>= 3.8.0) - cucumber-tag_expressions (>= 1.0.1) - gherkin (>= 4.1.3) - cucumber-tag_expressions (1.0.1) + cucumber-tag_expressions (~> 1.1.0) + gherkin (>= 5.0.0) + cucumber-tag_expressions (1.1.1) diff-lcs (1.3) diffy (3.2.0) docker-api (1.34.0) @@ -153,7 +153,7 @@ GEM httpclient (2.8.3) inifile (3.0.0) iniparse (1.4.4) - inspec (1.45.13) + inspec (1.47.0) addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) @@ -172,7 +172,7 @@ GEM sslshake (~> 1.2) thor (~> 0.19) tomlrb (~> 1.2) - train (~> 0.29, >= 0.29.2) + train (~> 0.30) ipaddress (0.8.3) iso8601 (0.9.1) json (2.1.0) @@ -227,7 +227,7 @@ GEM nori (2.6.0) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (13.6.0) + ohai (13.7.0) chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -327,7 +327,7 @@ GEM sslshake (1.2.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (1.19.1) + test-kitchen (1.19.2) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) @@ -337,12 +337,12 @@ GEM thor (~> 0.19, < 0.19.2) winrm (~> 2.0) winrm-elevated (~> 1.0) - winrm-fs (~> 1.0.2) + winrm-fs (~> 1.1.0) thor (0.19.1) timers (4.0.4) hitimes tomlrb (1.2.6) - train (0.29.2) + train (0.31.1) docker-api (~> 1.26) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) @@ -369,7 +369,7 @@ GEM winrm-elevated (1.1.0) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.0.2) + winrm-fs (1.1.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) @@ -381,7 +381,7 @@ PLATFORMS DEPENDENCIES berkshelf - chef-dk + chef-dk (= 2.4.17) chef-provisioning chef-vault chefspec diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 794f88316c11..df06793eaec0 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -3,7 +3,7 @@ bundlerEnv { # Last updated via: # nix-shell -p bundix -p gcc -p libxml2 -p zlib --run "bundix -mdl" - name = "chefdk-2.3.4"; + name = "chefdk-2.4.17"; ruby = ruby_2_4; gemdir = ./.; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index 8680741ff635..d4e97deea8dc 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -131,10 +131,10 @@ dependencies = ["addressable" "chef" "chef-provisioning" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06dnzlvwpkp9a2lrm3vn600i7j9328872nx4269hvbqnb9ix2cdk"; + sha256 = "0zqbwkad61rn4wli6z8a7l7glfnnrhbg474vfshvr0k1sicy8z2d"; type = "gem"; }; - version = "2.3.4"; + version = "2.4.17"; }; chef-provisioning = { dependencies = ["cheffish" "inifile" "mixlib-install" "net-scp" "net-ssh" "net-ssh-gateway" "winrm" "winrm-elevated" "winrm-fs"]; @@ -175,10 +175,10 @@ dependencies = ["chef" "fauxhai" "rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "181378d6qf8rxbaan5q8nrv71iy90zljd558n9nys7h5vmqws0qg"; + sha256 = "0zpycdwp18k6nkgyx7l3ndhyaby1v4bfqh9by6ld2fbksnx29p6k"; type = "gem"; }; - version = "7.1.0"; + version = "7.1.1"; }; cleanroom = { source = { @@ -217,18 +217,18 @@ dependencies = ["backports" "cucumber-tag_expressions" "gherkin"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qvnxa6ybbxqm22aji41vsappwnrdb56aiggy2swnphx1b7b1ql"; + sha256 = "06lip8ds4lw3wyjwsjv1laimk5kz39vsmvv9if7hiq9v611kd3sn"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; cucumber-tag_expressions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10q5096vag8s4azj4rmmb3ws7l316gr0jj8jhgr2fmhi05ppbqcf"; + sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.1"; }; diff-lcs = { source = { @@ -417,10 +417,10 @@ dependencies = ["addressable" "faraday" "hashie" "htmlentities" "json" "method_source" "mixlib-log" "parallel" "parslet" "pry" "rainbow" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i1kb0lanx9wzvlr83981528s5b8l4gqx0911ymh04pz2qy16c5x"; + sha256 = "0yvmqdhpag7v6m9z1mcwqj6y1rnrx6hbqws0lhh1zp4xky3w7fn4"; type = "gem"; }; - version = "1.45.13"; + version = "1.47.0"; }; ipaddress = { source = { @@ -701,10 +701,10 @@ dependencies = ["chef-config" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "systemu" "wmi-lite"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0li307m47jin82y9k9xsh1xd9fh5gapvrl3dy997w9i199jgp1hx"; + sha256 = "05dx2nsswcnd9f7qvz4jgiwwh18z4qbx6mqvflzlx276adx68i0s"; type = "gem"; }; - version = "13.6.0"; + version = "13.7.0"; }; paint = { source = { @@ -1021,10 +1021,10 @@ dependencies = ["mixlib-install" "mixlib-shellout" "net-scp" "net-ssh" "net-ssh-gateway" "safe_yaml" "thor" "winrm" "winrm-elevated" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19f2wck79wr56pf2vdq9bk98ksry4w22qpyyandljif7icgsmkmb"; + sha256 = "0wypsc0yl5zgw4f39i8nwq35z0lnjpqx333w9ginmiifs9jydlvm"; type = "gem"; }; - version = "1.19.1"; + version = "1.19.2"; }; thor = { source = { @@ -1055,10 +1055,10 @@ dependencies = ["docker-api" "json" "mixlib-shellout" "net-scp" "net-ssh" "winrm" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxv3gb665a05nhik3w44j5bvkyqfl8jz1aj4a69jvsf0jj406sw"; + sha256 = "1ic719ghmyvf93p4y91y00rc09s946sg4n1h855yip9h5795q9i5"; type = "gem"; }; - version = "0.29.2"; + version = "0.31.1"; }; treetop = { dependencies = ["polyglot"]; @@ -1116,10 +1116,10 @@ dependencies = ["erubis" "logging" "rubyzip" "winrm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ib5ggy0wfnpiyyynibvcixgipysgffh2jb6d8c4qddkzzbpy1dm"; + sha256 = "0vax34qbr3n6jifxyzr4nngaz8vrmzw6ydw21cnnrhidfkqgh7ja"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.1"; }; wmi-lite = { source = { diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index ed6c7f4fefb6..845e3f8a1dc4 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -61,7 +61,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - maintainer = with maintainers; [ avnik ]; + maintainers = with maintainers; [ avnik ]; license = licenses.asl20; description = "Continuous Integration platform built on container technology"; }; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 369f2f86bee6..cf4d5bcaa40c 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.2.0"; + version = "10.3.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "191yzh9k6ivj7mdfi5mv7wgbdcclb5q99rcbry70h064vzwfgkp6"; + sha256 = "0nhxxx2wxnli5nfz8vxqc0mwdjzj836zx3zmywnfyy1k2zybjijv"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1xvfsffwks5z74kxba6f4cilbabcsxhr0kskbxwczi90pn0rxsnn"; + sha256 = "0jacimz4p9k5s9j510g3vn7gg8pybpa20j4cvz4pffrcwl1lgk4i"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1psnajn4b3ym2fpvn6rizxqb093s78lvxcs3bysgrmf9q1ivf3a6"; + sha256 = "0wjy5bbz6bw0na57vglcwzn17q980x6j24qkschqx49rjyk3fz2i"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 16c56e682c6f..f44187a0ac16 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.92"; + version = "2.95"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "085h2hfhizli7bpvi06vi6jsav1cn86jw8l6vdpqq4ddx2hrhn39"; + sha256 = "08pmsxsk5qbs7h3m1ya7xbik95n58ak8m4p01y97l49kc70bj2hv"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 2764c81d6d86..79a077f4a751 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.0.0-RC3"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "0iiv79ig8p9pm7fklxskxn6bx1m4xqgdfdk6bvqq81gl8b101z5w"; + sha256 = "0167cgp3kqx336p8dmlxx57bi3lhzyp6ncly28v1s7r2sjxj9krj"; }; nativeBuildInputs = [ makeWrapper ]; - phases = "installPhase"; + unpackPhase = ":"; installPhase = '' mkdir -p $out/bin cp ${src} $out/bin/coursier chmod +x $out/bin/coursier - wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ; + wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/database/pg_tmp/default.nix b/pkgs/development/tools/database/pg_tmp/default.nix new file mode 100644 index 000000000000..b7d960d5af48 --- /dev/null +++ b/pkgs/development/tools/database/pg_tmp/default.nix @@ -0,0 +1,25 @@ +{ fetchFromBitbucket, stdenv }: + +stdenv.mkDerivation rec { + name = "pg_tmp-${version}"; + version = "2.3"; + + src = fetchFromBitbucket { + owner = "eradman"; + repo = "ephemeralpg"; + rev = "ephemeralpg-${version}"; + sha256 = "0j0va9pch2xhwwx4li3qx3lkgrd79c0hcy5w5y1cqax571hv89wa"; + }; + + installPhase = '' + PREFIX=$out make install + ''; + + meta = with stdenv.lib; { + homepage = http://ephemeralpg.org; + description = "Run tests on an isolated, temporary PostgreSQL database"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ hrdinka ]; + }; +} diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index a397ba696977..49e90ce64c87 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , withMySQL ? false, withPSQL ? false, withSQLite ? false -, mariadb, postgresql, sqlite, gawk, which +, mysql, postgresql, sqlite, gawk, which , lib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { patchShebangs . substituteInPlace shmig \ - --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb}/bin/mysql"}" \ + --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \ --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ --replace "awk" "${gawk}/bin/awk" \ diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index d5acd487e6b3..72c0aaabf857 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - version = "17.3.0.271.2323"; + version = "17.4.0.355.2349"; name = "sqldeveloper-${version}"; src = requireFile rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { obtain it you need to - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads + - make sure that it says "Version ${version}" above the list of downloads - if it does not, click on the "Previous Version" link below the downloads and repeat until the version is correct. This is necessarry because as the time of this writing there exists no permanent link for the current version @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nix-prefetch-url --type sha256 file:///path/to/${name} ''; # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` - sha256 = "06ba5920544bacbea83425548b1b8f69ab3e9bb279076321aece2c0c6d415dad"; + sha256 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850"; }; buildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 06b6a0993bec..3671a3dcca9b 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "delve-${version}"; - version = "0.12.1"; + version = "0.12.2"; goPackagePath = "github.com/derekparker/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,14 +11,14 @@ buildGoPackage rec { owner = "derekparker"; repo = "delve"; rev = "v${version}"; - sha256 = "0vkyx9sd66yrqz9sa4pysmpjv6gdgpfk1icrbjk93h2ry15ma8d6"; + sha256 = "1241zqyimgqil4qd72f0yiw935lkdmfr88kvqbkn9n05k7xhdg30"; }; - meta = { + meta = with stdenv.lib; { description = "debugger for the Go programming language"; homepage = https://github.com/derekparker/delve; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ vdemeester ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 9da88f6c63d8..6a98befd346e 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,28 +1,47 @@ -{ stdenv, pythonPackages, glibcLocales} : +{ stdenv +, lib +, pythonPackages +, glibcLocales +, devpi-server +, git +, mercurial +} : pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "devpi-client"; - version = "3.1.0rc1"; + version = "3.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3"; + sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr"; }; - # requires devpi-server which is currently not packaged - doCheck = true; - checkInputs = with pythonPackages; [ pytest webtest mock ]; - checkPhase = "py.test"; + + checkInputs = with pythonPackages; [ + pytest webtest mock + devpi-server tox + sphinx wheel git mercurial detox + setuptools + ]; + checkPhase = '' + export PATH=$PATH:$out/bin + + # setuptools do not get propagated into the tox call (cannot import setuptools) + rm testing/test_test.py + + # test tries to connect to upstream pypi + py.test -k 'not test_pypi_index_attributes' testing + ''; LC_ALL = "en_US.UTF-8"; - buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ]; - propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ]; + buildInputs = with pythonPackages; [ glibcLocales pkginfo check-manifest ]; + propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy setuptools ]; - meta = { + meta = with stdenv.lib; { homepage = http://doc.devpi.net; - description = "Github-style pypi index server and packaging meta tool"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ lewo makefu ]; - + description = "Client for devpi, a pypi index server and packaging meta tool"; + license = licenses.mit; + maintainers = with maintainers; [ lewo makefu ]; }; + } diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix new file mode 100644 index 000000000000..275e411fc8d7 --- /dev/null +++ b/pkgs/development/tools/devpi-server/default.nix @@ -0,0 +1,27 @@ + { stdenv, pythonPackages, glibcLocales, nginx }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "devpi-server"; + version = "4.3.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0x6ks2sbpknznxaqlh0gf5hcvhkmgixixq2zs91wgfqxk4vi4s6n"; + }; + + propagatedBuildInputs = with pythonPackages; + [ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ]; + checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout pytest-catchlog mock pyyaml ]; + checkPhase = '' + cd test_devpi_server/ + PATH=$PATH:$out/bin pytest --slow -rfsxX + ''; + + meta = with stdenv.lib;{ + homepage = http://doc.devpi.net; + description = "Github-style pypi index server and packaging meta tool"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5f31a2dfb7c6..b88b8e3c82a9 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; patches = [ - ./respect-xml-catalog-files-var.patch + passthru.respect_xml_catalog_files_var_patch ]; outputDevdoc = "out"; @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { configureFlags = "--disable-scrollkeeper"; + passthru = { + # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch + respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; + }; + meta = with stdenv.lib; { homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 0d639875da57..b6774fe24168 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,31 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.075.1"; + version = "2.078.0"; - src = fetchFromGitHub { - owner = "dlang"; - repo = "tools"; - rev = "v${version}"; - sha256 = "0lxn400s9las9hq6h9vj4mis2jr662k2yw0zcrvqcm1yg9pd245d"; - }; + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr"; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "tools"; + rev = "v${version}"; + sha256 = "1cydhn8g0h9i9mygzi80fb5fz3z1f6m8b9gypdvmyhkkzg63kf12"; + name = "dtools"; + }) + ]; + + sourceRoot = "."; + + postUnpack = '' + mv dmd dtools + cd dtools + ''; postPatch = '' substituteInPlace posix.mak \ @@ -26,27 +43,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dmd ]; buildInputs = [ curl ]; + makeCmd = '' + make -f posix.mak DMD=${dmd.out}/bin/dmd DMD_DIR=dmd + ''; + buildPhase = '' - make -f posix.mak DMD=${dmd.out}/bin/dmd INSTALL_DIR=$out + $makeCmd ''; doCheck = true; checkPhase = '' - export BITS=${builtins.toString stdenv.hostPlatform.parsed.cpu.bits} - export OSNAME=${if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name} - ./generated/$OSNAME/$BITS/rdmd -main -unittest rdmd.d - ${dmd.out}/bin/dmd rdmd_test.d - ./rdmd_test + $makeCmd test_rdmd ''; installPhase = '' - mkdir -p $out/bin - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "find $PWD/generated/${osname}/${bits} -perm /a+x -type f -exec cp {} $out/bin \\;" - } + $makeCmd INSTALL_DIR=$out install ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 74884e6f5a8a..fb91989775b4 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,25 +1,36 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.7.5"; + version = "1.7.9"; name = "electron-${version}"; + throwSystem = throw "Unsupported system: ${stdenv.system}"; + meta = with stdenv.lib; { description = "Cross platform desktop application shell"; homepage = https://github.com/electron/electron; license = licenses.mit; maintainers = [ maintainers.travisbhartwell ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" ]; }; linux = { inherit name version meta; - src = fetchurl { - url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1z1dzk6d2mfyms8lj8g6jn76m52izbd1d7c05k8h88m1syfsgav5"; - name = "${name}.zip"; - }; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "0m87n7hqimg93z3m8pa1ggs69f3h5mjrsrrl7x80hxmp3w142krc"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "17ii0x6326mwjd0x5dj2693r67y0jra88hkqcpddcq08vf1knr2f"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "17jkma50d6az8dbyrym8z2lsw2n0r6jhdlm8pb5c928bzgshryqm"; + }; + }.${stdenv.system} or throwSystem; buildInputs = [ unzip makeWrapper ]; @@ -45,18 +56,17 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1d3c3y5j99wbyxlzk1nkry0m1xgxy3mi4a6irvlgyxl729dnwi97"; - name = "${name}.zip"; + sha256 = "1s8kslp101xyaffb3rf8p5cw3p6zij2mn19fa68ykx4naykkwaly"; }; buildInputs = [ unzip ]; buildCommand = '' - mkdir -p $out/Applications - unzip $src - mv Electron.app $out/Applications - mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron ''; }; in diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix new file mode 100644 index 000000000000..22b5ff4f0866 --- /dev/null +++ b/pkgs/development/tools/fac/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: + +buildGoPackage rec { + name = "fac-${version}"; + version = "1.0.1"; + + goPackagePath = "github.com/mkchoi212/fac"; + + src = fetchFromGitHub { + owner = "mkchoi212"; + repo = "fac"; + rev = "v${version}"; + sha256 = "1j5kip3l3p9qlly03pih905sdz3ncvpj7135jpnfhckbk1s5x9dc"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/fac \ + --prefix PATH : ${git}/bin + ''; + + meta = with stdenv.lib; { + description = "CUI for fixing git conflicts"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 6233b9c6bdb4..0ef6e85297c1 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -24,6 +24,6 @@ homepage = "https://flywaydb.org/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = maintainers.cmcdragonkai; + maintainers = [ maintainers.cmcdragonkai ]; }; } diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix new file mode 100644 index 000000000000..f1533f551b2e --- /dev/null +++ b/pkgs/development/tools/gauge/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gauge-${version}"; + version = "0.9.6"; + + goPackagePath = "github.com/getgauge/gauge"; + + src = fetchFromGitHub { + owner = "getgauge"; + repo = "gauge"; + rev = "v${version}"; + sha256 = "0p2bnrzgx616jbyr9h4h9azaq7ry63z4qkwgy0ivwrpmhfqfqwmh"; + }; + + meta = with stdenv.lib; { + description = "Light weight cross-platform test automation"; + homepage = http://gauge.org; + license = licenses.gpl3; + maintainers = [ maintainers.vdemeester ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 7d94863ea1cb..fdb6616e5fd0 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -43,6 +43,6 @@ buildRustPackage rec { homepage = https://github.com/git-series/git-series; license = licenses.mit; - maintainer = [ maintainers.vmandela ]; + maintainers = [ maintainers.vmandela ]; }; } diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index f6fe24cc281f..6a336b7015a0 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: -pythonPackages.buildPythonApplication rec { +buildPythonApplication rec { name = "cligh-${version}"; version = "0.3"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn"; }; - propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ]; + propagatedBuildInputs = [ pyxdg PyGithub ]; meta = with stdenv.lib; { homepage = http://the-brannons.com/software/cligh.html; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix new file mode 100644 index 000000000000..e4ef9d26da25 --- /dev/null +++ b/pkgs/development/tools/goconvey/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "goconvey-${version}"; + version = "1.6.3"; + + goPackagePath = "github.com/smartystreets/goconvey"; + excludedPackages = "web/server/watch/integration_testing"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "smartystreets"; + repo = "goconvey"; + rev = "${version}"; + sha256 = "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"; + }; + + meta = { + description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go."; + homepage = https://github.com/smartystreets/goconvey; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/goconvey/deps.nix b/pkgs/development/tools/goconvey/deps.nix new file mode 100644 index 000000000000..d329359da709 --- /dev/null +++ b/pkgs/development/tools/goconvey/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"; + sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "0b37b35ec7434b77e77a4bb29b79677cced992ea"; + sha256 = "1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9"; + }; + } +] diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index fdb53dd288f0..6644c8fcfc4f 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "godef-${version}"; - version = "20160620-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "ee532b944160bb27b6f23e4f5ef38b8fdaa2a6bd"; + version = "20170920-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "b692db1de5229d4248e23c41736b431eb665615d"; goPackagePath = "github.com/rogpeppe/godef"; excludedPackages = "go/printer/testdata"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/rogpeppe/godef"; - sha256 = "1r8c4ijjnwvb9pci4wasmq88yj0ginwly2542kw4hyg2c87j613l"; + sha256 = "0xqp9smfyznm8v2iy4wyy3kd24mga12fx0y0896qimac4hj2al15"; }; meta = { diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 2041491cf80d..c85186e1c0b2 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -4,17 +4,17 @@ with python27Packages; stdenv.mkDerivation rec { name = "google-app-engine-go-sdk-${version}"; - version = "1.9.55"; + version = "1.9.61"; src = if stdenv.system == "x86_64-linux" then fetchzip { url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${version}.zip"; - sha256 = "1gwrmqs69h3wbx6z0a7shdr8gn1qiwrkvh3pg6mi7dybwmd1x61h"; + sha256 = "1i2j9ympl1218akwsmm7yb31v0gibgpzlb657bcravi1irfv1hhs"; } else fetchzip { url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip"; - sha256 = "0b8r2fqg9m285ifz0jahd4wasv7cq61nr6p1k664w021r5y5lbvr"; + sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; }; buildInputs = [python27 makeWrapper]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -r "$src" "$out/share/go_appengine" # create wrappers with correct env - for i in goapp appcfg.py; do + for i in goapp go-app-stager *.py; do makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \ --prefix PATH : "${python27}/bin" \ --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})" diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 92bb619be70a..65bc55c6d8d7 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,18 +1,25 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gox-${version}"; - version = "20140904-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549"; + version = "0.4.0"; - goPackagePath = "github.com/mitchellh/gox"; - src = fetchgit { - inherit rev; - url = "https://github.com/mitchellh/gox"; - sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "gox"; + rev = "v${version}"; + sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r"; }; goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/mitchellh/gox; + description = "A dead simple, no frills Go cross compile tool"; + platforms = platforms.all; + license = licenses.mpl20; + }; + } diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix index d15b8e7c0916..c4991e38ff02 100644 --- a/pkgs/development/tools/gox/deps.nix +++ b/pkgs/development/tools/gox/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/iochan"; - rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; - sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; + sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; }; } ] diff --git a/pkgs/development/tools/haskell/intero-nix-shim/default.nix b/pkgs/development/tools/haskell/intero-nix-shim/default.nix index a7ea5b9d5770..379d6b7e472d 100644 --- a/pkgs/development/tools/haskell/intero-nix-shim/default.nix +++ b/pkgs/development/tools/haskell/intero-nix-shim/default.nix @@ -24,4 +24,5 @@ mkDerivation { ''; homepage = https://github.com/michalrus/intero-nix-shim; license = stdenv.lib.licenses.asl20; + broken = true; # https://hydra.nixos.org/build/66703340 } diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 9b5a19700ff6..b607cc5604cd 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,17 +1,20 @@ -{ mkDerivation, fetchurl, async, base, bytestring, http-conduit, lens -, lens-aeson, optparse-applicative, retry, stdenv, text, unix +{ mkDerivation, fetchzip, async, base, bytestring, hpack, http-conduit +, lens, lens-aeson, optparse-applicative, retry, stdenv, text, unix , unordered-containers, utf8-string }: mkDerivation rec { pname = "vaultenv"; - version = "0.5.0"; + version = "0.5.3"; - src = fetchurl { + src = fetchzip { url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz"; - sha256 = "0hdcxq88cf3ygnikkppyg3fcf7xmwm9zif7274j3n34p9vd8xci3"; + sha256 = "1kxq2pp8l8xf7xwjyd9cwyi7z192013s6psq5fk8jrkkhrk8z3li"; }; + buildTools = [ hpack ]; + preConfigure = "hpack ."; + isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index b9d72084518b..20f5f8d17e89 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, python3, libftdi }: +{ stdenv, fetchFromGitHub, python3, libftdi, pkgconfig }: stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2017.11.05"; + version = "2017.12.06"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "3ba18d001754de563ab0baa2a1c8eecbe63ef121"; - sha256 = "1c7yv91xi4vx0130xn2zq74gfjbf7fhm2q4fma9xgwj5xpdy8rmn"; + rev = "14b44ca866665352e7146778bb932e45b5fdedbd"; + sha256 = "18qy7gylnydgzmqry1b4r0ilm6lkjdcyn0wj03syxdig9dbjiacm"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python3 libftdi ]; preBuild = '' makeFlags="PREFIX=$out $makeFlags" diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 629ddf69c4ed..a35af00f4492 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/imatix/gsl/; description = "A universal code generator"; platforms = platforms.unix; - maintainer = [ maintainers.moosingin3space ]; + maintainers = [ maintainers.moosingin3space ]; }; } diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix new file mode 100644 index 000000000000..9762926ddf5e --- /dev/null +++ b/pkgs/development/tools/jbake/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, jre }: + +stdenv.mkDerivation rec { + version = "2.5.1"; + name = "jbake-${version}"; + + src = fetchzip { + url = "http://jbake.org/files/jbake-${version}-bin.zip"; + sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912"; + }; + + buildInputs = [ jre ]; + + installPhase = '' + substituteInPlace bin/jbake --replace "java" "${jre}/bin/java" + mkdir -p $out + cp -vr * $out + ''; + + meta = with stdenv.lib; { + description = "JBake is a Java based, open source, static site/blog generator for developers & designers"; + homepage = "http://jbake.org/"; + license = licenses.mit; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 261d16367d40..8032b256905b 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { homepage = https://github.com/jeffail/leaps/; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; - meta.platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 760ad521cef6..15b8f82d0ab2 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -21,11 +21,18 @@ stdenv.mkDerivation rec { src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; - unpackPhase = "true"; - buildPhase = '' + unpackPhase = '' cp -R ${libphutil} libphutil cp -R ${arcanist} arcanist chmod +w -R libphutil arcanist + ''; + + postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + substituteInPlace libphutil/support/xhpast/Makefile \ + --replace "-minline-all-stringops" "" + ''; + + buildPhase = '' ( cd libphutil/support/xhpast make clean all install diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 5cd8c6229f68..292632b7cbce 100644 --- a/pkgs/development/tools/misc/automake/setup-hook.sh +++ b/pkgs/development/tools/misc/automake/setup-hook.sh @@ -2,4 +2,4 @@ addAclocals () { addToSearchPathWithCustomDelimiter : ACLOCAL_PATH $1/share/aclocal } -envHooks+=(addAclocals) +addEnvHooks "$hostOffset" addAclocals diff --git a/pkgs/development/tools/misc/binutils/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/always-search-rpath.patch new file mode 100644 index 000000000000..2e9956e6b6e4 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/always-search-rpath.patch @@ -0,0 +1,14 @@ +diff --git a/ld/genscripts.sh b/ld/genscripts.sh +index b6940d376d..0feb1adfd0 100755 +--- a/ld/genscripts.sh ++++ b/ld/genscripts.sh +@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then + USE_LIBPATH=yes + fi + ++# TODO: why is this needed? ++USE_LIBPATH=yes ++ + # Set the library search path, for libraries named by -lfoo. + # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. + # Otherwise, the default is set here. diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 519d5c722af8..05d0d21a179b 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -53,11 +53,20 @@ stdenv.mkDerivation rec { # elf32-littlearm-vxworks in favor of the first. # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 ./disambiguate-arm-targets.patch + + # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's + # not clear why this behavior was decided upon but it has the unfortunate + # consequence that the linker will fail to find transitive dependencies of + # shared objects when cross-compiling. Consequently, we are forced to + # override this behavior, forcing ld to search DT_RPATH even when + # cross-compiling. + ./always-search-rpath.patch ]; - outputs = [ "out" "info" ]; + outputs = [ "out" "info" "man" ]; - nativeBuildInputs = [ bison buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison ]; buildInputs = [ zlib ]; inherit noSysDirs; @@ -84,7 +93,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 6006c83c0cd9..b20f63e26253 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, python3Packages, wrapGAppsHook, gnome3, libwnck3 }: +, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }: let version = "${major}.13"; @@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 ]; + buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobjectIntrospection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 76d34bfd5640..8c2365974843 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -13,11 +13,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { name = "dialog-${version}"; - version = "1.3-20160209"; + version = "1.3-20171209"; src = fetchurl { - url = "ftp://invisible-island.net/dialog/${name}.tgz"; - sha256 = "11rzh14xy9s99gxdi5i7fgmgihjqsv0ls0ksavkmip2y37rgf503"; + urls = [ + "ftp://ftp.invisible-island.net/dialog/${name}.tgz" + "https://invisible-mirror.net/archives/dialog/${name}.tgz" + ]; + sha256 = "1rk72as52f5br3wcr74d00wib41w65g8wvi36mfgybly251984r0"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index 5509ededb070..a0d6e49c0258 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ pcre ]; nativeBuildInputs = [ cmake doxygen ]; + # Multiple doxygen can not generate man pages in the same base directory in + # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153 + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = http://editorconfig.org/; description = "EditorConfig core library written in C"; diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 9d84011e3657..8d2e67859005 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,16 +1,22 @@ -{stdenv, fetchurl, rpm}: +{stdenv, fetchFromGitHub, rpm}: stdenv.mkDerivation rec { name = "epm-${version}"; - version = "4.2"; + version = "4.4"; - src = fetchurl { - url = "http://www.msweet.org/files/project2/epm-4.2-source.tar.bz2"; - sha256 = "13imglm1fgd7p5y9lc0xsl6x4cdjsk5lnan5sn8f7m4jwbx8kik6"; + src = fetchFromGitHub { + repo = "epm"; + owner = "michaelrsweet"; + rev = "v${version}"; + sha256 = "0kaw7v2m20qirapkps4dna6nf9xibnwljvvv0l9vpvi920kw7j7p"; }; buildInputs = [ rpm ]; + preInstall = '' + sed -i 's/README/README.md/' Makefile + ''; + meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; homepage = http://www.msweet.org/projects.php?Z2; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index ca8d0c6f7173..73c9021c5e9f 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, bison, flex }: stdenv.mkDerivation rec { - name = "gob2-${minVer}.18"; + name = "gob2-${minVer}.20"; minVer = "2.0"; src = fetchurl { - url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.gz"; - sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa"; + url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.xz"; + sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428"; }; # configure script looks for d-bus but it is only needed for tests diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index ada2dd1a89a1..6e341b577cfb 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.4"; + name = "help2man-1.47.5"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; + sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"; }; nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 4c1cd5bd7bdf..8bc35ba01a61 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { name = "inotify-tools-${version}"; - version = "3.14"; + version = "3.20.1"; - src = fetchurl { - url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz"; - sha256 = "0by9frv1k59f76cx08sn06sk6lmdxsfb6zr0rshzhyrxi6lcqar2"; + src = fetchFromGitHub { + repo = "inotify-tools"; + owner = "rvoicilas"; + rev = version; + sha256 = "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { homepage = https://github.com/rvoicilas/inotify-tools/wiki; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index ed3f1b46947d..9c131b72a316 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = https://01.org/linuxgraphics/; description = "Tools for development and testing of the Intel DRM driver"; license = licenses.mit; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 0bbab096c73f..31d70d280e32 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -9,7 +9,7 @@ let "macosx" else if stdenv.system == "aarch64-linux" then "linux-arm" - else abort "Platform ${stdenv.system} not yet supported."; + else throw "Platform ${stdenv.system} not yet supported."; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 88a33bb5dccb..23cc2c87a513 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { name = "libtool-1.5.26"; - + src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w"; }; - - buildInputs = [m4 perl]; + + nativeBuildInputs = [m4]; + buildInputs = [perl]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index af792c0c6b96..05229e4be7b2 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,12 +2,12 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.5.0"; + version = "0.5.1"; name = "${pname}-${version}"; src = python2.pkgs.fetchPypi { inherit pname version; - sha256 = "3ea4251e78ebeb2e07be2feb33243d1f8931d956efc96ccc2b0846ced212b58c"; + sha256 = "0z651m3vkbk85y41larnsjxrszkbi58x9gzml3lb6ga7qwcrsg97"; }; # Non-standard test suite. Needs custom checkPhase. diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index cace3e7f0a94..acfc8c54f641 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; license = [licenses.gpl2 licenses.lgpl21]; - maintainer = [maintainers.vcunat]; + maintainers = [maintainers.vcunat]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index c2268ba8da20..cdfa51d6f2bd 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code search and cross reference engine"; - homepage = http://opengrok.github.io/OpenGrok/; + homepage = https://opengrok.github.io/OpenGrok/; license = licenses.cddl; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 5be42855a9c7..7cfd78a39a28 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -24,7 +24,15 @@ stdenv.mkDerivation rec { buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] - ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; + ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] + # Can't run these tests while cross-compiling + ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) + [ "glib_cv_stack_grows=no" + "glib_cv_uscore=no" + "ac_cv_func_posix_getpwuid_r=yes" + "ac_cv_func_posix_getgrgid_r=yes" + ]; + postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index 1c153976a343..34a9b9f1173b 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -3,8 +3,4 @@ addPkgConfigPath () { addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig } -if test -n "$crossConfig"; then - crossEnvHooks+=(addPkgConfigPath) -else - envHooks+=(addPkgConfigPath) -fi +addEnvHooks "$targetOffset" addPkgConfigPath diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index b0bb32449a4c..93220a02e2df 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, CoreServices }: +{ stdenv, fetchFromGitHub, Foundation, readline }: with stdenv.lib; stdenv.mkDerivation rec { - name = "premake-${version}"; - version = "5.0.0pre.alpha.11"; + name = "premake5-${version}"; + version = "5.0.0-alpha12"; src = fetchFromGitHub { owner = "premake"; repo = "premake-core"; - rev = "5dfb0238bc309df04819dd430def621ce854678d"; - sha256 = "0k9xbqrnbwj0hnmdgcrwn70py1kiqvr10l42aw42xnlmdyg1sgsc"; + rev = "v${version}"; + sha256 = "1h3hr96pdz94njn4bg02ldcz0k5j1x017d8svc7fdyvl2b77nqzf"; }; - buildInputs = optional stdenv.isDarwin [ CoreServices ]; + buildInputs = optionals stdenv.isDarwin [ Foundation readline ]; patchPhase = optional stdenv.isDarwin '' substituteInPlace premake5.lua \ diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 86be86cb6d63..de2d6c5b7bfd 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7"; } else - abort "Saleae Logic software requires i686-linux or x86_64-linux"; + throw "Saleae Logic software requires i686-linux or x86_64-linux"; desktopItem = makeDesktopItem { name = "saleae-logic"; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index cf143f7d9e9d..28500ee08eee 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sloccount-2.26"; src = fetchurl { - url = "http://www.dwheeler.com/sloccount/${name}.tar.gz"; + url = "https://www.dwheeler.com/sloccount/${name}.tar.gz"; sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.dwheeler.com/sloccount/; + homepage = https://www.dwheeler.com/sloccount/; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 45a31ad66f20..612df55471ba 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql, - libaio }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql +, libaio }: stdenv.mkDerivation rec { name = "sysbench-1.0.6"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ vim libmysql libaio ]; + buildInputs = [ vim mysql.connector-c libaio ]; src = fetchFromGitHub { owner = "akopytov"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 7b360655c4f7..4263b80789a2 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = licenses.gpl3; description = "Firmware uploader for the Teensy microcontroller boards"; - homepage = http://www.pjrc.com/teensy/; + homepage = https://www.pjrc.com/teensy/; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 2a77fc42602a..eb51abe03214 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,22 +2,25 @@ stdenv.mkDerivation rec { name = "universal-ctags-${version}"; - version = "2017-09-22"; + version = "2018-01-05"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "b9537289952cc7b26526aaff3094599d714d1729"; - sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g"; + rev = "c66bdfb4db99977c1bd0568e33e60853a48dca65"; + sha256 = "0fdzhr0704cj84ym00plkl5l9w83haal6i6w70lx6f4968pcliyi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + # to generate makefile.in autoreconfPhase = '' - ./autogen.sh --tmpdir + ./autogen.sh ''; + configureFlags = [ "--enable-tmpdir=/tmp" ]; + postConfigure = '' sed -i 's|/usr/bin/env perl|${perl}/bin/perl|' misc/optlib2c ''; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index aef851e64765..dea1ab2a4459 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://martiansoftware.com/nailgun/; license = licenses.apsl20; platforms = platforms.linux; - maintainer = with maintainers; [ volth ]; + maintainers = with maintainers; [ volth ]; }; } diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 846546ae7699..186b78ce3f36 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fi } - envHooks+=(addOCamlPath) + addEnvHooks "$targetOffset" addOCamlPath ''; meta = { diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 904e070e5115..d09f06623a7e 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.3"; + version = "3.0.5"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "19gz9vcdna84xcm2b53m6b5g4c7ppb61j05fnvry3shvjiz2p58p"; + sha256 = "06h0klzzvb62rzb6m0pq8aa207fz7z54mjr05vky4wv8195bbjiy"; }; buildInputs = [ ocaml findlib yojson ] diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index e9331d078cf3..3cf70d66ddbd 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { inherit (jbuilder) installPhase; meta = { - homepage = http://www.typerex.org/ocaml-top.html; + homepage = https://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; platforms = ocamlPackages.ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 2a9a634d0a4a..8da0f781a8b2 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -22,7 +22,7 @@ buildOcaml { ''; meta = with stdenv.lib; { - homepage = http://www.typerex.org/ocp-build.html; + homepage = https://www.typerex.org/ocp-build.html; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index f96b7888db0f..d11278f4d29c 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -9,11 +9,11 @@ assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; stdenv.mkDerivation rec { name = "ocp-indent-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchzip { url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; - sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; nativeBuildInputs = [ ocpBuild opam ]; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index c212ce324b33..37807b245ff2 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -7,6 +7,9 @@ stdenv.mkDerivation rec buildInputs = with ocamlPackages; [ ocaml findlib ]; + + dontStrip = true; + installPhase = '' mkdir -p $out/bin make bindir=$out/bin install diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index c34eb9fc7084..612196cba77a 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20170201"; + version = "20170709"; src = fetchurl { urls = [ - "ftp://invisible-island.net/byacc/${name}.tgz" - "http://invisible-mirror.net/archives/byacc/${name}.tgz" + "ftp://ftp.invisible-island.net/byacc/${name}.tgz" + "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91"; + sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7"; }; doCheck = true; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 1a6a4ca890c0..f7d22395a03e 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -74,6 +74,10 @@ in stdenv.mkDerivation rec { url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/unlock-qt.patch"; + sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03"; + }) ./system-qtbase.patch ]; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 01433a6ce4d4..b017b1dc24b5 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "8.2.7"; + version = "9.0.1"; src = fetchPypi { inherit pname version; - sha256 = "08wkxs6qqgzxamym523bjv7zahg8p9v18x0yi9vwclij5k91iyzm"; + sha256 = "16k77iy1apbc1s5j78aimhjrcw89vbkq5irs80dmm70wayi0myz1"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 772178dd84c1..10a10fa21efb 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -1,15 +1,21 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "pup-${version}"; - version = "20160425-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "e76307d03d4d2e0f01fb7ab51dee09f2671c3db6"; - + version = "0.4.0"; + rev = "v${version}"; + goPackagePath = "github.com/ericchiang/pup"; src = fetchgit { inherit rev; - url = "https://github.com/ericchiang/pup"; - sha256 = "15lwas4cjchlwhrwnd5l4gxcwqdfgazdyh466hava5qzxacqxrm5"; + url = "https://${goPackagePath}"; + sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz"; + }; + + meta = with lib; { + description = "Streaming HTML processor/selector"; + license = licenses.mit; + maintainers = with maintainers; [ yegortimoshenko ]; }; } diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index ac4a39f06920..baba4fd75ea9 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "remarshal-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = "remarshal"; rev = "v${version}"; - sha256 = "0jslawpzghv3chamrfddnyn5p5068kjxy8d38fxvi5h06qgfb4wp"; + sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/remarshal/deps.nix b/pkgs/development/tools/remarshal/deps.nix deleted file mode 100644 index 32f9f6eb0bb5..000000000000 --- a/pkgs/development/tools/remarshal/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; - }; - } -] diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix index da8a8e2e77db..634ca28aaf13 100644 --- a/pkgs/development/tools/rhc/default.nix +++ b/pkgs/development/tools/rhc/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/openshift/rhc; description = "OpenShift client tools"; license = licenses.asl20; - maintaners = maintainers.szczyp; + maintainers = [ maintainers.szczyp ]; }; } diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index d304560515c4..73e64c83696d 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.31.1"; + version = "0.32.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; - rev = "v${version}"; - sha256 = "0b0nr42vvxzrykzn11mwk1h9cqn87fh8423wwrs3h8vpk5jqg55i"; + rev = version; + sha256 = "15m1y468c7ixzxwx29wazag0i19a3bmzjp53np6b62sf9wfzbsfa"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - cargoSha256 = "1pjyancb5w9rrxirwx8ghhjbnfcc2r0ha5bfnmlfamj8aaaqdc5w"; + cargoSha256 = "01h0y5phdv3ab8mk2yxw8lgg9783pjjnjl4087iddqhqanlv600d"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index b7065cc5d7da..6a2d5758f1fb 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -52,6 +52,6 @@ rustPlatform.buildRustPackage rec { description = "The Rust toolchain installer"; homepage = https://www.rustup.rs/; license = licenses.mit; - maintainer = [ maintainers.mic92 ]; + maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 391c653b98ab..d50b1435b733 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,29 +1,37 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, jdk, jre, coursier, makeWrapper }: -stdenv.mkDerivation rec { - version = "0.6.8"; +let baseName = "scalafmt"; + version = "1.4.0"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch com.geirsson:scalafmt-cli_2.12:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "12hsix3b7qnyr9x2v7i6jgqljdqxpfj4bfvhjdl99ijr793g3lnp"; + }; +in +stdenv.mkDerivation rec { name = "${baseName}-${version}"; - src = fetchurl { - url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "1iaanrxk5lhxx1zj9gbxzgqbnyy1azfrab984mga7di5z1hs02s2"; - }; + buildInputs = [ jdk makeWrapper deps ]; - unpackPhase = "tar xvzf $src"; + doCheck = true; + + phases = [ "installPhase" "checkPhase" ]; installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + makeWrapper ${jre}/bin/java $out/bin/${baseName} \ + --add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli" + ''; - cp cli/target/scala-2.11/scalafmt.jar "$out/lib/${name}.jar" - - cat > "$out/bin/${baseName}" << EOF - #!${stdenv.shell} - exec ${jre}/bin/java -jar "$out/lib/${name}.jar" "\$@" - EOF - - chmod a+x "$out/bin/${baseName}" + checkPhase = '' + $out/bin/${baseName} --version | grep -q "${version}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d05706a7fadf..0f720f1f7e32 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.23"; + version = "0.1.27"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "1axxnm87fpsd7q28v951ilhmzd42k8wyh741gdfdcajjwglfj0nn"; + sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; }; patches = [ diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch index eb3c54ae66c4..fe456b58e548 100644 --- a/pkgs/development/tools/skopeo/path.patch +++ b/pkgs/development/tools/skopeo/path.patch @@ -22,17 +22,4 @@ index 50e29b2..7108df5 100644 if c.GlobalBool("insecure-policy") { policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} } else if policyPath == "" { -diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go -index b989770..697d2ee 100644 ---- a/vendor/github.com/containers/image/docker/docker_client.go -+++ b/vendor/github.com/containers/image/docker/docker_client.go -@@ -154,6 +154,9 @@ func setupCertificates(dir string, tlsc *tls.Config) error { - if os.IsNotExist(err) { - return nil - } -+ if os.IsPermission(err) { -+ return nil -+ } - return err - } diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index bfd4b7370e0a..fc6bf1921e2f 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -8,14 +8,14 @@ spirv_sources = { tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4"; - sha256 = "0rh25y1k3m3f1nqs032lh3mng5qfw9kqn6xv9yzzm47i1i0b6hmr"; + rev = "7e2d26c77b606b21af839b37fd21381c4a669f23"; + sha256 = "1nlzj081v1xdyfz30nfs8hfcnqd072fra127h46gav179f04kss2"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "6c08995e6e7b94129e6086c78198c77111f2f262"; - sha256 = "07m12wm9prib7hldj7pbc8vwnj0x6llgx4shzgy8x4xbhbafawws"; + rev = "2bb92e6fe2c6aa410152fc6c63443f452acb1a65"; + sha256 = "1rgjd7kpa7xpbwpzd6m3f6yq44s9xn5ddhz135213pxwbi5c0c26"; }; }; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2017-03-23"; + version = "2017-09-01"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 578e759548a1..5b46b975cf7f 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -17,7 +17,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ - boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase + boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase ]; preConfigure = '' @@ -51,6 +51,8 @@ in mkDerivation rec { "-lssl" ]; + NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ]; + postFixup = '' wrapProgram $out/bin/tora \ --prefix PATH : ${lib.getBin graphviz}/bin diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile new file mode 100644 index 000000000000..d32951f1c054 --- /dev/null +++ b/pkgs/development/tools/vagrant/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem 'vagrant' diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock new file mode 100644 index 000000000000..208aab0a2078 --- /dev/null +++ b/pkgs/development/tools/vagrant/Gemfile.lock @@ -0,0 +1,149 @@ +GIT + remote: https://github.com/mitchellh/vagrant-spec.git + revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1 + specs: + vagrant-spec (0.0.1) + childprocess (~> 0.6.0) + log4r (~> 1.1.9) + rspec (~> 3.5.0) + thor (~> 0.18.1) + +PATH + remote: . + specs: + vagrant (2.0.1) + childprocess (~> 0.6.0) + erubis (~> 2.7.0) + hashicorp-checkpoint (~> 0.1.1) + i18n (>= 0.6.0, <= 0.8.0) + listen (~> 3.1.5) + log4r (~> 1.1.9, < 1.1.11) + net-scp (~> 1.2.0) + net-sftp (~> 2.1) + net-ssh (~> 4.1.0) + rb-kqueue (~> 0.2.0) + rest-client (>= 1.6.0, < 3.0) + ruby_dep (<= 1.3.1) + wdm (~> 0.1.0) + winrm (~> 2.1) + winrm-elevated (~> 1.1) + winrm-fs (~> 1.0) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + builder (3.2.3) + childprocess (0.6.3) + ffi (~> 1.0, >= 1.0.11) + crack (0.4.3) + safe_yaml (~> 1.0.0) + diff-lcs (1.3) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) + erubis (2.7.0) + fake_ftp (0.1.1) + ffi (1.9.18) + gssapi (1.2.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hashdiff (0.3.7) + hashicorp-checkpoint (0.1.4) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + i18n (0.8.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + little-plugger (1.1.4) + log4r (1.1.10) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + multi_json (1.12.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (4.1.0) + netrc (0.11.0) + nori (2.6.0) + public_suffix (3.0.1) + rake (12.0.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rb-kqueue (0.2.5) + ffi (>= 0.5.0) + rest-client (2.0.2) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-its (1.2.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + ruby_dep (1.3.1) + rubyntlm (0.6.2) + rubyzip (1.2.1) + safe_yaml (1.0.4) + thor (0.18.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.4) + wdm (0.1.1) + webmock (2.3.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + winrm (2.2.3) + builder (>= 2.1.2) + erubis (~> 2.7) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.1) + winrm-elevated (1.1.0) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.1.1) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 2.0) + +PLATFORMS + ruby + +DEPENDENCIES + fake_ftp (~> 0.1.1) + rake (~> 12.0.0) + rspec (~> 3.5.0) + rspec-its (~> 1.2.0) + vagrant! + vagrant-spec! + webmock (~> 2.3.1) + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index e72520d61b33..714935513f74 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,141 +1,55 @@ -{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, rake, ruby, buildRubyGem, libiconv -, libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby }: let version = "2.0.1"; + url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; + sha256 = "1fjfl00n4rsq6khypm56g0vq6l153q128r35zky2ba30bz292ar1"; - url = if stdenv.isLinux - then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb" - else if stdenv.isDarwin - then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.dmg" - else "system ${stdenv.system} not supported"; + deps = bundlerEnv rec { + name = "${pname}-${version}"; + pname = "vagrant"; + inherit version; - sha256 = { - "x86_64-linux" = "0kyqchjsy747vbvhqiynz81kik8g0xqpkv70rz7hyr9x7fl9i51g"; - "i686-linux" = "0p3xhxy6shkd0393wjyj8qycdn3zqv60vnyz1b6zclz0kfah07zs"; - "x86_64-darwin" = "01hr5j9k31hsdlcwv3srzk0lphd8w0n9z95jvfkschdyjm9clpwm"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + inherit ruby; + gemdir = ./.; + gemset = lib.recursiveUpdate (import ./gemset.nix) { + vagrant = { + source = { + type = "url"; + inherit url sha256; + }; + inherit version; + }; + }; + }; - arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system; - -in stdenv.mkDerivation rec { - name = "vagrant-${version}"; +in buildRubyGem rec { + name = "${gemName}-${version}"; + gemName = "vagrant"; inherit version; - src = fetchurl { - inherit url sha256; + doCheck = true; + dontBuild = false; + src = fetchurl { inherit url sha256; }; + + patches = [ + ./unofficial-installation-nowarn.patch + ]; + + postInstall = '' + wrapProgram "$out/bin/vagrant" \ + --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" + ''; + + passthru = { + inherit ruby deps; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for building complete development environments"; - homepage = http://vagrantup.com; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; - platforms = with platforms; linux ++ darwin; + homepage = https://www.vagrantup.com/; + license = licenses.mit; + maintainers = with maintainers; [ aneeshusa ]; + platforms = with platforms; linux ++ darwin; }; - - buildInputs = [ makeWrapper ] - ++ stdenv.lib.optional stdenv.isDarwin [ p7zip xar gzip cpio ]; - - unpackPhase = if stdenv.isLinux - then '' - ${dpkg}/bin/dpkg-deb -x "$src" . - '' - else '' - 7z x $src - cd Vagrant/ - xar -xf Vagrant.pkg - cd core.pkg/ - cat Payload | gzip -d - | cpio -id - - # move unpacked directories to match unpacked .deb from linux, - # so installPhase can be shared - mkdir -p opt/vagrant/ usr/ - mv embedded opt/vagrant/embedded - mv bin usr/bin - ''; - - buildPhase = ""; - - installPhase = '' - sed -i "s|/opt|$out/opt|" usr/bin/vagrant - - # overwrite embedded binaries - - # curl: curl, curl-config - rm opt/vagrant/embedded/bin/{curl,curl-config} - ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin - ln -s ${curl.dev}/bin/curl-config opt/vagrant/embedded/bin - - # libarchive: bsdtar, bsdcpio - rm opt/vagrant/embedded/lib/libarchive* - ln -s ${libarchive}/lib/libarchive.so opt/vagrant/embedded/lib/libarchive.so - rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio} - ln -s ${libarchive}/bin/bsdtar opt/vagrant/embedded/bin - ln -s ${libarchive}/bin/bsdcpio opt/vagrant/embedded/bin - - # openssl: c_rehash, openssl - rm opt/vagrant/embedded/bin/{c_rehash,openssl} - ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin - ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin - - # libiconv: iconv - rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin - - # libxml: xml2-config, xmlcatalog, xmllint - rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} - ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin - - # libxslt: xslt-config, xsltproc - rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} - ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin - ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin - - '' + (stdenv.lib.optionalString (! stdenv.isDarwin) '' - # ruby: erb, gem, irb, rake, rdoc, ri, ruby - rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} - ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin - ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin - ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin - ln -s ${rake}/bin/rake opt/vagrant/embedded/bin - ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin - ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin - ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin - - # ruby libs - rm -rf opt/vagrant/embedded/lib/* - for lib in ${ruby}/lib/*; do - ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} - done - - # libffi - ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 - - '') + '' - mkdir -p "$out" - cp -r opt "$out" - cp -r usr/bin "$out" - wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxml2 libxslt ]}" \ - --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib" - - install -D "opt/vagrant/embedded/gems/gems/vagrant-$version/contrib/bash/completion.sh" \ - "$out/share/bash-completion/completions/vagrant" - ''; - - preFixup = '' - # 'hide' the template file from shebang-patching - chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" - ''; - - postFixup = '' - chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" - '' + - (stdenv.lib.optionalString stdenv.isDarwin '' - # undo the directory movement done in unpackPhase - mv $out/opt/vagrant/embedded $out/ - rm -r $out/opt - ''); } diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix new file mode 100644 index 000000000000..3dd517388d21 --- /dev/null +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -0,0 +1,457 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv"; + type = "gem"; + }; + version = "0.6.3"; + }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + domain_name = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + type = "gem"; + }; + version = "0.5.20170404"; + }; + erubis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + type = "gem"; + }; + version = "2.7.0"; + }; + fake_ftp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7"; + type = "gem"; + }; + version = "0.1.1"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + type = "gem"; + }; + version = "1.9.18"; + }; + gssapi = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; + type = "gem"; + }; + version = "1.2.0"; + }; + gyoku = { + dependencies = ["builder"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + type = "gem"; + }; + version = "1.3.1"; + }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; + type = "gem"; + }; + version = "0.3.7"; + }; + hashicorp-checkpoint = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15shgckjnxqpz1n9z6y4ax1dcnn5vdqcva29gdg2l7ny0g1w7c7m"; + type = "gem"; + }; + version = "0.1.4"; + }; + http-cookie = { + dependencies = ["domain_name"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00nsll7q89ab6k43dl3apxjhy4zidlgjmgb9mpk42bj3wk5zdyzf"; + type = "gem"; + }; + version = "0.8.0"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + type = "gem"; + }; + version = "3.1.5"; + }; + little-plugger = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + log4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv"; + type = "gem"; + }; + version = "1.1.10"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + type = "gem"; + }; + version = "3.1"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + type = "gem"; + }; + version = "3.2016.0521"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + type = "gem"; + }; + version = "1.12.2"; + }; + net-scp = { + dependencies = ["net-ssh"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + type = "gem"; + }; + version = "1.2.1"; + }; + net-sftp = { + dependencies = ["net-ssh"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + type = "gem"; + }; + version = "2.1.2"; + }; + net-ssh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + type = "gem"; + }; + version = "4.1.0"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + nori = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; + type = "gem"; + }; + version = "3.0.1"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + type = "gem"; + }; + version = "12.0.0"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + type = "gem"; + }; + version = "0.10.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + rb-kqueue = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14mhzrhs2j43vj36i1qq4z29nd860shrslfik015f4kf1jiaqcrw"; + type = "gem"; + }; + version = "0.2.5"; + }; + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + type = "gem"; + }; + version = "2.0.2"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i"; + type = "gem"; + }; + version = "3.5.4"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-its = { + dependencies = ["rspec-core" "rspec-expectations"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; + type = "gem"; + }; + version = "1.2.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-support = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0"; + type = "gem"; + }; + version = "3.5.0"; + }; + ruby_dep = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v0qznxz999lx4vs76mr590r90i0cm5m76wwvgis7sq4y21l308l"; + type = "gem"; + }; + version = "1.3.1"; + }; + rubyntlm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + type = "gem"; + }; + version = "0.6.2"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + type = "gem"; + }; + version = "1.2.1"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; + type = "gem"; + }; + version = "0.18.1"; + }; + unf = { + dependencies = ["unf_ext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + type = "gem"; + }; + version = "0.0.7.4"; + }; + vagrant = { + dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; + }; + vagrant-spec = { + dependencies = ["childprocess" "log4r" "rspec" "thor"]; + source = { + fetchSubmodules = false; + rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1"; + sha256 = "03bpxlliyiny062p8a8vxyb1hymxpgfwliky4vlqn7lbm6z7n6kr"; + type = "git"; + url = "https://github.com/mitchellh/vagrant-spec.git"; + }; + version = "0.0.1"; + }; + wdm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x5l2pn4x92734k6i2wcjbn2klmwgkiqaajvxadh35k74dgnyh18"; + type = "gem"; + }; + version = "0.1.1"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + type = "gem"; + }; + version = "2.3.2"; + }; + winrm = { + dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02lzbixdbjvhmb0byqx9rl9x4xx9pqc8jwm7y6mmp7w7mri72zh6"; + type = "gem"; + }; + version = "2.2.3"; + }; + winrm-elevated = { + dependencies = ["winrm" "winrm-fs"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr"; + type = "gem"; + }; + version = "1.1.0"; + }; + winrm-fs = { + dependencies = ["erubis" "logging" "rubyzip" "winrm"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vax34qbr3n6jifxyzr4nngaz8vrmzw6ydw21cnnrhidfkqgh7ja"; + type = "gem"; + }; + version = "1.1.1"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch new file mode 100644 index 000000000000..885959428956 --- /dev/null +++ b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch @@ -0,0 +1,16 @@ +diff --git i/bin/vagrant w/bin/vagrant +index 19df75033..682fae226 100755 +--- i/bin/vagrant ++++ w/bin/vagrant +@@ -128,11 +128,6 @@ begin + end + end + +- if !Vagrant.in_installer? && !Vagrant.very_quiet? +- # If we're not in the installer, warn. +- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) +- end +- + begin + # Execute the CLI interface, and exit with the proper error code + exit_status = env.cli(argv) diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index fae0ca88124f..51e066f3d390 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -23,6 +23,6 @@ buildPythonApplication rec { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = https://github.com/dirk-thomas/vcstool; license = licenses.asl20; - maintainer = with maintainers; [ sivteck ]; + maintainers = with maintainers; [ sivteck ]; }; } diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 66fdb1841e40..2a4ddaf80398 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "vndr-${version}"; - version = "20170511-${lib.strings.substring 0 7 rev}"; - rev = "0cb33a0eb64c8ca73b8e2939a3430b22fbb8d3e3"; + version = "20171005-${lib.strings.substring 0 7 rev}"; + rev = "b57c5799efd5ed743f347a025482babf01ba963e"; goPackagePath = "github.com/LK4D4/vndr"; excludedPackages = "test"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "LK4D4"; repo = "vndr"; - sha256 = "02vdr59xn79hffayfcxg29nf62rdc33a60i104fgj746kcswgy5n"; + sha256 = "15mmy4a06jgzvlbjbmd89f0xx695x8wg7jqi76kiz495i6figk2v"; }; meta = { diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9dfd3b7e7289..af6aa6061b0b 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -25,6 +25,9 @@ let ''; ini = writeText "wp-cli.ini" '' + [PHP] + memory_limit = 512M ; composer can be a bit of a memory pig + [Phar] phar.readonly = Off ''; diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index e1f4d9089f38..18368588c2af 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -2,4 +2,4 @@ addNodePath () { addToSearchPath NODE_PATH $1/lib/node_modules } -envHooks+=(addNodePath) +addEnvHooks "$hostOffset" addNodePath diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 08fd91aaf8de..64674066b295 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "4.8.5"; - sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; + version = "4.8.7"; + sha256 = "1y21wq092d3gmccm2zldbflbbbx7a71wi9l0bpkxvzmgws69liq3"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index c703377d5a04..3688ee0b7ef0 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.11.5"; - sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w"; + version = "6.12.2"; + sha256 = "1z6sn4b973sxw0h9hd38rjq6cqdkzl5gsd48f793abvarwgpqrrk"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 14dfb8164f43..fa5f10e8f7b7 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.9.1"; - sha256 = "1q0p9zl260pd8038yvn13lw5whs480dy11ar2ijcm2hgyqhhq5pg"; + version = "8.9.4"; + sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 8a1cd2d148d1..1a2184d4cb9a 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.2.0"; - sha256 = "1hmvwfbavk2axqz9kin8b5zsld25gznhvlz55h3yl6nwx9iz5jk4"; + version = "9.3.0"; + sha256 = "1kap1hi4am5advfp6yb3bd5nhd2wx2j72cjq8qqg7yh95xg0g25j"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index ad11542f04b0..90f2a8dcfed4 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,29 +1,24 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala_0_28, ctpl +{ stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { name = "valum-${version}"; - version = "0.2.16"; + version = "0.3.14"; src = fetchFromGitHub { owner = "valum-framework"; repo = "valum"; rev = "v${version}"; - sha256 = "0ca067gg5z1798bazwzgg2yd2mbysvk8i2q2v3i8d0d188y2hj84"; + sha256 = "1w1mipczcfmrrxg369wvrj3wvf76rqn8rrkxbq88aial1bi23kd3"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python glib vala_0_28 ctpl libgee libsoup fcgi ]; - - configurePhase = ''python waf configure --prefix=$out''; - - buildPhase = ''python waf build''; - - installPhase = ''python waf install''; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with stdenv.lib; { homepage = https://github.com/valum-framework/valum; description = "Web micro-framework written in Vala"; + license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix new file mode 100644 index 000000000000..22b38af29a3c --- /dev/null +++ b/pkgs/development/web/woff2/default.nix @@ -0,0 +1,32 @@ +{ brotli, cmake, fetchFromGitHub, stdenv }: + +stdenv.mkDerivation rec { + name = "woff2-${version}"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "google"; + repo = "woff2"; + rev = "v${version}"; + sha256 = "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y"; + }; + + outputs = [ "out" "dev" "lib" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ brotli ]; + + # without this binaries only get built if shared libs are disable + patchPhase = '' + sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "Webfont compression reference code"; + homepage = https://github.com/google/woff2; + license = licenses.mit; + maintainers = [ maintainers.hrdinka ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 21f6e68e416a..0437a1b130f8 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -2,14 +2,14 @@ SDL2_mixer, freetype, gettext }: stdenv.mkDerivation rec { - version = "2017-07-12"; + version = "2017-12-09"; name = "cataclysm-dda-git-${version}"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; - rev = "2d7aa8c"; - sha256 = "0xx7si4k5ivyb5gv98fzlcghrg3w0dfblri547x7x4is7fj5ffjd"; + rev = "24e92956db5587809750283873c242cc0796d7e6"; + sha256 = "1a7kdmx76na4g65zra01qaq98lxp9j2dl9ddv09r0p5yxaizw68z"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -33,7 +33,10 @@ stdenv.mkDerivation rec { --add-flags "--datadir $out/share/cataclysm-dda/" ''; - enableParallelBuilding = true; + # https://hydra.nixos.org/build/65193254 + # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory + # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 + enableParallelBuilding = false; meta = with stdenv.lib; { description = "A free, post apocalyptic, zombie infested rogue-like"; diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index e8daca26ef7d..b8a4d4e06dc0 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm' - #enableParallelBuilding = true; + enableParallelBuilding = false; installPhase = '' runHook preInstall diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 9baa38777068..b2a0b2884254 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern Interpreter for the Commander Keen Games"; - longdescription = '' + longDescription = '' Commander Genius is an open-source clone of Commander Keen which allows you to play the games, and some of the mods diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix new file mode 100644 index 000000000000..253a7fcbf304 --- /dev/null +++ b/pkgs/games/cutemaze/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, qmake, qttools, qtsvg }: + +stdenv.mkDerivation rec { + name = "cutemaze-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; + sha256 = "1a2jmkm7fjzdrvzgvbqfq20k0vvpwfcycagsm0haxb3fpv86950y"; + }; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtsvg ]; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv CuteMaze.app $out/Applications + ''; + + meta = with stdenv.lib; { + homepage = https://gottcode.org/cutemaze/; + description = "Simple, top-down game in which mazes are randomly generated"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index bdd55b5aeda7..c759c4c60dae 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -12,7 +12,6 @@ let }; soundSense = callPackage ./soundsense.nix { }; - stoneSense = callPackage ./stonesense.nix { }; dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index dbb3e7c32e25..ff2c471e137d 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -4,13 +4,13 @@ }: let - dfVersion = "0.43.05"; - version = "${dfVersion}-r2"; + dfVersion = "0.44.03"; + version = "${dfVersion}-beta1"; rev = "refs/tags/${version}"; - sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c"; + sha256 = "1gyaq6krm0cvccyw7rdy6afh9vy983dl86d0wnpr25dl3jky27xw"; # revision of library/xml submodule - xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9"; + xmlRev = "7e23a328fd81e3d6db794c0c18b8b2e7bd235649"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index e7ef9a02eb70..affb364b26f2 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "37.0.0-Hello71"; + version = "39.1.2"; src = fetchFromGitHub { - ## We use `Hello71`'s fork for 43.05 support - # owner = "splintermind"; - owner = "Hello71"; + owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; - rev = "42ccaa71f6077ebdd41543255a360c3470812b97"; - sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz"; + rev = "v${version}"; + sha256 = "0j5pldc184xv1mhdrhsmp23g58cy9a2bba27djigkh2sd5rksgji"; }; outputs = [ "out" "layouts" ]; @@ -33,9 +31,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ the-kenny abbradar ]; + maintainers = with maintainers; [ the-kenny abbradar bendlas ]; license = licenses.mit; platforms = platforms.linux; - homepage = https://github.com/splintermind/Dwarf-Therapist; + homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist; }; } diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 3a1a52d44cdb..6debf0bb0b2b 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,9 +1,11 @@ -{ symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }: +{ stdenv, symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }: let df = dwarf-fortress-original; dt = dwarf-therapist-original; - inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini"; + platformSlug = if stdenv.targetPlatform.is32bit then + "linux32" else "linux64"; + inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}_${platformSlug}.ini"; dfHashFile = "${df}/hash.md5"; in symlinkJoin { diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 740125bf4426..4c8712fd40ec 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -3,8 +3,8 @@ }: let - baseVersion = "43"; - patchVersion = "05"; + baseVersion = "44"; + patchVersion = "03"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; platform = @@ -12,8 +12,8 @@ let else if stdenv.system == "i686-linux" then "linux32" else throw "Unsupported platform"; sha256 = - if stdenv.system == "x86_64-linux" then "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45" - else if stdenv.system == "i686-linux" then "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03" + if stdenv.system == "x86_64-linux" then "0bgrkwcdghwch96krqdwq8lcjwr6svw0xl53d2jysyszfy7nfl88" + else if stdenv.system == "i686-linux" then "1mvnbkjvm68z2q7h81jrh70qy9458b1spv0m3nlc680fm19hpz40" else throw "Unsupported platform"; in diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index c87f42d58c0f..8e1742663c77 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.43.05"; + dfVersion = "0.44.03"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/stonesense.nix b/pkgs/games/dwarf-fortress/stonesense.nix deleted file mode 100644 index 52de513ac8fd..000000000000 --- a/pkgs/games/dwarf-fortress/stonesense.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - name = "stonesense"; - src = fetchFromGitHub { - owner = "DFHack"; - repo = "stonesense"; - rev = "be793a080e66db1ff79ac284070632ec1a896708"; - sha256 = "1kibqblxp16z75zm48kk59w483933rkg4w339f28fcrbpg4sn92s"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DDFHACK_BUILD_ARCH=64" ]; -} diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 7d1f26e9aabc..90e67eb41952 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cla-theme-${version}"; - version = "43.05-v23"; + version = "44.01-v24"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "1i74lyz7mpfrvh5g7rajxldhw7zddc2kp8f6bgfr3hl5l8ym5ci9"; + sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.43.05"; + passthru.dfVersion = "0.44.03"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 07bbde9f1480..97d2c2b20ef4 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "43.05c"; + version = "44.03"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "0wiz9rd5ypibgh8854h5n2xwksfxylaziyjpbp3p1rkm3r7kr4fd"; + sha256 = "0jpklikg2bf315m45kdkhd1n1plzb4jwzsg631gqfm9dwnrcs4w3"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.43.05"; + passthru.dfVersion = "0.44.03"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 105da5a5731b..1831b2b60620 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,14 +3,16 @@ , ncurses, glib, gtk2, libsndfile, zlib }: +let dfVersion = "0.44.03"; in + stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-2016-07-13"; + name = "dwarf_fortress_unfuck-${dfVersion}"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; - rev = "d6a4ee67e7b41bec1caa87548640643db35a6080"; - sha256 = "17p7jzmwd5z54wn6bxmic0i8y8mma3q359zcy3r9x2mp2wv1yd7p"; + rev = dfVersion; + sha256 = "0rd8d2ilhhks9kdi9j73bpyf8j56fhmmsj21yzdc0a4v2hzyxn2w"; }; cmakeFlags = [ @@ -33,7 +35,7 @@ stdenv.mkDerivation { # Breaks dfhack because of inlining. hardeningDisable = [ "fortify" ]; - passthru.dfVersion = "0.43.05"; + passthru = { inherit dfVersion; }; meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 05e851db6f85..3d904d006e46 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -38,11 +38,11 @@ let }; in -assert lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) pkgs; - stdenv.mkDerivation rec { name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}"; + compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs; + dfInit = substituteAll { name = "dwarf-fortress-init"; src = ./dwarf-fortress-init.in; diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix new file mode 100644 index 000000000000..be45866a7dd7 --- /dev/null +++ b/pkgs/games/easyrpg-player/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen ? null, pkgconfig, freetype ? null, harfbuzz ? null +, liblcf, libpng, libsndfile ? null, libxmp ? null, libvorbis ? null, mpg123 ? null +, opusfile ? null, pixman, SDL2, speexdsp ? null, wildmidi ? null, zlib }: + +stdenv.mkDerivation rec { + name = "easyrpg-player-${version}"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "EasyRPG"; + repo = "Player"; + rev = version; + sha256 = "1cn3g08ap6cf812s8p3ilf31q7y7y4knp1s0gk45mqcz215cpd8q"; + }; + + nativeBuildInputs = [ cmake doxygen pkgconfig ]; + + buildInputs = [ + freetype + harfbuzz + liblcf + libpng + libsndfile + libxmp + libvorbis + mpg123 + opusfile + SDL2 + pixman + speexdsp + wildmidi + zlib + ]; + + meta = with stdenv.lib; { + homepage = https://easyrpg.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 411101955093..a830fa38df55 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut, freetype -, SDL, SDL_mixer, SDL_image, libXi, inputproto +, sfml, libXi, inputproto , libXmu, libXext, xextproto, libXt, libSM, libICE , libpng, pkgconfig, gettext, intltool }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.4"; name = "extremetuxracer-${version}"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "0fl9pwkywqnsmgr6plfj9zb05xrdnl5xb2hcmbjk7ap9l4cjfca4"; + sha256 = "0d2j4ybdjmimg67v2fndgahgq4fvgz3fpfb3a4l1ar75n6hy776s"; }; buildInputs = [ mesa libX11 xproto tcl freeglut freetype - SDL SDL_mixer SDL_image libXi inputproto + sfml libXi inputproto libXmu libXext xextproto libXt libSM libICE libpng pkgconfig gettext intltool ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE" ''; meta = { diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index ba23db2fbdf5..ac04022a4629 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -16,9 +16,9 @@ let # where the ultimate "_" (before the version) is changed to a "-". binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { - alpha = bdist { sha256 = "0y6d7pvf3dgyll175323xp4zmrbyrjn73zrb478y1gpl6dqh064d"; fetcher = authenticatedFetch; }; - headless = bdist { sha256 = "1agkra3qq11la307ymsfb7v358wc2s2mdpmfbc5n0sb4gnmnqazq"; }; - demo = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; version = "0.15.33"; }; + alpha = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; }; + headless = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; }; + demo = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; }; }; i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { alpha = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; }; @@ -29,7 +29,7 @@ let actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.15.37" + , version ? "0.15.40" , fetcher ? fetchurl , nameMut ? x: x }: diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 438b01fe51ac..61a1aed8178f 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, cmake, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, doxygen -, libxslt, makeWrapper }: +{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper +, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, libxslt }: stdenv.mkDerivation rec { - version = "0.4.6"; + version = "0.4.7.1"; name = "freeorion-${version}"; - src = fetchurl { - url = "https://github.com/freeorion/freeorion/releases/download/v0.4.6/FreeOrion_v0.4.6_2016-09-16.49f9123_Source.tar.gz"; - sha256 = "04g3x1cymf7mnmc2f5mm3c2r5izjmy7z3pvk2ykzz8f8b2kz6gry"; + src = fetchFromGitHub { + owner = "freeorion"; + repo = "freeorion"; + rev = "v${version}"; + sha256 = "1m05l3a6ilqd7p2g3aqjpq89grb571cg8n9bpgz0y3sxskcym6sp"; }; - buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen makeWrapper ]; + buildInputs = [ boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew ]; + + nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; + + enableParallelBuilding = true; patches = [ ./fix_rpaths.patch ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/fixpaths # We need final slashes for XSLT replace to work properly @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; homepage = http://www.freeorion.org; - license = [ licenses.gpl2 licenses.cc-by-sa-30 ]; + license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index abe1c2c55991..0e9025259224 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gemrb.org/; license = licenses.gpl2; - maintainer = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; }; } diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 4ca2cd271cdb..28fd6fe6e501 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - documentation = ''City building game''; + description = ''City building game''; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix new file mode 100644 index 000000000000..161f4691c8f9 --- /dev/null +++ b/pkgs/games/linux-steam-integration/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext, + gcc_multi, libressl }: + +let + version = "0.7.2"; + steamBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ steam ])}/steam"; + zenityBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ gnome3.zenity ])}/zenity"; + +in stdenv.mkDerivation rec { + name = "linux-steam-integration-${version}"; + + nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; + buildInputs = [ gtk libressl ]; + + src = fetchFromGitHub { + owner = "solus-project"; + repo = "linux-steam-integration"; + rev = "v${version}"; + sha256 = "0yn71fvjqi63dxk04jsndb26pgipl0nla10sy94bi7q95pk3sdf6"; + fetchSubmodules = true; + }; + + # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c + # Patch path to lsi-steam in lsi-steam.desktop + # Patch path to zenity in lsi.c + postPatch = '' + sed -i -e "s|/usr/|$out/|g" src/shim/shim.c + sed -i -e "s|/usr/|$out/|g" data/lsi-steam.desktop + sed -i -e "s|zenity|${zenityBinPath}|g" src/lsi/lsi.c + ''; + + configurePhase = '' + # Configure 64bit things + meson build \ + -Dwith-shim=co-exist \ + -Dwith-frontend=true \ + -Dwith-steam-binary=${steamBinPath} \ + -Dwith-new-libcxx-abi=true \ + -Dwith-libressl-mode=native \ + --prefix / \ + --libexecdir lib \ + --libdir lib \ + --bindir bin + + # Configure 32bit things + CC="gcc -m32" CXX="g++ -m32" meson build32 \ + -Dwith-shim=none \ + -Dwith-libressl-mode=native \ + --prefix / \ + --libexecdir lib32 \ + --libdir lib32 + ''; + + buildPhase = '' + # Build 64bit things + ninja -C build + + # Build 32bit things + ninja -C build32 + ''; + + installPhase = '' + DESTDIR="$out" ninja -C build install + DESTDIR="$out" ninja -C build32 install + ''; + + meta = with stdenv.lib; { + description = "Steam wrapper to improve compability and performance"; + longDescription = '' + Linux Steam Integration is a helper system to make the Steam Client and + Steam games run better on Linux. In a nutshell, LSI automatically applies + various workarounds to get games working, and fixes long standing bugs in + both games and the client + ''; + homepage = https://github.com/solus-project/linux-steam-integration; + license = licenses.lgpl21; + maintainers = [ maintainers.etu ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 3fafcfddcbfb..d43904bca6ca 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc +{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib +, fetchFromGitHub }: let - version = "3.9.2"; + version = "3.13.0"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext + paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype stdenv.cc.cc glew mesa_glu wxGTK ]; }; @@ -18,18 +19,24 @@ in stdenv.mkDerivation { name = "megaglest-${version}"; - src = fetchgit { - url = "git://github.com/MegaGlest/megaglest-source"; - rev = "refs/tags/${version}"; - sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; + src = fetchFromGitHub { + owner = "MegaGlest"; + repo = "megaglest-source"; + rev = "${version}"; + fetchSubmodules = true; + sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK + buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON + cmake -DCMAKE_INSTALL_PREFIX=$out \ + -DBUILD_MEGAGLEST=On \ + -DBUILD_MEGAGLEST_MAP_EDITOR=On \ + -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \ + -DBUILD_MEGAGLEST_MODEL_VIEWER=On ''; postInstall = '' diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 03052c52f7fe..02bd0ba78d18 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { rm -r $out/lib/python2.7/site-packages/nix ''; meta = { - homepage = http://mnemosyne-proj.org/; + homepage = https://mnemosyne-proj.org/; description = "Spaced-repetition software"; longDescription = '' The Mnemosyne Project has two aspects: diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 8ea8dfccb166..d0c07b71e2ea 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.rybern]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.seehuhn.de/pages/moon-buggy; + homepage = https://www.seehuhn.de/pages/moon-buggy; }; } diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 92d87697fb16..d9ab3ee833b2 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -3,7 +3,7 @@ let platform = if lib.elem stdenv.system lib.platforms.unix then "unix" - else abort "Unknown platform for NetHack"; + else throw "Unknown platform for NetHack: ${stdenv.system}"; unixHint = if stdenv.isLinux then "linux" else if stdenv.isDarwin then "macosx10.10" diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 0006f895809b..62d89c7c31e5 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "neverball-1.6.0"; src = fetchurl { - url = "http://neverball.org/${name}.tar.gz"; + url = "https://neverball.org/${name}.tar.gz"; sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://neverball.org/; + homepage = https://neverball.org/; description = "Tilt the floor to roll a ball"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 51f2b6a8c4e4..c0053088db76 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,38 +1,35 @@ -{ fetchFromGitHub, stdenv, automake, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, mesa -, autoconf, pkgconfig }: +{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig +, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, mesa +}: -let - version = "20160116"; - checksum = "07w5yin2xhb0fdlj1aipi64yx6vnr1siahsy0bxvzi06d73ffj6r"; -in stdenv.mkDerivation rec { name = "pioneer-${version}"; + version = "20171001"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = checksum; + sha256 = "0yxw1zdvidrwc28vxfi3qpx2nq2dix2d6ylwgzq9ph8kgwv9fl5n"; }; - buildInputs = [ - automake curl libsigcxx SDL2 SDL2_image freetype libvorbis - libpng assimp mesa autoconf pkgconfig - ]; + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp mesa ]; NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" ]; - preConfigure = '' export PIONEER_DATA_DIR="$out/share/pioneer/data"; ./bootstrap ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { - description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century"; + description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = https://pioneerspacesim.net; license = with licenses; [ gpl3 cc-by-sa-30 diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index e96cf5e59322..d916ff0d3444 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; homepage = http://residualvm.org/; repositories.git = https://github.com/residualvm/residualvm.git; - licencse = licenses.gpl2; + license = licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index e965fc459ad8..29b44f9d8576 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,19 +1,29 @@ -{ stdenv -, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa +{ stdenv, fetchurl, nasm +, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, mesa, SDL2, zlib , hostPlatform }: stdenv.mkDerivation rec { - name = "scummvm-1.9.0"; + name = "scummvm-${version}"; + version = "2.0.0"; src = fetchurl { - url = "http://scummvm.org/frs/scummvm/1.9.0/scummvm-1.9.0.tar.bz2"; - sha256 = "813d7d8a76e3d05b45001d37451368711dadc32899ecf907df1cc7abfb1754d2"; + url = "http://scummvm.org/frs/scummvm/${version}/${name}.tar.xz"; + sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p"; }; - - buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib mesa ]; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ nasm ]; + + buildInputs = [ + alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis mesa SDL2 zlib + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-c++11" + "--enable-release" + ]; crossAttrs = { preConfigure = '' @@ -27,10 +37,11 @@ stdenv.mkDerivation rec { ''; }; - meta = { + meta = with stdenv.lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; homepage = http://www.scummvm.org/; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.peterhoeg ]; + platforms = platforms.linux; }; } - diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 02f6026371fe..ada2520a097c 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -4,7 +4,7 @@ let # Choose your "paksets" of objects, images, text, music, etc. - paksets = config.simutrans.paksets or "pak64 pak128"; + paksets = config.simutrans.paksets or "pak64 pak64.japan pak128 pak128.britain pak128.german"; result = with stdenv.lib; withPaks ( if paksets == "*" then attrValues pakSpec # taking all @@ -12,15 +12,15 @@ let ); ver1 = "120"; - ver2 = "1"; - ver3 = "1"; + ver2 = "2"; + ver3 = "2"; version = "${ver1}.${ver2}.${ver3}"; ver_dash = "${ver1}-${ver2}-${ver3}"; ver2_dash = "${ver1}-${ver2}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; - sha256 = "00cyxbn17r9p1f08jvx1wrhydxknkrxj5wk6ld912yicfql998r0"; + sha256 = "1yi6rwbrnfd65qfz63cncw2n56pbypvg6cllwh71mgvs6x2c28kz"; }; @@ -29,22 +29,21 @@ let (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { - # No release for 120.1 yet! - srcPath = "120-0/simupak64-120-0-1"; - sha256 = "0y5v1ncpjyhjkkznqmk13kg5d0slhjbbvg1y8q5jxhmhlkghk9q2"; + srcPath = "120-2/simupak64-120-2"; + sha256 = "1s310pssar4s1nf6gi9cizbx4m75avqm2qk039ha5rk8jk4lzkmk"; }; "pak64.japan" = { - # No release for 120.1 yet! + # No release for 120.2 yet! srcPath = "120-0/simupak64.japan-120-0-1"; sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i"; }; pak128 = { - srcPath = "pak128%20for%20ST%20120%20%282.5.3%2C%20minor%20changes%29/pak128-2.5.3--ST120"; - sha256 = "19c66wvfg6rn7s9awi99cfp83hs9d8dmsjlmgn8m91a19fp9isdh"; + srcPath = "pak128%20for%20ST%20120.2.2%20%282.7%2C%20minor%20changes%29/pak128"; + sha256 = "1x6g6yfv1hvjyh3ciccly1i2k2n2b63dw694gdg4j90a543rmclg"; }; "pak128.britain" = { - srcPath = "pak128.Britain%20for%20${ver2_dash}/pak128.Britain.1.17-${ver2_dash}"; + srcPath = "pak128.Britain%20for%20120-1/pak128.Britain.1.17-120-1"; sha256 = "1nviwqizvch9n3n826nmmi7c707dxv0727m7lhc1n2zsrrxcxlr5"; }; "pak128.cs" = { # note: it needs pak128 to work @@ -53,8 +52,8 @@ let }; "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" - + "PAK128.german_0.8_${ver1}.x/PAK128.german_0.8.0_${ver1}.x.zip"; - sha256 = "1a8pc88vi59zlvff9i1f8nphdmisqmgg03qkdvrf5ks46aw8j6s5"; + + "PAK128.german_0.10.x_for_ST_120.x/PAK128.german_0.10.3_for_ST_120.x.zip"; + sha256 = "1379zcviyf3v0wsli33sqa509k6zlw6fkk57vahc44mrnhka5fpb"; }; /* This release contains accented filenames that prevent unzipping. @@ -164,7 +163,7 @@ let homepage = http://www.simutrans.com/; license = with licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ kkallio vcunat phile314 ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; # TODO: ++ darwin; }; }; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index a7392bbc34e9..49d786284da6 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -69,6 +69,9 @@ in buildFHSUserEnv rec { xlibs.libX11 xlibs.libXfixes + # Needed to properly check for libGL.so.1 in steam-wrapper.sh + pkgsi686Linux.glxinfo + # Not formally in runtime but needed by some games gst_all_1.gstreamer gst_all_1.gst-plugins-ugly @@ -103,7 +106,26 @@ in buildFHSUserEnv rec { export TZDIR=/etc/zoneinfo ''; - runScript = "steam"; + runScript = writeScript "steam-wrapper.sh" '' + #!${stdenv.shell} + if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS + glxinfo >/dev/null 2>&1 + # If there was an error running glxinfo, we know something is wrong with the configuration + if [ $? -ne 0 ]; then + cat < /dev/stderr + ** + WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix + and then run \`sudo nixos-rebuild switch\`: + { + hardware.opengl.driSupport32Bit = true; + hardware.pulseaudio.support32Bit = true; + } + ** + EOF + fi + fi + steam + ''; passthru.run = buildFHSUserEnv { name = "steam-run"; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 54805e91b2bd..6a6485d43319 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -6,7 +6,7 @@ let self = rec { steamArch = if pkgs.stdenv.system == "x86_64-linux" then "amd64" else if pkgs.stdenv.system == "i686-linux" then "i386" - else abort "Unsupported platform"; + else throw "Unsupported platform: ${pkgs.stdenv.system}"; steam-runtime = callPackage ./runtime.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 388e5cc3a6cf..c5e5e525f365 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -5,7 +5,7 @@ assert !(nativeOnly && runtimeOnly); -let +let runtimePkgs = with pkgs; [ # Required glib @@ -88,6 +88,8 @@ let libva vulkan-loader gcc.cc + nss + nspr ]; ourRuntime = if runtimeOnly then [] diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 504353afebef..bd37ba0f01fb 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { Flag. You can even design your own maps! ''; - homepage = http://teeworlds.com/; + homepage = https://teeworlds.com/; license = "BSD-style, see `license.txt'"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index ad9b5f7dc6cd..f07fd88fbaf3 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.4.9"; name = "tome4-${version}"; src = fetchurl { - url = "http://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; + url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl"; }; nativeBuildInputs = [ premake4 ]; @@ -34,7 +34,7 @@ EOF cp -r game $out/opt/tome4 ''; meta = with stdenv.lib; { - homepage = http://te4.org/; + homepage = https://te4.org/; description = "Tales of Maj'eyal (rogue-like game)"; maintainers = [ maintainers.chattered ]; license = licenses.gpl3; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index 57749c4f228c..a1a8272fd0f9 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fork of NetHack"; - homepage = http://unnethack.wordpress.com/; + homepage = https://unnethack.wordpress.com/; license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index dd21d13a0273..6ed276c0695b 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -12,12 +12,12 @@ let in stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz"; - sha256 = "064xfxwkqpvqyy7kz46cwi71mxmimxi4wgjly9g51wwxkvz8snmg"; + sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw"; }; buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi ]; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 503deb695f7f..2f898a5aed39 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "xsnow-${version}"; src = fetchurl { - url = "http://dropmix.xs4all.nl/rick/Xsnow/${name}.tar.gz"; + url = "http://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "An X-windows application that will let it snow on the root, in between and on windows"; - homepage = http://dropmix.xs4all.nl/rick/Xsnow/; + homepage = http://janswaal.home.xs4all.nl/Xsnow/; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.robberer ]; }; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index f795a2ea3a25..da2f256aeb71 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer -, libmysql, makeWrapper }: +, mysql, makeWrapper }: stdenv.mkDerivation rec { name = "zod-engine-2011-03-18"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ]; - NIX_LDFLAGS = "-L${stdenv.lib.getLib libmysql}/lib/mysql"; + NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d005f6becadb..db344b32d218 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam -, dbus, systemd, acl, gmp, darwin +{ stdenv, fetchurl, fetchpatch, pkgconfig, removeReferencesTo +, zlib, libjpeg, libpng, libtiff, pam, dbus, systemd, acl, gmp, darwin , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -9,18 +9,26 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cups-${version}"; - version = "2.2.2"; + version = "2.2.6"; passthru = { inherit version; }; src = fetchurl { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "1xp4ji4rz3xffsz6w6nd60ajxvvihn02pkyp2l4smhqxbmyvp2gm"; + sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; }; outputs = [ "out" "lib" "dev" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + patches = [ + (fetchpatch { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups"; + sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; + }) + ]; + + nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ @@ -30,16 +38,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; configureFlags = [ - # Put just lib/* and locale into $lib; this didn't work directly. - # lib/cups is moved back to $out in postInstall. - # Beware: some parts of cups probably don't fully respect these. - "--prefix=$(lib)" - "--datadir=$(out)/share" - "--localedir=$(lib)/share/locale" - "--localstatedir=/var" "--sysconfdir=/etc" - "--with-systemd=\${out}/lib/systemd/system" + "--with-rundir=/run" "--enable-raw-printing" "--enable-threads" ] ++ optionals stdenv.isLinux [ @@ -49,15 +50,24 @@ stdenv.mkDerivation rec { ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" ++ optional (libpaper != null) "--enable-libpaper" - ++ optionals stdenv.isDarwin [ - "--with-bundledir=$out" - "--disable-launchd" - ]; + ++ optional stdenv.isDarwin "--disable-launchd"; - # XXX: Hackery until https://github.com/NixOS/nixpkgs/issues/24693 - preBuild = if stdenv.isDarwin then '' - export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks - '' else null; + preConfigure = '' + configureFlagsArray+=( + # Put just lib/* and locale into $lib; this didn't work directly. + # lib/cups is moved back to $out in postInstall. + # Beware: some parts of cups probably don't fully respect these. + "--prefix=$lib" + "--datadir=$out/share" + "--localedir=$lib/share/locale" + + "--with-systemd=$out/lib/systemd/system" + + ${optionalString stdenv.isDarwin '' + "--with-bundledir=$out" + ''} + ) + ''; installFlags = [ # Don't try to write in /var at build time. @@ -80,21 +90,26 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - moveToOutput lib/cups "$out" + libexec=${if stdenv.isDarwin then "libexec/cups" else "lib/cups"} + moveToOutput $libexec "$out" + + # $lib contains references to $out/share/cups. + # CUPS is working without them, so they are not vital. + find "$lib" -type f -exec grep -q "$out" {} \; \ + -printf "removing references from %p\n" \ + -exec remove-references-to -t "$out" {} + # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint - # Some outputs in cups-config were unexpanded and some even wrong. moveToOutput bin/cups-config "$dev" - sed -e "/^cups_serverbin=/s|\$(lib)|$out|" \ - -e "s|\$(out)|$out|" \ - -e "s|\$(lib)|$lib|" \ + sed -e "/^cups_serverbin=/s|$lib|$out|" \ -i "$dev/bin/cups-config" # Rename systemd files provided by CUPS for f in "$out"/lib/systemd/system/*; do substituteInPlace "$f" \ + --replace "$lib/$libexec" "$out/$libexec" \ --replace "org.cups.cupsd" "cups" \ --replace "org.cups." "" diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 2856aee4a5d2..b83e84154bbe 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -9,7 +9,7 @@ let arch = if stdenv.system == "x86_64-linux" then "64" else if stdenv.system == "i686-linux" then "32" - else abort "Unsupported architecture"; + else throw "Unsupported system ${stdenv.system}"; in stdenv.mkDerivation rec { name = "cnijfilter-${version}"; diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index be9d4f837092..17e5b37ed440 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -4,7 +4,7 @@ let platform = if stdenv.system == "x86_64-linux" then "64bit" else if stdenv.system == "i686-linux" then "32bit" - else abort "Unsupported platform"; + else throw "Unsupported system: ${stdenv.system}"; libPath = lib.makeLibraryPath [ cups ]; in diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index f538066e75ce..37f2361b45e8 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -73,7 +73,7 @@ pythonPackages.buildPythonApplication { pyqt4 ]; - makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 66ed1d44adc7..9897345b88a6 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -73,7 +73,7 @@ pythonPackages.buildPythonApplication { pyqt5 ]; - makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix new file mode 100644 index 000000000000..bbb0d1523dfe --- /dev/null +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -0,0 +1,62 @@ +{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook +, gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg +, evdev, pygobject3, pylibacl, pytest +, linuxHeaders +, libX11, libXext, libXfixes, libusb1 +}: + +buildPythonApplication rec { + pname = "sc-controller"; + version = "0.4.0.1"; + + src = fetchFromGitHub { + owner = "kozec"; + repo = "sc-controller"; + rev = "v${version}"; + sha256 = "0vhgiqg4r4bnn004ql80rvi23y05wlax80sj8qsr91pvqsxwv3yl"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ gtk3 gobjectIntrospection libappindicator-gtk3 librsvg ]; + + propagatedBuildInputs = [ evdev pygobject3 pylibacl ]; + + checkInputs = [ pytest ]; + + postPatch = '' + substituteInPlace scc/paths.py --replace sys.prefix "'$out'" + substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include + ''; + + LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") + # gdk-pixbuf setup hook can not choose between propagated librsvg + # and our librsvg with GObject introspection. + GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache) + ''; + + postFixup = '' + ( + # scc runs these scripts as programs. (See find_binary() in scc/tools.py.) + cd $out/lib/python*/site-packages/scc/x11 + patchPythonScript scc-autoswitch-daemon.py + patchPythonScript scc-osd-daemon.py + ) + ''; + + checkPhase = '' + PYTHONPATH=. py.test + ''; + + meta = with lib; { + homepage = https://github.com/kozec/sc-controller; + # donations: https://www.patreon.com/kozec + description = "User-mode driver and GUI for Steam Controller and other controllers"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.orivej ]; + }; +} diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix new file mode 100644 index 000000000000..d44c90d198a9 --- /dev/null +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders +, GyroplotSupport ? false +}: + +with python3Packages; + +buildPythonApplication rec { + name = "steamcontroller-${version}"; + version = "2017-08-11"; + + src = fetchFromGitHub { + owner = "ynsta"; + repo = "steamcontroller"; + rev = "80928ce237925e0d0d7a65a45b481435ba6b931e"; + sha256 = "0lv9j2zv8fmkmc0x9r7fa8zac2xrwfczms35qz1nfa1hr84wniid"; + }; + + postPatch = '' + substituteInPlace src/uinput.py --replace \ + "/usr/include" "${linuxHeaders}/include" + ''; + + buildInputs = [ libusb1 ]; + propagatedBuildInputs = + [ psutil python3Packages.libusb1 ] + ++ lib.optionals GyroplotSupport [ pyqtgraph pyside ]; + + meta = with stdenv.lib; { + description = "A standalone Steam controller driver"; + homepage = https://github.com/ynsta/steamcontroller; + license = licenses.mit; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 4dc0f2591d82..35a9bd2e3844 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -9,7 +9,7 @@ let if isx86_64 then "64bit" else if isi686 then "32bit" - else abort "${system} not considered in build derivation. Might still be supported."; + else throw "${system} not considered in build derivation. Might still be supported."; in stdenv.mkDerivation { diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index ffb2052ca0c1..8262eea48b43 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { buildInputs = [ scons libX11 libusb1 boost glib dbus_glib]; meta = with stdenv.lib; { - homepage = http://pingus.seul.org/~grumbel/xboxdrv/; + homepage = https://pingus.seul.org/~grumbel/xboxdrv/; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ maintainers.fuuzetsu ]; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index d03b18f12d63..56f63e747342 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Provides a Virtual (SCSI) HBA"; homepage = http://cdemu.sourceforge.net/about/vhba/; platforms = platforms.linux; - licenses = licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 41dbfd1999c4..c18a63f720dd 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,38 +1,72 @@ -{ stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline -, openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev -, libpulseaudio ? null }: +, openal, libXdmcp, portaudio, libusb, libevdev +, libpulseaudio ? null +, curl + +, qt5 +# - Inputs used for Darwin +, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL +, wxGTK +, libpng +, hidapi + +# options +, dolphin-wxgui ? true +, dolphin-qtgui ? false +}: +# XOR: ensure only wx XOR qt are enabled +assert dolphin-wxgui || dolphin-qtgui; +assert !(dolphin-wxgui && dolphin-qtgui); stdenv.mkDerivation rec { - name = "dolphin-emu-20170902"; + name = "dolphin-emu-20171218"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "b073db51e5f3df8c9890e09a3f4f8a2276c31e3f"; - sha256 = "0pr5inkd7swc6s7im7axhvmkdbqidhrha2wpflnr25aiwq0dzm10"; + rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa"; + sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc"; }; - cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DENABLE_LTO=True - ''; + cmakeFlags = [ + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" + "-DENABLE_LTO=True" + ] ++ stdenv.lib.optionals (!dolphin-qtgui) [ "-DENABLE_QT2=False" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre gettext libpthreadstubs libXrandr libXext libSM readline openal - libevdev libXdmcp portaudio libusb libpulseaudio ]; + libXdmcp portaudio libusb libpulseaudio libpng hidapi + ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] + ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev ] + ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ]; + + # - Change install path to Applications relative to $out + # - Allow Dolphin to use nix-provided libraries instead of building them + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's,/Applications,Applications,g' Source/Core/DolphinWX/CMakeLists.txt + sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' CMakeLists.txt + sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt + ''; + + preInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + ''; meta = { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ MP2E ]; + branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index ed15ab6c56e2..48696f6b3008 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "A DOS emulator"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; - licenses = licenses.gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index bfe43403bc6c..74aa29e84ef8 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; meta = { - homepage = http://segaretro.org/Gens/GS; + homepage = https://segaretro.org/Gens/GS; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index f14608fd93ef..64e29f59a186 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,21 +1,34 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 , qtbase, qtmultimedia }: stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1kzb6zj2lxfaiyfq9h7q26fh7xh1ggybmh5pin5rcgs7jyygrsjb"; + sha256 = "1fgxn3j6wc5mcgb81sc6fzy5m4saz02jz4zlms51dgycvy0flbz7"; }; nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ]; + patches = [ + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/e31373560535203d826687044290a4994706c2dd.patch"; + sha256 = "07582vj0fqgsgryx28pnshiwri9dn88l1rr4vkraib7bzx7cs4f9"; + }) + + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/baabe0090bb1fd5997e531fd9568c2de09b5fc21.patch"; + sha256 = "1kv9dxxna35s050q9af9nzskplz2x1aq8avg0ihbznhxjl8vmxz9"; + }) + ]; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 64bb8b4e356d..82e2384cf0bd 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ((map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos))} '' + lib.optionalString supportFlags.gstreamerSupport '' - for i in wine wine64; do + for i in wine ; do if [ -e "$out/bin/$i" ]; then wrapProgram "$out/bin/$i" \ --argv0 "" \ diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 39bd26714e78..cb0561f76550 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -1,4 +1,11 @@ { pkgs ? import {} }: +## we default to importing here, so that you can use +## a simple shell command to insert new sha256's into this file +## e.g. with emacs C-u M-x shell-command +## +## nix-prefetch-url sources.nix -A {stable{,.mono,.gecko64,.gecko32}, unstable, staging, winetricks} + +# here we wrap fetchurl and fetchFromGitHub, in order to be able to pass additional args around it let fetchurl = args@{url, sha256, ...}: pkgs.fetchurl { inherit url sha256; } // args; fetchFromGitHub = args@{owner, repo, rev, sha256, ...}: @@ -6,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "2.0.2"; + version = "2.0.3"; url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz"; - sha256 = "16iwf48cfi39aqyy8131jz4x7lr551c9yc0mnks7g24j77sq867p"; + sha256 = "0mmyc94r5drffir8zr8jx6iawhgfzjk96fj494aa18vhz1jcc4d8"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 524121a898e3..182e176cacba 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -8,8 +8,9 @@ assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let - version = "9.20"; - sha256 = "1az0dnvgingqv78yvfhzmx1zavn5sv1xrrscz984hy3gvz2ks3rw"; + version = "9.${ver_min}"; + ver_min = "22"; + sha256 = "1fyi4yvdj39bjgs10klr31cda1fbx1ar7a7b7yz7v68gykk65y61"; fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { name = "ghostscript-${version}"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/${name}.tar.xz"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz"; inherit sha256; }; @@ -117,7 +118,7 @@ stdenv.mkDerivation rec { of output drivers for various file formats and printers. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 20da91efede8..a242f0261c77 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.11-RC1"; + version = "1.9.12"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "0i708ar3ll5p8yj0h7ffg84nrn49ap47l2yy75rxyw30cyywhxp4"; + sha256 = "0ynpyn0l77m94b50g7ysl795nvam3ra65wx5zb46nxspgbf6wnkh"; }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 67cb0a4ca6d2..7cb3e68dec86 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; homepage = https://github.com/Ma27/i3lock-pixeled; license = licenses.mit; - platform = platforms.linux; + platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 87b55e3948b8..d77526775a54 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "xscreensaver-${version}"; src = fetchurl { - url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; + url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; sha256 = "1ng5ddzb4k2h1w54pvk9hzxvnxxmc54bc4a2ibk974nzjjjaxivs"; }; @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { ; meta = { - homepage = http://www.jwz.org/xscreensaver/; + homepage = https://www.jwz.org/xscreensaver/; description = "A set of screensavers"; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = with stdenv.lib.platforms; allBut cygwin; inherit version; - downloadPage = "http://www.jwz.org/xscreensaver/download.html"; + downloadPage = "https://www.jwz.org/xscreensaver/download.html"; updateWalker = true; }; } diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index d302fbe6d4b6..537576ca63b6 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,42 +1,35 @@ -{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala_0_23, python, intltool, fuse, ccnet}: +{stdenv, fetchurl, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { version = "6.1.0"; name = "seafile-shared-${version}"; - src = fetchurl - { + src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which automake autoconf libtool vala_0_23 python intltool fuse ]; + nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; + buildInputs = [ python fuse ]; propagatedBuildInputs = [ ccnet curl ]; - preConfigure = '' - sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh - ./autogen.sh - ''; - - configureFlags = "--disable-server --disable-console"; - - buildPhase = "make -j1"; + configureFlags = [ + "--disable-server" + "--disable-console" + ]; postInstall = '' - # Remove seafile binary - rm -rf "$out/bin/seafile" - # Remove cli client binary - rm -rf "$out/bin/seaf-cli" + # Remove seafile binary + rm -rf "$out/bin/seafile" + # Remove cli client binary + rm -rf "$out/bin/seaf-cli" ''; - meta = - { + meta = with stdenv.lib; { homepage = https://github.com/haiwen/seafile; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.calrama ]; }; } diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 9a4ec9f49f68..9d63e9c3aafc 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.92.1.72"; + version = "3.93.0.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "19kav8m6aj4h7qg0z92k09lppzdgy6h9lxxv3qqqrl3hmg7bn0sx"; + sha256 = "0l662l66ja8dsakcgwg6ab69lkl0va0r5h74dr6yjdsy0q4h2m7h"; }; preferLocalBuild = true; @@ -27,9 +27,10 @@ stdenv.mkDerivation rec { buildInputs = [ gdk_pixbuf librsvg - gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + postPatch = "patchShebangs ."; configureFlags = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "An adaptive Gtk+ theme based on Material Design"; + description = "An adaptive Gtk+ theme based on Material Design Guidelines"; homepage = https://github.com/adapta-project/adapta-gtk-theme; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix new file mode 100644 index 000000000000..42ff954a46ba --- /dev/null +++ b/pkgs/misc/themes/arc-kde/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "arc-kde-theme-${version}"; + version = "2017-11-09"; + + src = fetchFromGitHub { + owner = "PapirusDevelopmentTeam"; + repo = "arc-kde"; + rev = "a0abe6fc5ebf74f9ae88b8a2035957cc16f706f5"; + sha256 = "1p6f4ny97096nb054lrgyjwikmvg0qlbcnsjag7m5dfbclfnvzkg"; + }; + + makeFlags = ["PREFIX=$(out)" ]; + + # Make this a fixed-output derivation + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + ouputHash = "2c2def57092a399aa1c450699cbb8639f47d751157b18db17"; + + meta = { + description = "A port of the arc theme for Plasma"; + homepage = https://git.io/arc-kde; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.nixy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 2106b816e07b..b9c0d0d4436f 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -4,8 +4,9 @@ let # treat versions newer than 3.22 as 3.22 gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version; pname = "arc-theme"; +in -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "2017-05-12"; @@ -17,8 +18,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gnome3.gtk ]; - buildInputs = [ gtk-engine-murrine gnome3.gtk ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; preferLocalBuild = true; diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index dbc0beb1872b..5eead87b1c7b 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/misc/themes/deepin/default.nix index d8a3ecaa4119..bdddc28cc440 100644 --- a/pkgs/misc/themes/deepin/default.nix +++ b/pkgs/misc/themes/deepin/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.4"; + version = "17.10.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw"; + sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3"; }; - buildInputs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/misc/themes/elementary/default.nix b/pkgs/misc/themes/elementary/default.nix new file mode 100644 index 000000000000..0d02b32c8ffe --- /dev/null +++ b/pkgs/misc/themes/elementary/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "elementary-gtk-theme-${version}"; + version = "5.1.1"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "stylesheet"; + rev = version; + sha256 = "1749byc2lbxmprladn9n7k6jh79r8ffgayjn689gmqsrm6czsmh2"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/themes/elementary + cp -r gtk-* plank $out/share/themes/elementary + ''; + + meta = with stdenv.lib; { + description = "GTK theme designed to be smooth, attractive, fast, and usable"; + homepage = https://github.com/elementary/stylesheet; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix index 73e9ea604d77..cc1769b48df2 100644 --- a/pkgs/misc/themes/gnome-breeze/default.nix +++ b/pkgs/misc/themes/gnome-breeze/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { cp -r Breeze* $out/share/themes ''; + preferLocalBuild = true; + meta = { description = "A GTK theme built to match KDE's breeze theme"; homepage = https://github.com/dirruk1/gnome-breeze; @@ -19,6 +21,5 @@ stdenv.mkDerivation { maintainers = with stdenv.lib.maintainers; [ bennofs ]; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; - preferLocalBuild = true; }; } diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 5800bd5c0459..c1de0856dcea 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; - buildInputs = [ gtk-engine-murrine ]; - + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + meta = { description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)"; homepage = https://github.com/shimmerproject/Greybird; diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix new file mode 100644 index 000000000000..1d281b3ac90d --- /dev/null +++ b/pkgs/misc/themes/kde2/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, cmake, extra-cmake-modules +, qtbase, kcoreaddons, kdecoration }: + +let + version = "2017-03-15"; +in stdenv.mkDerivation rec { + name = "kde2-decoration-${version}"; + + src = fetchFromGitHub { + owner = "repos-holder"; + repo = "kdecoration2-kde2"; + rev = "2a9cf18ac0646b3532d4db2dd28bd73c4c229783"; + sha256 = "0kilw6sd3blvm6gx9w4w5ivkjfxlv6wnyivw46pwwvhgxqymkbxk"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + buildInputs = [ qtbase kcoreaddons kdecoration ]; + + meta = with stdenv.lib; { + description = "KDE 2 window decoration ported to Plasma 5"; + homepage = src.meta.homepage; + license = licenses.bsd2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index e66b7767c6ec..753188ed007b 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { name = "materia-theme-${version}"; - version = "20171112"; + version = "20171213"; src = fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; rev = "v${version}"; - sha256 = "0iwak15mxkwazfnkxw4wf2qgr6s64jh8lxy0wfqvb2willzabprk"; + sha256 = "1dn458r8ca97xz4pqyxy2rqigs97dg3k868l4yvlsdy732mspm0h"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; - buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine gdk_pixbuf librsvg ]; + buildInputs = [ gnome3.gnome_themes_standard gdk_pixbuf librsvg ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontBuild = true; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Material Design-like theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; + description = "A Material Design theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix index a56f67b8df45..9001ad9e5a3a 100644 --- a/pkgs/misc/themes/numix-sx/default.nix +++ b/pkgs/misc/themes/numix-sx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0"; }; - buildInputs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontBuild = true; diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index e21faf8b805c..f7b5f3d91af4 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; - buildInputs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; postPatch = '' substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 9c41d8386592..86a6b4883acf 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; configureFlags = [ "--disable-unity" ]; diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index 3d0de843a91b..00743a345c93 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km"; }; - buildInputs = [ gdk_pixbuf gtk_engines gtk-engine-murrine ]; + buildInputs = [ gdk_pixbuf gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontBuild = true; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 199e4bd896d7..1bfcea1057e9 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bc, dtc, python2 +{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2 , hostPlatform }: @@ -7,6 +7,7 @@ let , filesToInstall , installDir ? "$out" , defconfig + , extraMakeFlags ? [] , extraMeta ? {} , ... } @ args: stdenv.mkDerivation (rec { @@ -20,6 +21,10 @@ let }; patches = [ + (fetchpatch { + url = https://github.com/dezgeg/u-boot/commit/cbsize-2017-11.patch; + sha256 = "08rqsrj78aif8vaxlpwiwwv1jwf0diihbj0h88hc0mlp0kmyqxwm"; + }) (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch; sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9"; @@ -38,11 +43,11 @@ let patchShebangs tools ''; - nativeBuildInputs = [ bc dtc python2 ]; + nativeBuildInputs = [ bc dtc openssl python2 ]; hardeningDisable = [ "all" ]; - makeFlags = [ "DTC=dtc" ]; + makeFlags = [ "DTC=dtc" ] ++ extraMakeFlags; configurePhase = '' make ${defconfig} @@ -85,7 +90,15 @@ in rec { buildFlags = "tools NO_SDL=1"; dontStrip = false; targetPlatforms = stdenv.lib.platforms.linux; - filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"]; + # build tools/kwboot + extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ]; + filesToInstall = [ + "tools/dumpimage" + "tools/fdtgrep" + "tools/kwboot" + "tools/mkenvimage" + "tools/mkimage" + ]; }; ubootA20OlinuxinoLime = buildUBoot rec { @@ -106,6 +119,13 @@ in rec { filesToInstall = ["MLO" "u-boot.img"]; }; + # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master + ubootClearfog = buildUBoot rec { + defconfig = "clearfog_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-spl.kwb"]; + }; + ubootJetsonTK1 = buildUBoot rec { defconfig = "jetson-tk1_defconfig"; targetPlatforms = ["armv7l-linux"]; @@ -118,12 +138,24 @@ in rec { filesToInstall = ["u-boot-dtb.bin"]; }; + ubootOrangePiPc = buildUBoot rec { + defconfig = "orangepi_pc_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootPcduino3Nano = buildUBoot rec { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; targetPlatforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootQemuArm = buildUBoot rec { + defconfig = "qemu_arm_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootRaspberryPi = buildUBoot rec { defconfig = "rpi_defconfig"; targetPlatforms = ["armv6l-linux"]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ffe77f14fcd7..d50667e80e63 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -88,6 +88,7 @@ rec { polyglot = vim-polyglot; quickrun = vim-quickrun; repeat = vim-repeat; + rhubarb = vim-rhubarb; signature = vim-signature; stylish-haskell = vim-stylish-haskell; stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 @@ -182,22 +183,22 @@ rec { }; Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2017-06-20"; + name = "Supertab-2017-11-14"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "22aac5c2cb6a8ebe906bf1495eb727717390e62e"; - sha256 = "1m70rx9ba2aqydfr9yxsrff61qyzmnda24qkgn666ypnsai7cfbn"; + rev = "40fe711e088e2ab346738233dd5adbb1be355172"; + sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; }; dependencies = []; }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2017-11-06"; + name = "Syntastic-2017-11-17"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "206b616c8e49f948d18231799c469aa3e6e2c29c"; - sha256 = "0q6k00x2gxd1lryqj80pqd0g9q1nmzz1fxacs81gxhx8c8hpxmcy"; + rev = "96cc251075f3f9d290c5afd4adf1b64c1542d469"; + sha256 = "1c2nch9037565n3mrpxf17dnn4c6j7w8wwzfj3fw9anwzr1m5kwl"; }; dependencies = []; @@ -215,33 +216,33 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-10-19"; + name = "Tagbar-2017-12-03"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "dc155af2fdd20e081680d777bde558c56f8d55c3"; - sha256 = "0xicazayayp208qv7ln4shj41favj5a6aysvz29pwqy28svmg3xd"; + rev = "c004652797185121bbf264138d57eb2a0199b6db"; + sha256 = "0aj319iz3g9b1xs8g2k7ikjhjy6y94i0hyk0a9km7swglairld06"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2017-10-31"; + name = "The_NERD_Commenter-2017-11-07"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "63ba1a1123609c9bfb9f5d76debcd34afe429096"; - sha256 = "01aq0n5028kyvjzgb0yrzwnp0r3jiayahmbvkfakg3vw9hgapggr"; + rev = "fd61bc71f64c8accf86f06c633fd19b205efa85b"; + sha256 = "07196j5bp3k4ckapyrp3366h0nyvqq5r26hqqihgfa62s1n8rjsl"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2017-11-02"; + name = "The_NERD_tree-2017-12-06"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "97433edd43f3a4a95c84389bcaafbe7a047cf756"; - sha256 = "04z45bs1a37mdck80bcqj3d0bp2zz5xyjkys0zv925mpq9rwx22s"; + rev = "8cbea5109e8c7ed682da25bb488267d781db0bd4"; + sha256 = "0n4shpdl33yghkqk0vllrmmb74dflf39liyclkbpqmcymx9rw2qj"; }; dependencies = []; @@ -290,7 +291,7 @@ rec { buildInputs = [ unzip ]; dependencies = []; meta = { - url = "http://www.vim.org/scripts/script.php?script_id=1234"; + homepage = "http://www.vim.org/scripts/script.php?script_id=1234"; }; sourceRoot = "."; @@ -377,11 +378,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-10-21"; + name = "fugitive-2017-11-30"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "7c9b87a3c3ef4b53425aca4a27e11a7359caae9f"; - sha256 = "1kpgnn3pmy82kqy9vcvd1vi9jjmfj03p4606pvh42ky4y0m0qmms"; + rev = "5032d9ee72361dc3cfaae1a9b3353211203e443f"; + sha256 = "1zx5l8lx7440l3pvs2bx81r3wmpvbmq7qs8ziz9lvlp91s7dqy88"; }; dependencies = []; @@ -399,22 +400,22 @@ rec { }; vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2017-03-10"; + name = "vim-auto-save-2017-11-08"; src = fetchgit { url = "https://github.com/907th/vim-auto-save"; - rev = "a81dea26d2a62dbe1a0f89aba5834aee40a89512"; - sha256 = "16ljzp2rww9c13pl2ci2pqri1774qp3yhhh042n7vqxcwy80kjjc"; + rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; + sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; }; dependencies = []; }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2017-10-23"; + name = "vim-autoformat-2017-12-06"; src = fetchgit { url = "https://github.com/Chiel92/vim-autoformat"; - rev = "c32b27cd4059770ff6f4639082b69e76ada948bd"; - sha256 = "1sy1bjrk560qww97538m883r8gkmfl114lbp68gdl0j48fdhmh78"; + rev = "27f0e48a9b60ab8a45178d6104fa819a99ead2ee"; + sha256 = "0na5qwgpafnxz7lbscs9y0ffbd01b1ab2q1kqrr78a3gqz37ga0s"; }; dependencies = []; @@ -432,33 +433,33 @@ rec { }; tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2017-11-01"; + name = "tsuquyomi-2017-11-10"; src = fetchgit { url = "https://github.com/Quramy/tsuquyomi"; - rev = "fb5a5fd26bcca3c3a9fcde732b969e34c1ae89ea"; - sha256 = "0pg2w250fksnj168ygkdniryyr4asrr8y5fh2gq2hpyx6wpph7f8"; + rev = "8a647de888e1d823718f717d47678a97b5012196"; + sha256 = "0zvcr15g6m17736a7nwr9aa7c3sd25ad39v7dban0jiz6asd7nn1"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-11-04"; + name = "deoplete-nvim-2017-12-06"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "bea8e1c122d31ab6f2dd6f7d9a5b4545d08b2c4f"; - sha256 = "0y88h7w8d3h43yfjkawgn9inkyky5llrk8gmdfax5fqvgjgz4jg9"; + rev = "9d048047807b7bfacd7406ebe85acdb1dc019018"; + sha256 = "15b881j6f54ykljqhbpl9ajjbhjlgqywr963a7g0d35qnyxzidb8"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2017-05-05"; + name = "Spacegray-vim-2017-11-22"; src = fetchgit { url = "https://github.com/ajh17/Spacegray.vim"; - rev = "95a5adbbbba7fb641af847d8666b8cad20431333"; - sha256 = "10p02n4arml1b4ah0bz754ifvkqnbms4j0wlgzqs5azb20y2kliv"; + rev = "9a952cee86397ce28aef890209ccee2397d9a32e"; + sha256 = "0ddxkmqcjns0vznqcwji835kkn8pps93kyksx34b57ssr1qq28d1"; }; dependencies = []; @@ -509,25 +510,24 @@ rec { }; LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "LanguageClient-neovim-2017-11-06"; + name = "LanguageClient-neovim-2017-12-05"; src = fetchgit { url = "https://github.com/autozimu/LanguageClient-neovim"; - rev = "a42cad5247417a1dbe7517748df14a76bd795fc1"; - sha256 = "1dk44xmxpq7yix0vpy8pzabk90l0cqxjm79w1zh8vqmpcp27z4jd"; + rev = "eac16849eb5cb5592cf043fa222282a7082f257b"; + sha256 = "07j7zm8xbvsanr9ghwxaw88m0kfr0ih262g299n5rr972s93wpg6"; }; dependencies = []; }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-09-30"; + name = "clighter8-2017-11-30"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "193512aaa722d1f3dfd3c07bd60942e59c753f25"; - sha256 = "1xl1ggkvwg8j6xhfgs1vcah9wksw2z03b1333iyfbgcjdxrdail6"; + rev = "909f2162a3dfa3d4089533e42af01b4411ef6a78"; + sha256 = "0hi1v8ww4yzwpdr25zzdr4ccwvs5d3pa02gj5y6qfc5ddz1krdml"; }; dependencies = []; - buildInputs = [ makeWrapper ]; preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim @@ -535,11 +535,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-11-04"; + name = "neomake-2017-12-06"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "ef4e5be7315ffcb536b855974c91b1378beda62d"; - sha256 = "1xma1isbk7b3gccddfphvyxpi2sih6i1jgk69p8cig5rbggkrc4a"; + rev = "22bcbd560820d387b61ae285b1d1a74f338e3e13"; + sha256 = "1hp99fpbvi72m51m2ivn4rg64awlr9zqkvhjh99rl7ax8y0zw8ap"; }; dependencies = []; @@ -612,22 +612,22 @@ rec { }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2017-07-18"; + name = "agda-vim-2017-11-21"; src = fetchgit { url = "https://github.com/derekelkins/agda-vim"; - rev = "d82c5da78780e866e1afd8eecba1aa9c661c2aa8"; - sha256 = "1aq7wyi1an6znql814w3v30p96yzyd5xnypblzxvsi62jahysfwa"; + rev = "13e3b24aeb8677205ff43a79c6c7e090a602b31a"; + sha256 = "17vp11x1w9bibl5ibsvhw5m5ma2r8pzddshgxdvfg22wprx0kcp0"; }; dependencies = []; }; vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scala-2017-04-29"; + name = "vim-scala-2017-11-10"; src = fetchgit { url = "https://github.com/derekwyatt/vim-scala"; - rev = "e7640f26e56f0be344d60a6098e05d6928fd396d"; - sha256 = "17gyqzsjjsg48x760qpm31bi169bzq0g80nm88jjkjw75m9jbv2j"; + rev = "0b909e24f31d94552eafae610da0f31040c08f2b"; + sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5"; }; dependencies = []; @@ -667,11 +667,11 @@ rec { }; xptemplate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xptemplate-2017-04-18"; + name = "xptemplate-2017-12-06"; src = fetchgit { url = "https://github.com/drmingdrmer/xptemplate"; - rev = "52d84e361e9da53c4309b0d96a1ab667c67b7f07"; - sha256 = "195r5p4cyiip64zmgcih56c59gwm0irgid6cdrqc2y747gyxmf7m"; + rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3"; + sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p"; }; dependencies = []; @@ -777,11 +777,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-11-05"; + name = "vim-go-2017-12-06"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "c0d209cce7f0eb0af250d2471ae9495a8bf1f19e"; - sha256 = "1ci8nhsnda4wrpqi0knara1dqjjba6bccbqiw6va8d9mzsr12ivn"; + rev = "7f4673573d67aacec0ac35d37eb3123abe4fcf70"; + sha256 = "074097m1xd7j97zkkhrkfnj8d4ndms20gp8zas2vha1h48yy5a70"; }; dependencies = []; @@ -820,6 +820,17 @@ rec { }; + vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-codefmt-2017-03-04"; + src = fetchgit { + url = "https://github.com/google/vim-codefmt"; + rev = "8bae55b45c3f030845ab636d6860cef4071915d1"; + sha256 = "0wg0fplpwsgkbycjx1ryl29afbfzfsdv0j7xisjik26m9q8shn1k"; + }; + dependencies = ["maktaba"]; + + }; + vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jsonnet-2017-04-06"; src = fetchgit { @@ -854,11 +865,11 @@ rec { }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2017-08-02"; + name = "idris-vim-2017-12-04"; src = fetchgit { url = "https://github.com/idris-hackers/idris-vim"; - rev = "7f1363b65e14a8918d17f98b7f16de8f44f6bd00"; - sha256 = "07ws5c1yfv4kp1yl4fa634l9w162pp784zg12r2953xzwwmgwr83"; + rev = "091ed6b267749927777423160eeab520109dd9c1"; + sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1"; }; dependencies = []; @@ -876,11 +887,11 @@ rec { }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2017-11-05"; + name = "lightline-vim-2017-12-05"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "73f125dcf24db4baabe9be76d02de63be22dbd44"; - sha256 = "1aj0sn3fs78993nk8qfvyfbbny3586fnmsvkqkg7n9j2gd7dfn93"; + rev = "b19faca129f7921766c0a32a7c378dc89a61e590"; + sha256 = "1sif7wspivpakm4nlhsq1v93s6s18q5kx8s5zqq97chhv626l8c7"; }; dependencies = []; @@ -920,11 +931,11 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2017-04-19"; + name = "vim-orgmode-2017-11-17"; src = fetchgit { url = "https://github.com/jceb/vim-orgmode"; - rev = "8a5cb51fbb8d89b0151833a6deb654929818a964"; - sha256 = "0siqzwblads3n69chqsifpgglcda2iz2k40q76llf78fw5ylqd16"; + rev = "ce17a40108a7d5051a3909bd7c5c94b0b5660637"; + sha256 = "0ni99a5zylb0sbmik2xydia87qlv1xcl18j92nwxg8d6wxsnywb9"; }; dependencies = []; @@ -1019,11 +1030,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-11-02"; + name = "fzf-vim-2017-12-06"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "5c6cee878a71ed27b137aafa7993624a357c0b82"; - sha256 = "07wavw8j170siysjvpmm2znv6c1q72w1m0cgs908v9pr1fh1bghj"; + rev = "11b7fb91e152258c59b0bb0526c3fb04469cf38c"; + sha256 = "1p6p557bg56763vq49lfhyr8h30kf1gwiqz1jf6j0mqg46w4q77j"; }; dependencies = []; @@ -1062,6 +1073,17 @@ rec { }; + vim-clang = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-clang-2016-10-17"; + src = fetchgit { + url = "https://github.com/justmao945/vim-clang"; + rev = "0076e0c64baa71c1c1f404e6a500e45190cdad5c"; + sha256 = "04fbmlrvgl278hlrnhlxppy1dz5fdilj9rzrc1vvxrw9ih3knvr3"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { @@ -1096,11 +1118,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-11-01"; + name = "vimtex-2017-12-07"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "b56537a229d74fab815090e8e4b4ae873121e69c"; - sha256 = "1d94i19bkgqay7n5108majla2bx3nw5s230a2nw761v327bp65wd"; + rev = "9851656a0c280d394f8e0f0fac61988613ea392e"; + sha256 = "1mwhj6nk00srlmvsdbpcnqcpwsr87ciwzxgdr1v489bb8l4rw9na"; }; dependencies = []; @@ -1155,11 +1177,11 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2017-10-03"; + name = "vim-highlightedyank-2017-12-06"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "5fb7d0f2cb9e25397b1a6e1a5345584a6975b724"; - sha256 = "19jzaiv4iqgqvbwj6r5m6037qfm5nhk6jcwciyfacispdycmpkp7"; + rev = "7e072d62e79b68a548dfd0c18f7b739dca4cae74"; + sha256 = "1kkngy28nlbyb4dz010hjb8dxih1zlzwsr0yjkhqyvpz0k5vvyq9"; }; dependencies = []; @@ -1210,11 +1232,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-11-02"; + name = "vim-startify-2017-12-06"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "22ccf5861397dd2365756c24ce1952736632cd8c"; - sha256 = "1np32vz56hz19hd6zpz154dim2mzw3x1lx1vyhkkyda8rd9w4rmb"; + rev = "c905a0c9598c72cb4311ca88f3eb664d05e4d66b"; + sha256 = "1zdqr2lg1cf7dix6yvx7hmxcb698hb2zdimiqv2kgpdqlc40agcy"; }; dependencies = []; @@ -1252,7 +1274,7 @@ rec { dependencies = []; buildPhase = '' substituteInPlace ftplugin/python_yapf.vim \ - --replace '"yapf"' '"${pythonPackages.yapf}/bin/yapf"' + --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' ''; }; @@ -1345,11 +1367,11 @@ rec { }; vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2017-10-23"; + name = "vim-watchdogs-2017-12-03"; src = fetchgit { url = "https://github.com/osyo-manga/vim-watchdogs"; - rev = "4ba5e8f2d456d36ef4e660580245c648a6f106ff"; - sha256 = "1736m48yp41p2kwn6n0jmkzvxi84mf4llk1zw38n0v8npzcc2lnp"; + rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; + sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; }; dependencies = []; @@ -1367,11 +1389,11 @@ rec { }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2017-07-04"; + name = "python-mode-2017-12-01"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "d2dead6ce9d900b26dbf1a06c52969f4194eda64"; - sha256 = "1iq26a2l9maapz3433pwywmqla4wf7jass7s7bh32h10m2fh88a0"; + rev = "2ae7a2323d7632eaa5fc5170c287608ecf8d25c5"; + sha256 = "1qd7akvqlmrcxiknv1fxqb37vimlicidibxzc4jm9i05cvk1z68p"; }; dependencies = []; @@ -1442,11 +1464,11 @@ rec { }; nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-completion-manager-2017-10-26"; + name = "nvim-completion-manager-2017-11-09"; src = fetchgit { url = "https://github.com/roxma/nvim-completion-manager"; - rev = "a56d17bcfc107bed851c9a36f1a6fc8e93c04acd"; - sha256 = "18zd7sigp93057lw4mx9jfqrp1l31kwhh8df5kfimbyh75xpj469"; + rev = "21c4b617419c4de782a533c07afcf6cbc453a94a"; + sha256 = "0rdjp1qis96d83g967h73jlhlg27danrvvndljfq2ncgpg3b2x16"; }; dependencies = []; @@ -1475,11 +1497,11 @@ rec { }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2017-11-01"; + name = "neoformat-2017-12-04"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "0e2cfe93a14639b9e26373593a4a61b30e5e96ff"; - sha256 = "1nzc8yjpbimbg0sn3cmn4jkb1f91lk0iqg4c38czlzlvbfb2xasq"; + rev = "81d2d19e6bb65432b95f930af38ca6dab89d0434"; + sha256 = "13ivv4ymkxk5rl5hkrlb4r328vhhpw6il0zdsynp9j41d4qq198s"; }; dependencies = []; @@ -1497,11 +1519,11 @@ rec { }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2017-10-27"; + name = "vim-polyglot-2017-12-06"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "a61ab44810a0cb78223a179d78eff16d2e0b8bf6"; - sha256 = "0q3h46blqv963c4m636hr48j9ka1x2qv4naja7q2rr4f2pndhd23"; + rev = "11f53253ad9fd0cd3e7a44ed9f8c80a4f265b46e"; + sha256 = "1p1h0flhzcaivrpsxb1xc1lc0kc901aq80p32j15ia3g2ib8vl4y"; }; dependencies = []; @@ -1541,33 +1563,33 @@ rec { }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-10-01"; + name = "neosnippet-vim-2017-11-23"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "ddd01d0ee3d965d9a30051f2e12b14234c83b3ae"; - sha256 = "0475ilqyg0ppk276awvva2iaslm993l364vqcxqrl31x7ir2qa7f"; + rev = "9ee1b4e059d4ffcc02312da13ee36315dacbffe4"; + sha256 = "0c4pk02hnvzgj6pwy4lx481n7gj2fjwlsmcy7vxfps9h8h9qd6kw"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2017-10-22"; + name = "unite-vim-2017-12-06"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "c5c69d5d94e61a67d61730d04c82763196f63b10"; - sha256 = "1zn23x1bx40z0anl42v8ac8dv0c7f29rd1vwdqsmwdrkyxlyi1n1"; + rev = "49fe0efad7a838a5bec9e653fb80504c94744ff9"; + sha256 = "0vlpk053vdd5iqx2hmg9kvhg4270gq437smawdwjh88vriix3f1d"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2017-07-22"; + name = "vimproc-vim-2017-11-21"; src = fetchgit { url = "https://github.com/shougo/vimproc.vim"; - rev = "03a38f283ca9e15784e8fea84e8afc5d633b9639"; - sha256 = "0ypffp724f3qp0mryxmmmi1ci0bnz34nnr7yi3c893pd9mpkrjjr"; + rev = "81f4fa5239705724a49fbecd3299ced843f4972f"; + sha256 = "03pkp37d07nx857kqz2h6q2z13ca2944zq2lcqdcc97s9nnjnzha"; }; dependencies = []; buildInputs = [ which ]; @@ -1603,11 +1625,11 @@ rec { }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2017-10-31"; + name = "alchemist-vim-2017-11-22"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "15e6439439997a02fddb65fd3db51c1eb62207c0"; - sha256 = "03hvkj6957hcmlfqpzlddhm675ljqb7ka5r3j95ykl80npmqrnml"; + rev = "1e08668e844ef5c6cb552e83bb842285a6ba4228"; + sha256 = "05viwrvakxnc4fajscn7chvldc9vvjssbz4c81vdw8wgwxv8qay7"; }; dependencies = []; @@ -1647,11 +1669,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2017-08-14"; + name = "vim-quickrun-2017-11-25"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "13e60587a503620bd7d0dd1b822c29e18350e461"; - sha256 = "185pqahvpmag01vzr2xh68vnfz6fybpd3qlpr2qdq8712x11apwi"; + rev = "1170ba086f8e27c123add196675ddab64a59ce70"; + sha256 = "1vpllpinqf46ymsr7n1ywip4y7ibm3i8cidh271a57cvac0hig6d"; }; dependencies = []; @@ -1701,6 +1723,17 @@ rec { }; + vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-rhubarb-2017-06-28"; + src = fetchgit { + url = "https://github.com/tpope/vim-rhubarb"; + rev = "6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a"; + sha256 = "1bmc5j9056bgdhyhvylbd93jkp1k9067mv3af6skzh0r77rx1a0g"; + }; + dependencies = []; + + }; + vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-speeddating-2017-05-24"; src = fetchgit { @@ -1735,11 +1768,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-10-27"; + name = "youcompleteme-2017-12-03"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "bade99f5e9c5ba2f848cffb2d1a905e85d3ddb05"; - sha256 = "0rf9gd4asq9bddhp3c6qvvjcm6zpiadjhvslknkqh1i9aq01kj7a"; + rev = "290dd94721d1bc97fab4f2e975a0cf6258abfbac"; + sha256 = "0jhaixhx9lxqwb8ncxkafn478cc4dkh7ss6qjn29lcn9qdy9bvd7"; }; dependencies = []; buildPhase = '' @@ -1761,33 +1794,33 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2017-10-29"; + name = "vim-airline-themes-2017-11-18"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "26f67b926553555e505ac60e992c97ab5fdfc83f"; - sha256 = "0gzhi7l0cwzd66mzkrs6pgbzm9vqkkyhv4cwblywh5dkqqa9q71x"; + rev = "52dfa2b6c0dc2fd7a0e92954030893de3d173105"; + sha256 = "0m65xmg259781r1wk8dz0d0diiayqyl1wahsb2fdqs369wwx4irr"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2017-11-04"; + name = "vim-pandoc-2017-11-22"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "e9a24376c17817632951088838a3c3bdc1c5da30"; - sha256 = "17mmvsvdzmx9xqhxiryvv8l67m52bd4xl9lyrg0h9vk8s58cy0ig"; + rev = "6ab0e8ed4dd3325d6b304e8f97f2cba80e3269ae"; + sha256 = "07zdkp7g9y2vp3f9j2f12acap4ykgjp85in5qnhmg4dw8l8r07x5"; }; dependencies = []; }; vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-after-2015-06-01"; + name = "vim-pandoc-after-2017-11-22"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc-after"; - rev = "4377665e5c98f29ea838deb3b942200b8dd096ef"; - sha256 = "1379g174pvsaw1wdv1n18gby84sv59rsamfcgq9bqd4kg54g6h3j"; + rev = "844f27debf4d72811049167f97191a3b551ddfd5"; + sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf"; }; dependencies = []; @@ -1915,33 +1948,33 @@ rec { }; ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2017-11-05"; + name = "ale-2017-12-04"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "fa7d041c26aa6616c13a62274a7fc8458f6096dd"; - sha256 = "13h4pcahnfm0b5f7zbyfg7w2ailv8id58v59sp7h2qk3cx7zwb9k"; + rev = "e2a8f759d870ed7a1f0ee4698a73b65e9f36e54d"; + sha256 = "0fx9qr84li58jgz576gsyjjwd3f1c2jby8wl6d35vznjzw0x00cs"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2017-11-05"; + name = "vim-wakatime-2017-11-24"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "23e92a5701bad21f3604b3ab129546aef51a9b80"; - sha256 = "0hmpjrqy1w4qimpfg1l6sj5h9zbyz7lfzs3mjv1d3d2sp413warh"; + rev = "48b4e59dcd75890eb56d7ceb2d57ff63ed17c373"; + sha256 = "0aspkigh08cdnv2mq425dapklxizir134zksrm608q02qpf0m7hg"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2017-09-29"; + name = "command-t-2017-11-16"; src = fetchgit { url = "https://github.com/wincent/command-t"; - rev = "c5882de56f0ca3ce8e891c434f192519aca5c7bb"; - sha256 = "0dbghh7fwy49zyjick7840dkbybqchjw2sg9c6p0kmp5w3j46b92"; + rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6"; + sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r"; }; dependencies = []; buildInputs = [ ruby rake ]; @@ -1974,22 +2007,22 @@ rec { }; nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nim-vim-2017-10-31"; + name = "nim-vim-2017-11-29"; src = fetchgit { url = "https://github.com/zah/nim.vim"; - rev = "ae63bd21211b68d21b176ad5ea0cc4fc8f90eda5"; - sha256 = "1i5yxddwlcr3d2bzv5g9jz1z2lg7xnd6i038ph02rvllngcfsv00"; + rev = "8167c50bd421c921b198001387e60d4728868010"; + sha256 = "0yk6qmxns3jzb7riwyrddmlszy89s0ihii0462rfa4b8wlmpan1l"; }; dependencies = []; }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2017-09-08"; + name = "deoplete-go-2017-11-14"; src = fetchgit { url = "https://github.com/zchee/deoplete-go"; - rev = "9330737f365bcf430a9481561f24271ea2ab120b"; - sha256 = "1j8i2ahpwa0v9mjwl45a6bdqdsksyh0fpwpl96jgylq58d2g5gzb"; + rev = "844a0dce554f92cbd9938baf34f1801b5d872e58"; + sha256 = "15sf8ssb85va6b0si07nyh5c5xdikdl99fihgprqk1wxi9mp28cj"; }; dependencies = []; buildInputs = [ python3 ]; @@ -2002,11 +2035,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2017-10-24"; + name = "deoplete-jedi-2017-12-05"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "436624ce43d1424d4efef42e0990ac5fd19b5029"; - sha256 = "0phgjf6v90lwcbx2lks461ny6v4x5ypcs2cidg51w2jav2xvlqrq"; + rev = "715acf2847b8fa8d436a10a4c3dfd7187d53b72f"; + sha256 = "12d16z4mvc6aln5vnrdf275ci1w7v454zl9x54khqfikc0pwyjg8"; }; dependencies = []; @@ -2045,6 +2078,17 @@ rec { }; + maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "maktaba-2017-05-07"; + src = fetchgit { + url = "git://github.com/google/vim-maktaba"; + rev = "2ae8b4478ea9bc2c6c8106acb55ddfb935754fb9"; + sha256 = "1w8paqn0qyk4j5wfx48rc2za7kzhgdaggikklmjr1vsv2y0b8fzc"; + }; + dependencies = []; + + }; + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "matchit-zip"; src = fetchurl { @@ -2055,7 +2099,7 @@ rec { buildInputs = [ unzip ]; dependencies = []; meta = { - url = "http://www.vim.org/scripts/script.php?script_id=39"; + homepage = "http://www.vim.org/scripts/script.php?script_id=39"; }; unpackPhase = '' @@ -2176,7 +2220,7 @@ rec { buildInputs = [ unzip ]; dependencies = []; meta = { - url = "http://www.vim.org/scripts/script.php?script_id=273"; + homepage = "http://www.vim.org/scripts/script.php?script_id=273"; }; setSourceRoot = '' @@ -2419,22 +2463,22 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2017-11-06"; + name = "vim-airline-2017-11-27"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "396cc9226171f8dbf1069800a0ae56700bbf3913"; - sha256 = "1km9cvvrip5z8xzaa1r83n7w0kdw21zrxax27qmvnhlnq74s24zb"; + rev = "6c8d0f5e6af878db71b2dc44ccf1d1417381d6a0"; + sha256 = "0azrapbb3w84c62kcbrycm75qmwdfz38852sv7cccwb7v1xgj9ab"; }; dependencies = []; }; vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2017-03-03"; + name = "vim-coffee-script-2017-12-04"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; - rev = "aace5c23d812a205c93e87ff79df72d9366928df"; - sha256 = "1saz5m3c329m2vk8ffhvxw4virz70k2qrjncwhvjpkik27jf75yy"; + rev = "de6b6327b4e738ea5dbf0ef97d06d39217e4e6fc"; + sha256 = "0rvvsqlc3vrfpvh25a8kykwnf5dwx7blbnl5by1ja0l77l1hnrz4"; }; dependencies = []; @@ -2485,11 +2529,11 @@ rec { }; vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-09-22"; + name = "vim-latex-live-preview-2017-11-09"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "63abf0f2361e332597a5278b2dbd0fef980ebdb2"; - sha256 = "0pk2nx04bl8ym77mlylb6q5n3vz0y96jzs72gydjiffp1nm062l9"; + rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; + sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; }; dependencies = []; @@ -2529,11 +2573,11 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2017-11-02"; + name = "vim-snippets-2017-12-05"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "a7670a7b71e44fd93e0b97fe2c24739a20732f94"; - sha256 = "0bm4475x723bk9q6snl5d804pn3vvsk0p9bvgil6c0q24ams6abh"; + rev = "e116db735e54a8e428f8b2c08c842ee52b7230fe"; + sha256 = "05zn4z40awqab8fz9z49wkry6hww89la33vj552cf6lhzfkbbsvv"; }; dependencies = []; @@ -2562,11 +2606,11 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2017-11-04"; + name = "vimwiki-2017-12-04"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "7c2ae8a714a71956297cb291dbaefb6a0ce47da3"; - sha256 = "1sis3g7v5ck9gan3x6i64kdfmn6r40zvxp2jyw0qxaha1kfb1qa1"; + rev = "75fe1d4f003f77a33955f436e023a4ce9548cb69"; + sha256 = "1a4918jsxjvlzj4qqariygwjjcs2lflykgq5k5l3ar3jvwlw0n7p"; }; dependencies = []; @@ -2584,11 +2628,11 @@ rec { }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2017-06-08"; + name = "vundle-2017-11-10"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87"; - sha256 = "13k194g0rs5hz7ci0ys4gml71jily5hdd0yljzmmn8qjiq88v6p4"; + rev = "fcc204205e3305c4f86f07e09cd756c7d06f0f00"; + sha256 = "1wpxp59rh1l6i4mvavqsh1xxqj3fmqiggl92h6chj4lc8anssydy"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dd5cc1ba1007..268888b08ec3 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -59,7 +59,9 @@ "github:flazz/vim-colorschemes" "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" +"github:google/vim-codefmt" "github:google/vim-jsonnet" +"github:google/vim-maktaba" "github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" "github:idris-hackers/idris-vim" @@ -136,6 +138,7 @@ "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" "github:tpope/vim-repeat" +"github:tpope/vim-rhubarb" "github:tpope/vim-speeddating" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf index 63b54b22e0e0..c1eb9efefc36 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf @@ -1,4 +1,4 @@ buildPhase = '' substituteInPlace ftplugin/python_yapf.vim \ - --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"' + --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim index 89a96133fba5..0ddbeaae6be1 100644 --- a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim +++ b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim @@ -109,7 +109,7 @@ fun! nix#NixDerivation(opts, name, repository) abort \ ' buildInputs = [ unzip ];', \ ' dependencies = ['.join(map(copy(dependencies), "'\"'.nix#ToNixAttrName(v:val).'\"'")).'];', \ ' meta = {', - \ ' url = "http://www.vim.org/scripts/script.php?script_id='.a:repository.vim_script_nr.'";', + \ ' homepage = "http://www.vim.org/scripts/script.php?script_id='.a:repository.vim_script_nr.'";', \ ' };', \ addon_info == {} ? '' : (' addon_info = '.nix#ToNix(string(addon_info), [], "").';'), \ additional_nix_code, diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 8047e29ad558..16ddb8fd4052 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, callPackage, vscode-utils }: let - inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension; + inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension + extensionFromVscodeMarketplace; in # # Unless there is a good reason not to, we attemp to use the same name as the @@ -24,4 +25,6 @@ rec { }; ms-vscode.cpptools = callPackage ./cpptools {}; + + ms-python.python = callPackage ./python {}; } \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix new file mode 100644 index 000000000000..4e28de871b84 --- /dev/null +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, vscode-utils + +, pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. + # Use version from `PATH` for default setting otherwise. + # Defaults to `false` as we expect it to be project specific most of the time. +, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified. + # Use version from `PATH` for default setting otherwise. + # Defaults to `true` as usually not defined on a per projet basis. +}: + +assert pythonUseFixed -> null != python; +assert ctagsUseFixed -> null != ctags; + +let + pythonDefaultsTo = if pythonUseFixed then "${python}/bin/python" else "python"; + ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; +in + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "python"; + publisher = "ms-python"; + version = "0.8.0"; + sha256 = "0i7s93l5g5lyi6vn77zh3ipj0p267y17fayv6vjrxc2igrs27ik6"; + }; + + postPatch = '' + # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. + substituteInPlace "./package.json" \ + --replace "\"default\": \"python\"" "\"default\": \"${pythonDefaultsTo}\"" + + # Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`. + substituteInPlace "./package.json" \ + --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\"" + ''; + + meta = with lib; { + license = licenses.mit; + maintainer = [ maintainers.jraygauthier ]; + }; +} \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index f6e906ab575b..83cb559dca12 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -70,12 +70,14 @@ let mktplcRef = ext; }); + extensionFromVscodeMarketplace = mktplcExtRefToExtDrv; extensionsFromVscodeMarketplace = mktplcExtRefList: - builtins.map mktplcExtRefToExtDrv mktplcExtRefList; + builtins.map extensionFromVscodeMarketplace mktplcExtRefList; in { inherit fetchVsixFromVscodeMarketplace buildVscodeExtension - buildVscodeMarketplaceExtension extensionsFromVscodeMarketplace; + buildVscodeMarketplaceExtension extensionFromVscodeMarketplace + extensionsFromVscodeMarketplace; } \ No newline at end of file diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh index 04d8e878f4f7..b0d5915fc1fc 100644 --- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh @@ -39,4 +39,4 @@ useSystemCoreFoundationFramework () { export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks } -envHooks+=(useSystemCoreFoundationFramework) +addEnvHooks "$hostOffset" useSystemCoreFoundationFramework diff --git a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh index f31adaa0d744..ed9bdbd912db 100644 --- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh @@ -7,4 +7,4 @@ noDeprecatedDeclarations() { fi } -envHooks+=(noDeprecatedDeclarations) +addEnvHooks "$hostOffset" noDeprecatedDeclarations diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols index ed76787a9008..000af8ad7b74 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols @@ -451,7 +451,6 @@ _host_statistics _host_statistics64 _host_swap_exception_ports _host_virtual_physical_table_info -_host_zone_info _i386_get_ldt _i386_set_ldt _important_boost_assertion_token diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index a74198e8ddd7..a565971a6fa4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -33,7 +33,7 @@ appleDerivation { cc -I. -c res_send.c cc -I. -c res_sendsigned.c cc -I. -c res_update.c - cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -o libresolv.9.dylib *.o + cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -current_version 1.0.0 -compatibility_version 1.0.0 -o libresolv.9.dylib *.o ''; installPhase = '' diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 613606b50358..1fff4915da3c 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -17,10 +17,11 @@ in # TODO loop over targetPrefixed binaries too stdenv.mkDerivation { name = "${targetPrefix}cctools-binutils-darwin"; + outputs = [ "out" "info" "man" ]; buildCommand = '' mkdir -p $out/bin $out/include - ln -s ${binutils-raw.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt + ln -s ${binutils-raw.bintools.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt # We specifically need: # - ld: binutils doesn't provide it on darwin @@ -37,10 +38,16 @@ stdenv.mkDerivation { ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - # FIXME: this will give us incorrect man pages for bits of cctools - ln -s ${binutils-raw.out}/share $out/share + ln -s ${binutils-raw.bintools.out}/share $out/share ln -s ${cctools}/libexec $out/libexec + + mkdir -p "$info/nix-support" "$man/nix-support" + printWords ${binutils-raw.bintools.info} \ + >> $info/nix-support/propagated-build-inputs + # FIXME: cctools missing man pages + printWords ${binutils-raw.bintools.man} \ + >> $man/nix-support/propagated-build-inputs ''; passthru = { diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 10eac5d47191..a9051fd1279f 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [matthewbauer]; platforms = platforms.darwin; - licenses = licenses.publicDomain; + license = licenses.publicDomain; homepage = "http://duti.org/"; }; } diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix index d23328d362e0..46ba68281868 100644 --- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -2,8 +2,7 @@ { haskellPackages, src, deps ? p : [], name }: let inherit (haskellPackages) ghc ghcWithPackages; with-env = ghcWithPackages deps; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcName = "${crossPrefix}ghc"; + ghcName = "${ghc.targetPrefix}ghc"; in runCommand name { buildInputs = [ with-env cctools ]; } '' mkdir -p $out/lib mkdir -p $out/include diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix new file mode 100644 index 000000000000..b3790b8c87c3 --- /dev/null +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub, xcbuild }: + +stdenv.mkDerivation + { name = "insert_dylib-2016.08.28"; + src = fetchFromGitHub + { owner = "Tyilo"; + repo = "insert_dylib"; + rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; + sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; + }; + buildInputs = [ xcbuild ]; + installPhase = + '' + prog=$(find . -type f -name insert_dylib) + mkdir -p $out/bin + install -m755 $prog $out/bin + ''; + meta.platforms = stdenv.lib.platforms.darwin; + } diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index a04d1decbd8b..bd12373da884 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + preBuild = '' sed -e 's/break/true/' -i examples/turn_off_gpu.sh sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 67b843fac4dc..ade9b8f750f2 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; }) ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" ]; preBuild = '' diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 75b7802772d6..23e8c1ca7d7e 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_5, kernel -, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages_5, kernel +, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.5.0"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "106ri3yhjhp3dgsjb05y4j6va153d5nqln3zjdz6qfz87svak0rw"; + sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9"; }; buildInputs = [ @@ -17,7 +17,17 @@ stdenv.mkDerivation rec { elfutils python pythonPackages.netaddr luajit netperf iperf ]; - nativeBuildInputs = [ makeWrapper cmake flex bison ]; + patches = [ + # fix build with llvm > 5.0.0 && < 6.0.0 + (fetchpatch { + url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch"; + sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf"; + }) + ]; + + nativeBuildInputs = [ makeWrapper cmake flex bison ] + # libelf is incompatible with elfutils-libelf + ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"; diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix new file mode 100644 index 000000000000..1bb5612ce92c --- /dev/null +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -0,0 +1,122 @@ +{ stdenv, fetchurl, pkgconfig, unzip, which +, libuuid, attr, xfsprogs, cppunit +, zlib, openssl, sqlite, jre, openjdk, ant +} : + +let + version = "6.17"; + + subdirs = [ + "beegfs_thirdparty/build" + "beegfs_opentk_lib/build" + "beegfs_common/build" + "beegfs_admon/build" + "beegfs_java_lib/build" + "beegfs_ctl/build" + "beegfs_fsck/build" + "beegfs_helperd/build" + "beegfs_meta/build" + "beegfs_mgmtd/build" + "beegfs_online_cfg/build" + "beegfs_storage/build" + "beegfs_utils/build" + ]; + +in stdenv.mkDerivation rec { + name = "beegfs-${version}"; + + src = fetchurl { + url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}"; + sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3"; + }; + + nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant]; + buildInputs = [ libuuid attr xfsprogs zlib openssl sqlite jre ]; + + postPatch = '' + patchShebangs ./ + find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \; + find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \; + find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \; + ''; + + buildPhase = '' + for i in ${toString subdirs}; do + make -C $i + done + make -C beegfs_admon/build admon_gui + ''; + + installPhase = '' + binDir=$out/bin + docDir=$out/share/doc/beegfs + includeDir=$out/include/beegfs + libDir=$out/lib + libDirPkg=$out/lib/beegfs + + mkdir -p $binDir $libDir $libDirPkg $docDir $includeDir + + cp beegfs_admon/build/beegfs-admon $binDir + cp beegfs_admon/build/dist/usr/bin/beegfs-admon-gui $binDir + cp beegfs_admon_gui/dist/beegfs-admon-gui.jar $libDirPkg + cp beegfs_admon/build/dist/etc/beegfs-admon.conf $docDir + + cp beegfs_java_lib/build/jbeegfs.jar $libDirPkg + cp beegfs_java_lib/build/libjbeegfs.so $libDir + + cp beegfs_ctl/build/beegfs-ctl $binDir + cp beegfs_fsck/build/beegfs-fsck $binDir + + cp beegfs_utils/scripts/beegfs-check-servers $binDir + cp beegfs_utils/scripts/beegfs-df $binDir + cp beegfs_utils/scripts/beegfs-net $binDir + + cp beegfs_helperd/build/beegfs-helperd $binDir + cp beegfs_helperd/build/dist/etc/beegfs-helperd.conf $docDir + + cp beegfs_client_module/build/dist/sbin/beegfs-setup-client $binDir + cp beegfs_client_module/build/dist/etc/beegfs-client.conf $docDir + + cp beegfs_meta/build/beegfs-meta $binDir + cp beegfs_meta/build/dist/sbin/beegfs-setup-meta $binDir + cp beegfs_meta/build/dist/etc/beegfs-meta.conf $docDir + + cp beegfs_mgmtd/build/beegfs-mgmtd $binDir + cp beegfs_mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir + cp beegfs_mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir + + cp beegfs_storage/build/beegfs-storage $binDir + cp beegfs_storage/build/dist/sbin/beegfs-setup-storage $binDir + cp beegfs_storage/build/dist/etc/beegfs-storage.conf $docDir + + cp beegfs_opentk_lib/build/libbeegfs-opentk.so $libDir + + cp beegfs_client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir + cp -r beegfs_client_devel/include/* $includeDir + ''; + + postFixup = '' + substituteInPlace $out/bin/beegfs-admon-gui \ + --replace " java " " ${jre}/bin/java " \ + --replace "/opt/beegfs/beegfs-admon-gui/beegfs-admon-gui.jar" \ + "$libDirPkg/beegfs-admon-gui.jar" + ''; + + doCheck = true; + + checkPhase = '' + beegfs_common/build/test-runner --text + ''; + + meta = with stdenv.lib; { + description = "High performance distributed filesystem with RDMA support"; + homepage = "https://www.beegfs.io"; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = { + fullName = "BeeGFS_EULA"; + url = "https://www.beegfs.io/docs/BeeGFS_EULA.txt"; + free = false; + }; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/pkgs/os-specific/linux/beegfs/kernel-module.nix new file mode 100644 index 000000000000..4525d156159b --- /dev/null +++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, which +, kmod, kernel +} : + +let + version = "6.17"; +in stdenv.mkDerivation { + name = "beegfs-module-${version}-${kernel.version}"; + + src = fetchurl { + url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}"; + sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3"; + }; + + hardeningDisable = [ "fortify" "pic" "stackprotector" ]; + + nativeBuildInputs = [ which kmod ]; + + buildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/" ]; + + postPatch = '' + patchShebangs ./ + find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \; + find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \; + find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \; + ''; + + preBuild = "cd beegfs_client_module/build"; + + installPhase = '' + instdir=$out/lib/modules/${kernel.modDirVersion}/extras/fs/beegfs + mkdir -p $instdir + cp beegfs.ko $instdir + ''; + + meta = with stdenv.lib; { + description = "High performance distributed filesystem with RDMA support"; + homepage = "https://www.beegfs.io"; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl2; + maintainers = with maintainers; [ markuskowa ]; + broken = versionAtLeast kernel.version "4.14"; + }; +} diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 3143968d75c8..c6bd4f4b206d 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation { src = fetchurl { url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}"; - sha256 = hashes."${stdenv.system}"; + sha256 = hashes.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); }; hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + patches = [ ./i686-build-failure.patch ./license.patch diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 03b30af6c3e1..73c945fa0baf 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -51,6 +51,11 @@ stdenv.mkDerivation rec { url = "https://git.busybox.net/busybox/patch/?id=9ac42c500586fa5f10a1f6d22c3f797df11b1f6b"; sha256 = "0169p4ylz9zd14ghhb39yfjvbdca2kb21pphylfh9ny7i484ahql"; }) + (fetchpatch { + name = "CVE-2017-16544.patch"; + url = "https://git.busybox.net/busybox/patch/?id=c3797d40a1c57352192c6106cc0f435e7d9c11e8"; + sha256 = "1q3lkc4xczxrzhz73x2r0w7kmd6y33zhcnz3478nk5xi0qr66mcy"; + }) ]; configurePhase = '' @@ -90,7 +95,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; - nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fd585515cf02..b7a8dc23a787 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -131,6 +131,10 @@ stdenv.mkDerivation rec { ++ optional nvidiaSupport "-DBUILD_NVIDIA=ON" ; + # `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`: + # src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = http://conky.sourceforge.net/; description = "Advanced, highly configurable system monitor based on torsmo"; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index a63aceedee37..b11a4d6d8f2c 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, directfb, zlib, libjpeg, xproto }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xproto }: stdenv.mkDerivation rec { - name="directvnc-${version}"; - version="0.7.5-test-051207"; + name = "directvnc-${version}"; + version = "0.7.7.2015-04-16"; - src = fetchurl { - url = "http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz"; - sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9"; + src = fetchFromGitHub { + owner = "drinkmilk"; + repo = "directvnc"; + rev = "d336f586c5865da68873960092b7b5fbc9f8617a"; + sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - directfb zlib libjpeg xproto - ]; - - meta = { + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ directfb zlib libjpeg xproto ]; + + meta = with stdenv.lib; { description = "DirectFB VNC client"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://drinkmilk.github.io/directvnc/; + license = licenses.gpl2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/directvnc/src-for-default.nix b/pkgs/os-specific/linux/directvnc/src-for-default.nix deleted file mode 100644 index 1141a1133f50..000000000000 --- a/pkgs/os-specific/linux/directvnc/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="0.7.5-test-051207"; - name="directvnc-0.7.5-test-051207"; - hash="1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9"; - url="http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz"; - advertisedUrl="http://directvnc-rev.googlecode.com/files/directvnc-0.7.5-test-051207.tar.gz"; - - -} diff --git a/pkgs/os-specific/linux/directvnc/src-info-for-default.nix b/pkgs/os-specific/linux/directvnc/src-info-for-default.nix deleted file mode 100644 index 5c3ac7171add..000000000000 --- a/pkgs/os-specific/linux/directvnc/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://code.google.com/p/directvnc-rev/downloads/list"; - baseName = "directvnc"; - versionExtractorSedScript = ''s/[^0-9]*-([0-9].*[0-9])[.].*/\1/''; -} diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index e44a50233c34..4bd50fdae40f 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies; buildInputs = [ libvirt ]; RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 363ecf4fc41c..9ed691d69f0f 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,41 +1,41 @@ { lib, stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.5.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "0m0jqd6gyk4r43w6p5dvp1djg2qgvyhnzmg53sszlh55mlgla714"; + sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj"; }; hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + # linux 3.12 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - configurePhase = - '' - cd kernel/linux/ena - substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion} - ''; + configurePhase = '' + cd kernel/linux/ena + substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion} + ''; - installPhase = - '' - strip -S ena.ko - dest=$out/lib/modules/${kernel.modDirVersion}/misc - mkdir -p $dest - cp ena.ko $dest/ - xz $dest/ena.ko - ''; + installPhase = '' + strip -S ena.ko + dest=$out/lib/modules/${kernel.modDirVersion}/misc + mkdir -p $dest + cp ena.ko $dest/ + xz $dest/ena.ko + ''; - meta = { + meta = with stdenv.lib; { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; homepage = https://github.com/amzn/amzn-drivers; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 720bc34c4197..d65018c600ec 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { ''; hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index bbacd615cf20..809d0ba5264c 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2017-10-09-${src.iwlRev}"; + version = "2018-01-04-${src.iwlRev}"; # The src runCommand automates the process of building a merged repository of both # - # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ - # http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/ + # https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ + # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/ # # This gives us up to date iwlwifi firmware as well as # the usual set of firmware. firmware/linux-firmware usually lags kernel releases @@ -17,15 +17,21 @@ stdenv.mkDerivation rec { # update version to the more recent commit date src = runCommand "firmware-linux-nonfree-src-merged-${version}" { - # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash - baseRev = "bf04291309d3169c0ad3b8db52564235bbd08e30"; - iwlRev = "iwlwifi-fw-2017-11-03"; + shallowSince = "2017-10-01"; + baseRev = "65b1c68c63f974d72610db38dfae49861117cae2"; + iwlRev = "iwlwifi-fw-2017-11-15"; + # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash # randomly mutate the hash to break out of fixed hash, when updating - outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z"; + outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; + + # Doing the download on a remote machine just duplicates network + # traffic, so don't do that. + preferLocalBuild = true; + buildInputs = [ git gnupg ]; NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; } '' @@ -33,12 +39,12 @@ stdenv.mkDerivation rec { cd src git config user.email "build-daemon@nixos.org" git config user.name "Nixos Build Daemon $name" - git remote add base git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - git remote add iwl git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git - git fetch base $baseRev - git checkout -b work FETCH_HEAD - git fetch iwl $iwlRev - git merge FETCH_HEAD) + git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git + git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git + git fetch --shallow-since=$shallowSince base + git fetch --shallow-since=$shallowSince iwl + git checkout -b work $baseRev + git merge $iwlRev) rm -rf src/.git cp -a src $out ''; @@ -49,12 +55,15 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; + # Firmware blobs do not need fixing and should not be modified + dontFixup = true; + meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = http://packages.debian.org/sid/firmware-linux-nonfree; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; priority = 6; # give precedence to kernel firmware }; diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix index 61c0c7b495df..53924a782df7 100644 --- a/pkgs/os-specific/linux/hdapsd/default.nix +++ b/pkgs/os-specific/linux/hdapsd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hard Drive Active Protection System Daemon"; - hompage = "http://hdaps.sf.net/"; + homepage = "http://hdaps.sf.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix new file mode 100644 index 000000000000..f89747dc200d --- /dev/null +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, python, kernel, makeWrapper, writeText }: + +let + daemons = stdenv.mkDerivation rec { + name = "hyperv-daemons-bin-${version}"; + inherit (kernel) src version; + + nativeBuildInputs = [ makeWrapper ]; + + # as of 4.9 compilation will fail due to -Werror=format-security + hardeningDisable = [ "format" ]; + + preConfigure = '' + cd tools/hv + ''; + + installPhase = '' + runHook preInstall + + for f in fcopy kvp vss ; do + install -Dm755 hv_''${f}_daemon -t $out/bin + done + + install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin + + # I don't know why this isn't being handled automatically by fixupPhase + substituteInPlace $out/bin/lsvmbus \ + --replace '/usr/bin/env python' ${python.interpreter} + + runHook postInstall + ''; + + postFixup = '' + # kvp needs to be able to find the script(s) + wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin + ''; + }; + + service = bin: title: check: + writeText "hv-${bin}.service" '' + [Unit] + Description=Hyper-V ${title} daemon + ConditionVirtualization=microsoft + ${lib.optionalString (check != "") '' + ConditionPathExists=/dev/vmbus/${check} + ''} + [Service] + ExecStart=@out@/hv_${bin}_daemon -n + Restart=on-failure + PrivateTmp=true + Slice=hyperv.slice + + [Install] + WantedBy=hyperv-daemons.target + ''; + +in stdenv.mkDerivation rec { + name = "hyperv-daemons-${version}"; + + inherit (kernel) version; + + # we just stick the bins into out as well as it requires "out" + outputs = [ "bin" "lib" "out" ]; + + phases = [ "installPhase" ]; + + buildInputs = [ daemons ]; + + installPhase = '' + system=$lib/lib/systemd/system + + mkdir -p $system + + cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service + cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service + cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service + + cat > $system/hyperv-daemons.target <build, not build->host, C compiler. - nativeBuildInputs = [ buildPackages.stdenv.cc perl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ perl ]; extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 64f8163369bb..5fc22736d7f4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -370,6 +370,15 @@ with stdenv.lib; MICROCODE_AMD_EARLY y ''} + ${optionalString (versionAtLeast version "4.10") '' + # Write Back Throttling + # https://lwn.net/Articles/682582/ + # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655 + BLK_WBT y + BLK_WBT_SQ y + BLK_WBT_MQ y + ''} + # Misc. options. 8139TOO_8129 y 8139TOO_PIO n # PIO is slower diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index c2f4e6843f59..0d2b7655edb9 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -118,7 +118,7 @@ let }; kernel = buildLinux { - inherit version modDirVersion src kernelPatches stdenv; + inherit version modDirVersion src kernelPatches stdenv extraMeta; configfile = configfile.nativeDrv or configfile; @@ -131,10 +131,7 @@ let passthru = { features = kernelFeatures; - - meta = kernel.meta // extraMeta; - - passthru = kernel.passthru // (removeAttrs passthru [ "passthru" "meta" ]); + passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); }; nativeDrv = lib.addPassthru kernel.nativeDrv passthru; diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index a859a3cefbd4..b7959f9d3599 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -97,6 +97,9 @@ PANIC_TIMEOUT -1 GCC_PLUGINS y # Enable gcc plugin options +# Gather additional entropy at boot time for systems that may not have appropriate entropy sources. +GCC_PLUGIN_LATENT_ENTROPY y + ${optionalString (versionAtLeast version "4.11") '' GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin ''} diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 72ae02bbecde..767f7e35422a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -4,6 +4,12 @@ import ./generic.nix (args // rec { version = "4.13.16"; extraMeta.branch = "4.13"; + # TODO: perhaps try being more concrete (ideally CVE numbers). + extraMeta.knownVulnerabilities = [ + "ALSA: usb-audio: Fix potential out-of-bound access at parsing SU" + "eCryptfs: use after free in ecryptfs_release_messaging()" + ]; + src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; sha256 = "0cf7prqzl1ajbgl98w0symdyn0k5wl5xaf1l5ldgy6l083yg69dh"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index eed190a0f4f9..bd1f03c76a75 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.14.3"; + version = "4.14.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0rh3r1ik9xwa3pl5rrqjjbknyc7xnam10jih7v5q5v33pd716a5n"; + sha256 = "0wjpwhrnnvf6l3zpkkxk34dl722w9yp8j3vnh0xzi3hgb8dnvd2a"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d628f6b1b249..7ed69558fb04 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.103"; + version = "4.4.111"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "017r4aq6bwhrir3n4nckd5407gpnryv0bbgpp7rv6lnzbxwd008x"; + sha256 = "0260gvby59n550ijm9q43cnzw1gqizll28nv3vsv8qmgiqp2h0d2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5aa7316046dd..9fc7e51cbef2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.66"; + version = "4.9.76"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fwnmba25ww5q4asfz3mqdmbrhfdfgid388701h4xy20pwpjndsy"; + sha256 = "1pl7x1fnyhvwbdxgh0w5fka9dyysi74n8lj9fkgfmapz5hrr8axq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 863b6dcae782..5f4a5d5adb59 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.2"; + version = "4.14.12"; revision = "a"; - sha256 = "0bpkff1phc68shw6spkhd6zbxgjkgvdglym8b2hp383h14845qhb"; + sha256 = "002a3c177fix472wqc89zrpfzwk60l7dn76l869ivgnd60n6wqb2"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix index f262dfe34b79..32c684668d6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix @@ -1,7 +1,5 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: -assert stdenv.is64bit; - import ./generic.nix (args // rec { version = "4.12.2"; extraMeta.branch = "4.12-2"; @@ -14,5 +12,5 @@ import ./generic.nix (args // rec { sha256 = "1dr74i79p8r13522w2ppi8gnjd9bhngc9d2hsn91ji6f5a8fbxx9"; }; in "${upstream}/build/linux"; - extraMeta.hydraPlatforms = []; + extraMeta.platforms = [ "x86_64-linux" ]; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3fe9ff8e2870..6143f03dc8c4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.15-rc1"; - modDirVersion = "4.15.0-rc1"; + version = "4.15-rc7"; + modDirVersion = "4.15.0-rc7"; extraMeta.branch = "4.15"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1l7c132qb5qjd80hga03ivssfq65brqyd95sb4rd065dqrixp20n"; + sha256 = "1ph3asz5cc82mj7vb5cd5n80wnf66cm9jrlpa66da8kz8za0cdkh"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b4ee23079d93..e1936495921d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -39,6 +39,8 @@ in { config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile), # Cross-compiling config crossConfig ? if allowImportFromDerivation then (readConfig crossConfigfile) else config, + # Use defaultMeta // extraMeta + extraMeta ? {}, # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false }: @@ -47,6 +49,9 @@ let inherit (stdenv.lib) hasAttr getAttr optional optionalString optionalAttrs maintainers platforms; + # Dependencies that are required to build kernel modules + moduleBuildDependencies = stdenv.lib.optional (stdenv.lib.versionAtLeast version "4.14") libelf; + installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e mkdir -p $4 @@ -83,7 +88,7 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { - inherit version modDirVersion config kernelPatches configfile; + inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies; }; inherit src; @@ -228,11 +233,11 @@ let maintainers.thoughtpolice ]; platforms = platforms.linux; - }; + } // extraMeta; }; in -assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null; +assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // { name = "linux-${version}"; @@ -241,7 +246,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.15") libelf + ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ; diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 4a68160ce05a..3c5a0694a5d7 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "kexec-tools-${version}"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" ]; - sha256 = "1rwl04y1mpb28yq5ynnk8j124dmhj5p8c4hcdn453sri2j37p6w9"; + sha256 = "043hasx5b9zk7r7dzx24z5wybg74dpmh0nyns6nrnb3mmm8k642v"; }; hardeningDisable = [ "format" "pic" "relro" ]; diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix index aadecfdc8b5e..879e85a0c945 100644 --- a/pkgs/os-specific/linux/libwebcam/default.nix +++ b/pkgs/os-specific/linux/libwebcam/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The webcam-tools package"; platforms = platforms.linux; - licenses = with licenses; [ lgpl3 ]; + license = licenses.lgpl3; maintainers = with maintainers; [ jraygauthier ]; }; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index a1f00531cee1..066946d8f0bc 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,9 +1,14 @@ -{ stdenv, fetchurl, bison, flex, which, perl }: +{ sensord ? false, + stdenv, fetchurl, bison, flex, which, perl, + rrdtool ? null +}: + +assert sensord -> rrdtool != null; stdenv.mkDerivation rec { name = "lm-sensors-${version}"; version = "3.4.0"; # don't forget to tweak fedoraproject mirror URL hash - + src = fetchurl { urls = [ "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" @@ -12,10 +17,12 @@ stdenv.mkDerivation rec { sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0"; }; - buildInputs = [ bison flex which perl ]; + buildInputs = [ bison flex which perl ] + ++ stdenv.lib.optional sensord rrdtool; preBuild = '' - makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc) + makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc + ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"}) ''; meta = { diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index e6d5c10341b4..310ce51936c6 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation { "--enable-pkgconfig" "--enable-applib" "--enable-cmdlib" - ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; + ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd" + ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libudev libuuid thin-provisioning-tools ]; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index c23457c6b5f6..4f62b7eb128a 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam +, enableDebugBuild ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-2.0.7"; + name = "lxcfs-2.0.8"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a"; + sha256 = "04dzn6snqgw0znf7a7qdm64400jirip6q8amcx5fmz4705qdqahc"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; buildInputs = [ fuse pam ]; + preConfigure = stdenv.lib.optionalString enableDebugBuild '' + sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am + ''; + configureFlags = [ "--with-init-script=systemd" "--sysconfdir=/etc" diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index a656db306459..0a6fc3c977c8 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 1e2c1dafb2db..31dd0cbf18d8 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # This is to avoid self-references, which causes the initrd to explode # in size and in turn prevents mdraid systems from booting. - allowedReferences = [ stdenv.glibc.out ]; + allowedReferences = [ stdenv.cc.libc.out ]; patches = [ ./no-self-references.patch ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 97843b2253fc..f7393d79cc21 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20171117"; + version = "20180108"; src = fetchurl { - url = "https://downloadmirror.intel.com/27337/eng/microcode-${version}.tgz"; - sha256 = "1p14ypbg28bdkbza6dx6dpjrdr5p13vmgrh2cw0y1v2qzalivgck"; + url = "https://downloadmirror.intel.com/27431/eng/microcode-${version}.tgz"; + sha256 = "0c214238mjks07zwif07f4041c74jil522sy78r4kjs6lniilgq6"; }; buildInputs = [ libarchive ]; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 0d79027d8b79..c7990466ca73 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, glib, readline, pcre, systemd, udev }: -with stdenv.lib; stdenv.mkDerivation rec { - name = "miraclecast-0.0-git-20151002"; + name = "miraclecast-${version}"; + version = "1.0-20170427"; src = fetchFromGitHub { - owner = "albfan"; - repo = "miraclecast"; - rev = "30b8c2d22391423f76ba582aaaa1e0936869103a"; - sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd"; + owner = "albfan"; + repo = "miraclecast"; + rev = "a395c3c7afc39a958ae8ab805dea0f5d22118f0c"; + sha256 = "03kbjajv2x0i2g68c5aij0icf9waxnqkc9pp32z60nc8zxy9jk1y"; }; - # INFO: It is important to list 'systemd' first as for now miraclecast - # links against a customized systemd. Otherwise, a systemd package from - # a propagatedBuildInput could take precedence. - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ systemd udev glib readline ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; - meta = { - homepage = https://github.com/albfan/miraclecast; + buildInputs = [ glib pcre readline systemd udev ]; + + enableParallelBuilding = true; + + mesonFlags = [ + "-Drely-udev=true" + "-Dbuild-tests=true" + ]; + + meta = with stdenv.lib; { description = "Connect external monitors via Wi-Fi"; - license = licenses.lgpl21Plus; + homepage = https://github.com/albfan/miraclecast; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index ce9136e2ddbf..e9d654add49e 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchsvn }: +{ stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { - name = "mstpd-svn-${toString version}"; - version = 61; +stdenv.mkDerivation { + name = "mstpd-0.0.5.20171113"; - src = fetchsvn { - url = "svn://svn.code.sf.net/p/mstpd/code/trunk"; - rev = version; - sha256 = "0n5vqqqq8hk6iqdz100j9ps4zkz71vyl5qgz5bzjhayab2dyq1fd"; + src = fetchFromGitHub { + owner = "mstpd"; + repo = "mstpd"; + rev = "2522c6eed201bce8dd81e1583f28748e9c552d0d"; + sha256 = "0ckk386inwcx3776hf15w78hpw4db2rgv4zgf0i3zcylr83hhsr2"; }; - patches = [ ./fixes.patch ]; + nativeBuildInputs = [ autoreconfHook ]; - installFlags = [ "DESTDIR=\${out}" ]; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { description = "Multiple Spanning Tree Protocol daemon"; diff --git a/pkgs/os-specific/linux/mstpd/fixes.patch b/pkgs/os-specific/linux/mstpd/fixes.patch deleted file mode 100644 index 7303e1d7b4d3..000000000000 --- a/pkgs/os-specific/linux/mstpd/fixes.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/Makefile b/Makefile -index dde9f81..5af7cab 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,7 +34,6 @@ install: all - -mkdir -pv $(DESTDIR)/sbin - install -m 755 mstpd $(DESTDIR)/sbin/mstpd - install -m 755 mstpctl $(DESTDIR)/sbin/mstpctl -- install -m 755 bridge-stp /sbin/bridge-stp - -mkdir -pv $(DESTDIR)/lib/mstpctl-utils/ - cp -rv lib/* $(DESTDIR)/lib/mstpctl-utils/ - gzip -f $(DESTDIR)/lib/mstpctl-utils/mstpctl.8 -@@ -42,8 +41,9 @@ install: all - if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-pre-up.d/mstpctl ; fi - if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-post-down.d/mstpctl ; fi - if [ -d $(DESTDIR)/etc/bash_completion.d ] ; then ln -sf /lib/mstpctl-utils/bash_completion $(DESTDIR)/etc/bash_completion.d/mstpctl ; fi -- ln -sf /lib/mstpctl-utils/mstpctl.8.gz $(DESTDIR)/usr/share/man/man8/mstpctl.8.gz -- ln -sf /lib/mstpctl-utils/mstpctl-utils-interfaces.5.gz $(DESTDIR)/usr/share/man/man5/mstpctl-utils-interfaces.5.gz -+ mkdir -p $(DESTDIR)/share/man/man8 $(DESTDIR)/share/man/man5 -+ ln -sf /lib/mstpctl-utils/mstpctl.8.gz $(DESTDIR)/share/man/man8/mstpctl.8.gz -+ ln -sf /lib/mstpctl-utils/mstpctl-utils-interfaces.5.gz $(DESTDIR)/share/man/man5/mstpctl-utils-interfaces.5.gz - - romfs: all - $(ROMFSINST) /sbin/mstpd -diff --git a/bridge_track.c b/bridge_track.c -index c92fdf6..0c01aec 100644 ---- a/bridge_track.c -+++ b/bridge_track.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/broadcom_xstrata/driver_deps.c b/broadcom_xstrata/driver_deps.c -index e72e9e3..5194253 100644 ---- a/broadcom_xstrata/driver_deps.c -+++ b/broadcom_xstrata/driver_deps.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - - #include "log.h" -diff --git a/ctl_functions.h b/ctl_functions.h -index 9c3b914..df464de 100644 ---- a/ctl_functions.h -+++ b/ctl_functions.h -@@ -27,6 +27,7 @@ - #ifndef CTL_SOCKET_H - #define CTL_SOCKET_H - -+#include - #include - #include - -diff --git a/mstp.c b/mstp.c -index 1c6a2df..b2a1acd 100644 ---- a/mstp.c -+++ b/mstp.c -@@ -37,6 +37,7 @@ - - #include - #include -+#include - #include - #include - diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index f61611fbf017..e2abbd7335ee 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -18,15 +18,16 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3589"; + version = "3773"; src = fetchurl { - url = "http://www.magewell.com/files/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1arwnwrq52rs8g9zfxw8saip40vc3201sf7qnbqd2p23h8vzwb8i"; + url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; + sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g"; }; - patches = [] ++ optional (versionAtLeast kernel.version "4.13") ./linux_4_13_fix.patch - ++ optional (versionAtLeast kernel.version "4.14") ./linux_4_14_fix.patch; + nativeBuildInputs = [ kernel.moduleBuildDependencies ]; + + patches = [ ./linux_4_14_fix.patch ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch deleted file mode 100644 index 925af61b49a0..000000000000 --- a/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h ---- ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h 2017-08-17 02:46:07.000000000 -0700 -+++ ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h 2017-09-03 18:13:31.843510536 -0700 -@@ -172,7 +172,7 @@ - #else - struct completion done; - #endif -- wait_queue_t waitq; // for multi wait -+ wait_queue_entry_t waitq; // for multi wait - }; - typedef struct _os_event_t *os_event_t; - diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch index 9f92a38bcc45..94da5a00a2e2 100644 --- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch +++ b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch @@ -1,57 +1,68 @@ -diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c ---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.c 2017-08-17 02:46:07.000000000 -0700 -+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c 2017-11-13 20:18:50.842947380 -0800 -@@ -7,8 +7,8 @@ +diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c +--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c 2017-12-15 01:59:57.000000000 -0800 ++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c 2017-12-23 22:47:33.666823299 -0800 +@@ -7,8 +7,9 @@ #include "linux-file.h" -#include #include +#include ++#include struct file *linux_file_open(const char *path, int flags, int mode) { -@@ -28,27 +28,27 @@ +@@ -28,29 +29,36 @@ filp_close(file, NULL); } -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size) -+ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size) ++ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) ++ return(kernel_read(file, data, size, &offset)); ++#else mm_segment_t oldfs; ssize_t ret; oldfs = get_fs(); set_fs(get_ds()); - ret = vfs_read(file, data, size, &offset); -+ ret = kernel_read(file, data, size, &offset); ++ ret = vfs_read(file, (unsigned char *)data, size, &offset); set_fs(oldfs); return ret; ++#endif } -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size) +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) ++ return(kernel_write(file, data, size, &offset)); ++#else mm_segment_t oldfs; ssize_t ret; oldfs = get_fs(); set_fs(get_ds()); - ret = vfs_write(file, data, size, &offset); -+ ret = kernel_write(file, data, size, &offset); ++ ret = vfs_write(file, (const unsigned char *)data, size, &offset); set_fs(oldfs); return ret; -diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.h ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h ---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.h 2017-08-17 02:46:07.000000000 -0700 -+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h 2017-11-13 20:24:20.979690346 -0800 ++#endif + } +- +diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h +--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h 2017-12-15 01:59:57.000000000 -0800 ++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h 2017-12-23 22:46:22.028545189 -0800 @@ -13,9 +13,9 @@ void linux_file_close(struct file *file); -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size); -+ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size); ++ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size); -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size); +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size); diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 0498f5cf37e2..8dbacc46154f 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; - homepage = http://www.atoptool.nl/downloadnetatop.php; + homepage = https://www.atoptool.nl/downloadnetatop.php; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index e52174c09013..904dae55c9cb 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,10 +1,17 @@ { stdenv, fetchurl, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers +, buildEnv }: let statdPath = lib.makeBinPath [ systemd utillinux coreutils ]; + # Not nice; feel free to find a nicer solution. + kerberosEnv = buildEnv { + name = "kerberos-env-${kerberos.version}"; + paths = with lib; [ (getDev kerberos) (getLib kerberos) ]; + }; + in stdenv.mkDerivation rec { name = "nfs-utils-${version}"; version = "2.1.1"; @@ -26,7 +33,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-gss" "--with-statedir=/var/lib/nfs" - "--with-krb5=${kerberos}" + "--with-krb5=${kerberosEnv}" "--with-systemd=$(out)/etc/systemd/system" "--enable-libmount-mount" ] diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index c06de7ea6f2c..9d645fb1d848 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,11 +2,11 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.7"; + name = "nftables-0.8"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "0hzdqigdx4i6jbpxbdyq4zy4p4waqn8l6vvz7685ikh1v0wr4qzy"; + sha256 = "16iq9x0qxikdhp1nan500rk33ycqddl1k57876m4dfv3n7kqhnrz"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index bfbaa2db3b0c..22d415213c42 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,11 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "387.22"; - sha256_32bit = "16v4ljq07hs1xw6amc7cmddvmmmd3swli3b617xs8f3qcw54ym1r"; - sha256_64bit = "1i0fmzsv4bkfxaw2wnnhj2z64gdyqd6xvxrsq7zj7gq7crcd6sma"; - settingsSha256 = "0wszyfj9hcib7dcfin22nsrfsm1mb4rq6ha5fma7sq68p175j1yk"; - persistencedSha256 = "0wrkmw8gw780vcl0s0d0vd8niaf741ji5sggxxqb1aa1w61rjf0d"; + version = "387.34"; + sha256_32bit = "1haqk5h1fcmwp7kn9644k280wn409kh0xbivrj1ks8r8f4nbvfmq"; + sha256_64bit = "06w8dw6hb40ymz6ax7v82j29ihmp3d7yxsi8ah9ch10jldl973z4"; + settingsSha256 = "0dpm22ggpr93ypz24ap9vgx43ik7lw6cxcb29v8ys2iinhs7zm7s"; + persistencedSha256 = "02lf9b6j85amc1vr84lj98q74a680nrx4fmpxj17cz597yq8s200"; }; beta = generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 0d19079fe662..bde8ad361dcd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -62,7 +62,8 @@ let libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ]; - nativeBuildInputs = [ perl nukeReferences ]; + nativeBuildInputs = [ perl nukeReferences ] + ++ optionals (!libsOnly) kernel.moduleBuildDependencies; disallowedReferences = optional (!libsOnly) [ kernel.dev ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index acdc44c702f3..bbe3af5d0169 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -41,12 +41,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ] + buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus libXv ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; -# This next line makes the nvidia-settings binary fail to compile as of version 387.22 -# NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; - makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -74,7 +71,7 @@ stdenv.mkDerivation rec { binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; postFixup = '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \ + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \ $out/bin/$binaryName ''; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 5189b84ff7e2..3de7916bff69 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "linux-pam-${version}"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2"; - sha256 = "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl"; + sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4"; }; outputs = [ "out" "doc" "man" /* "modules" */ ]; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 40e7e1216a64..abbf3398ceda 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam kerberos ]; meta = with stdenv.lib; { - homepage = http://www.eyrie.org/~eagle/software/pam-krb5/; + homepage = https://www.eyrie.org/~eagle/software/pam-krb5/; description = "PAM module allowing PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC"; longDescription = '' pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index 4611a3c09b77..c1500e51ac37 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Test various memory protection measures"; license = licenses.gpl2; platforms = platforms.linux; - maintainer = with maintainers; [ copumpkin joachifm ]; + maintainers = with maintainers; [ copumpkin joachifm ]; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 949350b8944e..356939fe2946 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 9fe331e6cb12..12b361e953ea 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -10,7 +10,7 @@ let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version; xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer)); x64 = if stdenv.system == "x86_64-linux" then true else if stdenv.system == "i686-linux" then false - else abort "Parallels Tools for Linux only support {x86-64,i686}-linux targets"; + else throw "Parallels Tools for Linux only support {x86-64,i686}-linux targets"; in stdenv.mkDerivation rec { version = "${prl_major}.2.1-41615"; diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix index ba35d9f73ffc..ee7325edbe70 100644 --- a/pkgs/os-specific/linux/regionset/default.nix +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; homepage = http://linvdr.org/projects/regionset/; - descriptions = "Tool for changing the region code setting of DVD players"; + description = "Tool for changing the region code setting of DVD players"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 4ea6b35e377e..c79de39d5dac 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { }) ]; + buildInputs = kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 25548e0f962d..4bf3ef82978e 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -17,6 +17,8 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "pic" "format" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 9207a6b3511d..46abb6ccc662 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://tools.suckless.org/sinit; + homepage = https://tools.suckless.org/sinit; downloadPage = "http://git.suckless.org/sinit"; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index b2d090fa7ea2..e0d1754dd749 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,21 +1,18 @@ { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk -, configFile ? "all" # Kernel dependencies -, kernel ? null +, kernel }: with stdenv.lib; let - buildKernel = any (n: n == configFile) [ "kernel" "all" ]; - buildUser = any (n: n == configFile) [ "user" "all" ]; common = { version , sha256 , rev ? "spl-${version}" , broken ? false } @ args : stdenv.mkDerivation rec { - name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + name = "spl-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "zfsonlinux"; @@ -25,7 +22,7 @@ let patches = [ ./const.patch ./install_prefix.patch ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -37,8 +34,7 @@ let ''; configureFlags = [ - "--with-config=${configFile}" - ] ++ optionals buildKernel [ + "--with-config=kernel" "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; @@ -62,19 +58,16 @@ let }; }; in - assert any (n: n == configFile) [ "kernel" "user" "all" ]; - assert buildKernel -> kernel != null; + assert kernel != null; { splStable = common { - version = "0.7.3"; - sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb"; - - broken = kernel != null && stdenv.lib.versionAtLeast kernel.version "4.14"; + version = "0.7.5"; + sha256 = "0njb3274bc5pfr80pzj94sljq457pr71n50s0gsccbz8ghk28rlr"; }; splUnstable = common { - version = "2017-11-16"; - rev = "ed19bccfb651843fa208232b3a2d3d22a4152bc8"; - sha256 = "08ihjbf5fhcnhq9zavcwswg9djlbalbx1bil4rcv6i3d617wammb"; + version = "2017-12-21"; + rev = "c9821f1ccc647dfbd506f381b736c664d862d126"; + sha256 = "08r6sa36jaj6n54ap18npm6w85v5yn3x8ljg792h37f49b8kir6c"; }; } diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 3cb9179f535c..67df9dd2f11f 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, gcc_multi, glibc_multi }: +{ multiStdenv, fetchurl }: let version = "1.7.4"; in -stdenv.mkDerivation { +multiStdenv.mkDerivation { name = "statifier-${version}"; src = fetchurl { @@ -9,16 +9,14 @@ stdenv.mkDerivation { sha256 = "03lzkla6knjhh186b43cac410x2fmhi28pkmzb3d211n3zp5i9y8"; }; - buildInputs = [ gcc_multi glibc_multi ]; - phaseNames = [ "patchPhase" "installPhase" ]; postPatch = '' sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier - sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh + sed -e s@/bin/bash@"${multiStdenv.shell}"@g -i src/*.sh ''; - meta = with stdenv.lib; { + meta = with multiStdenv.lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 18d473e21941..919ddc1c3df0 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,18 +3,18 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1hmkjvfg3371hp873mnkjq9cirqszw2ji4p7mb6jcn9ihwxil2z2"; + sha256 = "04bsb7g6mh6dwk023v1rbdcjwp898y6ixdvrd7nxzm186qpycpnn"; }; buildInputs = [ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc - ]; + ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix new file mode 100644 index 000000000000..3189872ca3bc --- /dev/null +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, boost +, cmake +, fetchFromGitHub +, pkgconfig +, txt2tags +}: + +stdenv.mkDerivation rec { + name = "thunderbolt-${version}"; + version = "0.9.2"; + src = fetchFromGitHub { + owner = "01org"; + repo = "thunderbolt-software-user-space"; + rev = "1ae06410180320a5d0e7408a8d1a6ae2aa443c23"; + sha256 = "03yk419gj0767lpk6zvla4jx3nx56zsg4x4adl4nd50xhn409rcc"; + }; + + buildInputs = [ + boost + cmake + pkgconfig + txt2tags + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE='Release'" + "-DUDEV_BIN_DIR=$out/bin" + "-DUDEV_RULES_DIR=$out/udev" + ]; + + meta = { + description = "Thunderbolt(TM) user-space components"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ryantrinkle ]; + homepage = https://01.org/thunderbolt-sw; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 2ef5d53b0665..a43c53e02bbd 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tomb-${version}"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; rev = "v${version}"; - sha256 = "192jpgn02mvi4d4inbq2q11zl7xw6njymvali7al8wmygkkycrw4"; + sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 4fc14a04eeab..c3adcc6cdba9 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { name = "tp-smapi-${version}"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 81c8b7b4df7a..c4d2bf04d7a0 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ] "" cross else ""} $extraCrossConfig EOF - make oldconfig + ( set +o pipefail; yes "" | make oldconfig ) ''; hardeningDisable = [ "stackprotector" ]; @@ -88,7 +88,9 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional (gccCross != null) gccCross; - enableParallelBuilding = true; + # `make libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrwlock.h`: + # error: bits/sysnum.h: No such file or directory + enableParallelBuilding = false; installPhase = '' mkdir -p $out @@ -103,11 +105,11 @@ stdenv.mkDerivation { libiconv = libiconvReal; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.uclibc.org/; description = "A small implementation of the C library"; - maintainers = with stdenv.lib.maintainers; [ rasendubi ]; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ rasendubi ]; + license = licenses.lgpl2; + platforms = subtractLists ["aarch64-linux"] platforms.linux; }; } diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 490df3e1abe2..b1a8ac7d5182 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "upower-0.99.4"; src = fetchurl { - url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; + url = "https://upower.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installFlags = "historydir=$(TMPDIR)/foo"; meta = { - homepage = http://upower.freedesktop.org/; + homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index 5bec71a10907..72d7690d2f8a 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { "fortify" "pic" "stackprotector" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + patches = [ ./fix_kerndir.patch ./fix_kbuild.patch diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e1decf1d13d1..70811347be52 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171111"; + version = "0.0.20171221"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0mqix3v4qqwwa7hcd0h5rcwhc7yvm9jcl8b3v1vc4sj0m637fd6r"; + sha256 = "1vf5dbwc2lgcf28k1m919w94hil2gcl0l4h4da1sh6r7kdz6k5rb"; }; meta = with stdenv.lib; { @@ -37,6 +37,8 @@ let NIX_CFLAGS = ["-Wno-error=cpp"]; + nativeBuildInputs = kernel.moduleBuildDependencies; + buildPhase = "make module"; }; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 8d3e490db87c..54d164737705 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; meta = { - homepage = http://cgit.freedesktop.org/xorg/driver/xf86-video-nested; + homepage = https://cgit.freedesktop.org/xorg/driver/xf86-video-nested; description = "A driver to run Xorg on top of Xorg or something else"; maintainers = [ stdenv.lib.maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e932f5163750..5489bc5abbec 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -38,7 +38,8 @@ let patches = extraPatches; - nativeBuildInputs = [ autoreconfHook nukeReferences ]; + nativeBuildInputs = [ autoreconfHook nukeReferences ] + ++ optional buildKernel kernel.moduleBuildDependencies; buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -125,7 +126,7 @@ let Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. ''; - home = http://zfsonlinux.org/; + homepage = http://zfsonlinux.org/; license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; @@ -140,9 +141,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.3"; + version = "0.7.5"; - sha256 = "1bbajrwfilnmfhn1n69gvsaznyc4q29wi7nkwc0p9r4dli37w28b"; + sha256 = "086g4xjx05sy4fwn5709sm46m2yv35wb915xfmqjvpry46245nig"; extraPatches = [ (fetchpatch { @@ -159,10 +160,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2017-11-16"; + version = "2018-01-10"; - rev = "d4a72f23863382bdf6d0ae33196f5b5decbc48fd"; - sha256 = "0q2gkkj11hy8m8cjd70g99bs69ldxvc17ym0x1pgwvs4722hzpha"; + rev = "1d53657bf561564162e2ad6449f80fa0140f1dd6"; + sha256 = "0ibkhfz06cypgl2c869dzdbdx2i3m8ywwdmnzscv0cin5gm31vhx"; isUnstable = true; extraPatches = [ diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 6e21826381b6..53050435256f 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -4,4 +4,5 @@ stdenv.mkDerivation { inherit (callPackage ./common.nix {}) name src; buildInputs = [ windows.mingw_w64_headers ]; dontStrip = true; + hardeningDisable = [ "stackprotector" "fortify" ]; } diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix index c585ab54ff89..1a33e8db07e8 100644 --- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -1,9 +1,9 @@ -{ stdenvNoCC, callPackage }: +{ stdenv, callPackage }: let inherit (callPackage ./common.nix {}) name src; -in stdenvNoCC.mkDerivation { +in stdenv.mkDerivation { name = name + "-pthreads"; inherit src; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index f9b7a24273ff..f4a6b47a45a4 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zookeeper_mt, zstd }: +{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools +, icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC +, zookeeper_mt, zstd }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; @@ -16,7 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libtool ]; - buildInputs = [ boost double-conversion gperftools icu libmysql lz4 openssl poco re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd ]; + buildInputs = [ + boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco + re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd + ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 69afd479af30..59d627901131 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.02.6"; + version = "17.02.9"; src = fetchurl { - url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2"; - sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh"; + url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; + sha256 = "0w8v7fzbn7b3f9kg6lcj2jpkzln3vcv9s2cz37xbdifz0m2p1x7s"; }; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl + curl python munge perl pam openssl mysql.connector-c ncurses gtk2 lua hwloc numactl ]; configureFlags = @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { rm -f $out/lib/*.la $out/lib/slurm/*.la ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.schedmd.com/; description = "Simple Linux Utility for Resource Management"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index bf7a7266022e..3d8b825cc921 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { "--without-gssapi" "--without-idn" "--without-idnlib" + "--without-lmdb" "--without-pkcs11" "--without-purify" "--without-python" diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d8aed9b3143f..531d88b78bee 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "c032e63a6b922294746e1ab4002860346e7a6d92b8502965a13ba599088fcb42"; + sha256 = "146dcb24422ef685fb4167e3c536a838cf4101acaa85fcfa0c150eebdba78f81"; }; outputs = [ "out" "dev" ]; @@ -37,11 +37,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = true; doInstallCheck = true; - installCheckTarget = "check"; preInstallCheck = '' - export LD_LIBRARY_PATH="$out/lib" - sed '/^\thints$/c #' -i tests/config/test_config.mk + patchShebangs tests/config/runtest.sh ''; postInstall = '' diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 6cf98daab5bf..d14233016d86 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -10,14 +10,16 @@ , rootServer ? false , rrtypes ? false , zoneStats ? false + +, configFile ? "etc/nsd/nsd.conf" }: stdenv.mkDerivation rec { - name = "nsd-4.1.16"; + name = "nsd-4.1.19"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1cmaddfjb7yr87gjd5yv4d0qng0j97sy5rw5m3zxsp6c4fnng0vz"; + sha256 = "1i82kvgxv4vz79dqd0ckz6syr1fdf6q60r4b926qh5klnnwjqy5h"; }; prePatch = '' @@ -39,7 +41,15 @@ stdenv.mkDerivation rec { ++ edf rootServer "root-server" ++ edf rrtypes "draft-rrtypes" ++ edf zoneStats "zone-stats" - ++ [ "--with-ssl=${openssl.dev}" "--with-libevent=${libevent.dev}" ]; + ++ [ "--with-ssl=${openssl.dev}" + "--with-libevent=${libevent.dev}" + "--with-nsd_conf_file=${configFile}" + "--with-configdir=etc/nsd" + ]; + + patchPhase = '' + sed 's@$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)$(nsdconfigfile).sample@@g' -i Makefile.in + ''; meta = with stdenv.lib; { homepage = http://www.nlnetlabs.nl; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 9b017249c15e..ae023649bc3d 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -11,11 +11,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.0.6"; + version = "4.0.8"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "03fnjiacvhdlkr3a2206mham0p6p24gkawashs5v12r68k32l67j"; + sha256 = "04v5y6mfdhn8ikigqmm3k5k0zz5l8d3k1a7ih464n1161q7z0vww"; }; nativeBuildInputs = [ pkgconfig ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A recursive DNS server"; - homepage = http://www.powerdns.com/; + homepage = https://www.powerdns.com/; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index ff21a9e8f090..79fff80b0b8c 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, boost, libyamlcpp, libsodium, sqlite, protobuf, - libmysql, postgresql, lua, openldap, geoip, curl + mysql57, postgresql, lua, openldap, geoip, curl }: stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "0qypns1iqlrc5d3iwabrsi1vpb0yffy36chsb1zpqiv9vs4snx6r"; + sha256 = "097ci4s2c63gl0bil8yh87dsy0sk3fds4w8cpyjh5kns6zazmj2v"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; + buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 745ed18c00f8..05d53d444627 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.36.0"; + version = "3.2.60.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0b75v6g7qm03jqm5za70z4x5lqks3a4cd84vblqr35zrla9vs83b"; + sha256 = "0yrbwq5dzzq5047vdpar4vkwzcgd9dj2v9basaw413hzncf2q8gj"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index db9d11219923..bf74ca81ced8 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -13,7 +13,7 @@ , withMemcached ? false , hiredis , withRedis ? false -, libmysql +, mysql , withMysql ? false , json_c , withJson ? false @@ -29,7 +29,7 @@ assert withPcap -> libpcap != null; assert withCap -> libcap != null; assert withMemcached -> libmemcached != null; assert withRedis -> hiredis != null; -assert withMysql -> libmysql != null; +assert withMysql -> mysql != null; assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ optional withCap libcap ++ optional withMemcached libmemcached ++ optional withRedis hiredis - ++ optional withMysql libmysql + ++ optional withMysql mysql.connector-c ++ optional withJson json_c ++ optional withYubikey libyubikey ++ optional withCollectd collectd; diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix deleted file mode 100644 index 63a716339237..000000000000 --- a/pkgs/servers/games/ghost-one/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, unzip, gmp, zlib, bzip2, boost, mysql }: -stdenv.mkDerivation rec { - - name = "ghost-one-${version}"; - version = "1.7.265"; - - src = fetchurl { - url = "http://www.maxdevlon.com/ghost/ghostone${version}.zip"; - sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2"; - }; - - buildInputs = [ unzip gmp zlib bzip2 boost mysql.client ]; - - patchPhase = '' - substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \ - "${stdenv.lib.getLib mysql.client}/lib/mysql" - ''; - - buildPhase = '' - cd bncsutil/src/bncsutil - make - cd ../../../StormLib/stormlib/ - make - mkdir -p $out/lib - cd ../.. -# cp bncsutil/src/bncsutil/libbncutil.so $out/lib -# cp StormLib/stormlib/libStorm.so $out/lib - cd ghost - make - cd .. - ''; - - installPhase = '' - mkdir -p $out/lib - cp bncsutil/src/bncsutil/libbncsutil.so $out/lib - cp StormLib/stormlib/libStorm.so $out/lib - - mkdir -p $out/bin - cp ghost/ghost++ $out/bin - - mkdir -p $out/share/ghost-one/languages - cp -r mapcfgs $out/share/ghost-one - cp Languages/*.cfg $out/share/ghost-one/languages - cp language.cfg $out/share/ghost-one/languages/English.cfg - cp ip-to-country.csv $out/share/ghost-one/ - ''; - - meta = with stdenv.lib; { - homepage = http://www.codelain.com/forum/; - description = "A Warcraft III: Reign of Chaos and Warcraft III: The Frozen Throne game hosting bot"; - license = licenses.asl20; - maintainers = [ maintainers.phreedom ]; - broken = true; # can't even get downloaded - }; -} diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 25097a31416d..41e65b588e16 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -4,11 +4,11 @@ , http2Support ? true, nghttp2 , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 +, brotliSupport ? true, brotli , luaSupport ? false, lua5 }: -let optional = stdenv.lib.optional; - optionalString = stdenv.lib.optionalString; +let inherit (stdenv.lib) optional optionalString; in assert sslSupport -> aprutil.sslSupport && openssl != null; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; # it would move $out/modules, etc. buildInputs = [perl] ++ + optional brotliSupport brotli ++ optional sslSupport openssl ++ optional ldapSupport openldap ++ # there is no --with-ldap flag optional libxml2Support libxml2 ++ @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { --enable-cern-meta --enable-imagemap --enable-cgi + ${optionalString brotliSupport "--enable-brotli --with-brotli=${brotli}"} ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl"} ${optionalString http2Support "--enable-http2 --with-nghttp2"} diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index aa6f0e1f9108..2267c07e6f98 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "An advanced and secure webserver"; license = licenses.gpl2; homepage = https://www.hiawatha-webserver.org; - maintainer = [ maintainers.ndowens ]; + maintainers = [ maintainers.ndowens ]; }; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index c3e15ed846db..181e3bf134fb 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,27 +1,31 @@ { stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, mysql ? null +, enableLdap ? false, openldap ? null }: assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; +assert enableLdap -> openldap != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.45"; + name = "lighttpd-1.4.48"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw"; + sha256 = "0djgsx06x3p22rjvzml5klq7gqd9nk88qzlxifa7p7ajqymdb2hg"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql mysql.lib; + ++ stdenv.lib.optional enableMysql mysql.connector-c + ++ stdenv.lib.optional enableLdap openldap; configureFlags = [ "--with-openssl" ] ++ stdenv.lib.optional enableMagnet "--with-lua" - ++ stdenv.lib.optional enableMysql "--with-mysql"; + ++ stdenv.lib.optional enableMysql "--with-mysql" + ++ stdenv.lib.optional enableLdap "--with-ldap"; preConfigure = '' sed -i "s:/usr/bin/file:${file}/bin/file:g" configure diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 0eb8979c3ac4..3ec493d67da2 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.6"; - sha256 = "1y7qcdpjskjc1iwwrjqsbgm74jpnf873pwv17clsy83ak1pzq4l5"; + version = "1.13.8"; + sha256 = "1ib4hkngj9z7pl73lnn96d85m7v2wwb56nkypwx7d6pm3z1vc444"; }) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index de6fd61ee813..36d0ea6b1e88 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, pkgs }: +{ fetchFromGitHub, fetchurl, lib, pkgs }: { brotli = { @@ -11,12 +11,12 @@ }; }; - rtmp = { + rtmp ={ src = fetchFromGitHub { owner = "arut"; repo = "nginx-rtmp-module"; - rev = "v1.1.11"; - sha256 = "09zrnf8lk179mpqnx92zm24xl7m3bq4ca84wc2zwi5hc8kxjbwxc"; + rev = "v1.2.1"; + sha256 = "0na1aam176irz6w148hnvamqy1ilbn4abhdzkva0yrm35a3ksbzn"; }; }; @@ -47,12 +47,12 @@ ''; }; - modsecurity-beta = { + modsecurity-nginx = { src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity-nginx"; - rev = "abbf2c47f6f3205484a1a9db618e067dce213b89"; - sha256 = "04ar51bnqjca6g4p2irymgdmc8rh5nsi8ml43srm4krllnkvw8qn"; + rev = "v1.0.0"; + sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7"; }; inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; }; @@ -153,7 +153,7 @@ owner = "pagespeed"; repo = "ngx_pagespeed"; rev = "v${version}-beta"; - sha256 = "03dvzf1lgsjxcs1jjxq95n2rhgq0wy0f9ahvgascy0fak7qx4xj9"; + sha256 = "176skx7zmi7islc1hmdxcynix4lkvgmr78lknn13s9gskc7qi25w"; }; ngx_pagespeed = pkgs.runCommand @@ -172,6 +172,7 @@ ''; in { src = ngx_pagespeed; + inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps }; shibboleth = { diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 6a29ecaad569..098825d59ce8 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -32,25 +32,25 @@ let in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.81"; - sha256 = "0mcr3caizqk6qrc0j9p91apdsg65ksawg0l6xpqk1fq6071nd5rq"; + versionMinor = "0.82"; + sha256 = "0vb7c5i50ral4rr39ss95k7cxnzd7fs21zd7f97d1f3qslzwl69g"; }; tomcat8 = common { versionMajor = "8"; - versionMinor = "0.46"; - sha256 = "14wb9mgb7z02j6wvvmcsfc2zkcqnijc40gzyg1mnxcy5fvf8nzpk"; + versionMinor = "0.47"; + sha256 = "0xv4v3i08rwzfmz7rkhglq5cbjgnfava8dw0i33vsp7dk162a4g4"; }; tomcat85 = common { versionMajor = "8"; - versionMinor = "5.20"; - sha256 = "1l5cgxzaassjnfbr4rbr3wzz45idcqa8aqhphhvlx1xl8xqv6p8a"; + versionMinor = "5.23"; + sha256 = "1qnww70x75c0qf2wn8mkpz5lszggjnh78dpb4chyw2fnbm3wxain"; }; - tomcatUnstable = common { + tomcat9 = common { versionMajor = "9"; - versionMinor = "0.0.M17"; - sha256 = "1ilvka2062m7412bj2fsdwvfxbrjyj9qxcia40hhv22prvkxw3cg"; + versionMinor = "0.2"; + sha256 = "0aaykzi0b2xsdmjp60ihcjzh1m95p0a79kn5l2v7vgbkyg449638"; }; } diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 6ad233593a3b..002760ff0fd3 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p"; }; - nativeBuildInputs = [ pkgconfig xmlto docbook2x ]; + nativeBuildInputs = [ pkgconfig xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ python @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { # python.pkgs.pysocks ]; - preBuild = '' - export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml' - ''; - postPatch = '' substituteInPlace Makefile \ --replace '-o 0 -g 0' "" diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix new file mode 100644 index 000000000000..9386be321b45 --- /dev/null +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "clamsmtp-" + version; + version = "1.10"; + + src = fetchurl { + url = "http://thewalter.net/stef/software/clamsmtp/${name}.tar.gz"; + sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5"; + }; + + meta = with stdenv.lib; { + description = "SMTP filter that allows to check for viruses using the ClamAV + anti-virus software"; + homepage = http://thewalter.net/stef/software/clamsmtp/; + license = licenses.bsd3; + maintainers = [ maintainers.ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 33da203c502d..e2d1f448b321 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -2,24 +2,24 @@ , bzip2, zlib, inotify-tools, pam, libcap , clucene_core_2, icu, openldap # Auth modules -, withMySQL ? false, libmysql +, withMySQL ? false, mysql , withPgSQL ? false, postgresql , withSQLite ? true, sqlite }: stdenv.mkDerivation rec { - name = "dovecot-2.2.32"; + name = "dovecot-2.2.33.2"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] - ++ lib.optional withMySQL libmysql + ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "0bmwyvi1crmrca2knvknsf517x53w7gxrclwyrvrhddgw98j22qn"; + sha256 = "117f9i62liz2pm96zi2lpldzlj2knzj7g410zhifwmlsc1w3n7py"; }; preConfigure = '' diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 3df0b41c2cab..67094228a5e7 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.4.20"; + version = "0.4.21"; src = fetchurl { url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "0nxy007wmyamwj01yfiqbqjnbsd98z783b811rcavwi5iw5pvqbg"; + sha256 = "0snxrx9lk3j0rrcd4jlhwlqk4v31n1qfx2asgwb4scy5i2vrrq2a"; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 623f0a2b0e22..b63390bb2474 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper , gawk, gnused, gnugrep, coreutils, which , perl, NetSMTP -, withMySQL ? false, zlib, libmysql +, withMySQL ? false, zlib, mysql57 , withPgSQL ? false, postgresql , withSQLite ? false, sqlite , withDB ? false, db @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ perl ] - ++ lib.optionals withMySQL [ zlib libmysql ] + ++ lib.optionals withMySQL [ zlib mysql57.connector-c ] ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite ++ lib.optional withDB db; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { "--enable-preferences-extension" "--enable-long-usernames" "--enable-external-lookup" - ] ++ lib.optional withMySQL "--with-mysql-includes=${lib.getDev libmysql}/include/mysql" + ] ++ lib.optional withMySQL "--with-mysql-includes=${mysql57.connector-c}/include/mysql" ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib"; # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR" diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index b02f80577fc0..45ac738c5bb9 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,11 +1,11 @@ { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "exim-4.89.1"; + name = "exim-4.90"; src = fetchurl { url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "157syn472gnp1x2lrazwdvqsg3zgwyv87952sq5rrnp220m3488s"; + sha256 = "101syariyvv2xxhjyx1zfdvad6303ihp67800s8n4083km98nm4k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index d64e41f30071..8ff20869b94e 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7"; }; - buildInputs = [ python pythonPackages.dns ]; + buildInputs = [ python pythonPackages.dnspython ]; patches = [ ./fix-var-prefix.patch ]; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 5e5170afbc79..5e87a1fb0995 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }: + python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis }: + stdenv.mkDerivation rec { name = "opensmtpd-extras-${version}"; version = "5.7.1"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libevent - libasr python2 lua5 perl mariadb.client postgresql sqlite hiredis ]; + libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ]; configureFlags = [ "--sysconfdir=/etc" @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optional (mariadb != null) [ + ] ++ stdenv.lib.optional (mysql != null) [ "--with-table-mysql" ] ++ stdenv.lib.optional (postgresql != null) [ @@ -67,7 +68,8 @@ stdenv.mkDerivation rec { "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) "-I${hiredis}/include/hiredis" ++ + stdenv.lib.optional (mysql != null) "-L${mysql.connector-c}/lib/mysql"; meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 7b6be5ec39e8..bf1a1e782a5a 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl , coreutils, findutils, gnugrep, gawk, icu, pcre , withPgSQL ? false, postgresql -, withMySQL ? false, libmysql +, withMySQL ? false, mysql , withSQLite ? false, sqlite , withLDAP ? false, openldap }: @@ -11,7 +11,7 @@ let "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ] + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE" ++ lib.optional withLDAP "-DHAS_LDAP"); auxlibs = lib.concatStringsSep " " ([ @@ -25,17 +25,17 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1gs025smgynrlsg44cypjam99ds92mc9q46l5085d9sy0xfrf2sv"; + sha256 = "1xn782bvzbrdwkz04smkq8ns89wbnqz11vnmz0m7jr545amfnmgc"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ] ++ lib.optional withPgSQL postgresql - ++ lib.optional withMySQL libmysql + ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withSQLite sqlite ++ lib.optional withLDAP openldap; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 95f460e917b5..b221bfa0dd4c 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -19,7 +19,7 @@ in runCommand name { description = "A postfix policy server to provide greylisting"; homepage = https://postgrey.schweikert.ch/; platforms = postfix.meta.platforms; - licenses = licenses.gpl2; + license = licenses.gpl2; }; } '' mkdir -p $out/bin diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 99045570a718..e499dc5de04b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -10,27 +10,29 @@ let }; }; matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec { - name = "matrix-synapse-ldap3-${version}"; - version = "0.1.2"; + pname = "matrix-synapse-ldap3"; + version = "0.1.3"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-synapse-ldap3"; rev = "v${version}"; - sha256 = "16pivz1lhs1c3z84rxxy8khyvn0hqxwxaz552br1y9ri0maa0aq8"; + sha256 = "0ss7ld3bpmqm8wcs64q1kb7vxlpmwk9lsgq0mh21a9izyfc7jb2l"; }; propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ]; + + checkInputs = with pythonPackages; [ ldaptor mock ]; }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "110558l147n1dqpylzrdzp8spj36nack88c5kknsxn69gr8yb7j2"; + sha256 = "1ggdnb4c8y835j9lxsglxry6fqy7d190s70rccjrc3rj0p5vwlyj"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index fabd5b83724b..c625ce575f2e 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.39"; + version = "1.5.4"; + name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "0dfpmx0fqgp55j4vl06cz63fwx5kzhzipdm7n2kxjkvyg1ybzi13"; + sha256 = "1m03fhzq1f9byk2agccsr0x458niqqjpips5mbcgzhm4kylczhz0"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index fbe49dd634ec..2f9a141024b0 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.6.2"; + version = "4.6.3"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0awf00n3rrxjyiza3mga496k1k9c4fkg6rxn9azdab1qvdkzh513"; + sha256 = "18r35pwarbgamhd7m9z4wpx6x1ymd5qsymvfll58zcgivis6c32j"; }; srcStatic = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "08svlg190h5nvv701lcl3a2iak2xdmslpdwjv2w5fcdfyp7bd6ld"; + url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; + sha256 = "01f50w57n7p7if37rhj8zy0y0x84qajbxrrdcfrsbi2qi1kzfz03"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 212ab8513a91..dcc6f6f16b7f 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.rvl ]; inherit version; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 5d7becb16525..b0e2f29a3b48 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; - homepage = http://www.nagios.org/; + homepage = https://www.nagios.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 312caab954bb..e458e130ba49 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -32,6 +32,6 @@ in python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://www.claudiokuenzler.com/nagios-plugins/; license = licenses.gpl2; - maintainer = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 441d9595bbd1..9f33835c8851 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -46,9 +46,9 @@ let ''; meta = with stdenv.lib; { - homepage = https://labs.consol.de/; - license = licenses.gpl2; - maintainer = with maintainers; [ peterhoeg ]; + homepage = https://labs.consol.de/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; inherit description; }; }; diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 2f26bc26ba44..9f03c9ea96f6 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Uptime check plugin for Sensu/Nagios/others"; homepage = https://github.com/madrisan/nagios-plugins-uptime; license = licenses.gpl3; - maintainer = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index c5aa7f91bd6b..047585e2fc02 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.10.0"; + version = "0.11.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "0xxlmg6yin63pghlvjj8amf0h5plnichvcrmcq67bffhz6d792gc"; + sha256 = "1zwhyvjkf222bwvgim28yizk2vq0777dviqfkkc3vdhiwl9amr8v"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix new file mode 100644 index 000000000000..34120ad3fdae --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -0,0 +1,26 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "rabbitmq_exporter-${version}"; + version = "0.25.2"; + + goPackagePath = "github.com/kbudde/rabbitmq_exporter"; + + src = fetchFromGitHub { + owner = "kbudde"; + repo = "rabbitmq_exporter"; + rev = "8238c5d9ad509dab94e631cdecf3d75155fbdee4"; + sha256 = "1zb21jms2wlmiw5vhk1wyhv0xrv5a9y08y9q6x92hv727kjqjr6w"; + }; + + goDeps = ./rabbitmq-exporter_deps.nix; + + meta = with stdenv.lib; { + description = "Prometheus exporter for RabbitMQ"; + homepage = https://github.com/kbudde/rabbitmq_exporter; + license = licenses.mit; + maintainers = with maintainers; [ ocharles ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix new file mode 100644 index 000000000000..7a15a6a7b68c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix @@ -0,0 +1,165 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "95cd2b9c79aa5e72ab0bc69b7ccc2be15bf850f6"; + sha256 = "1rkkhl68iw523bwxmp2prdrp8pk62xfp52wifzvbmqf8v1svwsqv"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/cenk/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenk/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + { + goPackagePath = "github.com/fsouza/go-dockerclient"; + fetch = { + type = "git"; + url = "https://github.com/fsouza/go-dockerclient"; + rev = "1d4f4ae73768d3ca16a6fb964694f58dc5eba601"; + sha256 = "1s3m8jq8z1cm5rkn7dmjacf38n6ihkkzbdfang2aa2cgs5wl28y0"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + } + { + goPackagePath = "github.com/kbudde/gobert"; + fetch = { + type = "git"; + url = "https://github.com/kbudde/gobert"; + rev = "a6daecb9ddeb548b7cfb3f5ac9deef9ded522730"; + sha256 = "06g036w4dny8wdjwvprjjcdh0vx851qphgrvilrn5lghv3jdr29z"; + }; + } + { + goPackagePath = "github.com/kylelemons/godebug"; + fetch = { + type = "git"; + url = "https://github.com/kylelemons/godebug"; + rev = "d65d576e9348f5982d7f6d83682b694e731a45c6"; + sha256 = "0bc8j9kwkp0hrsz0sm7hav7cm5jp9d6ql8r2b3mz78xb1g65xhbc"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; + sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; + sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca"; + sha256 = "14kn5w7imcxxlfdqxl21fsnlf1ms7200g3ldy29hwamldv8qlm7j"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "a6e9df898b1336106c743392c48ee0b71f5c4efa"; + sha256 = "0zyprdp9bnpywcb6b9dzwyiji60mgf0s9wnw98zndfg3xrgnkasz"; + }; + } + { + goPackagePath = "github.com/streadway/amqp"; + fetch = { + type = "git"; + url = "https://github.com/streadway/amqp"; + rev = "ff791c2d22d3f1588b4e2cc71a9fba5e1da90654"; + sha256 = "1drridn4k1n7qy82msvw9r18w4pmrah1nip36wixz098nzalz55x"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; + sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a8b9294777976932365dabb6640cf1468d95c70f"; + sha256 = "112v83jfwd1brwaanjijvb7da4dx1iqk8b4bf9ahx0hvir56c2g8"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "8b4580aae2a0dd0c231a45d3ccb8434ff533b840"; + sha256 = "1w66xqnpkskvj22a3f841qg4rgf0lzcrxp8678s6n07yw8qdh92p"; + }; + } + { + goPackagePath = "gopkg.in/ory-am/dockertest.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/ory-am/dockertest.v3"; + rev = "a7951f7a8442f0e70d36e499ed4d744f00af2963"; + sha256 = "13qv0vl79m2wirhbjs0k2a3cjl6ib7sw6rg98v95xxpn8r39ijzw"; + }; + } +] diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index c0a2c3ca49e5..dba0c32b353b 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -9,7 +9,7 @@ bundlerEnv rec { meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = http://sensuapp.org/; + homepage = https://sensuapp.org/; license = licenses.mit; maintainers = with maintainers; [ theuni peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index f71ed052d04e..d5411e40a399 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.4.4"; + version = "1.5.0"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1hyjbx0hwyh39dgij86xlznaqnzh8m0yk96phqgxs328dlcxfl07"; + sha256 = "0h3v80qvb9xmkmgbp46sqh76y4k84c0da586vdy3xmmbrbagnypv"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.4.4.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.0.nix similarity index 93% rename from pkgs/servers/monitoring/telegraf/deps-1.4.4.nix rename to pkgs/servers/monitoring/telegraf/deps-1.5.0.nix index 0cfcf03dd148..916b4688a06e 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.4.4.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.5.0.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Shopify/sarama"; - rev = "c01858abb625b73a3af51d0798e4ad42c8147093"; - sha256 = "139fyfi2h6qas83kan0kpm9d92985nl1fyhijswy37d6ia86797w"; + rev = "3b1b38866a79f06deddf0487d5c27ba0697ccd65"; + sha256 = "02qwlqd1kdgwlv39fimpbzjhgw8shzkkad82kfwdy8lppscb20br"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/bsm/sarama-cluster"; - rev = "ccdc0803695fbce22f1706d04ded46cd518fd832"; - sha256 = "1jbb03bygjzzs6wyxp6cp057kyiyv80schwlhgi366nizp52hd56"; + rev = "abf039439f66c1ce78017f560b490612552f6472"; + sha256 = "16013ac7jv72mdiv84vhk4av1vb5q8xq3fhv253fz2a17h9ld78q"; }; } { @@ -126,6 +126,15 @@ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; }; } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } { goPackagePath = "github.com/docker/docker"; fetch = { @@ -275,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/jackc/pgx"; - rev = "b84338d7d62598f75859b2b146d830b22f1b9ec8"; - sha256 = "13q763a31yya8ij6m5zbnri7wc88hjwwn1rw4v7dmwbwsrqn885c"; + rev = "63f58fd32edb5684b9e9f4cfaac847c6b42b3917"; + sha256 = "1n9cbdwzpagnrisxwq0frqdnkmyfg2qlxsr890527d32633hp0h2"; }; } { @@ -324,6 +333,24 @@ sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf"; }; } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + }; + } + { + goPackagePath = "github.com/multiplay/go-ts3"; + fetch = { + type = "git"; + url = "https://github.com/multiplay/go-ts3"; + rev = "07477f49b8dfa3ada231afc7b7b17617d42afe8e"; + sha256 = "1z2cfqhm6g48vzscargw6vl9idfppdcm3wq1xfwy73l1s77q4n9n"; + }; + } { goPackagePath = "github.com/naoina/go-stringutil"; fetch = { @@ -365,8 +392,8 @@ fetch = { type = "git"; url = "https://github.com/nsqio/go-nsq"; - rev = "a53d495e81424aaf7a7665a9d32a97715c40e953"; - sha256 = "04npqz6ajr4r2w5jfvfzppr307qrwr57w4c1ppq9p9ddf7hx3wpz"; + rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"; + sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x"; }; } { @@ -482,8 +509,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "48fc5612898a1213aa5d6a0fb2d4f7b968e898fb"; - sha256 = "14mwpxd2v3y4mr0g37g99vhy9jkaaaw29d3j7427rpv568vyb8sd"; + rev = "384a55110aa5ae052eb93ea94940548c1e305a99"; + sha256 = "00idmnsmalxhm1y60lhm9vyck1ay7gbp0r35fgs8bbiwq351bs23"; }; } { diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index db23987d4aac..6108f01e0b9e 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,15 +1,15 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "0.26.3" "0.26.3" "1qc69jk3730skdg2vdqncjwg15vywb1a9f8jqk6kwggmkwdklr0p") - (fetchbower "angular" "1.6.6" "~1.6.3" "1hc71mpipbdz6ban4zkagdhmn3rw28ksjkr6nwmbzfcpk59gnzkb") + (fetchbower "uchiwa-web" "1.1.0" "1.1.0" "0nv7csb38vx93yk08nwa9wj4x0b5icx9nl56d4v5azndcck2py30") + (fetchbower "angular" "1.6.7" "~1.6.3" "0sg9mqh94za8rv5ip9hmxyji6cmsb26sg3v60ppy6rld62f7gfj9") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") - (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0qfk0az32fmrn71ywjl63k7hgan0f0bb4d7fx7q5ch2kd75rzkfm") + (fetchbower "angular-cookies" "1.6.7" "~1.6.3" "0v5sqrxi411vjjz6m817pkh20vrw8lxdhxj30l4lhqws9cxj289z") (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi") (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj") - (fetchbower "angular-resource" "1.6.6" "~1.6.3" "1fxd188qa16zbidr4kbwnw7gqcc0bjpvpa7xcmv22nbfk5akjz5b") - (fetchbower "angular-route" "1.6.6" "~1.6.3" "05saq9lb7xqhr1f4k2hdc2qlq0nacbgr36qsv7izvvmgh6irn1iq") - (fetchbower "angular-sanitize" "1.6.6" "~1.6.3" "1cikmvq456pvxdmrqw0dp04y3ar9n0nxrgv583m7cy6z228sx1hl") + (fetchbower "angular-resource" "1.6.7" "~1.6.3" "0qrr1rxksfw0ynrs23kbrcnwswrqaa6pymx3z3cfgawzq85fp4hh") + (fetchbower "angular-route" "1.6.7" "~1.6.3" "0k7bizyihpna0542j6d219df4x0rbb7s8z2kmjnv3l7f2p8ghy83") + (fetchbower "angular-sanitize" "1.6.7" "~1.6.3" "1kzr57cb5irxs2mpv6kaxhfryr556y0dy2d84k5bk8rm0c0jnnl8") (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh") (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8") (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9") diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 924a92a2785e..51d3dfc0ffc2 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "0.26.3-1"; - sha256 = "13gklnrzhcj7s7j1ga5pa7ijwav0w9a96lqh4m7858mmm92v0bsk"; + version = "1.1.0-1"; + sha256 = "1ljrqz3ads5nn1alw4pa6lz7mbwhs09w498bpgg2hlcf8vklxg1y"; } diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index cd541f82d238..be52698ed839 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -44,7 +44,7 @@ in meta = { description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -60,7 +60,7 @@ in meta = with stdenv.lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 3a1e91b26eb0..de317ada6e45 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: stdenv.mkDerivation rec { - name = "neard-0.15-post-git-20510929"; + name = "neard-0.16"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/network/nfc/neard.git"; - sha256 = "07dny1l8n46v0yn30zqa8bkyj8ay01xphc124nhf2sqwbff7nf2m"; + src = fetchurl { + url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/${name}.tar.gz"; + sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ec4e78a54ece..d2e08932fe1d 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "12.0.3"; + version = "12.0.4"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0wgvvpk7h7psy41a32f0ljh6iasjsqbf4pxi8nhybl46m35srg48"; + sha256 = "1dh9knqbw6ph2rfrb5rscdraj4375rqddmrifw6adyga9jkn2hb5"; }; installPhase = '' diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix new file mode 100644 index 000000000000..4647260b1e28 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "3.11.1"; + sha256 = "1vgh4ysnl4xg8g5v6zm78h3sq308r7s17ppbw0ck4bwyfnbddvkg"; +}) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 969cd183c5c1..b9e850e8dfd4 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let version = "3.4.2"; +let version = "3.4.10"; system-libraries = [ "pcre" #"asio" -- XXX use package? @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "0n8vspccrpd2z9xk3yjpz4gprd730dfacw914ksjzz9iadn0zdi9"; + sha256 = "1wz2mhl9z0b1bdkg6m8v8mvw9k60mdv5ybq554xn3yjj9z500f24"; }; nativeBuildInputs = [ scons ]; @@ -61,12 +61,6 @@ in stdenv.mkDerivation rec { name = "boost160.patch"; sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8"; }) - # probably not needed for > 3.4.10 - (fetchpatch { - url = https://github.com/mongodb/mongo/commit/218a7b1d4ea3d3b.diff; - name = "pcre-8.41.patch"; - sha256 = "1dra51gw130bq78l2yfkdaj0jkha95ikpv4ig21rapbl63ip3znj"; - }) ]; postPatch = '' diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 9ef0987d9b96..354b4d579601 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,22 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, lua }: +{ stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.2"; + version = "4.0.6"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "04s8cgvwjj1979s3hg8zkwc9pyn3jkjpz5zidp87kfcipifr385i"; + sha256 = "1ypnwmxwm49l0b8i9swcbjdxnc6f0r9zyqm2h423wz13xilmv6vn"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15047.patch"; - url = https://github.com/antirez/redis/commit/ffcf7d5ab1e98d84c28af9bea7be76c6737820ad.patch; - sha256 = "0cgx3lm0n7jxhsly8v9hdvy6vlamj3ck2jsid4fwyapz6907h64l"; - }) - ]; - buildInputs = [ lua ]; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index a0df98faf360..4d0bb6c687db 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; - maintainer = with maintainers; [ mdaiter ]; + maintainers = with maintainers; [ mdaiter ]; }; } diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index cb004e15cc7a..661888c5c5cc 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ./regen.sh ${stdenv.lib.optionalString (kerberos != null) - "export KRB5_CONFIG=${kerberos}/bin/krb5-config"} + "export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"} configureFlagsArray=( "--with-linux-kernel-build=$TMP/linux" diff --git a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch deleted file mode 100644 index 12fcdb4fd02c..000000000000 --- a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp -index d14d8d9..c64d7fd 100644 ---- a/extractor/extractor_options.cpp -+++ b/extractor/extractor_options.cpp -@@ -50,7 +50,7 @@ bool ExtractorOptions::ParseArguments(int argc, char *argv[], ExtractorConfig &e - boost::program_options::options_description config_options("Configuration"); - config_options.add_options()("profile,p", - boost::program_options::value( -- &extractor_config.profile_path)->default_value("profile.lua"), -+ &extractor_config.profile_path)->default_value("@out@/profiles/car.lua"), - "Path to LUA routing profile")( - "threads,t", - boost::program_options::value(&extractor_config.requested_num_threads) diff --git a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch deleted file mode 100644 index 87b9b9501c4c..000000000000 --- a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND - NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW) - message(STATUS "Using gcc specific binutils for LTO.") -- set(CMAKE_AR "/usr/bin/gcc-ar") -- set(CMAKE_RANLIB "/usr/bin/gcc-ranlib") -+ # Just let PATH do its job -+ set(CMAKE_AR "gcc-ar") -+ set(CMAKE_RANLIB "gcc-ranlib") - endif() - endif (HAS_LTO_FLAG) - endif() diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 8846f50c8861..fa8e7d087cca 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,24 +1,18 @@ -{stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}: +{stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "4.9.1"; + version = "5.14.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "1r4dwniwxgfppnb9asdh98w5qxqwkjhp9gc5fabmck0gk73cwkcc"; + sha256 = "1ajgybjx7g6qzddavab8bj7il7wn5wy24nivjj5rk84mfbi71s5v"; }; - patches = [ - ./4.5.0-gcc-binutils.patch - (substituteAll { - src = ./4.5.0-default-profile-path.template.patch; - }) - ]; - - buildInputs = [ cmake luabind libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; @@ -26,6 +20,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Project-OSRM/osrm-backend/wiki; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers;[ erictapen ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index e4b457d0c17b..7997d0ebcd8b 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ${ssl} \ -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \ -e 's,^PREFIX .*,PREFIX='$out, \ + -e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \ Config sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \ templates/src/*.pl diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 6752e5b80b72..937bf327995f 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -21,6 +21,7 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = with python3Packages; [ vobject passlib + pytz ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/sql/mariadb/clang-isfinite.patch b/pkgs/servers/sql/mariadb/clang-isfinite.patch new file mode 100644 index 000000000000..8da527d57847 --- /dev/null +++ b/pkgs/servers/sql/mariadb/clang-isfinite.patch @@ -0,0 +1,17 @@ +diff --git a/include/my_global.h b/include/my_global.h +index cb31ae2..2866f87 100644 +--- a/include/my_global.h ++++ b/include/my_global.h +@@ -803,12 +803,6 @@ inline unsigned long long my_double2ulonglong(double d) + #endif + + #ifndef isfinite +-#ifdef HAVE_FINITE +-#define isfinite(x) finite(x) +-#else +-#define finite(x) (1.0 / fabs(x) > 0.0) +-#endif /* HAVE_FINITE */ +-#elif (__cplusplus >= 201103L) + #include + static inline bool isfinite(double x) { return std::isfinite(x); } + #endif /* isfinite */ diff --git a/pkgs/servers/sql/mariadb/cmake-includedir.patch b/pkgs/servers/sql/mariadb/cmake-includedir.patch new file mode 100644 index 000000000000..0c4fe7d321e2 --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-includedir.patch @@ -0,0 +1,11 @@ +--- a/include/CMakeLists.txt 2017-12-25 05:59:07.204144374 +0100 ++++ b/include/CMakeLists.txt 2017-12-25 05:59:26.339552817 +0100 +@@ -94,7 +94,7 @@ + ENDIF() + + MACRO(INSTALL_COMPAT_HEADER file footer) +- INSTALL(CODE "FILE(WRITE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDEDIR}/${file} ++ INSTALL(CODE "FILE(WRITE ${INSTALL_INCLUDEDIR}/${file} + \"/* Do not edit this file directly, it was auto-generated by cmake */ + + #warning This file should not be included by clients, include only diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d6731a5b7dc3..91d288c6a9e4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy -, openssl, pcre, boost, judy, bison, libxml2 +, libiconv, openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices }: @@ -11,31 +11,32 @@ let # in mariadb # spans the whole file mariadb = everything // { inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin server = everything; # a full single-output build, including everything in `client` again - lib = client; # compat. with the old mariadb split + inherit connector-c; # libmysqlclient.so }; common = rec { # attributes common to both builds - version = "10.1.28"; + version = "10.2.12"; src = fetchurl { - url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1g9b0c04qhgcgw6xw29bvdjjjacr7kn82crc7apvvi10ykzwhb99"; + url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; + sha256 = "1v21sc1y5qndwdbr921da1s009bkn6pshwcgw47w7aygp9zjvcia"; name = "mariadb-${version}.tar.gz"; }; - prePatch = '' - substituteInPlace cmake/libutils.cmake \ - --replace /usr/bin/libtool libtool - sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt - ''; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - ncurses openssl zlib pcre jemalloc + ncurses openssl zlib pcre jemalloc libiconv ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; + prePatch = '' + sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt + ''; + + patches = [ ./cmake-includedir.patch ] + ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; + cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" "-DMANUFACTURER=NixOS.org" @@ -72,7 +73,7 @@ common = rec { # attributes common to both builds find "''${!outputBin}/bin" -name '*test*' -delete ''; - passthru.mysqlVersion = "5.6"; + passthru.mysqlVersion = "5.7"; meta = with stdenv.lib; { description = "An enhanced, drop-in replacement for MySQL"; @@ -83,7 +84,6 @@ common = rec { # attributes common to both builds }; }; - client = stdenv.mkDerivation (common // { name = "mariadb-client-${common.version}"; @@ -97,21 +97,23 @@ client = stdenv.mkDerivation (common // { preConfigure = common.preConfigure + '' cmakeFlags="$cmakeFlags \ - -DINSTALL_BINDIR=$bin/bin -DINSTALL_SCRIPTDIR=$bin/bin \ + -DINSTALL_BINDIR=$bin/bin \ + -DINSTALL_SCRIPTDIR=$bin/bin \ -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \ - -DINSTALL_DOCDIR=$bin/share/doc/mysql -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \ + -DINSTALL_DOCDIR=$bin/share/doc/mysql \ + -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \ " ''; # prevent cycle; it needs to reference $dev postInstall = common.postInstall + '' moveToOutput bin/mysql_config "$dev" + moveToOutput bin/mariadb_config "$dev" ''; enableParallelBuilding = true; # the client should be OK }); - everything = stdenv.mkDerivation (common // { name = "mariadb-${common.version}"; @@ -120,9 +122,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] - ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ] - ; + ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" @@ -135,6 +135,8 @@ everything = stdenv.mkDerivation (common // { "-DINSTALL_DOCREADMEDIR=share/doc/mysql" "-DINSTALL_DOCDIR=share/doc/mysql" "-DINSTALL_SHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DINSTALL_SQLBENCHDIR=OFF" "-DENABLED_LOCAL_INFILE=ON" "-DWITH_READLINE=ON" @@ -153,12 +155,49 @@ everything = stdenv.mkDerivation (common // { ]; postInstall = common.postInstall + '' - rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data + rm -r "$out"/data # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 - - # Don't install mysqlbug to prevent a dependency on gcc. - rm $out/bin/mysqlbug + rm "$out"/bin/rcmysql ''; + + CXXFLAGS = optionalString stdenv.isi686 "-fpermissive" + + optionalString stdenv.isDarwin " -std=c++11"; }); +connector-c = stdenv.mkDerivation rec { + name = "mariadb-connector-c-${version}"; + version = "2.3.4"; + + src = fetchurl { + url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; + sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb"; + name = "mariadb-connector-c-${version}-src.tar.gz"; + }; + + # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0 + cmakeFlags = [ + "-DWITH_EXTERNAL_ZLIB=ON" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + ]; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ openssl zlib ]; + buildInputs = [ libiconv ]; + + enableParallelBuilding = true; + + postFixup = '' + ln -sv mariadb_config $out/bin/mysql_config + ln -sv mariadb $out/lib/mysql + ln -sv mariadb $out/include/mysql + ''; + + meta = with stdenv.lib; { + description = "Client library that can be used to connect to MySQL or MariaDB"; + license = licenses.lgpl21; + maintainers = with maintainers; [ globin ]; + platforms = platforms.all; + }; +}; + in mariadb diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 28e7824cd423..5a747fb85abd 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -3,7 +3,8 @@ # Note: zlib is not required; MySQL can use an internal zlib. -stdenv.mkDerivation rec { +let +self = stdenv.mkDerivation rec { name = "mysql-${version}"; version = "5.5.58"; @@ -59,11 +60,16 @@ stdenv.mkDerivation rec { rm $out/share/man/man1/mysql-test-run.pl.1 ''; - passthru.mysqlVersion = "5.5"; + passthru = { + client = self; + connector-c = self; + server = self; + mysqlVersion = "5.5"; + }; meta = { - homepage = http://www.mysql.com/; + homepage = https://www.mysql.com/; description = "The world's most popular open source database"; platforms = stdenv.lib.platforms.unix; }; -} +}; in self diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 687993e0dc57..0b2778218760 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -3,7 +3,8 @@ # Note: zlib is not required; MySQL can use an internal zlib. -stdenv.mkDerivation rec { +let +self = stdenv.mkDerivation rec { name = "mysql-${version}"; version = "5.7.20"; @@ -22,15 +23,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + outputs = [ "out" "static" ]; + cmakeFlags = [ "-DWITH_SSL=yes" - "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_UNITTEST=no" "-DWITH_ZLIB=yes" + "-DWITH_ARCHIVE_STORAGE_ENGINE=yes" + "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes" + "-DWITH_FEDERATED_STORAGE_ENGINE=yes" + "-DCMAKE_VERBOSE_MAKEFILE=yes" "-DHAVE_IPV6=yes" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_SYSCONFDIR=etc/mysql" "-DINSTALL_INFODIR=share/mysql/docs" "-DINSTALL_MANDIR=share/man" "-DINSTALL_PLUGINDIR=lib/mysql/plugin" @@ -50,15 +56,22 @@ stdenv.mkDerivation rec { ''; postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - rm -r $out/mysql-test "$out"/lib/*.a - rm $out/share/man/man1/mysql-test-run.pl.1 + install -vD $out/lib/*.a -t $static/lib + rm -r $out/mysql-test + rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a + ln -s libmysqlclient.so $out/lib/libmysqlclient_r.so ''; - passthru.mysqlVersion = "5.7"; + passthru = { + client = self; + connector-c = self; + server = self; + mysqlVersion = "5.7"; + }; meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; platforms = stdenv.lib.platforms.unix; }; -} +}; in self diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix new file mode 100644 index 000000000000..0f7f91b008d2 --- /dev/null +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, openssl, libevent }: + +stdenv.mkDerivation rec { + name = "pgbouncer-${version}"; + version = "1.7.2"; + + src = fetchurl { + url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; + sha256 = "de36b318fe4a2f20a5f60d1c5ea62c1ca331f6813d2c484866ecb59265a160ba"; + }; + + buildInputs = [ libevent openssl ]; + + meta = with stdenv.lib; { + homepage = https://pgbouncer.github.io; + description = "Lightweight connection pooler for PostgreSQL"; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cf3349dc1660..cffdbb969280 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -91,33 +91,33 @@ let in { postgresql93 = common { - version = "9.3.19"; + version = "9.3.20"; psqlSchema = "9.3"; - sha256 = "1d9gmi1psg4aa6h6ylvsrdm5jnnb7p36pn4h2qrvl9z9v4n8g7pv"; + sha256 = "1jp6lac4b0q6hb28yrdsl0ymzn75gg59hvp5zasarf3mf3b8l4zb"; }; postgresql94 = common { - version = "9.4.14"; + version = "9.4.15"; psqlSchema = "9.4"; - sha256 = "0szc0navrcjnpyafw2sai8cmwr3znsy0w6031lv7n1ab20xg4zcf"; + sha256 = "1i5c67gg4fj38hk07h6w6m4mqak84bhnblqsjbpiamg4x33v7gqj"; }; postgresql95 = common { - version = "9.5.9"; + version = "9.5.10"; psqlSchema = "9.5"; - sha256 = "1m6d4y3m3ir20dzl6q3s3yvmr0a7hq3si2v1hg5hanmbck3db379"; + sha256 = "10gjfn16bhzkmlqfsn384w49db0j39bg3n4majwxdpjd17g7lpcl"; }; postgresql96 = common { - version = "9.6.5"; + version = "9.6.6"; psqlSchema = "9.6"; - sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; + sha256 = "0m417h30s18rwa7yzkqqcdb22ifpcda2fpg2cyx8bxvjp3ydz71r"; }; postgresql100 = common { - version = "10.0"; + version = "10.1"; psqlSchema = "10.0"; - sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"; + sha256 = "04z7lm4h94625vbncwv98svycqr942n3q47ailqaczkszqjlxjrw"; }; } diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix index b17446ca7786..1206e50926ed 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgtap-${version}"; - version = "0.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "theory"; repo = "pgtap"; rev = "v${version}"; - sha256 = "1vzc8pxzi0rbywmrvx7i5awngsvzcz75i4jl9bk2vqr223chax6f"; + sha256 = "17r3b409k05pbypmwdwgm1fl669jc6a1391szyxizx784k44a369"; }; nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d0d0efa9aa6d..ebc08b745c63 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.4.4"; + version = "1.4.6"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "114861v8kg77zwnf742n25h7c4fly3i52inqx1kcpqs074rqm1wn"; + sha256 = "1sd7wfp1hvq505lgybbaiq9d1hyygzf5jgl0qidn103xnf1yqaw0"; }; buildInputs = [ go-bindata bash ]; diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 8724adfdad6d..a6c75439ca9c 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tt-rss-${version}"; - version = "17.4"; + version = "2018-01-05"; + rev = "c30f5e18119d1935e8fe6d422053b127e8f4f1b3"; - src = fetchgit { - url = "https://git.tt-rss.org/git/tt-rss.git"; - rev = "refs/tags/${version}"; - sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08"; + src = fetchurl { + url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz"; + sha256 = "18pc1l0dbjr7d5grcrb70y6j7cr2zb9575yqmy6zfwzrlvw0pa0l"; }; installPhase = '' @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; homepage = http://tt-rss.org; - maintainers = with maintainers; [ zohl ]; + maintainers = with maintainers; [ globin zohl ]; platforms = platforms.all; }; } - diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 71bc0de6d910..d4a0145e9b99 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.22"; + version = "5.6.29"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "1ffphdi4df3jhlcl68amb90f5pj7cwyrql4qwbswynh9d623880l"; + sha256 = "05na94mrd1dy95vnwd1ycqx4i38wf0lg67sjg263ilq5l1prdmz8"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index d30129d93d95..4614a9768b05 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,7 +4,7 @@ , pam, withPAM ? false , systemd, withSystemd ? false , python2, python3, ncurses -, ruby, php-embed +, ruby, php-embed, mysql }: let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" { @@ -33,8 +33,8 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else (lib.nameValuePair "php" { # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; - preBuild = "touch unix.h"; inputs = [ php-embed ] ++ php-embed.buildInputs; + NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ]; }) ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = [ "-lsystemd" ]; + NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; meta = with stdenv.lib; { homepage = http://uwsgi-docs.readthedocs.org/en/latest/; diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix new file mode 100644 index 000000000000..1adb3a70ccf1 --- /dev/null +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt3, libconfig, pkgconfig } : + +stdenv.mkDerivation rec { + name = "fileshelter"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "epoupon"; + repo = "fileshelter"; + rev = "v${version}"; + sha256 = "1n9hrls3l9gf8wfz6m9bylma1b1hdvdqsksv2dlp1zdgjdzv200b"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzip boost wt3 libconfig ]; + + postInstall = '' + ln -s ${wt3}/share/Wt/resources $out/share/fileshelter/docroot/resources + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/epoupon/fileshelter; + description = "FileShelter is a 'one-click' file sharing web application"; + maintainers = [ maintainers.willibutz ]; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/servers/web-apps/frab/Gemfile.lock b/pkgs/servers/web-apps/frab/Gemfile.lock index 530c54ebd898..06502ef59ad5 100644 --- a/pkgs/servers/web-apps/frab/Gemfile.lock +++ b/pkgs/servers/web-apps/frab/Gemfile.lock @@ -180,7 +180,7 @@ GEM pry (~> 0.10) pry-rails (0.3.4) pry (>= 0.9.10) - puma (3.6.0) + puma (3.9.1) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/pkgs/servers/web-apps/frab/gemset.nix index 9f881579f42d..449fbf1a5b6b 100644 --- a/pkgs/servers/web-apps/frab/gemset.nix +++ b/pkgs/servers/web-apps/frab/gemset.nix @@ -628,10 +628,10 @@ puma = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rmcny3jr1jj01f9fqijwmikj212a5iql7ghifklm77x4a8pp399"; + sha256 = "1k13n500r7v480rcbxm7k09hip0zi7p8zvy3vajj8g9hb7gdcwnp"; type = "gem"; }; - version = "3.6.0"; + version = "3.9.1"; }; rack = { source = { @@ -929,4 +929,4 @@ }; version = "0.9.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix index e5d6876ecbf5..697240e81c75 100644 --- a/pkgs/servers/web-apps/piwik/default.nix +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "piwik-${version}"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "21hss97mms5vavfzw41v2p3qsxx0ar8xa3dnr4d2fw2mps8jg3s5ng9i725lqrbl96q7855fh9ymabjsi1zr4q9nif2yap0izaakxib"; + sha512 = "1yisgywz7dm6kygh9mc207xnqpvdxbw4pa2l9gjh495a6979x3chi7z5rf410z4dmrg0kbj8wqm8mmmslfn276xvw37l2d4h73ij1h2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 1c5f52d4938e..28eeeb112591 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,34 +1,43 @@ { lib, pythonPackages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { - name = "searx-${version}"; - version = "0.12.0"; - namePrefix = ""; +with pythonPackages; +buildPythonApplication rec { + pname = "searx"; + version = "0.13.1"; + + # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0"; + sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani"; }; postPatch = '' substituteInPlace requirements.txt \ - --replace 'certifi==2017.1.23' 'certifi' \ - --replace 'lxml==3.7.3' 'lxml' \ - --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'certifi==2017.11.5' 'certifi' \ + --replace 'flask==0.12.2' 'flask==0.12.*' \ + --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \ + --replace 'lxml==4.1.1' 'lxml==4.1.*' \ + --replace 'idna==2.5' 'idna' \ --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ - --replace 'flask==0.12' 'flask==0.12.*' \ - --replace 'requests[socks]==2.13.0' 'requests[socks]==2.*' \ - --replace 'python-dateutil==2.6.0' 'python-dateutil==2.6.*' + --replace 'pyopenssl==17.4.0' 'pyopenssl' \ + --replace 'python-dateutil==2.6.1' 'python-dateutil==2.6.*' ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; + checkInputs = [ splinter mock plone-testing robotsuite unittest2 ]; + + preCheck = '' + rm tests/test_robot.py # A variable that is imported is commented out + ''; + meta = with lib; { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 215e9fade0aa..e6137a2db7c2 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.2.3"; + version = "2.3.1"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "0myqarwny9p53g2gmwmg1mcn17jlx5ah0bri13panhf7ryvmrzhk"; + sha256 = "1qk7jicni5g8acpjybrwnwf7zknk3b0mxiv5876lrsajcxdxwnf4"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" ]; patchPhase = '' rm Makefile # use the "shared hosting" package with bundled dependencies @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { ''; # exposes $WALLABAG_DATA installPhase = '' - mkdir -p $doc/share/doc - mv docs $doc/share/doc/wallabag mkdir $out/ cp -R * $out/ ''; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index d8dde97a0969..57254713f4b0 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,8 +2,8 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.9"; - sha256 = "1qffh413k8c1mf3jj9hys3a7y1qfjcg2w96w4c9x3ida3lchg7ln"; + rev = "4.9.1"; + sha256 = "0d931mv6wbgnc7f15nisnn5al0ffi19zya2iwdzw98s4klpaq955"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index bb3e5ac42832..5a832cb14d53 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -16,13 +16,8 @@ postInstall() { echo "propagating requisites $requires" - if test -n "$crossConfig"; then - local pkgs=("${crossPkgs[@]}") - else - local pkgs=("${nativePkgs[@]}") - fi for r in $requires; do - for p in "${pkgs[@]}"; do + for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedBuildInputs+=" $p" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d1c7c81c101e..cc2cade8ba13 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2588,11 +2588,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.5"; + name = "xorg-server-1.19.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2; - sha256 = "0iql4pgsgpyqcrd3256pv227cdadvz01ych61n0d41ixp67gmzqq"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2; + sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8f235df2617c..ca1a773c4a28 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -450,6 +450,7 @@ in }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + postPatch = "sed '1i#include ' -i include/os.h"; meta.platforms = stdenv.lib.platforms.unix; } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4ea77fee4431..dd48748dceb3 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -186,7 +186,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 3285456a3485..b0e3492c0da1 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,16 +1,24 @@ { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg -, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null -, withLibevent ? true, withZlib ? true }: +, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop +, withLibevent ? true, luaevent ? null +, withZlib ? true, luazlib ? null +, withDBI ? true, luadbi ? null +# use withExtraLibs to add additional dependencies of community modules +, withExtraLibs ? [ ] +, withCommunityModules ? [ ] }: assert withLibevent -> luaevent != null; assert withZlib -> luazlib != null; +assert withDBI -> luadbi != null; with stdenv.lib; let libs = [ luasocket luasec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent - ++ optional withZlib luazlib; + ++ optional withZlib luazlib + ++ optional withDBI luadbi + ++ withExtraLibs; getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; getLuaPath = lib : getPath lib "lua"; getLuaCPath = lib : getPath lib "so"; @@ -28,14 +36,12 @@ stdenv.mkDerivation rec { }; communityModules = fetchhg { - url = "http://prosody-modules.googlecode.com/hg/"; - rev = "4b55110b0aa8"; - sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; + url = "https://hg.prosody.im/prosody-modules"; + rev = "9a3e51f348fe"; + sha256 = "09g4vi52rv0r3jzcm0bsgp4ngqq6iapfbxfh0l7qj36qnajp4vm6"; }; - buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] - ++ optional withLibevent luaevent - ++ optional withZlib luazlib; + buildInputs = [ lua5 makeWrapper libidn openssl ]; configureFlags = [ "--ostype=linux" @@ -44,7 +50,9 @@ stdenv.mkDerivation rec { ]; postInstall = '' - cp $communityModules/mod_websocket/mod_websocket.lua $out/lib/prosody/modules/ + ${concatMapStringsSep "\n" (module: '' + cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ + '') withCommunityModules} wrapProgram $out/bin/prosody \ --set LUA_PATH '${luaPath};' \ --set LUA_CPATH '${luaCPath};' @@ -59,6 +67,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = http://www.prosody.im; platforms = platforms.linux; - maintainers = [ maintainers.flosse ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 4e15f472744d..c90684e0fe0d 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zookeeper-${version}"; - version = "3.4.10"; + version = "3.4.11"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; - sha256 = "09rz4ac31932yxyyc8gqrnq1zxb9ahibrq51wbz13b24w0a58zvz"; + sha256 = "110fs5manyaq6rxbzwzs9x3aqw8d5l4177y9qaj3xhgpr2hniggn"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index b4a2ba553881..5635c6a73bed 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -68,10 +68,10 @@ stdenv.mkDerivation rec { ]; # Note: Bison is needed because the patches above modify parse.y. + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [bison] ++ optional (texinfo != null) texinfo - ++ optional hostPlatform.isDarwin binutils - ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + ++ optional hostPlatform.isDarwin binutils; buildInputs = optional interactive readline70; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index ec99f2bbf8de..490832d31d8b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -88,7 +88,7 @@ let fish = stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.7.0"; + version = "2.7.1"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; @@ -96,7 +96,7 @@ let # There are differences between the release tarball and the tarball github packages from the tag # Hence we cannot use fetchFromGithub url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz"; - sha256 = "1jvvm27hp46w0cia14lfz6161dkz8b935j1m7j38i7rgx75bfxis"; + sha256 = "0nhc3yc5lnnan7zmxqqxm07rdpwjww5ijy45ll2njdc6fnfb2az4"; }; buildInputs = [ ncurses libiconv pcre2 ]; diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/nix-bash-completions/default.nix index 58425ed63407..bb945f404215 100644 --- a/pkgs/shells/nix-bash-completions/default.nix +++ b/pkgs/shells/nix-bash-completions/default.nix @@ -1,23 +1,33 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.5"; + version = "0.6.2"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "095dbbqssaxf0y85xw73gajif6lzy2aja4scg3plplng3k9zbldz"; + sha256 = "0w6mimi70drjkdpx5pcw66xy2a4kysjfzmank0kc5vbhrjgkjwyp"; }; + # To enable lazy loading via. bash-completion we need a symlink to the script + # from every command name. installPhase = '' - mkdir -p $out/share/bash-completion/completions - cp _nix $out/share/bash-completion/completions + commands=$( + function complete() { shift 2; echo "$@"; } + shopt -s extglob + source _nix + ) + install -Dm444 -t $out/share/bash-completion/completions _nix + cd $out/share/bash-completion/completions + for c in $commands; do + ln -s _nix $c + done ''; meta = with stdenv.lib; { - homepage = http://github.com/hedning/nix-bash-completions; + homepage = https://github.com/hedning/nix-bash-completions; description = "Bash completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index 0fbef1fe0fb6..29fb065a6f8b 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.5"; + version = "0.3.7"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "1fp565qbzbbwj99rq3c28gpq8gcnlxb2glj05382zimas1dfd0y9"; + sha256 = "164x8awia56z481r898pbywjgrx8fv8gfw8pxp4qgbxzp3gwq9iy"; }; installPhase = '' diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 8b8a67c2452a..3374f32738c0 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-09-24"; + version = "2017-12-14"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "accdcb2f1c3cca40527fef1fe4ab2d39eb6cf897"; - sha256 = "0jrixz02mdab63yr0s16sr8gzwzhf9xnhad852swnfp3c7qlq06z"; + rev = "c3b072eace1ce19a48e36c2ead5932ae2d2e06d9"; + sha256 = "14nmql4527l4qs4rxb5gczb8cklz8s682ly0l0nmqh36cmvaqx8y"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index ec7dbbbf5ffc..ab475a63499c 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, coreutils }: let - version = "0.1.0"; + version = "0.3.0"; in stdenv.mkDerivation { name = "oil-${version}"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "0cf7jwwgvcq7q6zq8g5pi464hnn83b2km0nv6711qgqbxmsw85nx"; + sha256 = "0j4fyn6xjaf29xqyzm09ahazmq9v1hkxv4kps7n3lzdfr32a4kk9"; }; postPatch = '' diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh-deer/default.nix index 3fa941c08c39..735d6a2b7619 100644 --- a/pkgs/shells/zsh-deer/default.nix +++ b/pkgs/shells/zsh-deer/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { description = "Ranger-like file navigation for zsh"; homepage = "https://github.com/Vifon/deer"; license = licenses.gpl3Plus; - maintainers = maintainers.vyp; + maintainers = [ maintainers.vyp ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh-prezto/default.nix index c96de397294e..7bef904081e0 100644 --- a/pkgs/shells/zsh-prezto/default.nix +++ b/pkgs/shells/zsh-prezto/default.nix @@ -1,28 +1,13 @@ { stdenv, fetchpatch, fetchgit, fetchFromGitHub }: -let - # https://github.com/spwhitt/nix-zsh-completions/pull/2 - nix-zsh-completions = fetchFromGitHub { - owner = "garbas"; - repo = "nix-zsh-completions"; - rev = "9b7d216ec095ccee541ebfa5f04249aa2964d054"; - sha256 = "1pvmfcqdvdi3nc1jm72f54mwf06yrmlq31pqw6b5fczawcz02jrz"; - }; -in stdenv.mkDerivation rec { - rev = "4f19700919c8ebbaf75755fc0d03716d13183f49"; - name = "zsh-prezto-2015-03-03_rev${builtins.substring 0 7 rev}"; +stdenv.mkDerivation rec { + name = "zsh-prezto-2017-12-03"; src = fetchgit { url = "https://github.com/sorin-ionescu/prezto"; - inherit rev; - sha256 = "17mql9mb7zbf8q1nvnci60yrmz5bl9q964i8dv4shz8b42861cdg"; + rev = "029414581e54f5b63156f81acd0d377e8eb78883"; + sha256 = "0crrj2nq0wcv5in8qimnkca2an760aqald13vq09s5kbwwc9rs1f"; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - url = "https://github.com/sorin-ionescu/prezto/pull/1028.patch"; - sha256 = "0yrj72s1hiaq13374xa82hxdig4s0kvqjn9apkmw0h7kzggxjfn3"; - }) - ]; buildPhase = '' sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh @@ -32,8 +17,7 @@ in stdenv.mkDerivation rec { sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh ''; installPhase = '' - mkdir -p $out/modules/nix - cp ${nix-zsh-completions}/* $out/modules/nix -R + mkdir -p $out cp ./* $out/ -R ''; meta = with stdenv.lib; { diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1a55b06ef367..f7d2c49a66d6 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -74,8 +74,7 @@ rec { }; in stdenv // { mkDerivation = - { buildInputs ? [], nativeBuildInputs ? [] - , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] + { nativeBuildInputs ? [] , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false , ... } @ args: @@ -98,14 +97,6 @@ rec { ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook ; - # Cross-linking dynamic libraries, every buildInput should - # be propagated because ld needs the -rpath-link to find - # any library needed to link the program dynamically at - # loader time. ld(1) explains it. - buildInputs = []; - propagatedBuildInputs = propagatedBuildInputs ++ buildInputs; - propagatedNativeBuildInputs = propagatedNativeBuildInputs; - crossConfig = hostPlatform.config; } // args.crossAttrs or {}); }; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 89c903b04a04..2542d2428859 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -58,12 +58,45 @@ in rec { extraPreHook ? "", extraNativeBuildInputs, extraBuildInputs, + libcxx, allowedRequisites ? null}: let + buildPackages = lib.optionalAttrs (last ? stdenv) { + inherit (last) stdenv; + }; + + coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; + gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; + + bintools = import ../../build-support/bintools-wrapper { + inherit shell; + inherit (last) stdenvNoCC; + + nativeTools = false; + nativeLibc = false; + inherit buildPackages coreutils gnugrep; + libc = last.pkgs.darwin.Libsystem; + bintools = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; + }; + + cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { + inherit shell; + inherit (last) stdenvNoCC; + + extraPackages = lib.optional (libcxx != null) libcxx; + + nativeTools = false; + nativeLibc = false; + inherit buildPackages coreutils gnugrep bintools; + libc = last.pkgs.darwin.Libsystem; + isClang = true; + cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; + }; + thisStdenv = import ../generic { inherit config shell extraNativeBuildInputs extraBuildInputs; allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [ - thisStdenv.cc.expand-response-params + cc.expand-response-params cc.bintools ]; name = "stdenv-darwin-boot-${toString step}"; @@ -72,24 +105,9 @@ in rec { hostPlatform = localSystem; targetPlatform = localSystem; - cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { - inherit shell; - inherit (last) stdenvNoCC; + inherit cc; - nativeTools = false; - nativeLibc = false; - buildPackages = lib.optionalAttrs (last ? stdenv) { - inherit (last) stdenv; - }; - libc = last.pkgs.darwin.Libsystem; - isClang = true; - cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; - binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; - coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; - gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; - }; - - preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' + preHook = lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. dontPatchShebangs=1 @@ -161,6 +179,7 @@ in rec { extraNativeBuildInputs = []; extraBuildInputs = []; + libcxx = null; }; stage1 = prevStage: let @@ -168,7 +187,8 @@ in rec { in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; extraNativeBuildInputs = []; - extraBuildInputs = [ pkgs.libcxx ]; + extraBuildInputs = [ ]; + libcxx = pkgs.libcxx; allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ]; @@ -195,7 +215,8 @@ in rec { ''; extraNativeBuildInputs = [ pkgs.xz ]; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs.libcxx; allowedRequisites = [ bootstrapTools ] ++ @@ -227,7 +248,8 @@ in rec { # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first. extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs.libcxx; extraPreHook = '' export PATH=${pkgs.bash}/bin:$PATH @@ -262,7 +284,9 @@ in rec { in with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs.libcxx; + extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; @@ -328,13 +352,15 @@ in rec { buildPackages = { inherit (prevStage) stdenv; }; - inherit (pkgs) coreutils binutils gnugrep; - cc = pkgs.llvmPackages.clang-unwrapped; - libc = pkgs.darwin.Libsystem; + inherit (pkgs) coreutils gnugrep; + cc = pkgs.llvmPackages.clang-unwrapped; + bintools = pkgs.darwin.binutils; + libc = pkgs.darwin.Libsystem; + extraPackages = [ pkgs.libcxx ]; }; extraNativeBuildInputs = []; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; extraAttrs = { inherit platform bootstrapTools; @@ -349,8 +375,8 @@ in rec { xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk - gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out - binutils gettext + gnugrep llvmPackages.clang-unwrapped patch pcre.out gettext + binutils-raw.bintools binutils binutils.bintools cc.expand-response-params ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools ICU libiconv locale diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 5d5a3a81d44b..6fb37f249144 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -15,6 +15,9 @@ in rec { # Avoid debugging larger changes for now. bzip2_ = bzip2.override (args: { linkStatic = true; }); + # Avoid messing with libkrb5. + curl_ = curl.override (args: { gssSupport = false; }); + build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; @@ -60,8 +63,8 @@ in rec { # This used to be in-nixpkgs, but now is in the bundle # because I can't be bothered to make it partially static - cp ${curl.bin}/bin/curl $out/bin - cp -d ${curl.out}/lib/libcurl*.dylib $out/lib + cp ${curl_.bin}/bin/curl $out/bin + cp -d ${curl_.out}/lib/libcurl*.dylib $out/lib cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib cp -d ${openssl.out}/lib/*.dylib $out/lib diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 8544d932f81c..6ae6e646e989 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -64,7 +64,7 @@ let !allowUnfreePredicate attrs; allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []); - allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x; + allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x; hasAllowedInsecure = attrs: (attrs.meta.knownVulnerabilities or []) == [] || @@ -125,18 +125,25 @@ let ''; - throwEvalHelp = { reason , errormsg ? "" }: - throw ('' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + handleEvalIssue = { reason , errormsg ? "" }: + let + msg = '' + Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + + '' + (builtins.getAttr reason remediation) attrs; + + handler = if config ? "handleEvalIssue" + then config.handleEvalIssue reason + else throw; + in handler msg; - '' + ((builtins.getAttr reason remediation) attrs)); metaTypes = with lib.types; rec { # These keys are documented description = str; longDescription = str; branch = str; - homepage = str; + homepage = either (listOf str) str; downloadPage = str; license = either (listOf lib.types.attrs) (either lib.types.attrs str); maintainers = listOf str; @@ -146,6 +153,7 @@ let broken = bool; # Weirder stuff that doesn't appear in the documentation? + knownVulnerabilities = listOf str; version = str; tag = str; updateWalker = bool; @@ -154,15 +162,16 @@ let position = str; repositories = attrsOf str; isBuildPythonPackage = platforms; - schedulingPriority = str; + schedulingPriority = int; downloadURLRegexp = str; isFcitxEngine = bool; isIbusEngine = bool; + isGutenprint = bool; }; checkMetaAttr = k: v: if metaTypes?${k} then - if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" + if metaTypes.${k}.check v then null else "key '${k}' has a value ${toString v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; @@ -191,7 +200,7 @@ let validityCondition = let v = checkValidity attrs; in if !v.valid - then throwEvalHelp (removeAttrs v ["valid"]) + then handleEvalIssue (removeAttrs v ["valid"]) else true; in diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index eb8545c6999e..396ed553999d 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -14,12 +14,29 @@ rec { mkDerivation = { name ? "" - , nativeBuildInputs ? [] - , buildInputs ? [] + # These types of dependencies are all exhaustively documented in + # the "Specifying Dependencies" section of the "Standard + # Environment" chapter of the Nixpkgs manual. - , propagatedNativeBuildInputs ? [] - , propagatedBuildInputs ? [] + # TODO(@Ericson2314): Stop using legacy dep attribute names + # host offset -> target offset + , depsBuildBuild ? [] # -1 -> -1 + , depsBuildBuildPropagated ? [] # -1 -> -1 + , nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name + , propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name + , depsBuildTarget ? [] # -1 -> 1 + , depsBuildTargetPropagated ? [] # -1 -> 1 + + , depsHostHost ? [] # 0 -> 0 + , depsHostHostPropagated ? [] # 0 -> 0 + , buildInputs ? [] # 0 -> 1 N.B. Legacy name + , propagatedBuildInputs ? [] # 0 -> 1 N.B. Legacy name + + , depsTargetTarget ? [] # 1 -> 1 + , depsTargetTargetPropagated ? [] # 1 -> 1 + + # Configure Phase , configureFlags ? [] , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. @@ -28,6 +45,13 @@ rec { configurePlatforms ? lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "build" "host" ] + + # Check phase + , doCheck ? false + + # InstallCheck phase + , doInstallCheck ? false + , crossConfig ? null , meta ? {} , passthru ? {} @@ -44,6 +68,7 @@ rec { , hardeningEnable ? [] , hardeningDisable ? [] + , ... } @ attrs: # TODO(@Ericson2314): Make this more modular, and not O(n^2). @@ -56,15 +81,35 @@ rec { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; }) else let - dependencies = map lib.chooseDevOutputs [ - (map (drv: drv.nativeDrv or drv) nativeBuildInputs - ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh - ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh) - (map (drv: drv.crossDrv or drv) buildInputs) + dependencies = map (map lib.chooseDevOutputs) [ + [ + (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) + (map (drv: drv.nativeDrv or drv) nativeBuildInputs + ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh + ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh) + (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) + ] + [ + (map (drv: drv.__spliced.hostHost or drv) depsHostHost) + (map (drv: drv.crossDrv or drv) buildInputs) + ] + [ + (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) + ] ]; - propagatedDependencies = map lib.chooseDevOutputs [ - (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) - (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + propagatedDependencies = map (map lib.chooseDevOutputs) [ + [ + (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated) + (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) + (map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated) + ] + [ + (map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated) + (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + ] + [ + (map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated) + ] ]; outputs' = @@ -105,11 +150,19 @@ rec { userHook = config.stdenv.userHook or null; __ignoreNulls = true; - nativeBuildInputs = lib.elemAt dependencies 0; - buildInputs = lib.elemAt dependencies 1; + depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; + nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; + depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; + depsHostBuild = lib.elemAt (lib.elemAt dependencies 1) 0; + buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; + depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; - propagatedNativeBuildInputs = lib.elemAt propagatedDependencies 0; - propagatedBuildInputs = lib.elemAt propagatedDependencies 1; + depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; + propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; + depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; + depsHostBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; + propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; + depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck configureFlags = let inherit (lib) optional elem; in @@ -134,9 +187,15 @@ rec { "/bin/sh" ]; __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; - } // (if outputs' != [ "out" ] then { + } // lib.optionalAttrs (outputs' != [ "out" ]) { outputs = outputs'; - } else { })); + } // lib.optionalAttrs (attrs ? doCheck) { + # TODO(@Ericson2314): Make unconditional / resolve #33599 + doCheck = doCheck && (stdenv.hostPlatform == stdenv.buildPlatform); + } // lib.optionalAttrs (attrs ? doInstallCheck) { + # TODO(@Ericson2314): Make unconditional / resolve #33599 + doInstallCheck = doInstallCheck && (stdenv.hostPlatform == stdenv.buildPlatform); + }); # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 686ed68cedeb..d2c67cce81a2 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -300,11 +300,83 @@ runHook preHook runHook addInputsHook -# Recursively find all build inputs. +# Package accumulators + +# shellcheck disable=SC2034 +declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget +declare -a pkgsHostHost pkgsHostTarget +declare -a pkgsTargetTarget + +declare -ra pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget) +declare -ra pkgHostAccumVars=(pkgsHostHost pkgsHostTarget) +declare -ra pkgTargetAccumVars=(pkgsTargetTarget) + +declare -ra pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars) + + +# Hooks + +declare -a envBuildBuildHooks envBuildHostHooks envBuildTargetHooks +declare -a envHostHostHooks envHostTargetHooks +declare -a envTargetTargetHooks + +declare -ra pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook) +declare -ra pkgHostHookVars=(envHostHostHook envHostTargetHook) +declare -ra pkgTargetHookVars=(envTargetTargetHook) + +declare -ra pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) + +# Add env hooks for all sorts of deps with the specified host offset. +addEnvHooks() { + local depHostOffset="$1" + shift + local pkgHookVarsSlice="${pkgHookVarVars[$depHostOffset + 1]}[@]" + local pkgHookVar + for pkgHookVar in "${!pkgHookVarsSlice}"; do + eval "${pkgHookVar}s"'+=("$@")' + done +} + + +# Propagated dep files + +declare -ra propagatedBuildDepFiles=( + propagated-build-build-deps + propagated-native-build-inputs # Legacy name for back-compat + propagated-build-target-deps +) +declare -ra propagatedHostDepFiles=( + propagated-host-host-deps + propagated-build-inputs # Legacy name for back-compat +) +declare -ra propagatedTargetDepFiles=( + propagated-target-target-deps +) +declare -ra propagatedDepFilesVars=( + propagatedBuildDepFiles + propagatedHostDepFiles + propagatedTargetDepFiles +) + +# Platform offsets: build = -1, host = 0, target = 1 +declare -ra allPlatOffsets=(-1 0 1) + + +# Mutually-recursively find all build inputs. See the dependency section of the +# stdenv chapter of the Nixpkgs manual for the specification this algorithm +# implements. findInputs() { - local pkg="$1"; shift - local var="$1"; shift - local propagatedBuildInputsFiles=("$@") + local -r pkg="$1" + local -ri hostOffset="$2" + local -ri targetOffset="$3" + + # Sanity check + (( "$hostOffset" <= "$targetOffset" )) || exit -1 + + local varVar="${pkgAccumVarVars[$hostOffset + 1]}" + local varRef="$varVar[\$targetOffset - \$hostOffset]" + local var="${!varRef}" + unset -v varVar varRef # TODO(@Ericson2314): Restore using associative array once Darwin # nix-shell doesn't use impure bash. This should replace the O(n) @@ -324,21 +396,106 @@ findInputs() { exit 1 fi - local file - for file in "${propagatedBuildInputsFiles[@]}"; do - file="$pkg/nix-support/$file" - [[ -f "$file" ]] || continue + # The current package's host and target offset together + # provide a <=-preserving homomorphism from the relative + # offsets to current offset + function mapOffset() { + local -ri inputOffset="$1" + if (( "$inputOffset" <= 0 )); then + local -ri outputOffset="$inputOffset + $hostOffset" + else + local -ri outputOffset="$inputOffset - 1 + $targetOffset" + fi + echo "$outputOffset" + } - local pkgNext - for pkgNext in $(< "$file"); do - findInputs "$pkgNext" "$var" "${propagatedBuildInputsFiles[@]}" + # Host offset relative to that of the package whose immediate + # dependencies we are currently exploring. + local -i relHostOffset + for relHostOffset in "${allPlatOffsets[@]}"; do + # `+ 1` so we start at 0 for valid index + local files="${propagatedDepFilesVars[$relHostOffset + 1]}" + + # Host offset relative to the package currently being + # built---as absolute an offset as will be used. + local -i hostOffsetNext + hostOffsetNext="$(mapOffset relHostOffset)" + + # Ensure we're in bounds relative to the package currently + # being built. + [[ "${allPlatOffsets[*]}" = *"$hostOffsetNext"* ]] || continue + + # Target offset relative to the *host* offset of the package + # whose immediate dependencies we are currently exploring. + local -i relTargetOffset + for relTargetOffset in "${allPlatOffsets[@]}"; do + (( "$relHostOffset" <= "$relTargetOffset" )) || continue + + local fileRef="${files}[$relTargetOffset - $relHostOffset]" + local file="${!fileRef}" + unset -v fileRef + + # Target offset relative to the package currently being + # built. + local -i targetOffsetNext + targetOffsetNext="$(mapOffset relTargetOffset)" + + # Once again, ensure we're in bounds relative to the + # package currently being built. + [[ "${allPlatOffsets[*]}" = *"$targetOffsetNext"* ]] || continue + + [[ -f "$pkg/nix-support/$file" ]] || continue + + local pkgNext + for pkgNext in $(< "$pkg/nix-support/$file"); do + findInputs "$pkgNext" "$hostOffsetNext" "$targetOffsetNext" + done done done } +# Make sure all are at least defined as empty +: ${depsBuildBuild=} ${depsBuildBuildPropagated=} +: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=} +: ${depsBuildTarget=} ${depsBuildTargetPropagated=} +: ${depsHostHost=} ${depsHostHostPropagated=} +: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=} +: ${depsTargetTarget=} ${depsTargetTargetPropagated=} + +for pkg in $depsBuildBuild $depsBuildBuildPropagated; do + findInputs "$pkg" -1 -1 +done +for pkg in $nativeBuildInputs $propagatedNativeBuildInputs; do + findInputs "$pkg" -1 0 +done +for pkg in $depsBuildTarget $depsBuildTargetPropagated; do + findInputs "$pkg" -1 1 +done +for pkg in $depsHostHost $depsHostHostPropagated; do + findInputs "$pkg" 0 0 +done +for pkg in $buildInputs $propagatedBuildInputs ; do + findInputs "$pkg" 0 1 +done +for pkg in $depsTargetTarget $depsTargetTargetPropagated; do + findInputs "$pkg" 1 1 +done +# Default inputs must be processed last +for pkg in $defaultNativeBuildInputs; do + findInputs "$pkg" -1 0 +done +for pkg in $defaultBuildInputs; do + findInputs "$pkg" 0 1 +done + # Add package to the future PATH and run setup hooks activatePackage() { local pkg="$1" + local -ri hostOffset="$2" + local -ri targetOffset="$3" + + # Sanity check + (( "$hostOffset" <= "$targetOffset" )) || exit -1 if [ -f "$pkg" ]; then local oldOpts="$(shopt -po nounset)" @@ -347,11 +504,18 @@ activatePackage() { eval "$oldOpts" fi - if [ -d "$pkg/bin" ]; then + # Only dependencies whose host platform is guaranteed to match the + # build platform are included here. That would be `depsBuild*`, + # and legacy `nativeBuildInputs`, in general. If we aren't cross + # compiling, however, everything can be put on the PATH. To ease + # the transition, we do include everything in thatcase. + # + # TODO(@Ericson2314): Don't special-case native compilation + if [[ ( -z "${crossConfig-}" || "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then addToSearchPath _PATH "$pkg/bin" fi - if [ -f "$pkg/nix-support/setup-hook" ]; then + if [[ -f "$pkg/nix-support/setup-hook" ]]; then local oldOpts="$(shopt -po nounset)" set +u source "$pkg/nix-support/setup-hook" @@ -359,67 +523,72 @@ activatePackage() { fi } -declare -a nativePkgs crossPkgs -if [ -z "${crossConfig:-}" ]; then - # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs) - # are handled identically to nativeBuildInputs - for i in ${nativeBuildInputs:-} ${buildInputs:-} \ - ${defaultNativeBuildInputs:-} ${defaultBuildInputs:-} \ - ${propagatedNativeBuildInputs:-} ${propagatedBuildInputs:-}; do - findInputs "$i" nativePkgs propagated-native-build-inputs propagated-build-inputs - done -else - for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do - findInputs "$i" nativePkgs propagated-native-build-inputs - done - for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do - findInputs "$i" crossPkgs propagated-build-inputs - done -fi +_activatePkgs() { + local -i hostOffset targetOffset + local pkg -for i in ${nativePkgs+"${nativePkgs[@]}"} ${crossPkgs+"${crossPkgs[@]}"}; do - activatePackage "$i" -done + for hostOffset in "${allPlatOffsets[@]}"; do + local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}" + for targetOffset in "${allPlatOffsets[@]}"; do + (( "$hostOffset" <= "$targetOffset" )) || continue + local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]" + local pkgsSlice="${!pkgsRef}[@]" + for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do + activatePackage "$pkg" "$hostOffset" "$targetOffset" + done + done + done +} +# Run the package setup hooks and build _PATH +_activatePkgs # Set the relevant environment variables to point to the build inputs # found above. # -# These `depOffset`s tell the env hook what sort of dependency -# (ignoring propagatedness) is being passed to the env hook. In a real -# language, we'd append a closure with this information to the -# relevant env hook array, but bash doesn't have closures, so it's -# easier to just pass this in. +# These `depOffset`s, beyond indexing the arrays, also tell the env +# hook what sort of dependency (ignoring propagatedness) is being +# passed to the env hook. In a real language, we'd append a closure +# with this information to the relevant env hook array, but bash +# doesn't have closures, so it's easier to just pass this in. +_addToEnv() { + local -i depHostOffset depTargetOffset + local pkg -_addToNativeEnv() { - local pkg="$1" - if [[ -n "${crossConfig:-}" ]]; then - local -i depOffset=-1 - else - local -i depOffset=0 - fi - - # Run the package-specific hooks set by the setup-hook scripts. - runHook envHook "$pkg" + for depHostOffset in "${allPlatOffsets[@]}"; do + local hookVar="${pkgHookVarVars[$depHostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}" + for depTargetOffset in "${allPlatOffsets[@]}"; do + (( "$depHostOffset" <= "$depTargetOffset" )) || continue + local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" + if [[ -z "${crossConfig-}" ]]; then + # Apply environment hooks to all packages during native + # compilation to ease the transition. + # + # TODO(@Ericson2314): Don't special-case native compilation + for pkg in \ + ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \ + ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \ + ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \ + ${pkgsHostHost+"${pkgsHostHost[@]}"} \ + ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ + ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} + do + runHook "${!hookRef}" "$pkg" + done + else + local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]" + local pkgsSlice="${!pkgsRef}[@]" + for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do + runHook "${!hookRef}" "$pkg" + done + fi + done + done } -# Old bash empty array hack -for i in ${nativePkgs+"${nativePkgs[@]}"}; do - _addToNativeEnv "$i" -done - -_addToCrossEnv() { - local pkg="$1" - local -i depOffset=0 - - # Run the package-specific hooks set by the setup-hook scripts. - runHook crossEnvHook "$pkg" -} - -# Old bash empty array hack -for i in ${crossPkgs+"${crossPkgs[@]}"}; do - _addToCrossEnv "$i" -done +# Run the package-specific hooks set by the setup-hook scripts. +_addToEnv _addRpathPrefix "$out" @@ -882,6 +1051,7 @@ installPhase() { # propagated-build-inputs. fixupPhase() { # Make sure everything is writable so "strip" et al. work. + local output for output in $outputs; do if [ -e "${!output}" ]; then chmod -R u+w "${!output}"; fi done @@ -895,19 +1065,35 @@ fixupPhase() { done - # Propagate build inputs and setup hook into the development output. + # Propagate dependencies & setup hook into the development output. + declare -ra flatVars=( + # Build + depsBuildBuildPropagated + propagatedNativeBuildInputs + depsBuildTargetPropagated + # Host + depsHostHostPropagated + propagatedBuildInputs + # Target + depsTargetTargetPropagated + ) + declare -ra flatFiles=( + "${propagatedBuildDepFiles[@]}" + "${propagatedHostDepFiles[@]}" + "${propagatedTargetDepFiles[@]}" + ) + + local propagatedInputsIndex + for propagatedInputsIndex in "${!flatVars[@]}"; do + local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]" + local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}" + + [[ "${!propagatedInputsSlice}" ]] || continue - if [ -n "${propagatedBuildInputs:-}" ]; then mkdir -p "${!outputDev}/nix-support" # shellcheck disable=SC2086 - printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs" - fi - - if [ -n "${propagatedNativeBuildInputs:-}" ]; then - mkdir -p "${!outputDev}/nix-support" - # shellcheck disable=SC2086 - printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs" - fi + printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile" + done if [ -n "${setupHook:-}" ]; then diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index a114ab609e6c..858323e5cc56 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -80,9 +80,10 @@ let inherit (prevStage) stdenv; }; cc = prevStage.gcc-unwrapped; + bintools = prevStage.binutils; isGNU = true; libc = prevStage.glibc; - inherit (prevStage) binutils coreutils gnugrep; + inherit (prevStage) coreutils gnugrep; name = name; stdenvNoCC = prevStage.ccWrapperStdenv; }; @@ -143,7 +144,15 @@ in ''; }; gcc-unwrapped = bootstrapTools; - binutils = bootstrapTools; + binutils = import ../../build-support/bintools-wrapper { + nativeTools = false; + nativeLibc = false; + buildPackages = { }; + libc = self.glibc; + inherit (self) stdenvNoCC coreutils gnugrep; + bintools = bootstrapTools; + name = "bootstrap-binutils-wrapper"; + }; coreutils = bootstrapTools; gnugrep = bootstrapTools; }; @@ -165,7 +174,7 @@ in # Rebuild binutils to use from stage2 onwards. overrides = self: super: { - binutils = super.binutils.override { gold = false; }; + binutils = super.binutils_nogold; inherit (prevStage) ccWrapperStdenv glibc gcc-unwrapped coreutils gnugrep; @@ -188,9 +197,14 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - binutils gcc-unwrapped coreutils gnugrep + gcc-unwrapped coreutils gnugrep perl paxctl gnum4 bison; # This also contains the full, dynamically linked, final Glibc. + binutils = prevStage.binutils.override { + # Rewrap the binutils with the new glibc, so both the next + # stage's wrappers use it. + libc = self.glibc; + }; }; }) @@ -235,6 +249,15 @@ in # other purposes (binutils and top-level pkgs) too. inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; + binutils = super.binutils.override { + # Don't use stdenv's shell but our own + shell = self.bash + "/bin/bash"; + # Build expand-response-params with last stage like below + buildPackages = { + inherit (prevStage) stdenv; + }; + }; + gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; @@ -243,8 +266,9 @@ in inherit (prevStage) stdenv; }; cc = prevStage.gcc-unwrapped; + bintools = self.binutils; libc = self.glibc; - inherit (self) stdenvNoCC binutils coreutils gnugrep; + inherit (self) stdenvNoCC coreutils gnugrep; name = ""; shell = self.bash + "/bin/bash"; }; @@ -299,8 +323,8 @@ in allowedRequisites = with prevStage; with lib; # Simple executable tools concatMap (p: [ (getBin p) (getLib p) ]) - [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk - gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl + [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils + gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl ] # Library dependencies ++ map getLib ( @@ -310,7 +334,7 @@ in # More complicated cases ++ [ glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders - gcc gcc.cc gcc.cc.lib gcc.expand-response-params + binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] ++ lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; @@ -322,7 +346,7 @@ in attr acl paxctl zlib pcre; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. - inherit (prevStage) binutils; + inherit (prevStage) binutils binutils-raw; gcc = cc; }; }; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 8a1f7445b30b..ac1d57a22752 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -1,232 +1,16 @@ {system ? builtins.currentSystem}: -let buildFor = toolsArch: ( - let - lib = import ../../../lib; - pkgsFun = import ../../..; - - inherit (lib.systems.examples) - sheevaplug raspberryPi armv7l-hf-multiplatform - aarch64-multiplatform scaleway-c1 pogoplug4; - - selectedCrossSystem = - if toolsArch == "armv5tel" then sheevaplug else - if toolsArch == "scaleway" then scaleway-c1 else - if toolsArch == "pogoplug4" then pogoplug4 else - if toolsArch == "armv6l" then raspberryPi else - if toolsArch == "armv7l" then armv7l-hf-multiplatform else - if toolsArch == "aarch64" then aarch64-multiplatform else null; - - pkgs = pkgsFun ({ inherit system; crossSystem = selectedCrossSystem; }); - - glibc = pkgs.libcCross; - bash = pkgs.bash; - findutils = pkgs.findutils; - diffutils = pkgs.diffutils; - gnused = pkgs.gnused; - gnugrep = pkgs.gnugrep; - gawk = pkgs.gawk; - gzip = pkgs.gzip; - bzip2 = pkgs.bzip2; - gnumake = pkgs.gnumake; - patch = pkgs.patch; - patchelf = pkgs.patchelf; - gcc = pkgs.gcc.cc; - gmpxx = pkgs.gmpxx; - mpfr = pkgs.mpfr; - zlib = pkgs.zlib; - libmpc = pkgs.libmpc; - binutils = pkgs.binutils; - libelf = pkgs.libelf; - - # Keep these versions in sync with the versions used in the current GCC! - isl = pkgs.isl_0_14; -in - -rec { - - - coreutilsMinimal = pkgs.coreutils.override (args: { - # We want coreutils without ACL/attr support. - aclSupport = false; - attrSupport = false; - # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks. - singleBinary = "symlinks"; - }); - - tarMinimal = pkgs.gnutar.override { acl = null; }; - - busyboxMinimal = pkgs.busybox.override { - useMusl = true; - enableStatic = true; - enableMinimal = true; - extraConfig = '' - CONFIG_ASH y - CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_TEST y - CONFIG_ASH_OPTIMIZE_FOR_SIZE y - CONFIG_MKDIR y - CONFIG_TAR y - CONFIG_UNXZ y - ''; + make = crossSystem: import ./make-bootstrap-tools.nix { + localSystem = { inherit system; }; + inherit crossSystem; }; - build = - - pkgs.stdenv.mkDerivation { - name = "stdenv-bootstrap-tools-cross"; - crossConfig = pkgs.hostPlatform.config; - - nativeBuildInputs = [ - pkgs.buildPackages.nukeReferences - pkgs.buildPackages.cpio - ]; - - buildCommand = '' - set -x - mkdir -p $out/bin $out/lib $out/libexec - - # Copy what we need of Glibc. - cp -d ${glibc.out}/lib/ld-*.so* $out/lib - cp -d ${glibc.out}/lib/libc*.so* $out/lib - cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib - cp -d ${glibc.out}/lib/libm*.so* $out/lib - cp -d ${glibc.out}/lib/libdl*.so* $out/lib - cp -d ${glibc.out}/lib/librt*.so* $out/lib - cp -d ${glibc.out}/lib/libpthread*.so* $out/lib - cp -d ${glibc.out}/lib/libnsl*.so* $out/lib - cp -d ${glibc.out}/lib/libutil*.so* $out/lib - cp -d ${glibc.out}/lib/libnss*.so* $out/lib - cp -d ${glibc.out}/lib/libresolv*.so* $out/lib - cp -d ${glibc.out}/lib/crt?.o $out/lib - - cp -rL ${glibc.dev}/include $out - chmod -R u+w "$out" - - # glibc can contain linker scripts: find them, copy their deps, - # and get rid of absolute paths (nuke-refs would make them useless) - local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") - cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u) - for f in $lScripts; do - substituteInPlace "$f" --replace '${glibc.out}/lib/' "" - done - - # Hopefully we won't need these. - rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video - find $out/include -name .install -exec rm {} \; - find $out/include -name ..install.cmd -exec rm {} \; - mv $out/include $out/include-glibc - - # Copy coreutils, bash, etc. - cp ${coreutilsMinimal}/bin/* $out/bin - (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - - cp ${bash}/bin/bash $out/bin - cp ${findutils}/bin/find $out/bin - cp ${findutils}/bin/xargs $out/bin - cp -d ${diffutils}/bin/* $out/bin - cp -d ${gnused}/bin/* $out/bin - cp -d ${gnugrep}/bin/grep $out/bin - cp ${gawk}/bin/gawk $out/bin - cp -d ${gawk}/bin/awk $out/bin - cp ${tarMinimal}/bin/tar $out/bin - cp ${gzip}/bin/gzip $out/bin - cp ${bzip2.bin}/bin/bzip2 $out/bin - cp -d ${gnumake}/bin/* $out/bin - cp -d ${patch}/bin/* $out/bin - cp ${patchelf}/bin/* $out/bin - - cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep - - # Copy what we need of GCC. - cp -d ${gcc.out}/bin/gcc $out/bin - cp -d ${gcc.out}/bin/cpp $out/bin - cp -d ${gcc.out}/bin/g++ $out/bin - cp -d ${gcc.lib}/lib*/libgcc_s.so* $out/lib - cp -d ${gcc.lib}/lib*/libstdc++.so* $out/lib - cp -rd ${gcc.out}/lib/gcc $out/lib - chmod -R u+w $out/lib - rm -f $out/lib/gcc/*/*/include*/linux - rm -f $out/lib/gcc/*/*/include*/sound - rm -rf $out/lib/gcc/*/*/include*/root - rm -f $out/lib/gcc/*/*/include-fixed/asm - rm -rf $out/lib/gcc/*/*/plugin - #rm -f $out/lib/gcc/*/*/*.a - cp -rd ${gcc.out}/libexec/* $out/libexec - chmod -R u+w $out/libexec - rm -rf $out/libexec/gcc/*/*/plugin - mkdir $out/include - cp -rd ${gcc.out}/include/c++ $out/include - chmod -R u+w $out/include - rm -rf $out/include/c++/*/ext/pb_ds - rm -rf $out/include/c++/*/ext/parallel - - cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib - cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib - cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib - cp -d ${zlib.out}/lib/libz.so* $out/lib - cp -d ${libelf}/lib/libelf.so* $out/lib - - # These needed for cross but not native tools because the stdenv - # GCC has certain things built in statically. See - # pkgs/stdenv/linux/default.nix for the details. - cp -d ${isl}/lib/libisl*.so* $out/lib - - cp -d ${bzip2.out}/lib/libbz2.so* $out/lib - - # Copy binutils. - for i in as ld ar ranlib nm strip readelf objdump; do - cp ${binutils.out}/bin/$i $out/bin - done - - chmod -R u+w $out - - # Strip executables even further. - for i in $out/bin/* $out/libexec/gcc/*/*/*; do - if test -x $i -a ! -L $i; then - chmod +w $i - $crossConfig-strip -s $i || true - fi - done - - nuke-refs $out/bin/* - nuke-refs $out/lib/* - nuke-refs $out/libexec/gcc/*/*/* - - mkdir $out/.pack - mv $out/* $out/.pack - mv $out/.pack $out/pack - - mkdir $out/on-server - tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . - cp ${busyboxMinimal}/bin/busybox $out/on-server - chmod u+w $out/on-server/busybox - nuke-refs $out/on-server/busybox - ''; # */ - - # The result should not contain any references (store paths) so - # that we can safely copy them out of the store and to other - # locations in the store. - allowedReferences = []; - }; - - dist = pkgs.stdenv.mkDerivation { - name = "stdenv-bootstrap-tools-cross"; - - buildCommand = '' - mkdir -p $out/nix-support - echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products - echo "file busybox ${build}/on-server/busybox" >> $out/nix-support/hydra-build-products - ''; - }; -} - -); in { - armv5tel = buildFor "armv5tel"; - armv6l = buildFor "armv6l"; - armv7l = buildFor "armv7l"; - aarch64 = buildFor "aarch64"; - scaleway = buildFor "scaleway"; - pogoplug4 = buildFor "pogoplug4"; +in with (import ../../../lib).systems.examples; { + armv5tel = make sheevaplug; + scaleway = make scaleway-c1; + pogoplug4 = make pogoplug4; + armv6l = make raspberryPi; + armv7l = make armv7l-hf-multiplatform; + aarch64 = make aarch64-multiplatform; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 52eea41bdbd7..f51a39d5820d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,8 +1,13 @@ -{ system ? builtins.currentSystem }: +{ localSystem ? { system = builtins.currentSystem; } +, crossSystem ? null +}: -with import ../../.. {inherit system;}; - -rec { +let + pkgs = import ../../.. { inherit localSystem crossSystem; }; + glibc = if pkgs.hostPlatform != pkgs.buildPlatform + then pkgs.glibcCross + else pkgs.glibc; +in with pkgs; rec { coreutilsMinimal = coreutils.override (args: { @@ -35,7 +40,7 @@ rec { stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; - buildInputs = [nukeReferences cpio]; + nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]; buildCommand = '' set -x @@ -118,15 +123,22 @@ rec { cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib - cp -d ${libmpc}/lib/libmpc*.so* $out/lib + cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + '' + lib.optionalString (hostPlatform != buildPlatform) '' + # These needed for cross but not native tools because the stdenv + # GCC has certain things built in statically. See + # pkgs/stdenv/linux/default.nix for the details. + cp -d ${isl_0_14.out}/lib/libisl*.so* $out/lib + + '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do - cp ${binutils.out}/bin/$i $out/bin + cp ${binutils.bintools.out}/bin/$i $out/bin done chmod -R u+w $out @@ -135,13 +147,14 @@ rec { for i in $out/bin/* $out/libexec/gcc/*/*/*; do if test -x $i -a ! -L $i; then chmod +w $i - strip -s $i || true + $STRIP -s $i || true fi done nuke-refs $out/bin/* nuke-refs $out/lib/* nuke-refs $out/libexec/gcc/*/*/* + nuke-refs $out/lib/gcc/*/*/* mkdir $out/.pack mv $out/* $out/.pack @@ -176,11 +189,14 @@ rec { bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; }; - bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; + bootstrapTools = import ./bootstrap-tools { + inherit (hostPlatform) system; + inherit bootstrapFiles; + }; test = derivation { name = "test-bootstrap-tools"; - inherit system; + inherit (hostPlatform) system; builder = bootstrapFiles.busybox; args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; diff --git a/pkgs/test/cc-wrapper/multilib.nix b/pkgs/test/cc-wrapper/multilib.nix new file mode 100644 index 000000000000..5ea50b5eb268 --- /dev/null +++ b/pkgs/test/cc-wrapper/multilib.nix @@ -0,0 +1,37 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "cc-multilib-test"; + + # XXX: "depend" on cc-wrapper test? + + # TODO: Have tests report pointer size or something; ensure they are what we asked for + buildCommand = '' + NIX_DEBUG=1 $CC -v + NIX_DEBUG=1 $CXX -v + + printf "checking whether compiler builds valid C binaries... " >&2 + $CC -o cc-check ${./cc-main.c} + ./cc-check + + printf "checking whether compiler builds valid 32bit C binaries... " >&2 + $CC -m32 -o c32-check ${./cc-main.c} + ./c32-check + + printf "checking whether compiler builds valid 64bit C binaries... " >&2 + $CC -m64 -o c64-check ${./cc-main.c} + ./c64-check + + printf "checking whether compiler builds valid 32bit C++ binaries... " >&2 + $CXX -m32 -o cxx32-check ${./cxx-main.cc} + ./cxx32-check + + printf "checking whether compiler builds valid 64bit C++ binaries... " >&2 + $CXX -m64 -o cxx64-check ${./cxx-main.cc} + ./cxx64-check + + touch $out + ''; + + meta.platforms = stdenv.lib.platforms.x86_64; +} diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix index 51e8ae53736c..73b359ffe6a4 100644 --- a/pkgs/test/macos-sierra-shared/default.nix +++ b/pkgs/test/macos-sierra-shared/default.nix @@ -3,7 +3,7 @@ let makeBigExe = stdenv: prefix: rec { - count = 500; + count = 320; sillyLibs = lib.genList (i: stdenv.mkDerivation rec { name = "${prefix}-fluff-${toString i}"; @@ -75,13 +75,14 @@ in stdenvNoCC.mkDerivation { buildInputs = [ good.finalExe bad.finalExe ]; # TODO(@Ericson2314): Be impure or require exact MacOS version of builder? buildCommand = '' - if bad-asdf - then echo "bad-asdf can succeed on non-sierra, OK" >&2 + if bad-asdf &> /dev/null + then echo "WARNING: bad-asdf did not fail, not running on sierra?" >&2 else echo "bad-asdf should fail on sierra, OK" >&2 fi # Must succeed on all supported MacOS versions good-asdf + echo "good-asdf should succeed on sierra, OK" touch $out ''; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 2245f03ec7fe..669da86621fd 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Simple X background setter inspired by imlibsetroot and feh"; homepage = https://github.com/ttzhou/setroot; license = licenses.gpl3Plus; - maintainers = maintainers.vyp; + maintainers = [ maintainers.vyp ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 33a0deedafac..10b0dfff9bf8 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/sselp; + homepage = https://tools.suckless.org/sselp; description = "Prints the X selection to stdout, useful in scripts"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 717ad327c676..f71bcdef9f4f 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://portland.freedesktop.org/wiki/; + homepage = https://portland.freedesktop.org/wiki/; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 5eb1faafe2ef..93bbe1ce0bc5 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/vain/xpointerbarrier; description = "Create X11 pointer barriers around your working area"; license = stdenv.lib.licenses.mit; - maintainers = stdenv.lib.maintainers.xzfc; + maintainers = [ stdenv.lib.maintainers.xzfc ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index 6232e4ad95ba..b8b335bd6186 100644 --- a/pkgs/tools/admin/ansible/2.1.nix +++ b/pkgs/tools/admin/ansible/2.1.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchFromGitHub , pythonPackages , windowsSupport ? false }: @@ -10,9 +11,11 @@ let jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; name = "${old.pname}-${version}"; - src = old.src.override { - inherit version; - sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + src = fetchFromGitHub { + owner = "pallets"; + repo = "jinja"; + rev = version; + sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a"; }; }); in buildPythonPackage rec { @@ -36,7 +39,7 @@ in buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = [ - pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 02392d7ac89f..ccca64b86b64 100644 --- a/pkgs/tools/admin/ansible/2.2.nix +++ b/pkgs/tools/admin/ansible/2.2.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchFromGitHub , pythonPackages , windowsSupport ? false }: @@ -12,9 +13,11 @@ let jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; name = "${old.pname}-${version}"; - src = old.src.override { - inherit version; - sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + src = fetchFromGitHub { + owner = "pallets"; + repo = "jinja"; + rev = version; + sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a"; }; }); in buildPythonPackage rec { @@ -38,7 +41,7 @@ in buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = [ - pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix index 7330b7d0858b..b827bdcc9c31 100644 --- a/pkgs/tools/admin/ansible/2.3.nix +++ b/pkgs/tools/admin/ansible/2.3.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = with pythonPackages; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix index 9c8df647e593..4f90e80202e4 100644 --- a/pkgs/tools/admin/ansible/2.4.nix +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = with pythonPackages; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 8061cbfded80..b6c7270a4250 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -25,14 +25,13 @@ let }); in buildPythonPackage rec { - name = "${pname}-${version}"; pname = "awscli"; - version = "1.11.185"; + version = "1.14.17"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "18rskl6sla456z4hkq2gmmm03fqc4rqw5pfiqdyc7a2v9kljv4ah"; + sha256 = "456499acc41ab67671062a08e218a22aa1a1ff64ae531e694163d0371e8a1dd0"; }; # No tests included diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index b9852ed587c5..e70a7ba9b50c 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python2.pkgs; [ argparse boto - dns + dnspython ]; meta = with lib; { diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index dd88dd8c4ac2..babef61311e4 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.66.2) + fastlane (2.68.2) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -73,7 +73,7 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - highline (1.7.8) + highline (1.7.10) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 16179d9118b6..39f7be68255f 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12pwfz36l1ks84618g6y7l6s4pbb86ngr4fmg1dnxgj01h4m7dx6"; + sha256 = "1dgpr6rdg0bc8fxv0ysf4pw6p1by03jw8bwzqxkyai5fsl6hggpf"; type = "gem"; }; - version = "2.66.2"; + version = "2.68.2"; }; gh_inspector = { source = { @@ -171,10 +171,10 @@ highline = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; type = "gem"; }; - version = "1.7.8"; + version = "1.7.10"; }; http-cookie = { dependencies = ["domain_name"]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 6dec65892b0f..4588a6f7fb43 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,23 +19,23 @@ let sources = name: system: { i686-linux = { url = "${baseUrl}/${name}-linux-x86.tar.gz"; - sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp"; + sha256 = "127f98a25293d537d5a64d0df559d4053e6a8c77bbdc13566896ff7e6c2ceede"; }; x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g"; + sha256 = "7b0f037db60b6ebde89afd80ba7c96f036637dd5cba77201952d1137801d5060"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc"; + sha256 = "3cae8a7b021f3c9eaab6c0b59a1301eb7cda3a422e645b3b0c6ccfe89b1e0332"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "177.0.0"; + version = "182.0.0"; src = fetchurl (sources name stdenv.system); diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 5ba53c75371e..e4b206f54488 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-xorgcfg --disable-xprint --disable-static \ - --disable-composite --disable-xtrap --enable-xcsecurity \ + --enable-composite --disable-xtrap --enable-xcsecurity \ --disable-{a,c,m}fb \ --disable-xwayland \ --disable-config-dbus --disable-config-udev --disable-config-hal \ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ --with-xkb-output=$out/share/X11/xkb/compiled - make TIGERVNC_SRCDIR=`pwd`/../.. + make TIGERVNC_SRCDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES popd ''; diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix new file mode 100644 index 000000000000..0d983ad98ea1 --- /dev/null +++ b/pkgs/tools/admin/vncdo/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub +, pythonPackages +}: +pythonPackages.buildPythonPackage rec { + pname = "vncdo"; + version = "0.11.2"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "sibson"; + repo = "vncdotool"; + rev = "5c03a82dcb5a3bd9e8f741f8a8d0c1ce082f2834"; + sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh"; + }; + + propagatedBuildInputs = with pythonPackages; [ + pillow + twisted + pexpect + nose + ptyprocess + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/sibson/vncdotool; + description = "A command line VNC client and python library"; + license = licenses.mit; + maintainers = with maintainers; [ elitak ]; + platforms = with platforms; linux ++ darwin; + }; + +} diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 00de2c2ec462..77536a7ad30e 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE Compressed ROM filesystem with lzma"; - homepage = http://bisqwit.iki.fi/source/cromfs.html; + homepage = https://bisqwit.iki.fi/source/cromfs.html; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch b/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch deleted file mode 100644 index c53d92891fc4..000000000000 --- a/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 7340f67b9860ea0531c1450e5aa261c50f67165d -Author: Paul Eggert -Date: Sat Oct 29 21:04:40 2016 -0700 - - When extracting, skip ".." members - - * NEWS: Document this. - * src/extract.c (extract_archive): Skip members whose names - contain "..". - -diff --git a/src/extract.c b/src/extract.c -index f982433..7904148 100644 ---- a/src/extract.c -+++ b/src/extract.c -@@ -1629,12 +1629,20 @@ extract_archive (void) - { - char typeflag; - tar_extractor_t fun; -+ bool skip_dotdot_name; - - fatal_exit_hook = extract_finish; - - set_next_block_after (current_header); - -+ skip_dotdot_name = (!absolute_names_option -+ && contains_dot_dot (current_stat_info.orig_file_name)); -+ if (skip_dotdot_name) -+ ERROR ((0, 0, _("%s: Member name contains '..'"), -+ quotearg_colon (current_stat_info.orig_file_name))); -+ - if (!current_stat_info.file_name[0] -+ || skip_dotdot_name - || (interactive_option - && !confirm ("extract", current_stat_info.file_name))) - { diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 447ef1f623fc..4677ee45afb2 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "gnutar-${version}"; - version = "1.29"; + version = "1.30"; src = fetchurl { url = "mirror://gnu/tar/tar-${version}.tar.xz"; - sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"; + sha256 = "1lyjyk8z8hdddsxw0ikchrsfg3i0x3fsh7l63a8jgaz1n7dr5gzi"; }; - patches = [ ./CVE-2016-6321.patch ]; - # avoid retaining reference to CF during stdenv bootstrap configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "gt_cv_func_CFPreferencesCopyAppValue=no" diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index dd91c874736e..b750f40ab405 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.17"; + version = "8.13.18"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "1niafqn3kzd3fpx2c7m0by8il52ird2hbhvr7l03l290vlpjw6zc"; + sha256 = "0fzhk43fidyflqj8wd7m3m4pibzrbr1c120xi9wskzb3627pgyh1"; }; prePatch = '' diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index cbb674f3801c..55f0f2e92bd1 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2017.06.10"; + version = "2018.01.02"; - src = fetchFromGitHub { - owner = "leesavide"; - repo = "abcmidi"; - rev = name; - sha256 = "0y92m3mj63vvy79ksq4z5hgkz6w50drg9a4bmbk6jylny0l0bdpy"; + # You can find new releases on http://ifdo.ca/~seymour/runabc/top.html + src = fetchzip { + url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; + sha256 = "0s8wm637dgzgpgdxba3a6fh06i0c4iwvv9cdghh8msnx428k68iw"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://abc.sourceforge.net/abcMIDI/; license = licenses.gpl2Plus; - description = "abc <-> MIDI conversion utilities"; + description = "Utilities for converting between abc and MIDI"; maintainers = [ maintainers.dotlambda ]; }; } diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 7e9d0ff9d860..c711881d528f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -95,13 +95,13 @@ let in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; rev = "v${version}"; - sha256 = "0fvfp9ckq3dhs4f8abg9fprfppyf0g6mv8br2xz99plg4wnffzmy"; + sha256 = "0m8macydkn1fp4ymig0rg7bzw77rrm454q763gxdpq2kg08yl5py"; }; propagatedBuildInputs = [ @@ -194,7 +194,8 @@ in pythonPackages.buildPythonApplication rec { BEETS_TEST_SHELL="${testShell}" \ BASH_COMPLETION_SCRIPT="${completion}" \ HOME="$(mktemp -d)" \ - nosetests -v + # Exclude failing test https://github.com/beetbox/beets/issues/2652 + nosetests -v --exclude="test_single_month_nonmatch_" runHook postCheck ''; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 385021b7354a..9906fa449dda 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { name = "pnmixer-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; rev = "v${version}"; - sha256 = "0mmrq4m2rk0wmkfmqs3fk2rnw5g5lvd7ill2s3d7ggf9vba1pcn2"; + sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; }; nativeBuildInputs = [ cmake pkgconfig gettext ]; - buildInputs = [ alsaLib gtk3 glib libnotify libX11 ]; + buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; meta = with stdenv.lib; { homepage = https://github.com/nicklan/pnmixer; diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix index f07bf7d3fc51..8251c7d5cfc9 100644 --- a/pkgs/tools/audio/pulsemixer/default.nix +++ b/pkgs/tools/audio/pulsemixer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pulsemixer"; - version = "1.3.0-license"; + version = "1.4.0"; src = fetchFromGitHub { owner = "GeorgeFilipkin"; repo = pname; rev = version; - sha256 = "186xbzyn35w2j58l68mccj0cnf0wxj93zb7s0r26zj4cppwszn90"; + sha256 = "0l5zawv36d46sj3k31k5w6imnnxzyn62r83wdhr7fp5mi3ls1h5x"; }; inherit libpulseaudio; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index c32567138322..4af20f76449a 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb -, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null +, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: -assert sqlite != null || postgresql != null || libmysql != null; +assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; let @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettools gettext readline openssl python2 flex ncurses sqlite postgresql - libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb + mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb ]; postPatch = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (libmysql != null) "--with-mysql=${libmysql.dev}" + ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix new file mode 100644 index 000000000000..8ef846a8dca3 --- /dev/null +++ b/pkgs/tools/backup/bdsync/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, openssl, coreutils, which }: + +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + pname = "bdsync"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "TargetHolding"; + repo = pname; + rev = "v${version}"; + sha256 = "144hlbk3k29l7sja6piwhd2jsnzzsak13fcjbahd6m8yimxyb2nf"; + }; + + postPatch = '' + patchShebangs ./tests.sh + patchShebangs ./tests/ + ''; + + buildInputs = [ openssl coreutils which ]; + + doCheck = true; + checkPhase = '' + make test + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + cp bdsync $out/bin/ + cp bdsync.1 $out/share/man/man1/ + ''; + + meta = with stdenv.lib; { + description = "Fast block device synchronizing tool"; + homepage = https://github.com/TargetHolding/bdsync; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 867d2cf903a0..12a7d484bf7b 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.1.1"; + version = "1.1.4"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "0iik5lq349cl87imlwra2pp0j36wjhpn8r1d3778azvvqpyjq2d5"; + sha256 = "1cicqwh85wfp65y00qaq6q4i4jcyy9b66qz5gpl80qc880wab912"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch b/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch deleted file mode 100644 index 1ebb34ded9ea..000000000000 --- a/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d5978c207f2b266165140dd21e9746ace5792daf Mon Sep 17 00:00:00 2001 -From: Moritz Ulrich -Date: Fri, 18 Mar 2016 14:01:22 +0100 -Subject: [PATCH] btrbk: Prefix PATH instead of resetting it. - -Some distros don't even install use /usr/bin, /sbin, etc. (notably -NixOS). Instead, they use PATH to specify which programs are available -to a given executable. - -This patch changes the behavior or `btrbk` so it extends PATH with its -own search paths instead of resetting it. This allows users and distros -to specify their own custom location for `btrfs` via `PATH`. ---- - btrbk | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/btrbk b/btrbk -index ab15858..0b91cbe 100755 ---- a/btrbk -+++ b/btrbk -@@ -2464,10 +2464,11 @@ sub exit_status - - MAIN: - { -- # set PATH instead of using absolute "/sbin/btrfs" (for now), as -- # different distros (and even different versions of btrfs-progs) -- # install the "btrfs" executable to different locations. -- $ENV{PATH} = '/sbin:/bin:/usr/sbin:/usr/bin'; -+ # Prefix PATH with /sbin etc. instead of using absolute -+ # "/sbin/btrfs" (for now), as different distros (and even different -+ # versions of btrfs-progs) install the "btrfs" executable to -+ # different locations. -+ $ENV{PATH} .= '/sbin:/bin:/usr/sbin:/usr/bin'; - - Getopt::Long::Configure qw(gnu_getopt); - $Data::Dumper::Sortkeys = 1; --- -2.7.3 - diff --git a/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch b/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch deleted file mode 100644 index 050f1a6c4303..000000000000 --- a/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8abe8a915aa2d0c79c4dbe00dc7d255c32b7b85d Mon Sep 17 00:00:00 2001 -From: Moritz Ulrich -Date: Fri, 18 Mar 2016 13:20:48 +0100 -Subject: [PATCH] btrbk-mail: Use `btrbk` instead of unbound variable `$btrbk` - ---- - contrib/cron/btrbk-mail | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/cron/btrbk-mail b/contrib/cron/btrbk-mail -index f7e4f12..9143f2d 100755 ---- a/contrib/cron/btrbk-mail -+++ b/contrib/cron/btrbk-mail -@@ -113,7 +113,7 @@ case $exitcode in - ;; - 10) status="ERROR: At least one backup task aborted!" - ;; -- *) status="ERROR: $btrbk failed with error code $exitcode" -+ *) status="ERROR: btrbk failed with error code $exitcode" - ;; - esac - --- -2.7.3 - diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index f9feaf40ec2f..e68bf8463637 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages, makeWrapper }: +{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages +, asciidoc-full, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchurl { url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5"; + sha256 = "1brnh5x3fd91j3v8rz3van08m9i0ym4lv4hqz274s86v1kx4k330"; }; - patches = [ - # https://github.com/digint/btrbk/pull/74 - ./btrbk-Prefix-PATH-instead-of-resetting-it.patch - ]; - - buildInputs = with perlPackages; [ makeWrapper perl DateCalc ]; + buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ]; preInstall = '' - substituteInPlace Makefile \ - --replace "/usr" "$out" \ - --replace "/etc" "$out/etc" + for f in $(find . -name Makefile); do + substituteInPlace "$f" \ + --replace "/usr" "$out" \ + --replace "/etc" "$out/etc" + done # Tainted Mode disables PERL5LIB substituteInPlace btrbk --replace "perl -T" "perl" diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index d7c14a91efb4..f24e89fcc840 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper +{ stdenv, fetchFromGitHub, makeWrapper , perl, pandoc, python2Packages, git , par2cmdline ? null, par2Support ? true }: @@ -19,7 +19,12 @@ stdenv.mkDerivation rec { sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf"; }; - buildInputs = [ git python2Packages.python ]; + buildInputs = [ + git + (python2Packages.python.withPackages + (p: with p; [ setuptools tornado ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ])) + ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; postPatch = '' @@ -41,11 +46,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/bup \ - --prefix PATH : ${git}/bin \ - --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") - (with python2Packages; - [ setuptools tornado ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))} + --prefix PATH : ${git}/bin ''; meta = { diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix new file mode 100644 index 000000000000..da8805bc226e --- /dev/null +++ b/pkgs/tools/backup/mydumper/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, glib, zlib, pcre, mysql, libressl }: + +stdenv.mkDerivation rec { + version = "0.9.3"; + name = "mydumper-${version}"; + + src = fetchFromGitHub { + owner = "maxbube"; + repo = "mydumper"; + rev = "v${version}"; + sha256 = "139v6707sxyslg7n1fii8b1ybdq50hbqhc8zf6p1cr3h2hhl6ns9"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ glib zlib pcre mysql.connector-c libressl ]; + + meta = with stdenv.lib; { + description = ''High-perfomance MySQL backup tool''; + homepage = https://github.com/maxbube/mydumper; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix new file mode 100644 index 000000000000..6899ba88a22c --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, boost, bison, curl, ncurses, openssl, readline, xxd +, libaio, libev, libgcrypt, libgpgerror, libtool, zlib +}: + +stdenv.mkDerivation rec { + name = "percona-xtrabackup-${version}"; + version = "2.4.9"; + + src = fetchFromGitHub { + owner = "percona"; + repo = "percona-xtrabackup"; + rev = name; + sha256 = "11w87wj2jasrnygzjg3b59q9x0m6lhyg1wzdvclmgbmqsk9bvqv4"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + boost bison curl ncurses openssl readline xxd + libaio libev libgcrypt libgpgerror libtool zlib + ]; + + cmakeFlags = [ + "-DBUILD_CONFIG=xtrabackup_release" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DWITH_SSL=system" + "-DWITH_ZLIB=system" + "-DWITH_MECAB=system" + "-DWITH_EXTRA_CHARSETS=all" + "-DWITH_INNODB_MEMCACHED=1" + "-DWITH_MAN_PAGES=OFF" + "-DWITH_HTML_DOCS=OFF" + "-DWITH_LATEX_DOCS=OFF" + "-DWITH_PDF_DOCS=OFF" + ]; + + meta = with stdenv.lib; { + description = "Non-blocking backup tool for MySQL"; + homepage = http://www.percona.com/software/percona-xtrabackup; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index cad43773e16c..40d8e0a4fbc4 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.8.0"; + version = "0.8.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "10r2p4mkspkkzmj41jskqii02qkliwz2zfhvsabkg8clr8lzfkv9"; + sha256 = "13pawz031pzyc4ap5kk229cmzj0qjx5x0j1mw7jhwhc4w4ximvl3"; }; buildPhase = '' diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix index 182af5328eeb..0af5dd5bfff1 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix @@ -294,12 +294,12 @@ rec { }; ssql = eggDerivation { - name = "ssql-0.2.2"; + name = "ssql-0.2.4"; src = fetchegg { name = "ssql"; - version = "0.2.2"; - sha256 = "10557ymy0fgvqqazsg2jsbqvng0b91jqcjfgsxkrq8xs3klyd5mf"; + version = "0.2.4"; + sha256 = "0qhnghhx1wrvav4s7l780mspwlh8s6kzq4bl0cslwp1km90fx9bk"; }; buildInputs = [ diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix index cd7cde778fa2..9329618887fb 100644 --- a/pkgs/tools/backup/ugarit/eggs.nix +++ b/pkgs/tools/backup/ugarit/eggs.nix @@ -294,12 +294,12 @@ rec { }; ssql = eggDerivation { - name = "ssql-0.2.2"; + name = "ssql-0.2.4"; src = fetchegg { name = "ssql"; - version = "0.2.2"; - sha256 = "10557ymy0fgvqqazsg2jsbqvng0b91jqcjfgsxkrq8xs3klyd5mf"; + version = "0.2.4"; + sha256 = "0qhnghhx1wrvav4s7l780mspwlh8s6kzq4bl0cslwp1km90fx9bk"; }; buildInputs = [ diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 9027bdf9c5fc..71df4a1b5a55 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp -, hicolor_icon_theme, librsvg, wrapGAppsHook +, hicolor_icon_theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: let @@ -15,7 +15,10 @@ in stdenv.mkDerivation rec { sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; }; - nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ]; + nativeBuildInputs = [ + gobjectIntrospection intltool pkgconfig pythonPackages.cython + pythonPackages.wrapPython wrapGAppsHook + ]; buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ] ++ pythonPath diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix new file mode 100644 index 000000000000..c7aab91adbeb --- /dev/null +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ccd2iso-0.3"; + + src = fetchurl { + url = "mirror://sourceforge/ccd2iso/${name}.tar.gz"; + sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; + }; + + meta = with stdenv.lib; { + description = "CloneCD to ISO converter"; + homepage = https://sourceforge.net/projects/ccd2iso/; + license = licenses.gpl2; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 7d0fc5969bf2..6a3f92a57c2d 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = https://sourceforge.net/projects/lsdvd/; - shortDescription = "Display information about audio, video, and subtitle tracks on a DVD"; + description = "Display information about audio, video, and subtitle tracks on a DVD"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index bd33eb4d437a..f4fbb3685354 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,21 +4,27 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1rqgp8xi1k4sjy9sngg1vw0v8q2mm46dhyya4d35n3k6yk7pk0qv"; + sha256 = "1rpg16zpr7h6vs7qr6npmqhyw4w5nkp24iq70s4dryn77m0r4mcv"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; + + outputs = [ "out" "dev" "lib" ]; # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = "rm BUILD"; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$lib/lib") + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 1d693f781e6c..095bd5f7d9a5 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./include-systypes.patch ]; buildPhase = '' - cc -O3 -lbz2 bspatch.c -o bspatch - cc -O3 -lbz2 bsdiff.c -o bsdiff + $CC -O3 -lbz2 bspatch.c -o bspatch + $CC -O3 -lbz2 bsdiff.c -o bsdiff ''; installPhase = '' diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index cee23934d0ce..298e490be873 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; + setupHook = ./lzip-setup-hook.sh; + doCheck = true; + enableParallelBuilding = true; meta = { homepage = http://www.nongnu.org/lzip/lzip.html; diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/pkgs/tools/compression/lzip/lzip-setup-hook.sh new file mode 100644 index 000000000000..092ad7737dd1 --- /dev/null +++ b/pkgs/tools/compression/lzip/lzip-setup-hook.sh @@ -0,0 +1,5 @@ +lzipUnpackCmdHook() { + [[ "$1" = *.tar.lz ]] && tar --lzip -xf "$1" +} + +unpackCmdHooks+=(lzipUnpackCmdHook) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 48c58434acd8..05cc672ab15e 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xz-5.2.3"; src = fetchurl { - url = "http://tukaani.org/xz/${name}.tar.bz2"; + url = "https://tukaani.org/xz/${name}.tar.bz2"; sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; meta = with stdenv.lib; { - homepage = http://tukaani.org/xz/; + homepage = https://tukaani.org/xz/; description = "XZ, general-purpose data compression software, successor of LZMA"; longDescription = diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index aad9421305eb..b28311657a1c 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { - sha256 = "1hwh6pw1z3y5kpwcwxrk8cwc83anigiqhy3z06ywy1jll8im57pz"; + sha256 = "15h9i9ygry0znlmvll5r21lzwgyqzynaw9q2wbj4bcn7zjy4c1pn"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index bfa45c9930e4..74ba47ceee1a 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A client implementation of the Apple Filing Protocol"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; - platform = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 4c8dc6218773..921d359616e8 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd }: -let version = "4.13.3"; in +let version = "4.14.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "10yp0b4pwrw5mcd81yn3d0d87fnqpp4si5d25dfhl6n2640dnnw0"; + sha256 = "1palnddw3d50kyflwk1j4xapbc6jniid6j5i9dsr8l8a7nkv7ich"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt zstd ]; # gcc bug with -O1 on ARM with gcc 4.8 diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 77207cb8b3a1..3a0e8e2fd467 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { which only understands the MP3 format, or transcode files through simple drag-and-drop in a file browser. ''; - homepage = http://khenriks.github.io/mp3fs/; + homepage = https://khenriks.github.io/mp3fs/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index 35efa8533ab1..defdf6702ea7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Old-style RAID configuration utility"; - longDescritipn = '' + longDescription = '' Old RAID configuration utility (still under development, though). It is fully compatible with modern kernels and mdadm recognizes its volumes. May be needed for rescuing an older system or nuking diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index df14d7efda4e..1ddcbb2376c5 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { meta = { homepage = http://sourceware.org/lvm2/; - descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; + description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 0cf439c9fe95..6acf5e221d47 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tuxera.com/community/open-source-ntfs-3g/; + homepage = https://www.tuxera.com/community/open-source-ntfs-3g/; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch deleted file mode 100644 index fba1d250c42b..000000000000 --- a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build 2017-09-23 22:02:57.770555382 +0200 -+++ b/meson.build 2017-09-23 23:11:28.258095182 +0200 -@@ -25,7 +25,7 @@ - endif - - --rst2man = find_program('rst2man', required: false) -+rst2man = find_program('rst2man.py', required: true) - - cfg = configuration_data() - diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index eebe3076c98a..6fd55c369d59 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 -, buildManPages ? true, docutils +, docutils }: let @@ -15,10 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv"; }; - patches = optional buildManPages ./build-man-pages.patch; - - nativeBuildInputs = [ meson pkgconfig ninja ]; - buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils; + nativeBuildInputs = [ meson pkgconfig ninja docutils ]; + buildInputs = [ fuse3 glib ]; NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.system == "i686-linux") diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 03d5bd145ac4..89e5c0f35f05 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.6.1"; + version = "0.7.0"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "08mz08pw59zaljp7dcndklnfdbn36ld27capivq3ifbq96nnqdf3"; + sha256 = "0vccxb8mlr7wf92xawnqpvzwlw2xs3b962hjn09dnd6yxqscql64"; }; buildInputs = [ go fuse ]; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 7594474538d0..8aa14220250f 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, texinfo +, cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua , emacs ? null @@ -8,39 +9,44 @@ , libXaw ? null , aquaterm ? false , withWxGTK ? false, wxGTK ? null -, pango ? null -, cairo ? null -, pkgconfig ? null , fontconfig ? null , gnused ? null , coreutils ? null -, withQt ? false, qt }: +, withQt ? false, qttools, qtbase, qtsvg +}: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.1"; + name = "gnuplot-5.2.2"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "123yh0ysahn71nlibsz5qkq18rlf18qqfhrlkvl925ijdgxv1ikx"; + sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"; }; + nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; + buildInputs = - [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ] + [ cairo gd libcerf pango readline zlib ] ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt qt - # compiling with wxGTK causes a malloc (double free) error on darwin - ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; + ++ lib.optionals withQt [ qtbase qtsvg ] + ++ lib.optional withWxGTK wxGTK; - configureFlags = - (if withX then ["--with-x"] else ["--without-x"]) - ++ (if withQt then ["--enable-qt"] else ["--disable-qt"]) - ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]); + postPatch = '' + # lrelease is in qttools, not in qtbase. + substituteInPlace configure --replace '$'{QT5LOC}/lrelease lrelease + ''; + + configureFlags = [ + (if withX then "--with-x" else "--without-x") + (if withQt then "--with-qt=qt5" else "--without-qt") + (if aquaterm then "--with-aquaterm" else "--without-aquaterm") + ]; postInstall = lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ @@ -50,6 +56,8 @@ stdenv.mkDerivation rec { --run '. ${./set-gdfontpath-from-fontconfig.sh}' ''; + enableParallelBuilding = true; + meta = with lib; { homepage = http://www.gnuplot.info/; description = "A portable command-line driven graphing utility for many platforms"; diff --git a/pkgs/tools/graphics/graphviz/0001-vimdot-lookup-vim-in-PATH.patch b/pkgs/tools/graphics/graphviz/0001-vimdot-lookup-vim-in-PATH.patch deleted file mode 100644 index d5f71a4de9e5..000000000000 --- a/pkgs/tools/graphics/graphviz/0001-vimdot-lookup-vim-in-PATH.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2008bf62e13ebe41cdad3e16f8b42f46ae393876 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= -Date: Tue, 6 Jan 2015 20:39:41 +0100 -Subject: [PATCH] vimdot: lookup 'vim' in $PATH - -Instead of hardcoding /usr/bin/vim. Needed for NixOS (http://nixos.org), and is -probably useful for others too. ---- - plugin/xlib/vimdot.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugin/xlib/vimdot.sh b/plugin/xlib/vimdot.sh -index 749fe6a..4e6dd4b 100755 ---- a/plugin/xlib/vimdot.sh -+++ b/plugin/xlib/vimdot.sh -@@ -3,9 +3,9 @@ - - error() { echo "$0: $*" >&2; exit 1; } - --editor="/usr/bin/vim" -+editor="vim" - --if ! test -x "$editor"; then error "the \"$editor\" editor not found or not executable"; fi -+if ! test -x "$(command -v "$editor")"; then error "the \"$editor\" editor not found or not executable"; fi - - default="noname.gv" - --- -2.1.3 - diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index fb8f0472ce35..544949f33b71 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -1,67 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo -, ApplicationServices -}: - -stdenv.mkDerivation rec { +import ./base.nix { + rev = "10c3c34c5198beacfba950764f34960c6884a34f"; version = "2.32.0"; - name = "graphviz-${version}"; - - src = fetchurl { - url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "0ym7lw3xnkcgbk32vfmm3329xymca60gzn90rq6dv8887qqv4lyq"; - }; - - buildInputs = - [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig - pango gd gts - ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices gettext ]; - - CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; - - configureFlags = - [ "--with-pngincludedir=${libpng.dev}/include" - "--with-pnglibdir=${libpng.out}/lib" - "--with-jpegincludedir=${libjpeg.dev}/include" - "--with-jpeglibdir=${libjpeg.out}/lib" - "--with-expatincludedir=${expat.dev}/include" - "--with-expatlibdir=${expat.out}/lib" - "--with-ltdl-include=${libtool}/include" - "--with-ltdl-lib=${libtool.lib}/lib" - "--with-cgraph=no" - "--with-sparse=no" - ] - ++ stdenv.lib.optional (xorg == null) "--without-x"; - - hardeningDisable = [ "fortify" ]; - - preBuild = '' - sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile - ''; - - # "command -v" is POSIX, "which" is not - postInstall = '' - sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty - sed -i 's|which|command -v|' $out/bin/vimdot - ''; - - meta = { - homepage = http://www.graphviz.org/; - description = "Open source graph visualization software"; - - longDescription = '' - Graphviz is open source graph visualization software. Graph - visualization is a way of representing structural information as - diagrams of abstract graphs and networks. It has important - applications in networking, bioinformatics, software engineering, - database and web design, machine learning, and in visual - interfaces for other technical domains. - ''; - - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ]; - inherit version; - branch = "2.32"; - }; + sha256 = "18b2wnz6xk8hndy7dlr1vn9vziyryyflh747n9966778gmh8bick"; } diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix new file mode 100644 index 000000000000..8a46b302dcdf --- /dev/null +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -0,0 +1,59 @@ +{ rev, sha256, version }: + +{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex +, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango +, yacc, xorg ? null, ApplicationServices ? null }: + +assert stdenv.isDarwin -> ApplicationServices != null; + +let + inherit (stdenv.lib) optional optionals optionalString; +in + +stdenv.mkDerivation rec { + name = "graphviz-${version}"; + + src = fetchFromGitLab { + owner = "graphviz"; + repo = "graphviz"; + inherit sha256 rev; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ + libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) + ++ optionals (stdenv.isDarwin) [ ApplicationServices gettext ]; + + hardeningDisable = [ "fortify" ]; + + CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) + "-I${cairo.dev}/include/cairo"; + + configureFlags = optional (xorg == null) "--without-x"; + + postPatch = '' + for f in $(find . -name Makefile.in); do + substituteInPlace $f --replace "-lstdc++" "-lc++" + done + ''; + + preAutoreconf = "./autogen.sh"; + + postFixup = optionalString (xorg != null) '' + substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty + substituteInPlace $out/bin/vimdot \ + --replace /usr/bin/vi '$(command -v vi)' \ + --replace /usr/bin/vim '$(command -v vim)' \ + --replace /usr/bin/vimdot $out/bin/vimdot \ + ''; + + meta = with stdenv.lib; { + homepage = https://graphviz.org; + description = "Graph visualization tools"; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor raskin ]; + }; +} diff --git a/pkgs/tools/graphics/graphviz/cve-2014-9157.patch b/pkgs/tools/graphics/graphviz/cve-2014-9157.patch deleted file mode 100644 index 66ce496ca748..000000000000 --- a/pkgs/tools/graphics/graphviz/cve-2014-9157.patch +++ /dev/null @@ -1,24 +0,0 @@ -From https://lists.debian.org/debian-qa-packages/2014/12/msg00048.html , which -seems to come from Ubuntu. - -Subject: Fix format string vulnerability (CVE-2014-9157) in yyerror() routine -Origin: https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081 -Author: Emden R. Gansner - ---- - lib/cgraph/scan.l | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/lib/cgraph/scan.l -=================================================================== ---- a/lib/cgraph/scan.l -+++ b/lib/cgraph/scan.l -@@ -225,7 +225,7 @@ - agxbput (&xb, buf); - agxbput (&xb, yytext); - agxbput (&xb,"'\n"); -- agerr(AGERR,agxbuse(&xb)); -+ agerr(AGERR, "%s", agxbuse(&xb)); - agxbfree(&xb); - } - /* must be here to see flex's macro defns */ diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index ce864261c8b3..48b1b0764c51 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,69 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat -, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo -, flex -, ApplicationServices -}: - -stdenv.mkDerivation rec { +import ./base.nix rec { + rev = "stable_release_${version}"; version = "2.40.1"; - name = "graphviz-${version}"; - - src = fetchurl { - url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna"; - }; - - hardeningDisable = [ "fortify" ]; - - patches = [ ]; - - buildInputs = - [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango - ] ++ stdenv.lib.optionals (xorg != null) - (with xorg; [ xlibsWrapper libXrender libXaw libXpm ]) - ++ stdenv.lib.optionals (stdenv.isDarwin) [ ApplicationServices gettext ]; - - CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) - "-I${cairo.dev}/include/cairo"; - - configureFlags = stdenv.lib.optional (xorg == null) "--without-x"; - - postPatch = (stdenv.lib.optionalString stdenv.isDarwin '' - for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \ - cmd/mingle/Makefile.in plugin/gdiplus/Makefile.in; do - substituteInPlace "$foo" --replace "-lstdc++" "-lc++" - done - '') + '' - substituteInPlace "plugin/xlib/vimdot.sh" --replace "/usr/bin/vim" "\$(command -v vim)" - ''; - - preBuild = '' - sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile - ''; - - # "command -v" is POSIX, "which" is not - postInstall = stdenv.lib.optionalString (xorg != null) '' - sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty - sed -i 's|which|command -v|' $out/bin/vimdot - ''; - - meta = { - homepage = http://www.graphviz.org/; - description = "Open source graph visualization software"; - - longDescription = '' - Graphviz is open source graph visualization software. Graph - visualization is a way of representing structural information as - diagrams of abstract graphs and networks. It has important - applications in networking, bioinformatics, software engineering, - database and web design, machine learning, and in visual - interfaces for other technical domains. - ''; - - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ]; - downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/"; - inherit version; - updateWalker = true; - }; -} + sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj"; + } diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix new file mode 100644 index 000000000000..bc1419070757 --- /dev/null +++ b/pkgs/tools/graphics/optar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, imagemagick, libpng }: + +stdenv.mkDerivation rec { + name = "optar-${version}"; + version = "20150210"; + + src = fetchurl { + url = "http://ronja.twibright.com/optar.tgz"; + sha256 = "10lr31k3xfcpa6vxkbl3abph7j3gks2210489khnnzmhmfdnm1a4"; + }; + + buildInputs = [ libpng ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/local $out + + substituteInPlace pgm2ps \ + --replace 'convert ' "${stdenv.lib.getBin imagemagick}/bin/convert " + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper"; + homepage = http://ronja.twibright.com/optar/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = with platforms; linux; # possibly others, but only tested on Linux + }; +} diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 7e6b3523ed80..a74d83e9a1e2 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, cmake, pkgconfig, openexr, ilmbase, zlib, imagemagick, mesa, freeglut, fftwFloat, fftw, gsl, libexif, perl, opencv, qt4 }: +{ stdenv, fetchurl, cmake, pkgconfig +, openexr, zlib, imagemagick, mesa, freeglut, fftwFloat +, fftw, gsl, libexif, perl, opencv, qt4 +}: stdenv.mkDerivation rec { - name = "pfstools"; - version = "2.0.5"; + name = "${pname}-${version}"; + pname = "pfstools"; + version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tgz"; - sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9"; + url = "mirror://sourceforge/${pname}/${version}/${name}.tgz"; + sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six"; }; outputs = [ "out" "dev" "man"]; @@ -15,9 +19,11 @@ stdenv.mkDerivation rec { -DWITH_MATLAB=false ''; - buildInputs = [ openexr zlib imagemagick mesa freeglut fftwFloat fftw gsl libexif perl opencv qt4 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + openexr zlib imagemagick mesa freeglut fftwFloat + fftw gsl libexif perl opencv qt4 + ]; patches = [ ./threads.patch ./pfstools.patch ]; diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 104e423bd721..a83e38e577dd 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, libpng, pkgconfig }: stdenv.mkDerivation rec { - name = "qrencode-3.4.4"; + name = "qrencode-4.0.0"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "198zvsfa2y5bb3ccikrhmhd4i43apr3b26dqcf3zkjyv3n5iirgg"; + sha256 = "02vx69fl52jbcrmnydsaxcmy6nxqm9jyxzd7hr07s491d7hka069"; }; buildInputs = [ libpng ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = https://fukuchi.org/works/qrencode/; description = "QR code encoder"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + maintainers = with maintainers; [ yegortimoshenko ]; }; } diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 4c7c5f1c3858..266221de1735 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,25 +1,23 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "svgcleaner-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = "svgcleaner"; rev = "v${version}"; - sha256 = "0l75a2kqh2syl14pmywrkxhr19fcnfpzjj9gj3503aw0r800g16m"; + sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f"; }; - cargoSha256 = "1hl04wqdgspajf2w664i00vgp13yi0sxvjjpfs5vfhm641z3j69y"; + cargoSha256 = "0d5jlq301s55xgdg9mv26hbj75pkjkyxfny7vbiqp9igj128lza3"; meta = with stdenv.lib; { description = "A tool for tidying and optimizing SVGs"; homepage = "https://github.com/RazrFalcon/svgcleaner"; license = licenses.gpl2; platforms = platforms.all; - maintainer = [ maintainers.mehandes ]; + maintainers = [ maintainers.mehandes ]; }; } diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index b513115c68fe..3ecd91aaca14 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://wkhtmltopdf.org/; + homepage = https://wkhtmltopdf.org/; description = "Tools for rendering web pages to PDF or images"; longDescription = '' wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 87bb4923b8ad..b8bf73fda648 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook +, enableVideo ? stdenv.isLinux }: let @@ -38,7 +39,12 @@ in stdenv.mkDerivation rec { buildInputs = [ imagemagickBig pkgconfig python pygtk perl libX11 - libv4l qt4 lzma gtk2 autoreconfHook ]; + lzma autoreconfHook ] ++ + stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ]; + + configureFlags = stdenv.lib.optionals (!enableVideo) [ + "--disable-video" "--without-gtk" "--without-qt" + ]; hardeningDisable = [ "fortify" ]; @@ -52,7 +58,7 @@ in stdenv.mkDerivation rec { Code. ''; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; homepage = http://zbar.sourceforge.net/; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix new file mode 100644 index 000000000000..c2e8837f5d13 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: + +stdenv.mkDerivation rec { + name = "fcitx-skk-${version}"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx-skk"; + rev = "f66d0f56a40ff833edbfa68a4be4eaa2e93d0e3d"; + sha256 = "1yl2syqrk212h26vzzkwl19fyp71inqmsli9411h4n2hbcp6m916"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ fcitx libskk skk-dicts ]; + + cmakeFlags = [ "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.combined" + "-DENABLE_QT=FALSE" + ]; + preInstall = '' + substituteInPlace src/cmake_install.cmake \ + --replace ${fcitx} $out + substituteInPlace po/cmake_install.cmake \ + --replace ${fcitx} $out + substituteInPlace data/cmake_install.cmake \ + --replace ${fcitx} $out + ''; + + meta = with stdenv.lib; { + isFcitxEngine = true; + description = "A SKK style input method engine for fcitx"; + longDescription = '' + Fcitx-skk is an input method engine for fcitx. It is based on libskk and thus + provides basic features of SKK Japanese input method such as kana-to-kanji conversion, + new word registration, completion, numeric conversion, abbrev mode, kuten input, + hankaku-katakana input, and re-conversion. + ''; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ yuriaisaka ]; + }; + +} diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 3fd29d65f369..f71a21b914f3 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,129 +1,138 @@ -{ stdenv, fetchurl, wrapGAppsHook -, intltool, isocodes, pkgconfig -, python3 -, gtk2, gtk3, atk, dconf, glib, json_glib -, dbus, libnotify, gobjectIntrospection, wayland -}: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig +, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 +, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true +, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: + +assert withWayland -> wayland != null && libxkbcommon != null; + +with stdenv.lib; let - emojiData = let - srcs = { - data = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; - sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf"; - }; - sequences = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; - sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1"; - }; - variation-sequences = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; - sha256 = "1wlg4gbq7spmpppjfy5zdl82sj0hc836p8gljgfrjmwsjgybq286"; - }; - zwj-sequences = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; - sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q"; - }; - test = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; - sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw"; - }; + emojiSrcs = { + data = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; + sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf"; }; - in stdenv.mkDerivation { + sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; + sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1"; + }; + variation-sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; + sha256 = "1wlg4gbq7spmpppjfy5zdl82sj0hc836p8gljgfrjmwsjgybq286"; + }; + zwj-sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; + sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q"; + }; + test = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; + sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw"; + }; + }; + emojiData = stdenv.mkDerivation { name = "emoji-data-5.0"; unpackPhase = ":"; - dontBuild = true; - installPhase = with stdenv.lib; '' + installPhase = '' mkdir $out - ${builtins.toString (flip mapAttrsToList srcs (k: v: '' - cp ${v} $out/emoji-${k}.txt - ''))} + ${builtins.toString (flip mapAttrsToList emojiSrcs (k: v: "cp ${v} $out/emoji-${k}.txt;"))} ''; }; cldrEmojiAnnotation = stdenv.mkDerivation rec { name = "cldr-emoji-annotation-${version}"; - version = "31.0.1_1"; - src = fetchurl { - url = "https://github.com/fujiwarat/cldr-emoji-annotation/releases/download/${version}/${name}.tar.gz"; - sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7"; + version = "31.90.0_1"; + src = fetchFromGitHub { + owner = "fujiwarat"; + repo = "cldr-emoji-annotation"; + rev = version; + sha256 = "1vsj32bg8ab4d80rz0fxy6sj2lv31inzyjnddjm079bnvlaf2kih"; }; + nativeBuildInputs = [ autoreconfHook ]; }; - pyEnv = python3.buildEnv.override { - extraLibs = [ python3.pkgs.pygobject3 ]; - + python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); + python3BuildEnv = python3.buildEnv.override { # ImportError: No module named site postBuild = '' - makeWrapper '${glib.dev}/bin/glib-genmarshal' "$out"/bin/glib-genmarshal \ - --unset PYTHONPATH + makeWrapper ${glib.dev}/bin/gdbus-codegen $out/bin/gdbus-codegen --unset PYTHONPATH + makeWrapper ${glib.dev}/bin/glib-genmarshal $out/bin/glib-genmarshal --unset PYTHONPATH + makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; -in stdenv.mkDerivation rec { - name = "ibus-${version}"; - version = "1.5.16"; +in - src = fetchurl { - url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; - sha256 = "07py16jb81kd7vkqhcia9cb2avsbg5jswp2kzf0k4bprwkxppd9n"; +stdenv.mkDerivation rec { + name = "ibus-${version}"; + version = "1.5.17"; + + src = fetchFromGitHub { + owner = "ibus"; + repo = "ibus"; + rev = version; + sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av"; }; postPatch = '' - # These paths will be set in the wrapper. - sed -e "/export IBUS_DATAROOTDIR/ s/^.*$//" \ - -e "/export IBUS_LIBEXECDIR/ s/^.*$//" \ - -e "/export IBUS_LOCALEDIR/ s/^.*$//" \ - -e "/export IBUS_PREFIX/ s/^.*$//" \ - -i "setup/ibus-setup.in" + substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter} + substituteInPlace data/dconf/Makefile.am --replace "dconf update" true + substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus + echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh + cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make . ''; + preAutoreconf = "touch ChangeLog"; + preConfigure = "intltoolize"; + configureFlags = [ "--disable-gconf" - "--enable-dconf" "--disable-memconf" - "--enable-ui" - "--enable-python-library" + (enableFeature (dconf != null) "dconf") + (enableFeature (libnotify != null) "libnotify") + (enableFeature withWayland "wayland") + (enableFeature enablePythonLibrary "python-library") + (enableFeature enableUI "ui") "--with-unicode-emoji-dir=${emojiData}" "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations" ]; - buildInputs = [ - pyEnv - intltool isocodes pkgconfig - gtk2 gtk3 dconf - json_glib - dbus libnotify gobjectIntrospection wayland + nativeBuildInputs = [ + autoreconfHook + gconf + gtk_doc + intltool + makeWrapper + pkgconfig + python3BuildEnv + vala + wrapGAppsHook ]; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ wrapGAppsHook ]; - - outputs = [ "out" "dev" ]; + buildInputs = [ + dbus + dconf + gdk_pixbuf + gobjectIntrospection + gtk2 + gtk3 + isocodes + json_glib + libnotify + ] ++ optionals withWayland [ + libxkbcommon + wayland + ]; enableParallelBuilding = true; - preConfigure = '' - # Fix hard-coded installation paths, so make does not try to overwrite our - # Python installation. - sed -e "/py2overridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \ - -e "/pyoverridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \ - -e "/PYTHON2_LIBDIR/ s|=.*|=$out/lib/${python3.libPrefix}|" \ - -i configure - - # Don't try to generate a system-wide dconf database; it wouldn't work. - substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" - ''; - doInstallCheck = true; installCheckPhase = "$out/bin/ibus version"; - postInstall = '' - moveToOutput "bin/ibus-setup" "$dev" - ''; - - meta = with stdenv.lib; { + meta = { homepage = https://github.com/ibus/ibus; - description = "Intelligent Input Bus for Linux / Unix OS"; + description = "Intelligent Input Bus, input method framework"; + license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.ttuegel ]; + maintainers = with maintainers; [ ttuegel yegortimoshenko ]; }; } diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index b31a24b0c837..994e9da3e430 100644 --- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation { buildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = "https://gitlab.com/interception/linux/plugins/caps2esc"; description = "Transforming the most useless key ever into the most useful one"; - license = stdenv.lib.licenses.mit; - maintainers = stdenv.lib.maintainers.vyp; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.vyp ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index ba54d4954c58..77ac02649ad3 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; license = stdenv.lib.licenses.gpl3; - maintainers = stdenv.lib.maintainers.vyp; + maintainers = [ stdenv.lib.maintainers.vyp ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index f04afd639b7d..b930da02acc9 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Manipulate the scancode/keycode translation tables of keyboard drivers."; - homepace = http://0pointer.de/lennart/projects/keyfuzz/; + homepage = http://0pointer.de/lennart/projects/keyfuzz/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mboes ]; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 3f37c1a2ab0c..96b887141785 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,5 +1,31 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs4, ncurses, - cmake, anthy, automoc4, m17n_lib, m17n_db}: +{ stdenv, fetchurl, intltool, pkgconfig, cmake +, ncurses, m17n_lib, m17n_db, expat +, withAnthy ? true, anthy ? null +, withGtk ? true +, withGtk2 ? withGtk, gtk2 ? null +, withGtk3 ? withGtk, gtk3 ? null +, withQt ? true +, withQt4 ? withQt, qt4 ? null +, withLibnotify ? true, libnotify ? null +, withSqlite ? true, sqlite ? null +, withNetworking ? true, curl ? null, openssl ? null +, withFFI ? true, libffi ? null + +# Things that are clearly an overkill to be enabled by default +, withMisc ? false, libeb ? null +}: + +with stdenv.lib; + +assert withAnthy -> anthy != null; +assert withGtk2 -> gtk2 != null; +assert withGtk3 -> gtk3 != null; +assert withQt4 -> qt4 != null; +assert withLibnotify -> libnotify != null; +assert withSqlite -> sqlite != null; +assert withNetworking -> curl != null && openssl != null; +assert withFFI -> libffi != null; +assert withMisc -> libeb != null; stdenv.mkDerivation rec { version = "1.8.6"; @@ -8,32 +34,56 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig - qt4 - gtk2 - gtk3 - kdelibs4 ncurses cmake - anthy - automoc4 m17n_lib m17n_db - ]; + expat + ] + ++ optional withAnthy anthy + ++ optional withGtk2 gtk2 + ++ optional withGtk3 gtk3 + ++ optional withQt4 qt4 + ++ optional withLibnotify libnotify + ++ optional withSqlite sqlite + ++ optionals withNetworking [ + curl openssl + ] + ++ optional withFFI libffi + ++ optional withMisc libeb; patches = [ ./data-hook.patch ]; configureFlags = [ - "--with-gtk2" - "--with-gtk3" - "--enable-kde4-applet" - "--enable-notify=knotify4" "--enable-pref" - "--with-qt4" - "--with-qt4-immodule" "--with-skk" "--with-x" - "--with-anthy-utf8" - ]; + "--with-xft" + "--with-expat=${expat.dev}" + ] + ++ optional withAnthy "--with-anthy-utf8" + ++ optional withGtk2 "--with-gtk2" + ++ optional withGtk3 "--with-gtk3" + ++ optionals withQt4 [ + "--with-qt4" + "--with-qt4-immodule" + ] + ++ optional withLibnotify "--enable-notify=libnotify" + ++ optional withSqlite "--with-sqlite3" + ++ optionals withNetworking [ + "--with-curl" + "--with-openssl-dir=${openssl.dev}" + ] + ++ optional withFFI "--with-ffi" + ++ optional withMisc "--with-eb"; + + # TODO: things in `./configure --help`, but not in nixpkgs + #--with-canna Use Canna [default=no] + #--with-wnn Build with libwnn [default=no] + #--with-mana Build a plugin for Mana [default=yes] + #--with-prime Build a plugin for PRIME [default=yes] + #--with-sj3 Use SJ3 [default=no] + #--with-osx-dcs Build with OS X Dictionary Services [default=no] dontUseCmakeConfigure = true; @@ -45,8 +95,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/uim/uim"; description = "A multilingual input method framework"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ ericsagnes ]; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes oxij ]; }; } diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index be1df0510d7b..ee2680da0066 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -25,6 +25,11 @@ buildPythonApplication rec { sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4"; }; + checkInputs = [ + pytest + selenium + ]; + meta = { homepage = https://github.com/bepasty/bepasty-server; description = "Binary pastebin server"; diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix new file mode 100644 index 000000000000..c44967d36204 --- /dev/null +++ b/pkgs/tools/misc/blsd/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: + +buildGoPackage rec { + name = "blsd-${version}"; + version = "2017-07-27"; + + goPackagePath = "github.com/junegunn/blsd"; + + src = fetchFromGitHub { + owner = "junegunn"; + repo = "blsd"; + rev = "a2ac619821e502452abdeae9ebab45026893b9e8"; + sha256 = "0b0q6i4i28cjqgxqmwxbps22gp9rcd3jz562q5wvxrwlpbzlls2h"; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkgconfig libgit2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/junegunn/blsd; + description = "List directories in breadth-first order"; + license = licenses.mit; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix new file mode 100644 index 000000000000..55e6daea5e21 --- /dev/null +++ b/pkgs/tools/misc/blsd/deps.nix @@ -0,0 +1,11 @@ +[ +{ + goPackagePath = "github.com/libgit2/git2go"; + fetch = { + type = "git"; + url = "https://github.com/libgit2/git2go"; + rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5"; + sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc"; + }; +} +] diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix new file mode 100644 index 000000000000..7391c271cd17 --- /dev/null +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +python2Packages.buildPythonApplication rec { + name = "bmap-tools-${version}"; + version = "3.4"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "bmap-tools"; + rev = "v${version}"; + sha256 = "0p0pdwvyf9b4czi1pnhclm1ih8kw78nk2sj4if5hwi7s5423wk5q"; + }; + + meta = with stdenv.lib; { + description = "bmap-related tools"; + homepage = https://github.com/intel/bmap-tools; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index ea1ac6d116b1..8dbcd08fba6e 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,35 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: +{ stdenv, fetchurl, pkgconfig, python3, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { name = "brltty-5.5"; - + src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; buildInputs = [ bluez ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional systemdSupport systemd; - + meta = { description = "Access software for a blind person using a braille display"; longDescription = '' BRLTTY is a background process (daemon) which provides access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. It drives the braille display, and provides complete screen review functionality. - Some speech capability has also been incorporated. + Some speech capability has also been incorporated. ''; homepage = http://www.brltty.com/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bramd ]; platforms = stdenv.lib.platforms.all; }; - + + makeFlags = [ "PYTHON_PREFIX=$(out)" ]; + preConfigurePhases = [ "preConfigure" ]; preConfigure = '' diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix new file mode 100644 index 000000000000..d4ee1661801f --- /dev/null +++ b/pkgs/tools/misc/calamares/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore +, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase +, qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata +, ckbcomp, xkeyboard_config +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "calamares"; + version = "3.1.10"; + + # release including submodule + src = fetchurl { + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "12phmirx0fgvykvkl8frv5agxqi7n04sxf5bpwjwq12mydq2x7kc"; + }; + + buildInputs = [ + boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev + libatasmart libxcb libyamlcpp parted polkit-qt python qtbase + qtquickcontrols qtsvg qttools qtwebengine.dev utillinux + ]; + + enableParallelBuilding = false; + + cmakeFlags = [ + "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" + "-DCMAKE_VERBOSE_MAKEFILE=True" + "-DCMAKE_BUILD_TYPE=Release" + "-DWITH_PYTHONQT:BOOL=ON" + ]; + + POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions"; + + patchPhase = '' + sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ + -i calamares.desktop \ + -i com.github.calamares.calamares.policy + + sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ + -i src/modules/locale/timezonewidget/localeconst.h \ + -i src/modules/locale/SetTimezoneJob.cpp + + sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ + -i src/modules/locale/timezonewidget/localeconst.h + + sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ + -i src/modules/keyboard/keyboardwidget/keyboardglobal.h + + sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \ + -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp + + sed "s,\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR},''${out}/share/polkit-1/actions," \ + -i CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "Distribution-independent installer framework"; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ manveru ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index a70cba3f3d0d..df638f2b5565 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "1.2.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "0yjljpqpcbi84ibbrxbm5cbgs16ada4cmvir744hygrdl948zzk3"; + sha256 = "16gdrm985qwbrsmsqjfyh33glcmx678abl2jpq49djk2qrbhm49k"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 9894813d9556..fd6df64e5e76 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops - # growpart is needed in initrd in nixos/modules/virtualisation/grow-partition.nix + # growpart is needed in initrd in nixos/system/boot/grow-partition.nix name = "cloud-utils-${version}"; version = "0.30"; src = fetchurl { diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index a91cd627bdae..12821cf864c2 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kcmutils kio knotifications plasma-framework kwidgetsaddons + kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons kwindowsystem kitemviews lcms2 libXrandr qtx11extras ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9a422a96d703..589c58d0acc0 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -14,11 +14,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.28"; + name = "coreutils-8.29"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0r8c1bgm68kl70j1lgd0rv12iykw6143k4m9a56xip9rc2hv25qi"; + sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j"; }; patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 6dedb0b36a5b..c602a4c9235e 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { description = "Discordian version of the date program"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [kovirobi]; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 53755c8a19d2..3a243f9fdef0 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.ddcutil.com/; description = "Query and change Linux monitor settings using DDC/CI and USB"; license = licenses.gpl2; - maintainer = with maintainers; [ rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index a65862a78451..bd5678c651fb 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.92"; + version = "1.0.93"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "06gp6ivmfh0ks4mibx1mz0pwzjyxqas319s741pp9b3k091jkip1"; + sha256 = "1nyp9fwb7xrk1vin81dmgx2g9rb52yg4gwz4rcx97gamw4mlvbfd"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index e5e3815481f1..6e2f6548722e 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "desktop-file-utils-0.22"; + name = "desktop-file-utils-0.23"; src = fetchurl { url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; - sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; + sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 0753c4292e80..b0c0de996e74 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.13.3"; + version = "2.14.0"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "1scj13qg98p838d2jvn0ks893xvrdrlmvrrjqwvqm11xw0v8bzxr"; + sha256 = "0xgb895dda7q7qyl5lg1jfjfb82daaf133dx0vw8lp7d67xqv9r8"; }; postConfigure = '' diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index cb77edf0d29a..503f0df331cf 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -33,6 +33,6 @@ buildRustPackage rec { ''; homepage = https://the.exa.website; license = licenses.mit; - maintainer = [ maintainers.ehegnes ]; + maintainers = [ maintainers.ehegnes ]; }; } diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 5ac5233c9165..2681d14665cb 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "5.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "17y2fr3faaf32lv171ppkgi55v5zxq97jiilsgmjcn00rd9i6v0j"; + sha256 = "1l1p7jlrryd54jwwrwgvs4njr3r59m8xsh31z7db0bzpw3dk7n5k"; }; - cargoSha256 = "17f4plyj6mnz0d9f4ykgbmddsdp6c3f6q4kmgj406p49xsf0jjkc"; + cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r"; preFixup = '' mkdir -p "$out/man/man1" cp "$src/doc/fd.1" "$out/man/man1" mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions} - cp target/release/build/fd-find-*/out/fd.bash-completion "$out/share/bash-completion/completions/" + cp target/release/build/fd-find-*/out/fd.bash "$out/share/bash-completion/completions/" cp target/release/build/fd-find-*/out/fd.fish "$out/share/fish/completions/" cp target/release/build/fd-find-*/out/_fd "$out/share/zsh/site-functions/" ''; diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 2f43dd40f13e..6271eb599b58 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fpp-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "facebook"; repo = "PathPicker"; rev = version; - sha256 = "1mfyr9k5s3l1sg3c9vlyiqg8n1wwppzb981az2xaxqyk95wwl1sa"; + sha256 = "03n8sc2fvs2vk46jv6qfkjbyqz85yxnphvabji7qnmd3jv631w47"; }; postPatch = '' diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index d3a1a7124669..f9e40b6b7867 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fsmon-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = "${version}"; - sha256 = "0sqld41jn142d4zbqmylzrnx1km7xs6r8dnmf453gyhi3yzdbr1j"; + sha256 = "1b99cd5k2zh30sagp3f55jvj1r48scxibv7aqqc2sp82sci59npg"; }; installPhase = '' diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 82b3a1d963d4..592707be20ab 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "0.16.1"; + version = "0.18.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "1hphgpwxzdbfswzxbx0jm7lma1xkkwxvm8ll3jp2ljmimqzzb7jf"; + sha256 = "0qdld8jy1rkpfzbfhnssr58q1gciln3pw9m6fj0jarfgja4gj31l"; }; doCheck = true; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 830f9cb878be..1eb4393c978b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.1"; + version = "0.17.3"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0zxav6kfifppj49kif8917djq1vqjznqzmviqj4iiar8jmyrn2fy"; + sha256 = "1wsyykvnss5r0sx344kjbprnb87849462p9rg9xj37cp7qzciwdn"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index 3af8eda1d1b4..7336665594a7 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract the initial/default boot image from a CD image if existent"; homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/; - maintainer = [ maintainers.profpatsch ]; + maintainers = [ maintainers.profpatsch ]; license = licenses.gpl2; }; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 81606e1ca7f8..1c1fb05050f1 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; - licence = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 76bfb8c661ed..be002a8c3ad9 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.29.0"; + name = "gparted-0.30.0"; src = fetchurl { - sha256 = "1kf3ly7m3bikyzapjw8q1rlia0kg5zzgp59akhabx1rnnimvyl12"; url = "mirror://sourceforge/gparted/${name}.tar.gz"; + sha256 = "0jngbsbvg8k8vbpsphqbk8br2cbmxhabbm2c5bmxm2q5zvpr64fk"; }; configureFlags = [ "--disable-doc" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' - wrapProgram $out/sbin/gparted \ + wrapProgram $out/bin/gparted \ --prefix PATH : "${procps}/bin" wrapProgram $out/sbin/gpartedbin \ --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}" diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 11cbd87024f1..5c868ae5e2f6 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.3.2"; + version = "2.4.0"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0mzrhzbyblspia3qp85hvv5kdc7v3aird02q2pxrxbwca6wjlxcs"; + sha256 = "12ipp1bji0ss0d20dpqx8d6x3p3h38qdfdy98qy37mjy0fi22vpq"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index dfaefc2b2e22..21a624c9d256 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -139,19 +139,6 @@ in { description = "Graylog input plugin that reads MongoDB profiler data"; }; }; - netflow = glPlugin rec { - name = "graylog-netflow-${version}"; - pluginName = "graylog-plugin-netflow"; - version = "0.1.1"; - src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1pdv12f9dca1rxf62ds51n79cjhkkyj0gjny8kj1cq64vlayc9x9"; - }; - meta = { - homepage = https://github.com/Graylog2/graylog-plugin-netflow; - description = "Graylog NetFlow plugin"; - }; - }; pagerduty = glPlugin rec { name = "graylog-pagerduty-${version}"; pluginName = "graylog-plugin-pagerduty"; @@ -204,19 +191,6 @@ in { description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate."; }; }; - threatintel = glPlugin rec { - name = "graylog-threatintel-${version}"; - pluginName = "graylog-plugin-threatintel"; - version = "0.10.0"; - src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0clg0vy8aipw122rfqww1lnjriazlnnh77pqiy5vnmv6ycjw0y4i"; - }; - meta = { - homepage = https://github.com/Graylog2/graylog-plugin-threatintel; - description = "Graylog Processing Pipeline functions to enrich log messages with IoC information from threat intelligence databases"; - }; - }; twiliosms = glPlugin rec { name = "graylog-twiliosms-${version}"; pluginName = "graylog-plugin-twiliosms"; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index e50df02a1189..be5e1371cd45 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -21,5 +21,8 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/hakuneko/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; + + # This project was abandoned upstream. + broken = true; }; } diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index 81e417ee5abd..0997b2268029 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -12,7 +12,7 @@ bundlerEnv { meta = with lib; { description = "Your home directory is your castle. Don't leave your dotfiles behind"; - long_description = + longDescription = '' Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix index b6b2bc9a25cb..a0fcc6074dc0 100644 --- a/pkgs/tools/misc/hostsblock/default.nix +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An ad- and malware-blocking script for Linux"; - website = http://gaenserich.github.io/hostsblock/; + homepage = http://gaenserich.github.io/hostsblock/; license = licenses.gpl3; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index f5b1b950c131..b8b7666934b8 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; - homepage = http://www.funtoo.org/Keychain; + homepage = https://www.funtoo.org/Keychain; license = stdenv.lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 35cc95cb2cf7..10eca3d70024 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.44"; + version = "0.45.3"; in with stdenv.lib; with perlPackages; @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - sha256 = "0kjz3n2ilrg6yrz8z40714ppdprgwhbgvzcsjzs822l6da4qxna3"; + sha256 = "01lx1nb5nlhwz663v35gg7crd36c78hnipq4z0dqyb9wjigwwg9k"; }; buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] @@ -37,8 +37,9 @@ stdenv.mkDerivation { meta = { homepage = http://www.spinnaker.de/lbdb/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + platforms = platforms.all; description = "The Little Brother's Database"; + maintainers = [ maintainers.kaiha ]; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 989c1f57b6ef..d2f988396ca7 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,27 +1,29 @@ -{ stdenv, lib, fetchurl, pkgconfig, autoreconfHook -, boost, libsodium, czmqpp, libbitcoin }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +, boost, libbitcoin, libbitcoin-protocol }: let pname = "libbitcoin-client"; - version = "2.2.0"; + version = "3.4.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/libbitcoin/libbitcoin-client/archive/v${version}.tar.gz"; - sha256 = "1g79hl6jmf5dam7vq19h4dgdj7gcn19fa7q78vn573mg2rdyal53"; + src = fetchFromGitHub { + owner = "libbitcoin"; + repo = pname; + rev = "v${version}"; + sha256 = "1vdp6qgpxshh6nhdvr81z3nvh42wgmsm4prli4ajigwp970y8p56"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; + propagatedBuildInputs = [ libbitcoin libbitcoin-protocol ]; - propagatedBuildInputs = [ libsodium czmqpp libbitcoin ]; + enableParallelBuilding = true; configureFlags = [ + "--with-tests=no" "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" - "--with-bash-completiondir=$out/share/bash-completion/completions" ]; meta = with stdenv.lib; { @@ -30,8 +32,7 @@ in stdenv.mkDerivation { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; - # https://wiki.unsystem.net/en/index.php/Libbitcoin/License - # AGPL with an additional clause + # AGPL with a lesser clause license = licenses.agpl3; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 7b6da9bdd3ed..e9f4c977779f 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,24 +1,27 @@ -{ stdenv, lib, fetchurl, pkgconfig, autoreconfHook -, boost, libbitcoin-client }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +, boost, libbitcoin-client, libbitcoin-network }: let pname = "libbitcoin-explorer"; - version = "2.2.0"; + version = "3.4.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/libbitcoin/libbitcoin-explorer/archive/v${version}.tar.gz"; - sha256 = "00123vw7rxk0ypdfzk0xwk8q55ll31000mkjqdzl915krsbkbfvp"; + src = fetchFromGitHub { + owner = "libbitcoin"; + repo = pname; + rev = "v${version}"; + sha256 = "0rxiimklzqyp9vswznz9aia71dn6jxm2pxx5ljlhzs5rs583cj00"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ libbitcoin-client libbitcoin-network ]; - propagatedBuildInputs = [ libbitcoin-client ]; + enableParallelBuilding = true; configureFlags = [ + "--with-tests=no" "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" "--with-bash-completiondir=$out/share/bash-completion/completions" @@ -28,10 +31,9 @@ in stdenv.mkDerivation { description = "Bitcoin command line tool"; homepage = https://github.com/libbitcoin/libbitcoin-explorer; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ chris-martin asymmetric ]; - # https://wiki.unsystem.net/en/index.php/Libbitcoin/License - # AGPL with an additional clause + # AGPL with a lesser clause license = licenses.agpl3; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix new file mode 100644 index 000000000000..11657c03615d --- /dev/null +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +, boost, libbitcoin, zeromq }: + +let + pname = "libbitcoin-network"; + version = "3.4.0"; + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "libbitcoin"; + repo = pname; + rev = "v${version}"; + sha256 = "1zlhyh5z0fla1yc6kwkx65ycwgmrcrkvzj8119wbkxy3xhzpwxpv"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libbitcoin zeromq ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-tests=no" + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.out}/lib" + ]; + + meta = with stdenv.lib; { + description = "Bitcoin P2P Network Library"; + homepage = https://libbitcoin.org/; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ asymmetric ]; + + # AGPL with a lesser clause + license = licenses.agpl3; + }; +} diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix new file mode 100644 index 000000000000..5fbc2f403087 --- /dev/null +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +, boost, libbitcoin, secp256k1, zeromq }: + +let + pname = "libbitcoin-protocol"; + version = "3.4.0"; + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "libbitcoin"; + repo = pname; + rev = "v${version}"; + sha256 = "1wrlzani3wdjkmxqwjh30i8lg3clrzwcx2di7c9sdpnsbda985gb"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libbitcoin secp256k1 ]; + propagatedBuildInputs = [ zeromq ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-tests=no" + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.out}/lib" + ]; + + meta = with stdenv.lib; { + description = "Bitcoin Blockchain Query Protocol"; + homepage = https://libbitcoin.org/; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ asymmetric ]; + + # AGPL with a lesser clause + license = licenses.agpl3; + }; +} diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 6d0c7b4e9c95..623f34e8b615 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,24 +1,28 @@ -{ stdenv, lib, fetchurl, pkgconfig, autoreconfHook -, boost, libsodium, czmqpp, secp256k1 }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +, boost, secp256k1 }: let pname = "libbitcoin"; - version = "2.11.0"; + version = "3.4.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/libbitcoin/libbitcoin/archive/v${version}.tar.gz"; - sha256 = "1lpdjm13kgs4fbp579bwfvws8yf9mnr5dw3ph8zxg2gf110h85sy"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1h6h7cxbwkdk8bzbkfvnrrdzajw1d4lr8wqs66is735bksh6gk1y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; propagatedBuildInputs = [ secp256k1 ]; + enableParallelBuilding = true; + configureFlags = [ + "--with-tests=no" "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" ]; @@ -29,8 +33,7 @@ in stdenv.mkDerivation { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; - # https://wiki.unsystem.net/en/index.php/Libbitcoin/License - # AGPL with an additional clause + # AGPL with a lesser clause license = licenses.agpl3; }; } diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index 8540a3f785a7..bc52598ff800 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -1,4 +1,4 @@ -{ cabextract, glibc_multi, fetchFromGitHub, readline, stdenv_32bit }: +{ cabextract, fetchFromGitHub, readline, stdenv_32bit }: # stdenv_32bit is needed because the program depends upon 32-bit libraries and does not have # support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. @@ -14,7 +14,7 @@ stdenv_32bit.mkDerivation rec { sha256 = "01hb7wzfh1s5b8cvmrmr1gqknpq5zpzj9prq3wrpsgg129jpsjkb"; }; - buildInputs = [ glibc_multi cabextract readline stdenv_32bit.cc.libc ]; + buildInputs = [ cabextract readline ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 0a02f8fb4f73..d949108524f6 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = http://www.memtest.org/; description = "A tool to detect memory errors"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 2aea2530057c..3ef039507d4e 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -5,12 +5,13 @@ let if stdenv.system == "x86_64-linux" then "linux64" else if stdenv.system == "i686-linux" then "linux" else if stdenv.system == "x86_64-darwin" then "macosx64" - else abort "Unsupported platform"; + else throwSystem; + throwSystem = throw "Unsupported system: ${stdenv.system}"; gwnum = if stdenv.system == "x86_64-linux" then "make64" else if stdenv.system == "i686-linux" then "makefile" else if stdenv.system == "x86_64-darwin" then "makemac" - else abort "Unsupported platform"; + else throwSystem; in stdenv.mkDerivation { diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 5a4278888575..7657b072aa89 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mrtg-${version}"; src = fetchurl { - url = "http://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; - homepage = http://oss.oetiker.ch/mrtg/; + homepage = https://oss.oetiker.ch/mrtg/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 744e5d99ef5e..3b7f3019998c 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ms-sys-${version}"; version = "2.5.3"; - + src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0"; }; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix new file mode 100644 index 000000000000..3464a92fa110 --- /dev/null +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2 +, libxslt, libarchive, bzip2, lzma +}: + +stdenv.mkDerivation rec { + name = "osinfo-db-tools-1.1.0"; + + src = fetchurl { + url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; + sha256 = "0sslzrbhpb2js1vn48c11s5p0bic3yqzdnxm054dhc3wq0pwshd1"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ glib libxml2 libxslt libarchive bzip2 lzma ]; + + meta = with stdenv.lib; { + description = "Tools for managing the osinfo database"; + homepage = https://libosinfo.org/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index f55f4e53296d..8e2ecdcd6bbb 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchurl, premake5, hostPlatform }: +{ stdenv, fetchFromGitHub, premake5, ninja, hostPlatform }: stdenv.mkDerivation rec { name = "otfcc-${version}"; version = "0.8.6"; - src = fetchurl { - url = "https://github.com/caryll/otfcc/archive/v${version}.tar.gz"; - sha256 = "0kap52bzrn21fmph8j2pc71f80f38ak1p2fcczzmrh0hb1r9c8dd"; + src = fetchFromGitHub { + owner = "caryll"; + repo = "otfcc"; + rev = "v${version}"; + sha256 = "0yy9awffxxs0cdlf0akld73ndnwmylxvplac4k6j7641m3vk1g8p"; }; - nativeBuildInputs = [ premake5 ]; + nativeBuildInputs = [ premake5 ninja ]; configurePhase = '' - premake5 gmake + premake5 ninja ''; - preBuild = "cd build/gmake"; - - makeFlags = ''config=release_${if hostPlatform.isi686 then "x86" else "x64"}''; - - postBuild = "cd ../.."; + ninjaFlags = let x = if hostPlatform.isi686 then "x86" else "x64"; in + [ "-C" "build/ninja" "otfccdump_release_${x}" "otfccbuild_release_${x}" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 0865044eac63..cb55226109b4 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook -, gtk2, intltool, pkgconfig }: +, gtk2, hicolor_icon_theme, intltool, pkgconfig +, which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { name = "parcellite-${version}"; @@ -12,8 +13,13 @@ stdenv.mkDerivation rec { sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; - buildInputs = [ gtk2 ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + buildInputs = [ gtk2 hicolor_icon_theme ]; + + preFixup = '' + # Need which and xdotool on path to fix auto-pasting. + gappsWrapperArgs+=(--prefix PATH : "${which}/bin:${xdotool}/bin") + ''; meta = with stdenv.lib; { description = "Lightweight GTK+ clipboard manager"; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index bfafe0151a0a..dfd81bd97423 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "picocom-${version}"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "npat-efault"; repo = "picocom"; rev = version; - sha256 = "06b2ic34dnxc73cprc5imi3iamlhsv623sbg9vj5h5rvs586dwjx"; + sha256 = "1i75ksm44la8kn82v71hzq0q5642y108rascdb94zilhagdhilk2"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index c68d41532c22..3493e7ffa7ba 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -57,6 +57,6 @@ in stdenv.mkDerivation rec { license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; maintainers = with stdenv.lib.maintainers; [ skeidel ]; - platforms = with stdenv.lib.platforms; linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix new file mode 100644 index 000000000000..aa8c43b7cdd7 --- /dev/null +++ b/pkgs/tools/misc/pubs/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "pubs-${version}"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "pubs"; + repo = "pubs"; + rev = "v${version}"; + sha256 = "0n5wbjx9wqy6smfg625mhma739jyg7c92766biaiffp0a2bzr475"; + }; + + propagatedBuildInputs = with python3Packages; [ + dateutil configobj bibtexparser pyyaml requests beautifulsoup4 + pyfakefs ddt + ]; + + preCheck = '' + # API tests require networking + rm tests/test_apis.py + + # pyfakefs works weirdly in the sandbox + export HOME=/ + ''; + + meta = with stdenv.lib; { + description = "Command-line bibliography manager"; + homepage = https://github.com/pubs/pubs; + license = licenses.lgpl3; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix new file mode 100644 index 000000000000..e0fefe85b9fd --- /dev/null +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }: + +stdenv.mkDerivation rec { + name = "recoverjpeg-${version}"; + version = "2.6.1"; + + src = fetchurl { + url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; + sha256 = "00zi23l4nq9nfjg1zzbpsfxf1s47r5w713aws90w13fd19jqn0rj"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ python2 ]; + + postFixup = '' + wrapProgram $out/bin/sort-pictures \ + --prefix PATH : ${stdenv.lib.makeBinPath [ exif imagemagick ]} + ''; + + meta = with stdenv.lib; { + homepage = https://rfc1149.net/devel/recoverjpeg.html; + description = "Recover lost JPEGs and MOV files on a bogus memory card or disk"; + license = licenses.gpl2; + maintainers = with maintainers; [ dotlambda ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 32f5a551dfe3..e9ed5c0450af 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # `make build/rcc/qrc_rbutilqt-lang.cpp` fails with + # RCC: Error in 'rbutilqt-lang.qrc': Cannot find file 'lang/rbutil_cs.qm' + # Do not add `lrelease rbutilqt.pro` into preConfigure, otherwise `make lrelease` + # may clobber the files read by the parallel `make build/rcc/qrc_rbutilqt-lang.cpp`. + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; homepage = http://www.rockbox.org; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index e3e174e0204a..ed97601e5191 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.routino.org/; description = "OpenStreetMap Routing Software"; license = licenses.agpl3; - maintainter = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index f6c4c3548e2a..d1e5a2451a79 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ stdenv, fetchFromGitHub, cmake, pkgconfig , glew, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0is3mh2d1jqgvv72v5x92w23yf26n8n384nbr1b6cn883aw8j7jz"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ glew glm mesa libX11 libXext libXrender icu ] ++ stdenv.lib.optional doCheck cppcheck; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix new file mode 100644 index 000000000000..f1493630a2a5 --- /dev/null +++ b/pkgs/tools/misc/smenu/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + version = "v0.9.10"; + name = "smenu-${version}"; + + src = fetchFromGitHub { + owner = "p-gen"; + repo = "smenu"; + rev = version; + sha256 = "1fh0s5zhx8ps760w0yxjv682lhahz1j63i0gdwvvr5vnvyx6c40d"; + }; + + buildInputs = [ ncurses ]; + + meta = with stdenv.lib; { + homepage = https://github.com/p-gen/smenu; + description = "Terminal selection utility"; + longDescription = '' + Terminal utility that allows you to use words coming from the standard + input to create a nice selection window just below the cursor. Once done, + your selection will be sent to standard output. + ''; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 312c0ae6db5a..b428205fcd05 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = http://www.cgsecurity.org/wiki/TestDisk; + homepage = https://www.cgsecurity.org/wiki/TestDisk; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index b399077bc5b4..788529125da5 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,22 +1,32 @@ -{ fetchurl, stdenv, pkgs, ... }: +{ stdenv, fetchFromGitHub, buildPythonApplication +, colorama, decorator, psutil, pyte, six +, pytest, pytest-mock +}: -pkgs.pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; +buildPythonApplication rec { pname = "thefuck"; - version = "3.18"; + version = "3.25"; - src = fetchurl { - url = "https://github.com/nvbn/${pname}/archive/${version}.tar.gz"; - sha256 = "1xsvkqh89rgxq5w03mnlcfkn9y39nfwhb2pjabjspcc2mi2mq5y6"; + src = fetchFromGitHub { + owner = "nvbn"; + repo = "${pname}"; + rev = version; + sha256 = "090mg809aac932lgqmjxm4za53lg3bjprj562sp189k47xs4wijv"; }; - propagatedBuildInputs = with pkgs.pythonPackages; [ - psutil - colorama - six - decorator - pathlib2 - ]; + propagatedBuildInputs = [ colorama decorator psutil pyte six ]; + + checkInputs = [ pytest pytest-mock ]; + + checkPhase = '' + export HOME=$TMPDIR + export LANG=en_US.UTF-8 + export XDG_CACHE_HOME=$TMPDIR/cache + export XDG_CONFIG_HOME=$TMPDIR/config + py.test + ''; + + doCheck = false; # The above is only enough for tests to pass outside the sandbox. meta = with stdenv.lib; { homepage = https://github.com/nvbn/thefuck; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index a528f5f394fa..de6c16123960 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://tmate.io/; + homepage = https://tmate.io/; description = "Instant Terminal Sharing"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index b41f38905380..35bdcf1b8231 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -9,14 +9,14 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "tmuxinator"; version = "0.10.0"; - sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; + source.sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; erubis = buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "erubis"; version = "2.7.0"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + source.sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; thor = buildRubyGem rec { @@ -24,7 +24,7 @@ buildRubyGem rec { name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "thor"; version = "0.19.1"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + source.sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; xdg = buildRubyGem rec { @@ -32,7 +32,7 @@ buildRubyGem rec { name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "xdg"; version = "2.2.3"; - sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; + source.sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; }; propagatedBuildInputs = [ erubis thor xdg ]; diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index af56b09da9cc..968ead6131be 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -3,13 +3,13 @@ pythonPackages.buildPythonApplication rec { name = "togglesg-download-git-${version}"; - version = "2016-05-31"; + version = "2017-12-07"; src = fetchFromGitHub { - owner = "0x776b7364"; - repo = "toggle.sg-download"; - rev = "7d7c5f4d549360f95e248accd9771949abd94ad2"; - sha256 = "0xj42khvacwmhbiy2p8rxk7lqg7pvya4zdc2c34lnr3avdp49fjn"; + owner = "0x776b7364"; + repo = "toggle.sg-download"; + rev = "e64959f99ac48920249987a644eefceee923282f"; + sha256 = "0j317wmyzpwfcixjkybbq2vkg52vij21bs40zg3n1bs61rgmzrn8"; }; nativeBuildInputs = [ makeWrapper ]; @@ -19,10 +19,16 @@ pythonPackages.buildPythonApplication rec { dontStrip = true; installPhase = '' - mkdir -p $out/bin + runHook preInstall + + mkdir -p $out/{bin,share/doc/togglesg-download} substitute $src/download_toggle_video2.py $out/bin/download_toggle_video2.py \ --replace "ffmpeg_download_cmd = 'ffmpeg" "ffmpeg_download_cmd = '${lib.getBin ffmpeg_3}/bin/ffmpeg" chmod 0755 $out/bin/download_toggle_video2.py + + cp LICENSE README.md $out/share/doc/togglesg-download + + runHook postInstall ''; meta = with stdenv.lib; { @@ -34,7 +40,7 @@ pythonPackages.buildPythonApplication rec { on your OS of choice. ''; license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; - maintainers = [ maintainers.peterhoeg ]; }; } diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 5dcaea3ec1ea..decbddcd477f 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,23 +1,27 @@ -{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, libiconv, qtbase, enableGUI ? true }: +{ + stdenv, lib, fetchurl, pkgconfig, autoreconfHook +, freetype, harfbuzz, libiconv, qtbase +, enableGUI ? true +}: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.8.1"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "1wh783pyg79ks5qbni61x7qngdhyfc33swrkcl5r1czdwhhlif9x"; + sha256 = "1yflnydzdfkr8bi29yf42hb6h6525a4rdid3w8qjfk8rpqh53pqj"; }; - postPatch = '' + postAutoreconf = '' substituteInPlace configure --replace "macx-g++" "macx-clang" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; - configureFlags = lib.optional (!enableGUI) "--with-qt=no"; + configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 3ea58546acec..b816b5225ca4 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ttwatch-${version}"; - version = "2017-10-31"; + version = "2017-12-31"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "f4103bdeb612a216ac21747941b3df943d67c48c"; - sha256 = "0fylycdi0g119d21l11yz23cjjhr3qdxjv02vz86zkc15kyvgsas"; + rev = "a261851d91e3304a47a04995758f6940747bc54a"; + sha256 = "0llcai1yxikh8nvzry71rr1zz365rg0k0lwp24np5w74kzza3kwx"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 9fea1b85f6ac..820c5a65c740 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; - homepage = http://hoytech.com/vmtouch/; + homepage = https://hoytech.com/vmtouch/; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/winusb/default.nix b/pkgs/tools/misc/winusb/default.nix deleted file mode 100644 index b99d77dd70fc..000000000000 --- a/pkgs/tools/misc/winusb/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, parted, grub2_light, p7zip -, wxGTK30, gksu }: - -stdenv.mkDerivation rec { - name = "winusb-unstable-2017-01-30"; - - src = fetchFromGitHub { - owner = "slacka"; - repo = "WinUSB"; - rev = "599f00cdfd5c931056c576e4b2ae04d9285c4192"; - sha256 = "1219425d1m4463jy85nrc5xz5qy5m8svidbiwnqicy7hp8pdwa7x"; - }; - - buildInputs = [ wxGTK30 makeWrapper ]; - - postInstall = '' - # don't write data into / - substituteInPlace $out/bin/winusb \ - --replace /media/ /tmp/winusb/ - - wrapProgram $out/bin/winusb \ - --prefix PATH : ${stdenv.lib.makeBinPath [ parted grub2_light p7zip ]} - wrapProgram $out/bin/winusbgui \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gksu ]} - ''; - - meta = with stdenv.lib; { - description = "Create bootable USB disks from Windows ISO images"; - homepage = https://github.com/slacka/WinUSB; - license = licenses.gpl3; - maintainers = with maintainers; [ bjornfor gnidorah ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix new file mode 100644 index 000000000000..436a252e678d --- /dev/null +++ b/pkgs/tools/misc/woeusb/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper +, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget +, wxGTK30 }: + +stdenv.mkDerivation rec { + version = "3.1.4"; + name = "woeusb-${version}"; + + src = fetchFromGitHub { + owner = "slacka"; + repo = "WoeUSB"; + rev = "v${version}"; + sha256 = "0hvxsm6k6s29wnr3i5b9drf6ml0i32is2l50l3cxvf1f499w4bpc"; + }; + + buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; + + postPatch = '' + # Emulate version smudge filter (see .gitattributes, .gitconfig). + for file in configure.ac debian/changelog src/woeusb src/woeusb.1 src/woeusbgui.1; do + substituteInPlace "$file" \ + --replace '@@WOEUSB_VERSION@@' '${version}' + done + + substituteInPlace src/MainPanel.cpp \ + --replace "'woeusb " "'$out/bin/woeusb " + ''; + + postInstall = '' + # don't write data into / + substituteInPlace "$out/bin/woeusb" \ + --replace /media/ /run/woeusb/ + + # woeusbgui launches woeusb with pkexec, which sets + # PATH=/usr/sbin:/usr/bin:/sbin:/bin:/root/bin. Perhaps pkexec + # should be patched with a less useless default PATH, but for now + # we add everything we need manually. + wrapProgram "$out/bin/woeusb" \ + --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}' + ''; + + doInstallCheck = true; + + postInstallCheck = '' + # woeusb --version checks for missing runtime dependencies. + out_version="$("$out/bin/woeusb" --version)" + [ "$out_version" = '${version}' ] + ''; + + meta = with stdenv.lib; { + description = "Create bootable USB disks from Windows ISO images"; + homepage = https://github.com/slacka/WoeUSB; + license = licenses.gpl3; + maintainers = with maintainers; [ bjornfor gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 33c9489a70d0..63b6cb66883b 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; - sourceRoot = "${name}/X11"; + # Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook + # on aarch64 doesn't find the files to patch and the aarch64 build fails! + preConfigure = "cd X11"; buildInputs = [ libX11 xproto libXt libICE libSM libXext ]; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index b5c3f9371459..444b14c5a63f 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { description = "Tool to convert XDXF dictionary files to slob format"; homepage = https://github.com/itkach/xdxf2slob/; license = licenses.gpl3; - maintainer = [ maintainers.rycee ]; + maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 34ac4cb7366f..2967892521ca 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages }: +{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }: pythonPackages.buildPythonApplication rec { name = "yle-dl-${version}"; - version = "2.28"; + version = "2.30"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "1nb3gmkizgkd09slihc2iaf3rh1s7bdhy9zydkfghmqi7nv4mmq0"; + sha256 = "08qqsg0rmp4xfzmla81f0a4vblqfw3rh90wvxm91vbm6937b4i7i"; }; - propagatedBuildInputs = with pythonPackages; [ lxml pyamf pycrypto requests ]; + propagatedBuildInputs = with pythonPackages; [ lxml pyamf pycrypto requests future ffmpeg ]; pythonPath = [ rtmpdump php ]; doCheck = false; # tests require network access diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 13d5dec91cee..808858724e67 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonApplication -, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,6 +8,7 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true +, phantomjsSupport ? true , hlsEncryptedSupport ? true , makeWrapper }: @@ -15,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.11.06"; + version = "2017.12.31"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1djq3sf16il6y7n175gv7xwdz2s9lvsvzs38k95cj579l4k0433d"; + sha256 = "0cq10ii96lpq3z7l1js0s59sqb4h4yqwdqinl2yf7cdjynvj62xi"; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,7 +34,8 @@ buildPythonApplication rec { packagesToBinPath = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump; + ++ optional rtmpSupport rtmpdump + ++ optional phantomjsSupport phantomjs2; in '' wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" ''; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 29e527fe862d..c4a8f3a623be 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, openssl, pcsclite }: +{ stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.4.4"; + name = "yubico-piv-tool-1.5.0"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "0s9pib3g4lmxw9rjjd5h3ad401150kb1wqrzf8w1bq79g0zsq3mb"; + sha256 = "1axa0lnky5gsc8yack6mpfbjh49z0czr1cv52gbgjnx2kcbpb0y1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl pcsclite ]; + buildInputs = [ openssl pcsclite check ]; configureFlags = [ "--with-backend=pcsc" ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 5a56430c20e9..d7e1b2289dca 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }: +{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools +, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { name = "aircrack-ng-1.2-rc4"; @@ -8,13 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap openssl zlib libnl ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' sed -e 's@^prefix.*@prefix = '$out@ -i common.mak sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c - ''; + ''; + + postFixup = '' + wrapProgram $out/bin/airmon-ng --prefix PATH : ${stdenv.lib.makeBinPath [ + ethtool iw pciutils + ]} + ''; meta = with stdenv.lib; { description = "Wireless encryption cracking tools"; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index b19d4cca315d..c9d689b8b2c1 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, gettext, libssl }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, gettext, libssl }: stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.15"; + version = "2.16.1"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "0wm16s129615i7rw48422q3x3ixr4v2p9942p0s6qk2fjlc3y8hf"; + sha256 = "0v3hgqrpqqqkj8ghaky88a0wpnpwqd72vd04ywlbhgfzfkfrllk4"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gettext libssl ]; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 9d2f83098b89..194758905ff2 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -19,6 +19,8 @@ in stdenv.mkDerivation { chmod +x $out/bin/burpsuite ''; + preferLocalBuild = true; + meta = { description = "An integrated platform for performing security testing of web applications"; longDescription = '' @@ -30,7 +32,6 @@ in stdenv.mkDerivation { homepage = https://portswigger.net/burp/; downloadPage = "https://portswigger.net/burp/freedownload"; license = [ stdenv.lib.licenses.unfree ]; - preferLocalBuild = true; platforms = jre.meta.platforms; hydraPlatforms = []; maintainers = [ stdenv.lib.maintainers.bennofs ]; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 24c86f4fa9a6..036819ea76e1 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,36 +1,25 @@ -{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala_0_23, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: +{stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { version = "6.1.0"; seafileVersion = "6.1.0"; name = "ccnet-${version}"; - src = fetchurl - { + src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which automake autoconf libtool vala_0_23 python ]; + nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; - preConfigure = '' - sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh - ./autogen.sh - ''; + configureFlags = [ "--enable-server" ]; - configureFlags = "--enable-server"; - - buildPhase = "make -j1"; - - meta = - { + meta = with stdenv.lib; { homepage = https://github.com/haiwen/ccnet; description = "A framework for writing networked applications in C"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.calrama ]; }; } diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index c7749e578d25..e0912007d952 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,41 +1,26 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, makeWrapper, libX11 }: +{ stdenv, fetchFromGitHub, qmake, qtbase, libX11 }: stdenv.mkDerivation rec { name = "cmst-${version}"; - version = "2017.03.18"; + version = "2017.09.19"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = name; - sha256 = "0lsg8ya36df48ij0jawgli3f63hy6mn9zcla48whb1l4r7cih545"; + sha256 = "14inss0mr9i4q6vfqqfxbjgpjaclp1kh60qlm5xv4cwnvi395rc7"; }; - nativeBuildInputs = [ makeWrapper qmake ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase ]; enableParallelBuilding = true; - preConfigure = '' - substituteInPlace ./cmst.pro \ - --replace "/usr/share" "$out/share" - - substituteInPlace ./cmst.pri \ - --replace "/usr/lib" "$out/lib" \ - --replace "/usr/share" "$out/share" - - substituteInPlace ./apps/cmstapp/cmstapp.pro \ - --replace "/usr/bin" "$out/bin" - - substituteInPlace ./apps/rootapp/rootapp.pro \ - --replace "/etc" "$out/etc" \ - --replace "/usr/share" "$out/share" - ''; - - postInstall = '' - wrapProgram $out/bin/cmst \ - --prefix "QTCOMPOSE" ":" "${libX11}/share/X11/locale" + postPatch = '' + for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do + substituteInPlace $f --replace /etc $out/etc --replace /usr $out + done ''; meta = { diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 0dc3d02d154b..f40b1ce6f4c9 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--enable-datafiles" "--enable-pptp" "--with-pptp=${pptp}/sbin/pptp" + "--enable-iwd" ]; postInstall = '' diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d67b34371fe2..be42c4a1381a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -6,8 +6,9 @@ , sslSupport ? false, openssl ? null , gnutlsSupport ? false, gnutls ? null , scpSupport ? false, libssh2 ? null -, gssSupport ? false, gss ? null +, gssSupport ? false, kerberos ? null , c-aresSupport ? false, c-ares ? null +, brotliSupport ? false, brotli ? null }: assert http2Support -> nghttp2 != null; @@ -19,13 +20,15 @@ assert !(gnutlsSupport && sslSupport); assert gnutlsSupport -> gnutls != null; assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; +assert brotliSupport -> brotli != null; +assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.56.1"; + name = "curl-7.57.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "142zidvlmrz31yx480nrhh47hl01d7jbaagin23pspl7cw1ng515"; + sha256 = "09j88lzqmi79rvvg2l7bjcs56330bq388f5p468hgblf6hdf6by9"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -43,11 +46,12 @@ stdenv.mkDerivation rec { optional idnSupport libidn ++ optional ldapSupport openldap ++ optional zlibSupport zlib ++ - optional gssSupport gss ++ + optional gssSupport kerberos ++ optional c-aresSupport c-ares ++ optional sslSupport openssl ++ optional gnutlsSupport gnutls ++ - optional scpSupport libssh2; + optional scpSupport libssh2 ++ + optional brotliSupport brotli; # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' @@ -64,9 +68,10 @@ stdenv.mkDerivation rec { ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) + ( if brotliSupport then "--with-brotli" else "--without-brotli" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; + ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"; CXX = "c++"; CXXCPP = "c++ -E"; diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 5edeee715c29..95bfdca6315a 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.9.5"; src = fetchurl { - url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${name}.orig.tar.gz"; sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8"; }; diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix index cfc9986b0db8..913e76c0f4ba 100644 --- a/pkgs/tools/networking/hss/default.nix +++ b/pkgs/tools/networking/hss/default.nix @@ -13,7 +13,7 @@ buildRubyGem rec { inherit ruby; gemName = "hss"; version = "1.0.1"; - sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; + source.sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; postInstall = '' substituteInPlace $GEM_HOME/gems/${gemName}-${version}/bin/hss \ diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 83ad64a66a4a..fd7caf927653 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -20,6 +20,10 @@ pythonPackages.buildPythonApplication rec { six ]; + checkPhase = '' + $out/bin/${name} --version | grep -q "${version}" + ''; + meta = with stdenv.lib; { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; homepage = https://github.com/eliangcs/http-prompt; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index cf26ec61139b..d66ff70180ac 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.31"; + name = "i2p-0.9.32"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1v2my5jqcj8zidxij34h0lpa533rr6ianzz8yld01sxi6gg41w28"; + sha256 = "1c82yckwzp51wqrr8qhww3sifm1a9nzrymsf9qv99ngsxq4n5l6i"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 68fb72ff7d9e..f33fe7a7105c 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" + "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - openssl log4cplus boost python3 mysql.client + openssl log4cplus boost python3 mysql.connector-c botan2 gmp bzip2 ]; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 6808c5c0a42b..bbee6546b2f4 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -8,11 +8,12 @@ let arch = if stdenv.system == "x86_64-linux" then "x64" else if stdenv.system == "i686-linux" then "x86" - else abort "Unsupported architecture"; + else throwSystem; + throwSystem = throw "Unsupported system: ${stdenv.system}"; sha256 = if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3" else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" - else abort "Unsupported architecture"; + else throwSystem; libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index aee5302405a5..6f47b4b55766 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, libtool, pkgconfig +{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, gss, mysql }: +, python, gss, mysql }: let p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files"; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "${project}-${version}"; project = "mailutils"; version = "3.2"; @@ -16,11 +15,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook gettext libtool pkgconfig + autoreconfHook gettext pkgconfig ] ++ stdenv.lib.optional doCheck dejagnu; buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools - gss mysql.lib + gss mysql.connector-c python ]; patches = [ @@ -52,14 +51,20 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -e '/AM_GNU_GETTEXT_VERSION/s/0.18/0.19/' -i configure.ac sed -i -e '/chown root:mail/d' \ -e 's/chmod [24]755/chmod 0755/' \ */Makefile{.in,.am} + sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac + sed -i 's/0\.18/0.19/' configure.ac + sed -i -e 's:mysql/mysql.h:mysql.h:' \ + -e 's:mysql/errmsg.h:errmsg.h:' \ + sql/mysql.c ''; + NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql"; + preCheck = '' - # Add missing files. + # Add missing test files cp ${builtins.toString readmsg-tests} readmsg/tests/ for f in hdr.at nohdr.at twomsg.at weed.at; do mv readmsg/tests/*-$f readmsg/tests/$f diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 7c7c63ef230c..a59aee83b939 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.9.98"; src = fetchurl { - url = "http://megatools.megous.com/builds/${name}.tar.gz"; + url = "https://megatools.megous.com/builds/${name}.tar.gz"; sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; - homepage = http://megatools.megous.com/; + homepage = https://megatools.megous.com/; license = licenses.gpl2Plus; maintainers = [ maintainers.viric maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index efe2847ae355..a1a2b79b86a4 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Teredo IPv6 Tunneling Daemon"; - homepage = http://www.remlab.net/miredo/; + homepage = https://www.remlab.net/miredo/; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index f96987a1300b..131021704a22 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,6 +1,28 @@ { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: -python3.pkgs.buildPythonPackage rec { +let + # When overrides are not needed, then only remove the contents of this set. + packageOverrides = self: super: { + ldap3 = super.ldap3.overridePythonAttrs (oldAttrs: rec { + version = "2.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "c056b3756076e15aa71c963c7c5a44d5d9bbd430263ee49598d4454223a766ac"; + }; + }); + pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { + version = "0.3.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965"; + }; + }); + }; + + pythonPackages = (python3.override {inherit packageOverrides; }).pkgs; +in with pythonPackages; + +buildPythonPackage rec { baseName = "mitmproxy"; name = "${baseName}-unstable-2017-10-31"; @@ -17,7 +39,7 @@ python3.pkgs.buildPythonPackage rec { LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ blinker click certifi cryptography h2 hyperframe kaitaistruct passlib pyasn1 pyopenssl @@ -25,13 +47,13 @@ python3.pkgs.buildPythonPackage rec { urwid brotlipy sortedcontainers ldap3 ]; - buildInputs = with python3.pkgs; [ + buildInputs = [ beautifulsoup4 flask pytest pytestrunner glibcLocales ]; meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = http://mitmproxy.org/; + homepage = https://mitmproxy.org/; license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index e66209c7ce95..fb94b750e1d8 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty -, makeWrapper, perl, openssl, autoreconfHook, openssh }: +, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion }: stdenv.mkDerivation rec { name = "mosh-1.3.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl ]; + buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl bash-completion ]; patches = [ ./ssh_path.patch ]; postPatch = '' @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { --subst-var-by ssh "${openssh}/bin/ssh" ''; + configureFlags = [ "--enable-completion" ]; + postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index c83bc61bbcd0..4c632899ac2e 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, coreutils }: -let version = "3.2.5"; in +let version = "3.2.6"; in stdenv.mkDerivation { name = "ncftp-${version}"; src = fetchurl { - url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.bz2"; - sha256 = "0hlx12i0lwi99qsrx7nccf4nvwjj2gych4yks5y179b1ax0y5sxl"; + url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz"; + sha256 = "1389657cwgw5a3kljnqmhvfh4vr2gcr71dwz1mlhf22xq23hc82z"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index e19b8ba7f649..bd5190767d1f 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; license = stdenv.lib.licenses.gpl2; - homepage = http://mamuti.net/netrw/index.en.html; + homepage = https://mamuti.net/netrw/index.en.html; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index fc320ba2fb96..d0881c5ac5e5 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -2,7 +2,7 @@ , libnotify, libsecret, polkit, isocodes, modemmanager , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk -, withGnome ? false }: +, libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: stdenv.mkDerivation rec { name = "${pname}-${major}.${minor}"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--without-selinux" + "--with-appindicator" ]; outputs = [ "out" "dev" ]; @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes udev libgudev gnome3.libgnome_keyring modemmanager jansson glib_networking + libindicator-gtk3 libappindicator-gtk3 ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 91b4a5e8957f..b40afa605e3b 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.2.4"; + version = "1.2.8"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = "${version}"; - sha256 = "1mvn0z1vl4j9drl3dsw2dv0pppqvj29d2m07487dzzi8cbxrqj36"; + sha256 = "110157dpamgr7r5kb8aidi0a2ap9z2m52bff94fb4nhxacz69yv8"; }; buildInputs = [ networkmanager ppp libsecret ] @@ -31,13 +31,18 @@ stdenv.mkDerivation rec { intltoolize -f ''; - configureFlags = - if withGnome then "--with-gnome" else "--without-gnome"; + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/var" + "--sysconfdir=$(out)/etc" + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/seriyps/NetworkManager-l2tp; + homepage = https://github.com/nm-l2tp/network-manager-l2tp; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 9d26a84d6f2e..f26571874644 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, procps +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps , gnome3, libgnome_keyring, libsecret }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure" ''; - buildInputs = [ networkmanager libsecret ] + buildInputs = [ networkmanager strongswanNM libsecret ] ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]); nativeBuildInputs = [ intltool pkgconfig ]; @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/bin/sysctl" ''; + configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; + meta = { description = "NetworkManager's strongswan plugin"; inherit (networkmanager.meta) platforms; }; } - diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 93646d58cd30..e5fde0f80385 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.7"; src = fetchurl { - url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; + url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; - homepage = http://arthurdejong.org/nss-pam-ldapd/; + homepage = https://arthurdejong.org/nss-pam-ldapd/; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix index f2d4d979ceeb..c93e94e2f287 100644 --- a/pkgs/tools/networking/ocproxy/default.nix +++ b/pkgs/tools/networking/ocproxy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenConnect proxy"; - longdescription = '' + longDescription = '' ocproxy is a user-level SOCKS and port forwarding proxy for OpenConnect based on lwIP. ''; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c167851086e6..4295151516d8 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.2"; + version = "7.1.4"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1bvlbw3bsx3qs8np1qdqbhpdr9qykzsql9684gm7gg84gw51i667"; + sha256 = "04y2bsgmxykkhcjh3540y2a43xrwfkzd7wks1wvl6av0vjaqa5gm"; }; postPatch = '' diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index f22ad32aaa4e..209e1f64c72b 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; - homepage = http://roy.marples.name/projects/openresolv; + homepage = https://roy.marples.name/projects/openresolv; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index ddcdfd31c260..272900e0e5b0 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig +{ stdenv, fetchurl, iproute, lzo, openssl, pam, pkgconfig +, useSystemd ? stdenv.isLinux, systemd ? null , pkcs11Support ? false, pkcs11helper ? null, }: +assert useSystemd -> (systemd != null); assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; @@ -17,13 +19,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lzo openssl ] - ++ optionals stdenv.isLinux [ pam systemd iproute ] + ++ optionals stdenv.isLinux [ pam iproute ] + ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; configureFlags = optionals stdenv.isLinux [ - "--enable-systemd" "--enable-iproute2" "IPROUTE=${iproute}/sbin/ip" ] + ++ optional useSystemd "--enable-systemd" ++ optional pkcs11Support "--enable-pkcs11" ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index d9b44cc23116..b082a981ae74 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "An offline WPS bruteforce utility"; homepage = https://github.com/wiire/pixiewps; license = stdenv.lib.licenses.gpl3; - maintainer = stdenv.lib.maintainers.nico202; + maintainers = [ stdenv.lib.maintainers.nico202 ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 6332d6c85774..ceee8cca1aae 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx"; }; + patches = [ ./tar-1.30.diff ]; # quicktun master seems not to need this + buildInputs = [ libsodium ]; buildPhase = "bash build.sh"; diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/tools/networking/quicktun/tar-1.30.diff new file mode 100644 index 000000000000..88498e542807 --- /dev/null +++ b/pkgs/tools/networking/quicktun/tar-1.30.diff @@ -0,0 +1,19 @@ +Fix build with gnutar-1.30 + +Creating source archive... +tar: The following options were used after any non-optional arguments in archive create or update mode. These options are positional and affect only arguments that follow them. Please, rearrange them properly. +tar: --exclude 'debian/data' has no effect +tar: Exiting with failure status due to previous errors +diff --git a/build.sh b/build.sh +index 0ea0403..725178c 100755 +--- a/build.sh ++++ b/build.sh +@@ -25,7 +25,7 @@ rm -rf out/ obj/ tmp/ + mkdir -p out + if [ "$1" != "debian" ]; then + echo Creating source archive... +- $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data" ++ $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" --exclude "debian/data" build.sh clean.sh debian src version + fi + + mkdir -p obj tmp tmp/include tmp/lib diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f3baddd2653c..46580c0b802c 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }: +{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }: stdenv.mkDerivation rec { name = "snabb-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { done # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 77409f6fc3e9..eff498a174eb 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,7 +1,14 @@ -{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook -, curl, trousers, sqlite, iptables, libxml2, openresolv -, ldns, unbound, pcsclite, openssl, systemd, pam -, enableTNC ? false }: +{ stdenv, fetchurl +, pkgconfig, autoreconfHook +, gmp, python, iptables, ldns, unbound, openssl, pcsclite +, openresolv +, systemd, pam + +, enableTNC ? false, curl, trousers, sqlite, libxml2 +, enableNetworkManager ? false, networkmanager +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "strongswan-${version}"; @@ -17,8 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ gmp python iptables ldns unbound openssl pcsclite ] - ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ] - ++ stdenv.lib.optionals stdenv.isLinux [ systemd.dev pam ]; + ++ optionals enableTNC [ curl trousers sqlite libxml2 ] + ++ optionals stdenv.isLinux [ systemd.dev pam ] + ++ optionals enableNetworkManager [ networkmanager ]; patches = [ ./ext_auth-path.patch @@ -54,9 +62,9 @@ stdenv.mkDerivation rec { "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] - ++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] - ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" - ++ stdenv.lib.optionals enableTNC [ + ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] + ++ optional (stdenv.system == "i686-linux") "--enable-padlock" + ++ optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" @@ -65,14 +73,15 @@ stdenv.mkDerivation rec { "--enable-tnc-ifmap" "--enable-tnc-imc" "--enable-tnc-imv" "--with-tss=trousers" "--enable-aikgen" - "--enable-sqlite" ]; + "--enable-sqlite" ] + ++ optional enableNetworkManager "--enable-nm"; NIX_LDFLAGS = "-lgcc_s" ; meta = { description = "OpenSource IPsec-based VPN Solution"; homepage = https://www.strongswan.org; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 8f9636041fff..7ba4a0d89362 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stun server and test client"; - homepage = http://sourceforge.net/projects/stun/; + homepage = https://sourceforge.net/projects/stun/; license = licenses.vsl10; maintainers = with maintainers; [ marcweber obadz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index fbebba21dbd6..deac37468360 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.41"; + version = "5.44"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "13qld0b8w2yfs2kfwnqvhcg98warh8hcyk13rjxdwv8zxqhn6p7h"; + sha256 = "1692y69wl7j6yjgnrrzclgzb34bxsaxjzl1dfy47vms7pdfk42lr"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix new file mode 100644 index 000000000000..0c3af79628e1 --- /dev/null +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + version = "2.2.1"; + pname = "swagger-codegen"; + name = "${pname}-${version}"; + + jarfilename = "${pname}-cli-${version}.jar"; + + nativeBuildInputs = [ + makeWrapper + ]; + + src = fetchurl { + url = "https://oss.sonatype.org/content/repositories/releases/io/swagger/${pname}-cli/${version}/${jarfilename}"; + sha256 = "1pwxkl3r93c8hsif9xm0h1hmbjrxz1q7hr5qn5n0sni1x3c3k0d1"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre}/bin/java $out/bin/swagger-codegen \ + --add-flags "-jar $out/share/java/${jarfilename}" + ''; + + meta = with stdenv.lib; { + description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; + homepage = https://github.com/swagger-api/swagger-codegen; + license = licenses.asl20; + maintainers = [ maintainers.jraygauthier ]; + }; +} diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 5b7f8f114df3..4af7e1eb5bab 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { checkPhase = "make test"; meta = { - homepage = http://random.zerodogg.org/swec/; + homepage = https://random.zerodogg.org/swec/; description = "Simple Web Error Checker (SWEC)"; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 8dba4b373a32..5c6920487b7d 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { crossAttrs = { LDFLAGS = if enableStatic then "-static" else ""; configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional - (hostPlatform.platform.kernelMajor == "2.4") "--disable-ipv6"); + (hostPlatform.platform.kernelMajor or null == "2.4") "--disable-ipv6"); }; meta = { diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 1c8829a07b27..52bb418fc0d0 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; license = stdenv.lib.licenses.bsd3; - homepage = http://monkey.org/~marius/pages/?page=trickle; + homepage = https://monkey.org/~marius/pages/?page=trickle; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 56025dd88c60..5fe69ede1a7d 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = { homepage = https://github.com/sloonz/ua; license = stdenv.lib.licenses.isc; - shortDescription = "Universal Aggregator"; + description = "Universal Aggregator"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index c2c707fbc77a..7cb489a3f213 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { "-I${openssl.dev}/include/openssl"; installPhase = '' - mkdir -p $out/bin $out/lib $out/include - cp c-client/*.h c-client/linkage.c $out/include + mkdir -p $out/bin $out/lib $out/include/c-client + cp c-client/*.h osdep/unix/*.h c-client/linkage.c c-client/auths.c $out/include/c-client/ cp c-client/c-client.a $out/lib/libc-client.a cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \ tools/{an,ua} $out/bin diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 496c01c02fc5..86e483114a39 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/; + homepage = https://www.unix-ag.uni-kl.de/~massar/vpnc/; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix new file mode 100644 index 000000000000..16c0034e46fc --- /dev/null +++ b/pkgs/tools/networking/zssh/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, readline, deepin-terminal }: + +let + version = "1.5c"; +in stdenv.mkDerivation rec { + name = "zssh-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/zssh/${name}.tgz"; + sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52"; + }; + + buildInputs = [ readline ]; + + patches = [ + # Cargo-culted from Arch, returns “out of pty's” without it + (fetchurl { + name = "fix_use_ptmx_on_arch.patch"; + url = https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67; + sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; + }) + ]; + + patchFlags = [ "-p0" ]; + + # The makefile does not create the directories + postBuild = '' + install -dm755 "$out"/{bin,man/man1} + ''; + + meta = { + description = "SSH and Telnet client with ZMODEM file transfer capability"; + homepage = http://zssh.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = deepin-terminal.meta.maintainers; # required by deepin-terminal + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/tools/nix/info/info.sh index 473e035b8e0a..f108962b3bad 100755 --- a/pkgs/tools/nix/info/info.sh +++ b/pkgs/tools/nix/info/info.sh @@ -143,7 +143,7 @@ fact() { printf ", " fi else - printf " - %s: \`%s\`\n" "$name" "$value" + printf " - %s: \`%s\`\\n" "$name" "$value" fi if [ "$last" -eq 0 ]; then diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index e33776eaa2b7..042d2c314b19 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,12 +20,12 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.7"; + name = "dysnomia-0.7.1"; src = fetchurl { - url = https://github.com/svanderburg/dysnomia/files/842819/dysnomia-0.7.tar.gz; - sha256 = "0nlb7fvndnxs878aah30cac4gqf2w9qq4bdpqj4m0j3d9nhpak2j"; + url = https://github.com/svanderburg/dysnomia/files/1576949/dysnomia-0.7.1.tar.gz; + sha256 = "0fyyn6654p10mrm2rlgv017d74wjb8z9h2xzv8gwdly34kifj9dh"; }; - + preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; configureFlags = [ diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix new file mode 100644 index 000000000000..8eb266a9e654 --- /dev/null +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -0,0 +1,38 @@ +#Adapted from +#https://github.com/rycee/home-manager/blob/9c1b3735b402346533449efc741f191d6ef578dd/home-manager/default.nix + +{ bash, coreutils, less, stdenv, makeWrapper, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "home-manager-${version}"; + version = "2017-12-7"; + + src = fetchFromGitHub{ + owner = "rycee"; + repo = "home-manager"; + rev = "0be32c9d42e3a8739263ae7886dc2448c833c19c"; + sha256 = "06lmnzlf5fmiicbgai27ad9m3bj980xf8ifdpc5lzbsy77pfcfap"; + }; + + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + + installPhase = '' + install -v -D -m755 ${src}/home-manager/home-manager $out/bin/home-manager + + substituteInPlace $out/bin/home-manager \ + --subst-var-by bash "${bash}" \ + --subst-var-by coreutils "${coreutils}" \ + --subst-var-by less "${less}" \ + --subst-var-by HOME_MANAGER_PATH '${src}' + ''; + + meta = with stdenv.lib; { + description = "A user environment configurator"; + maintainers = with maintainers; [ rycee ]; + platforms = platforms.linux; + license = licenses.mit; + }; + +} diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 622d095d4613..b08d65e123da 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: +{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: stdenv.mkDerivation rec { version = "1.8.1"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ]; + cmakeFlags="-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"; + + buildInputs = [ python expat glib pcre openssl curl check attr gpgme ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here propagatedBuildInputs = [ curl gpgme expat ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index fe7818691779..33f132ae74f2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline +, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl -, libseccomp, busybox, nlohmann_json +, libseccomp, busybox , hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -39,7 +39,7 @@ let buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals fromGit [ brotli readline nlohmann_json ] # Since 1.12 + ++ lib.optionals fromGit [ brotli ] # Since 1.12 ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) (aws-sdk-cpp.override { @@ -152,21 +152,21 @@ in rec { nix = nixStable; nixStable = (common rec { - name = "nix-1.11.15"; + name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "d20f20e45d519f54fae5c61d55eadcf53e6d7cdbde9870eeec80d499f9805165"; + sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { name = "nix-unstable-1.12${suffix}"; - suffix = "pre5732_fd10f6f2"; + suffix = "pre5810_5d5b931f"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "fd10f6f2414521947ca60b9d1508d909f50e9faa"; - sha256 = "17561jll94c8hdpxnyvdbjslnwr9g7ii4wqvrla7gfza236j9hff"; + rev = "5d5b931fb178046ba286b8ef2b56a00b3a85c51c"; + sha256 = "0sspf8np53j335dvgxw03lid0w43wzjkcbx6fqym2kqdcvbzw57j"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 24d88517b6a4..04b29bcf8f7c 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "apg-2.3.0b"; src = fetchurl { @@ -8,9 +8,14 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; + makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; patches = [ ./apg.patch ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile + ''; + meta = { description = "Tools for random password generation"; longDescription = '' diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 7230d30c7955..edebd95303a9 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "2.0.7"; + version = "2.0.10"; goPackagePath = "github.com/dannyvankooten/browserpass"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "1dbp5za5qh6xmgh3w2cx5fbw13mh1szgj2y7ilmq0jh2ik09fbnd"; + sha256 = "0clkalw2wz2zs0p5hsq57iqp2bdp7y17zf5l2d0y7xfddff9sd82"; }; postInstall = '' diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix index 4a86966a9fc0..763317aafc7b 100644 --- a/pkgs/tools/security/browserpass/deps.nix +++ b/pkgs/tools/security/browserpass/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; - sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; + rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; + sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; }; } { diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 54aeb32cabd6..0cc026f0c877 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,16 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "chkrootkit-0.51"; + name = "chkrootkit-0.52"; src = fetchurl { url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; - sha256 = "0y0kbhy8156y8zli0wcqbakb9rprzl1w7jn0kw3xjfgzrgsncqgn"; + sha256 = "04d2yxpy99y90rvrlc9fqmlffs6iyfbghxbhvv12j1xfr2ww0y65"; }; # TODO: a lazy work-around for linux build failure ... makeFlags = [ "STATIC=" ]; + postPatch = '' + substituteInPlace chkrootkit \ + --replace " ./" " $out/bin/" + ''; + installPhase = '' mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 31f2262cd9ff..ca9cdcc8d6c0 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.7"; in +let version = "0.10.1"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "07l5pz93mz1r3g59xiyyznlpjfpv2zgvh3h9w0cbn79v7njim8kb"; + sha256 = "05ngnjxrwvfdd233s5n2wd8w4ndkpgrgymlfzn6i2fjlwf4hdikj"; }; propagatedBuildInputs = [ gamin ] diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 69b4b36fb9b3..66a50e268a53 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.79"; src = fetchurl { - url = "http://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; + url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; - homepage = http://als.regnet.cz/fpm2/; + homepage = https://als.regnet.cz/fpm2/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hce ]; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index aade96ed3899..51fff4c59ec1 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.8.18"; + version = "1.8.19"; name = "gnome-encfs-manager-${version}"; src = fetchurl { url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz"; - sha256 = "1rpf683lxa78fmxxb0hnq7vdh3yn7qid2gqq67q9mk65sp9vdhdj"; + sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 0519902308af..89fee90364e8 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1d4482c4pbi0p1k8cc0f9c4q51k56v8navrbz5samxrrs42p3lyb"; + sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix new file mode 100644 index 000000000000..abe7aa1fc7cf --- /dev/null +++ b/pkgs/tools/security/gopass/default.nix @@ -0,0 +1,45 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }: + +buildGoPackage rec { + version = "1.6.7"; + name = "gopass-${version}"; + + goPackagePath = "github.com/justwatchcom/gopass"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + owner = "justwatchcom"; + repo = "gopass"; + rev = "v${version}"; + sha256 = "0al2avdvmnnz7h21hnvlacr20k50my5l67plgf4cphy52p9461vp"; + }; + + wrapperPath = with stdenv.lib; makeBinPath ([ + git + gnupg + ]); + + postFixup = '' + wrapProgram $bin/bin/gopass \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = with stdenv.lib; { + description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; + homepage = https://github.com/justwatchcom/gopass; + license = licenses.mit; + maintainers = with maintainers; [ andir ]; + platforms = platforms.unix; + + longDescription = '' + gopass is a rewrite of the pass password manager in Go with the aim of + making it cross-platform and adding additional features. Our target + audience are professional developers and sysadmins (and especially teams + of those) who are well versed with a command line interface. One explicit + goal for this project is to make it more approachable to non-technical + users. We go by the UNIX philosophy and try to do one thing and do it + well, providing a stellar user experience and a sane, simple interface. + ''; + }; +} diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index f9c7f4eaf1c7..2b1708c9243c 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; homepage = http://www.haka-security.org/; license = stdenv.lib.licenses.mpl20; - maintaineres = [ stdenv.lib.maintainers.tvestelind ]; + maintainers = [ stdenv.lib.maintainers.tvestelind ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 4d60b11f977c..fd78d9b2efbf 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn"; }; - pythonPath = with pythonPackages; [ dns m2crypto ipaddr python-gnupg + pythonPath = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg pyunbound ]; buildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 81c92415c509..781a988619cc 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "0l1vq4h1gfxc2yclxkvy6gfz6sii2vyzip8pw6ifq930y8dvi34y"; + sha256 = "1pafjwibppylfgs3rck6724dhd3vwwndb9lkc29gd64pxd3l98kz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 37946b940cf1..7552b21ed333 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 -, writeText, gcc +, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper }: with stdenv.lib; @@ -35,7 +35,11 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--disable-native-macro" ]; - buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ]; + buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; + propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py + (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong MIMEBase64 # For pass_gen.pl + NetLDAP ]); # For sha-dump.pl + # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john # gcc: error: memdbg.o: No such file or directory @@ -43,18 +47,23 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ]; - installPhase = '' - mkdir -p "$out/etc/john" "$out/share/john" "$out/share/doc/john" - find ../run -mindepth 1 -maxdepth 1 -type f -executable \ - -exec "${stdenv.shell}" "${writeText "john-binary-install.sh" '' - filename="$(basename "$1")" - install -vD "$1" "$out/bin/''${filename%.*}" - ''}" {} \; + postInstall = '' + mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" + find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \ + -exec cp -d {} "$out/bin" \; cp -vt "$out/etc/john" ../run/*.conf cp -vt "$out/share/john" ../run/*.chr ../run/password.lst cp -vrt "$out/share/doc/john" ../doc/* ''; + postFixup = '' + wrapPythonPrograms + + for i in $out/bin/*.pl; do + wrapProgram "$i" --prefix PERL5LIB : $PERL5LIB + done + ''; + meta = { description = "John the Ripper password cracker"; license = licenses.gpl2; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index ce59ddca7c07..9395d4acb8b9 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,24 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }: +{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig +, bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "0nrsrd5cqyv2zydzzl1vryrnj1p0x17cx1rmrp4kmzh83bzgcfvv"; + sha256 = "0041z2awpmwq2fk8lbgp4fcia0r6wss2csvq5bxps0cx7fq69wc1"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; + buildInputs = [ - openssl curl libxml2 asciidoc docbook_xsl libxslt + bash-completion curl openssl libxml2 libxslt ]; - makeFlags = "PREFIX=$(out)"; + enableParallelBuilding = true; + + cmakeFlags = [ + "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions" + ]; installTargets = "install install-doc"; @@ -26,7 +31,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://github.com/lastpass/lastpass-cli"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix new file mode 100644 index 000000000000..5eb659f40c3a --- /dev/null +++ b/pkgs/tools/security/libacr38u/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }: + +stdenv.mkDerivation rec { + version = "1.7.11"; + name = "libacr38u-${version}"; + + src = fetchurl { + url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2"; + sha256 = "0lxbq17y51cablx6bcd89klwnyigvkz0rsf9nps1a97ggnllyzkx"; + }; + + doCheck = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcsclite libusb ]; + + preBuild = '' + makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); + ''; + + meta = with stdenv.lib; { + description = "ACR38U smartcard reader driver for pcsclite"; + longDescription = '' + A PC/SC IFD handler implementation for the ACS ACR38U + smartcard readers. This driver is for the non-CCID version only. + + This package is needed to communicate with the ACR38U smartcard readers through + the PC/SC Lite resource manager (pcscd). + + It can be enabled in /etc/nixos/configuration.nix by adding: + services.pcscd.enable = true; + services.pcscd.plugins = [ libacr38u ]; + + The package is based on the debian package libacr38u. + ''; + homepage = http://www.acs.com.hk; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ berce ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix new file mode 100644 index 000000000000..f746e8c8ffd9 --- /dev/null +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, doxygen, perl, valgrind +, curl, geoip, libxml2, lmdb, lua, pcre, yajl }: + +stdenv.mkDerivation rec { + name = "libmodsecurity-${version}"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "SpiderLabs"; + repo = "ModSecurity"; + fetchSubmodules = true; + rev = "v${version}"; + sha256 = "1y9nxbf5vgip4zl948a27xpw4mpimqd7xmskfi40k6g0cmmsx1x1"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ doxygen perl valgrind curl geoip libxml2 lmdb lua pcre yajl]; + + configureFlags = [ + "--enable-static" + "--with-curl=${curl.dev}" + "--with-libxml=${libxml2.dev}" + "--with-pcre=${pcre.dev}" + "--with-yajl=${yajl}" + ]; + + meta = with stdenv.lib; { + description = '' + ModSecurity v3 library component. + ''; + longDescription = '' + Libmodsecurity is one component of the ModSecurity v3 project. The + library codebase serves as an interface to ModSecurity Connectors taking + in web traffic and applying traditional ModSecurity processing. In + general, it provides the capability to load/interpret rules written in + the ModSecurity SecRules format and apply them to HTTP content provided + by your application via Connectors. + ''; + homepage = https://modsecurity.org/; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index 2d58bcc9a230..e30ad30a4dc1 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchgit, which, procps, kbd }: +{ stdenv, fetchgit, autoconf, automake, which, procps, kbd }: stdenv.mkDerivation rec { name = "logkeys-${version}"; - version = "2015-11-10"; + version = "2017-10-10"; src = fetchgit { url = https://github.com/kernc/logkeys; - rev = "78321c6e70f61c1e7e672fa82daa664017c9e69d"; - sha256 = "1b1fa1rblyfsg6avqyls03y0rq0favipn5fha770rsirzg4r637q"; + rev = "5c368327a2cd818efaed4794633c260b90b87abf"; + sha256 = "0akj7j775y9c0p53zq5v12jk3fy030fpdvn5m1x9w4rdj47vxdpg"; }; - buildInputs = [ which procps kbd ]; + buildInputs = [ autoconf automake which procps kbd ]; postPatch = '' - substituteInPlace src/Makefile.in --replace 'root' '$(id -u)' - substituteInPlace configure --replace '/dev/input' '/tmp' - sed -i '/chmod u+s/d' src/Makefile.in + substituteInPlace src/Makefile.am --replace 'root' '$(id -u)' + substituteInPlace configure.ac --replace '/dev/input' '/tmp' + sed -i '/chmod u+s/d' src/Makefile.am ''; + preConfigure = "./autogen.sh"; + meta = with stdenv.lib; { description = "A GNU/Linux keylogger that works!"; license = licenses.gpl3; homepage = https://github.com/kernc/logkeys; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [mikoim offline]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix new file mode 100644 index 000000000000..5e13674bb77a --- /dev/null +++ b/pkgs/tools/security/lynis/default.nix @@ -0,0 +1,38 @@ +{ stdenv, makeWrapper, fetchFromGitHub, gawk, perl }: + +stdenv.mkDerivation rec { + pname = "lynis"; + version = "2.5.7"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "CISOfy"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "19rfkiri73bi43i4yxpqrxjzpqn5rfrkq2picja5filjv14hbyly"; + }; + + nativeBuildInputs = [ makeWrapper perl ]; + + postPatch = '' + grep -rl '/usr/local/lynis' ./ | xargs sed -i "s@/usr/local/lynis@$out/share/lynis@g" + # Don't use predefined binary paths. See https://github.com/CISOfy/lynis/issues/468 + perl -i -p0e 's/BIN_PATHS="[^"]*"/BIN_PATHS=\$\(echo \$PATH\ | sed "s\/:\/ \/g")/sm;' include/consts + ''; + + installPhase = '' + mkdir -p $out/share/lynis + cp -r include db default.prf $out/share/lynis/ + mkdir -p $out/bin + cp -a lynis $out/bin + wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]} + ''; + + meta = with stdenv.lib; { + description = "Security auditing tool for Linux, macOS, and UNIX-based systems"; + homepage = "https://cisofy.com/lynis/"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.ryneeverett ]; + }; +} diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 88aa71810dcf..b8da305c36d1 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "make install-mkpasswd"; meta = with stdenv.lib; { - homepage = http://packages.qa.debian.org/w/whois.html; + homepage = https://packages.qa.debian.org/w/whois.html; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; maintainers = with maintainers; [ cstrahan fpletz ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1443409c0226..1aced2cd427d 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,16 +1,18 @@ -{ stdenv, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: +{ stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: stdenv.mkDerivation rec { name = "nitrokey-app"; - version = "1.1"; + version = "1.2"; + # We use fetchgit instead of fetchFromGitHub because of necessary git submodules src = fetchgit { url = "https://github.com/Nitrokey/nitrokey-app.git"; rev = "refs/tags/v${version}"; - sha256 = "11pz1p5qgghkr5f8s2wg34zqhxk2vq465i73w1h479j88x35rdp0"; + sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi"; }; buildInputs = [ + bash-completion hidapi libusb1 qt5.qtbase @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { cmake pkgconfig ]; - cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO"; + cmakeFlags = "-DCMAKE_BUILD_TYPE=Release"; meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index def98c9af4de..eba707b7d07c 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "paperkey-${version}"; - version = "1.4"; + version = "1.5"; src = fetchurl { url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; - sha256 = "0vrkryxqbsjcmqalsnxvc3pahg6vvyrn139aj8md29sihgnb0az1"; + sha256 = "1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass-otp/default.nix new file mode 100644 index 000000000000..327a9680f980 --- /dev/null +++ b/pkgs/tools/security/pass-otp/default.nix @@ -0,0 +1,29 @@ +{ stdenv, pass, fetchFromGitHub, oathToolkit }: +stdenv.mkDerivation { + name = "pass-otp"; + + src = fetchFromGitHub { + owner = "tadfisher"; + repo = "pass-otp"; + rev = "f2feb3082324a91089782af9b7fbb71d34aa213d"; + sha256 = "0iklvcfgw1320dggdr02lq3bc7xvnd2934l1w9kkjpbsfmhs955c"; + }; + + buildInputs = [ pass oathToolkit ]; + + patchPhase = '' + sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash + ''; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + description = "A pass extension for managing one-time-password (OTP) tokens"; + homepage = https://github.com/tadfisher/pass-otp; + license = licenses.gpl3; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 74bb5cc58197..589316b1d1c5 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.22"; + version = "1.8.23"; src = fetchurl { # This URL changes in unpredictable ways, so it is not sensible # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2"; - sha256 = "01flkdyqs7kr6c63dv2qg8dwir3v9jlr9rzlw7vafrivxmhqydba"; + url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2"; + sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; }; patches = [ ./no-dropdir-literals.patch ]; @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { "--enable-confdir=/etc" "--enable-ipcdir=/run/pcscd" ] ++ stdenv.lib.optional stdenv.isLinux - "--with-systemdsystemunitdir=\${out}/etc/systemd/system"; + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + ++ stdenv.lib.optional (!stdenv.isLinux) + "--disable-libsystemd"; postConfigure = '' sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ { diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 0d957fc97e08..c551a8161aa2 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null }: let @@ -7,16 +7,15 @@ let mkEnable = mkFlag "enable" "disable"; mkWith = mkFlag "with" "without"; in -with stdenv.lib; stdenv.mkDerivation rec { - name = "pinentry-1.0.0"; + name = "pinentry-1.1.0"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn"; + sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8"; }; - buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ]; + buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt ]; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -24,18 +23,10 @@ stdenv.mkDerivation rec { patches = lib.optionals (gtk2 != null) [ (fetchpatch { - url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0006-gtk2-Fix-a-problem-with-fvwm.patch; - sha256 = "1w3y4brqp74hy3fbfxqnqp6jf985bd6667ivy1crz50r3z9zsy09"; - })(fetchpatch { - url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch; - sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx"; - })]; - - # configure cannot find moc on its own - preConfigure = stdenv.lib.optionalString (qt4 != null) '' - export QTDIR="${qt4}" - export MOC="${qt4}/bin/moc" - ''; + url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch; + sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx"; + }) + ]; configureFlags = [ (mkWith (libcap != null) "libcap") @@ -44,20 +35,20 @@ stdenv.mkDerivation rec { (mkEnable true "pinentry-tty") (mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (gcr != null) "pinentry-gnome3") - (mkEnable (qt4 != null) "pinentry-qt") + (mkEnable (qt != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = http://gnupg.org/aegypten2/; - description = "GnuPG's interface to passphrase input"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + description = "GnuPG’s interface to passphrase input"; + license = licenses.gpl2Plus; + platforms = platforms.all; longDescription = '' Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix deleted file mode 100644 index 6230529a733a..000000000000 --- a/pkgs/tools/security/pinentry/qt5.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ fetchurl, stdenv, pkgconfig -, libgpgerror, libassuan -, qtbase -, libcap ? null -}: - -let - mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; -in -with stdenv.lib; -stdenv.mkDerivation rec { - name = "pinentry-0.9.6"; - - src = fetchurl { - url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a"; - }; - - buildInputs = [ libgpgerror libassuan libcap qtbase ]; - - # configure cannot find moc on its own - preConfigure = '' - export QTDIR="${qtbase.dev}" - export MOC="${qtbase.dev}/bin/moc" - ''; - - configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkEnable true "pinentry-qt") - ]; - - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - homepage = http://gnupg.org/aegypten2/; - description = "GnuPG's interface to passphrase input"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - longDescription = '' - Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users - to enter a passphrase when `gpg' or `gpg2' is run and needs it. - ''; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index e8709130015f..bfb3fb63b141 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://hal.freedesktop.org/docs/PolicyKit/; + homepage = https://hal.freedesktop.org/docs/PolicyKit/; description = "A dbus session bus service that is used to bring up authentication dialogs"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ phreedom ]; diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index de70b27163ae..3ec6abc3eb1c 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -12,15 +12,14 @@ let GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader ]; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "signing-party"; - version = "2.5"; + version = "2.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2"; + sha256 = "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"; }; sourceRoot = "."; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 6caf88973a61..ff3871bfbd96 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, botan }: +{ stdenv, fetchurl, botan, libobjc, Security }: stdenv.mkDerivation rec { @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { "--localstatedir=$out/var" ]; + propagatedBuildInputs = + stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ]; + buildInputs = [ botan ]; postInstall = "rm -rf $out/var"; @@ -26,6 +29,6 @@ stdenv.mkDerivation rec { description = "Cryptographic store accessible through a PKCS #11 interface"; license = licenses.bsd2; maintainers = [ maintainers.leenaars ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 26311cce73ce..1238a9207603 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { providing an audit trail of the commands and their arguments. ''; - homepage = http://www.sudo.ws/; + homepage = https://www.sudo.ws/; - license = http://www.sudo.ws/sudo/license.html; + license = https://www.sudo.ws/sudo/license.html; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 8530aab4e706..a07a374c5d87 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; - homepage = http://sourceforge.net/projects/tboot/; + homepage = https://sourceforge.net/projects/tboot/; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index e8eb3aacd3e9..9a7a245b8134 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysql, postgresql +{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql , withGUI ? false, makeWrapper, pkgconfig, gtk2 }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; - buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysql postgresql ] + buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ] ++ lib.optional withGUI gtk2; postInstall = lib.optionalString withGUI '' diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 576189d9a85a..a60cea1a738a 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.1.8"; + name = "tor-0.3.1.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "18dinpj03d036rashlad16lv7j2hba8gg742z07l37x5c242kxkx"; + sha256 = "09ixizsr635qyshvrn1m5asjkaz4fm8dx80lc3ajyy0fi7vh86vf"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 8c68787db25f..1944cf236e1e 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { application enablement of Trusted Computing using a Trusted Platform Module (TPM), similar to a smart card environment. ''; - homepage = http://sourceforge.net/projects/trousers/files/tpm-tools/; + homepage = https://sourceforge.net/projects/trousers/files/tpm-tools/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index bfb0dd11b8ed..002400e2c94b 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,13 +9,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1dcmqbcdkj42614am2invb6wf8v29z4sp4d354a4d83rwhyb0qly"; + sha256 = "1c3jaajf3wpjczbncvdpyy5vaa62gb9287bj2zi2khvqzvii36b0"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { buildPhase = '' patchShebangs ./ substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' + sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh mkdir -p src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index c86891d8ccd8..b2cbb005ae7c 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "vulnix"; - version = "1.3.4"; + version = "1.4.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1js1i86pgkkqc9yzp1rck7rmaz79klv4048r9z7v56fam0a6sg05"; + sha256 = "19kfqxlrigrgwn74x06m70ar2fhyhic5kfmdanjwjcbaxblha3l8"; }; buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index cc4ccdd40f09..eda2197b9f61 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bison, flex, pam +{ stdenv, fetchurl, fetchpatch, bison, flex, pam , sendmailPath ? "/run/wrappers/bin/sendmail" , atWrapperPath ? "/run/wrappers/bin/at" }: @@ -13,10 +13,17 @@ stdenv.mkDerivation rec { sha256 = "1fgsrqpx0r6qcjxmlsqnwilydhfxn976c870mjc0n1bkmcy94w88"; }; - patches = [ ./install.patch ]; + patches = [ + ./install.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/riscv/riscv-poky/master/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch"; + sha256 = "1rk4hskp0c1jqkanzdxf873i6jgki3xhrm609fsam8an8sl1njnm"; + }) + ]; - buildInputs = - [ bison flex pam ]; + nativeBuildInputs = [ bison flex ]; + + buildInputs = [ pam ]; preConfigure = '' diff --git a/pkgs/tools/system/at/install.patch b/pkgs/tools/system/at/install.patch index 35be4af875a3..41a35a789538 100644 --- a/pkgs/tools/system/at/install.patch +++ b/pkgs/tools/system/at/install.patch @@ -20,7 +20,7 @@ + $(INSTALL) -m 755 -d $(IROOT)$(sbindir) + $(INSTALL) -m 755 -d $(IROOT)$(docdir) + $(INSTALL) -m 755 -d $(IROOT)$(atdocdir) -+ $(INSTALL) -m 0755 -s at $(IROOT)$(bindir) ++ $(INSTALL) -m 0755 at $(IROOT)$(bindir) $(LN_S) -f at $(IROOT)$(bindir)/atq $(LN_S) -f at $(IROOT)$(bindir)/atrm - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) @@ -34,7 +34,7 @@ + $(INSTALL) -d -m 755 $(IROOT)$(man1dir) + $(INSTALL) -d -m 755 $(IROOT)$(man5dir) + $(INSTALL) -d -m 755 $(IROOT)$(man8dir) -+ $(INSTALL) -m 755 -s atd $(IROOT)$(sbindir) ++ $(INSTALL) -m 755 atd $(IROOT)$(sbindir) + $(INSTALL) -m 755 atrun $(IROOT)$(sbindir) + $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/ cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index ddfd8cbbc01f..e9ce2913a6cb 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -20,12 +20,12 @@ , libtool ? null , lm_sensors ? null , lvm2 ? null -, libmysql ? null +, mysql ? null , postgresql ? null , protobufc ? null , python ? null , rabbitmq-c ? null -, riemann ? null +, riemann_c_client ? null , rrdtool ? null , udev ? null , varnish ? null @@ -33,25 +33,30 @@ , net_snmp ? null , hiredis ? null , libmnl ? null +, mosquitto ? null +, rdkafka ? null +, mongoc ? null }: stdenv.mkDerivation rec { - version = "5.7.2"; + version = "5.8.0"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; + sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh"; }; - # on 5.7.2: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] + NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libdbi libgcrypt libmemcached cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt - libxml2 libmysql postgresql protobufc rrdtool + libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd + riemann_c_client mosquitto rdkafka mongoc + ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl @@ -60,11 +65,7 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.ApplicationServices ]; - # for some reason libsigrok isn't auto-detected - configureFlags = - [ "--localstatedir=/var" ] ++ - stdenv.lib.optional (stdenv.isLinux && libsigrok != null) "--with-libsigrok" ++ - stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; + configureFlags = [ "--localstatedir=/var" ]; # do not create directories in /var during installPhase postConfigure = '' @@ -77,6 +78,8 @@ stdenv.mkDerivation rec { fi ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = https://collectd.org; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 5ff4e7220ab3..533f0ab11e40 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Concise commandline monitoring for containers"; - homepage = http://ctop.sh/; + homepage = https://ctop.sh/; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 5f439ccdb530..e6af7abeda2b 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ lzip ]; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; + configureFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = with stdenv.lib; { description = "GNU ddrescue, a data recovery tool"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 963c383b66e9..89fb5f05ac97 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libaio, python, zlib }: let - version = "3.2"; - sha256 = "1sp83lxhrwg4627bma3pkcfg8yd1w3r6p02rdldv083962ljkinm"; + version = "3.3"; + sha256 = "0ipdpdn6rlsbppqjddyyk8c6rg1dl17d62dwwm0ijybi0m7imy1p"; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix new file mode 100644 index 000000000000..d9cfc77203e1 --- /dev/null +++ b/pkgs/tools/system/localtime/default.nix @@ -0,0 +1,22 @@ +{ stdenv, go, systemd, polkit, fetchFromGitHub, m4 }: + +stdenv.mkDerivation { + name = "localtime-2017-11-07"; + + src = fetchFromGitHub { + owner = "Stebalien"; + repo = "localtime"; + rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce"; + sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; + }; + + buildInputs = [ go systemd polkit m4 ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A daemon for keeping the system timezone up-to-date based on the current location"; + homepage = https://github.com/Stebalien/localtime; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 499f7c461546..f6e09b6816f6 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://ezix.org/project/wiki/HardwareLiSter; + homepage = https://ezix.org/project/wiki/HardwareLiSter; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom jgeerds ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index ed177820b644..7bb98e8e80c4 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.7.0"; + version = "1.9.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "1fv01jnbgwbafsxavlji90zdqizn8m4nfg9ivc4sbi05j036bg6n"; + sha256 = "1vy0jz5lxw63b830l9jgf1qqhp41gzapyhdr5k1gwg3zghvlg10w"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 226ec4351ea4..5a3ba8b66196 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { homepage = https://github.com/google/rowhammer-test; license = licenses.asl20; maintainers = [ maintainers.viric ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e642b91c3d96..a6999942e0c6 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson -, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -22,11 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql + fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c + ++ stdenv.lib.optional stdenv.isLinux systemd; hardeningDisable = [ "format" ]; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { (mkFlag false "valgrind") (mkFlag false "diagtools") (mkFlag true "usertools") - (mkFlag (libmysql != null) "mysql") + (mkFlag (mysql != null) "mysql") (mkFlag (postgresql != null) "pgsql") (mkFlag (libdbi != null) "libdbi") (mkFlag (net_snmp != null) "snmp") diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 6d6a3461f771..b5d4317eac2d 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://amanusk.github.io/s-tui/; - descrption = "Stress-Terminal UI monitoring tool"; + description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; }; diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix index ec2f90876b32..240ad9de19d1 100644 --- a/pkgs/tools/system/symlinks/default.nix +++ b/pkgs/tools/system/symlinks/default.nix @@ -2,27 +2,26 @@ stdenv.mkDerivation rec { name = "symlinks-${version}"; - version = "1.4"; + version = "1.4.3"; src = fetchurl { - url = "http://www.ibiblio.org/pub/Linux/utils/file/${name}.tar.gz"; - sha256 = "1683psyi8jwq6anhnkwwyaf7pfksf19v04fignd6vi52s2fnifxh"; + url = "https://github.com/brandt/symlinks/archive/v${version}.tar.gz"; + sha256 = "1cihrd3dap52z1msdhhgda7b7wy1l5ysfvyba8yxb3zjk0l5n417"; }; + buildFlags = [ "CC=${stdenv.cc}/bin/cc" ]; + installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man - cp symlinks $out/bin/ - cp symlinks.8 $out/share/man/ + mkdir -p $out/bin $out/share/man/man8 + cp symlinks $out/bin + cp symlinks.8 $out/share/man/man8 ''; - # No license is mentioned in the code but - # http://www.ibiblio.org/pub/Linux/utils/file/symlinks.lsm - # and other package managers list it as - # "(c) Mark Lord, freely distributable" meta = with stdenv.lib; { - description = "A symbolic link maintenance utility"; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + description = "Find and remedy problematic symbolic links on a system"; + homepage = "https://github.com/brandt/symlinks"; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu ckauhaus ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index a3e90f32c0ab..67dd3588b007 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Thermal Daemon"; homepage = https://01.org/linux-thermal-daemon; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index bd6ec17ceec1..ca35dae5827c 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -1,45 +1,36 @@ -{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman, openssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, openssl, openwsman }: stdenv.mkDerivation rec { - version = "2.6.0"; name = "wsmancli-${version}"; + version = "2.6.0"; - src = fetchurl { - url = "https://github.com/Openwsman/wsmancli/archive/v${version}.tar.gz"; - sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn"; + src = fetchFromGitHub { + owner = "Openwsman"; + repo = "wsmancli"; + rev = "v${version}"; + sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool openwsman openssl ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - preConfigure = '' - ./bootstrap + buildInputs = [ openwsman openssl ]; - configureFlagsArray=( - LIBS="-L${openssl.out}/lib -lssl -lcrypto" - ) + postPatch = '' + touch AUTHORS NEWS README ''; - meta = { + meta = with stdenv.lib; { description = "Openwsman command-line client"; - - longDescription = - '' Openwsman provides a command-line tool, wsman, to perform basic - operations on the command-line. These operations include Get, Put, - Invoke, Identify, Delete, Create, and Enumerate. The command-line tool - also has several switches to allow for optional features of the - WS-Management specification and Testing. - ''; - - homepage = https://github.com/Openwsman/wsmancli; - downloadPage = "https://github.com/Openwsman/wsmancli/releases"; - - maintainers = [ stdenv.lib.maintainers.deepfire ]; - - license = stdenv.lib.licenses.bsd3; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - + longDescription = '' + Openwsman provides a command-line tool, wsman, to perform basic + operations on the command-line. These operations include Get, Put, + Invoke, Identify, Delete, Create, and Enumerate. The command-line tool + also has several switches to allow for optional features of the + WS-Management specification and Testing. + ''; + downloadPage = https://github.com/Openwsman/wsmancli/releases; + inherit (openwsman.meta) homepage license maintainers platforms; inherit version; }; } diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 921dbc22d415..a2b6e3e6c3bb 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl1; - maintainers = maintainers.Adjective-Object; + maintainers = [ maintainers.Adjective-Object ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index cfc1d4badbdd..d106d140a67e 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "diffstat-1.61"; src = fetchurl { - url = "ftp://invisible-island.net/diffstat/${name}.tgz"; + urls = [ + "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" + "https://invisible-mirror.net/archives/diffstat/${name}.tgz" + ]; sha256 = "1vjmda2zfjxg0qkaj8hfqa8g6bfwnn1ja8696rxrjgqq4w69wd95"; }; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index cd64bd1566b5..60628e2139ce 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { configureFlags = # "pr" need not be on the PATH as a run-time dep, so we need to tell # configure where it is. Covers the cross and native case alike. - stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"; + stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" + ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 338967e5b9a0..59697891b6a3 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dos2unix-${version}"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "1i9hbxn0br7xa18z4bjpkdv7mrzmbfxhm44mzpd07yd2qnxsgkcc"; + url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; + sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs"; }; configurePhase = '' @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tools to transform text files from dos to unix formats and vicervesa"; license = licenses.bsd2; maintainers = with maintainers; [viric ndowens ]; - + }; } diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 65d0a1e4c00a..6783158ca77e 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { (if interactive then "--with-readline=${readline.dev}" else "--without-readline") ]; + makeFlags = "AR=${stdenv.cc.targetPrefix}ar"; + inherit doCheck; postInstall = '' diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index 11fcae855281..cf4b90643d7d 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "gist"; version = "4.6.1"; - sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff"; + source.sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 13579b57e796..dfdb25438cfe 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "ac_cv_func_strnlen_working=yes" ]; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; meta = { description = "GNU Patch, a program to apply differences to files"; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 275d65e7c370..90d7c2f4aa81 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.40"; + version = "3.41"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; rev = "${version}"; - sha256 = "0bkywhz4y10qcajimdha1ck5mvn7fsrv3yn8nd6rqbva39gbfmfd"; + sha256 = "163ghkyv3v6v200pskajlsz6sbq3hi31qx7abjcbwc0dajqfngvj"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index e2be6e9aca31..85888dbbf0df 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "icdiff-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; rev = "release-${version}"; - sha256 = "03gcgj3xsqasvgkr8r0q1ljbw2kd2xmfb21qpxhk9lqqm2gl11sv"; + sha256 = "0ffn5kq7dwvrimxgpj9ksym36c18md8nsdps82qzhm1xq7p9w9yb"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index a8657c3ea2f9..ed54f9d349ee 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ + "ftp://ftp.invisible-island.net/mawk/${name}.tgz" "https://invisible-mirror.net/archives/mawk/${name}.tgz" - "ftp://invisible-island.net/mawk/${name}.tgz" ]; sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv"; }; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix new file mode 100644 index 000000000000..a17c348c4cc1 --- /dev/null +++ b/pkgs/tools/text/miller/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: + +stdenv.mkDerivation rec { + name = "miller-${version}"; + + version = "5.3.0"; + + src = fetchFromGitHub { + owner = "johnkerl"; + repo = "miller"; + rev = "${version}"; + sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v"; + }; + + nativeBuildInputs = [ autoreconfHook flex libtool ]; + + meta = with stdenv.lib; { + description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON."; + homepage = "http://johnkerl.org/miller/"; + license = licenses.bsd2; + maintainers = with maintainers; [ mstarzyk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 42f80f29073f..187a6526dc3c 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Simple .odt to .txt converter"; homepage = http://stosberg.net/odt2txt; platforms = stdenv.lib.platforms.all; - lincense = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; }; } diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 18ef074c8a52..2719a4c81915 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches = [./malloc.patch]; meta = { - homepage = http://replace.richardlloyd.org.uk/; + homepage = https://replace.richardlloyd.org.uk/; description = "A tool to replace verbatim strings"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh index 52da517a8cbe..753a3ea64287 100644 --- a/pkgs/tools/text/sgml/opensp/setup-hook.sh +++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh @@ -18,5 +18,5 @@ if test -z "$sgmlHookDone"; then export ftp_proxy=http://nodtd.invalid/ export SGML_CATALOG_FILES - envHooks+=(addSGMLCatalogs) + addEnvHooks "$targetOffset" addSGMLCatalogs fi diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 6aad3c7b23da..592f9b8f1885 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://txt2tags.org/; + homepage = https://txt2tags.org/; description = "A KISS markup language"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index f068323e54a7..8fd04194124b 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,37 +1,35 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage, autovivification, BusinessISBN +{ stdenv, fetchFromGitHub, buildPerlModule, autovivification, BusinessISBN , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple +, DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder -, FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils -, ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate +, FileSlurp, FileWhich, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils +, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor -, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize }: +, TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey +, TestDifferences }: -let - version = "2.5"; -in -buildPerlPackage { +buildPerlModule rec { name = "biber-${version}"; + version = "2.7"; src = fetchFromGitHub { owner = "plk"; repo = "biber"; rev = "v${version}"; - sha256 = "1ldkszsr2n11nib4nvmpvsxmvp0qd9w3lxijyqlf01cfaryjdzgr"; + sha256 = "04jmsh59g2s0b61rm25z0hwb6yliqyh5gjs4y74va93d2b9mrd17"; }; buildInputs = [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K - ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils - ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + DateTime DateTimeFormatBuilder DateTimeCalendarJulian + ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize + ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey + TestDifferences ]; - preConfigure = "touch Makefile.PL"; - buildPhase = "perl Build.PL --prefix=$out; ./Build build"; - checkPhase = "./Build test"; - installPhase = "./Build install"; - # Tests seem to be broken + # Tests depend on the precise Unicode-Collate version (expects 1.19, but we have 1.25) doCheck = false; meta = { diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 140784fa9369..c53e8573c90f 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -12,6 +12,10 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ]; + checkInputs = with pythonPackages; [ + nose + ]; + meta = with stdenv.lib; { homepage = https://github.com/thorstenb/odpdown; repositories.git = https://github.com/thorstenb/odpdown.git; diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 902cf9a5f836..3e40c9caf28e 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF to ODT format converter"; - homepage = http://github.com/gutschke/pdf2odt; + homepage = https://github.com/gutschke/pdf2odt; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 11baa176b88d..71cc1738837c 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; }; - buildInputs = [ gcj unzip ]; + nativeBuildInputs = [ gcj unzip ]; hardeningDisable = [ "fortify" "format" ]; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index bfc1a8eb162e..1cb7b9ce9759 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sshlatex-${version}"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "iblech"; repo = "sshlatex"; rev = "${version}"; - sha256 = "02h81i8n3skg9jnlfrisyg5bhqicrn6svq64kp20f70p64s3d7ix"; + sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 7ffccde2c035..c4eaf4e1df46 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -21,11 +21,11 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.7"; + name = "dblatex-0.3.10"; src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr"; + sha256 = "1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg"; }; buildInputs = [ python2 libxslt tex ] diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 313474745d10..ac317fd51dcb 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { find ./ -name "config.guess" -exec rm {} \; -exec ln -s ${automake}/share/automake-*/config.guess {} \; '' else null; - patches = [ ./environment.patch ./getline.patch ./clang.patch ]; + patches = [ ./environment.patch ./getline.patch ./clang.patch ./extramembot.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/typesetting/tex/tetex/extramembot.patch b/pkgs/tools/typesetting/tex/tetex/extramembot.patch new file mode 100644 index 000000000000..f6c954fcfa5c --- /dev/null +++ b/pkgs/tools/typesetting/tex/tetex/extramembot.patch @@ -0,0 +1,12 @@ +diff -up texlive-2007/texk/web2c/tex.ch.extramembot texlive-2007/texk/web2c/tex.ch +--- texlive-2007/texk/web2c/tex.ch.extramembot 2006-12-19 02:11:11.000000000 +0100 ++++ texlive-2007/texk/web2c/tex.ch 2011-11-30 12:03:32.052795763 +0100 +@@ -365,7 +365,7 @@ for i:=@'177 to @'377 do xchr[i]:=i; + {Initialize enc\TeX\ data.} + for i:=0 to 255 do mubyte_read[i]:=null; + for i:=0 to 255 do mubyte_write[i]:=0; +-for i:=0 to 128 do mubyte_cswrite[i]:=null; ++for i:=0 to 127 do mubyte_cswrite[i]:=null; + mubyte_keep := 0; mubyte_start := false; + write_noexpanding := false; cs_converting := false; + special_printing := false; message_printing := false; diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh index 9c5424e881e3..5faef7fe5df5 100644 --- a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks+=(addTeXMFPath) +addEnvHooks "$targetOffset" addTeXMFPath diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 30979e312fc5..44c2dc163178 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -14,7 +14,7 @@ let withSystemLibs = map (libname: "--with-system-${libname}"); - year = "2016"; + year = "2017"; version = year; # keep names simple for now common = rec { @@ -22,9 +22,10 @@ let url = # "ftp://tug.org/historic/systems/texlive/${year}/" #"http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016" # FIXME: a proper mirror, though tarballs.nixos.org saves this case ATM - http://146.185.144.154/texlive-2016 - + "/texlive-${year}0523b-source.tar.xz"; - sha256 = "1v91vahxlxkdra0qz3f132vvx5d9cx2jy84yl1hkch0agyj2rcx8"; + # http://146.185.144.154/texlive-2016 + # + "/texlive-${year}0523b-source.tar.xz"; + "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0524-source.tar.xz"; + sha256 = "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81"; }; configureFlags = [ @@ -187,7 +188,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex ''; preBuild = "cd texk/web2c"; - CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2017 is out? + CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2018 is out? enableParallelBuilding = true; # now distribute stuff into outputs, roughly as upstream TL diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 390b7b9e5e00..35fee64ba54f 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -12,9 +12,11 @@ let (bin.core.doc // { pname = "core"; tlType = "doc"; }) ]; }; + partition = builtins.partition or (pred: l: + { right = builtins.filter pred l; wrong = builtins.filter (e: !(pred e)) l; }); pkgList = rec { all = lib.filter pkgFilter (combinePkgs pkgSet); - splitBin = lib.partition (p: p.tlType == "bin") all; + splitBin = partition (p: p.tlType == "bin") all; bin = mkUniquePkgs splitBin.right ++ lib.optional (lib.any (p: p.tlType == "run" && p.pname == "pdfcrop") splitBin.wrong) @@ -201,7 +203,7 @@ in buildEnv { perl `type -P mktexlsr.pl` ./share/texmf texlinks.sh "$out/bin" && wrapBin - perl `type -P fmtutil.pl` --sys --refresh | grep '^fmtutil' # too verbose + (perl `type -P fmtutil.pl` --sys --refresh || true) | grep '^fmtutil' # too verbose #texlinks.sh "$out/bin" && wrapBin # do we need to regenerate format links? perl `type -P updmap.pl` --sys --syncwithtrees --force perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 7665d277e38f..a6b1ac6c9f42 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, perl522, python, ruby +, makeWrapper, python, ruby, perl , useFixedHashes ? true , recurseIntoAttrs }: @@ -28,8 +28,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv fastUnique lib makeWrapper writeText - stdenv python ruby; - perl = perl522; # avoid issues like #26890, probably remove after texlive upgrade + stdenv python ruby perl; ghostscript = ghostscriptX; # could be without X, probably, but we use X above }; @@ -39,7 +38,8 @@ let curl http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \ | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix */ orig = import ./pkgs.nix tl; # XXX XXX XXX FIXME: the file is probably too big now XXX XXX XXX XXX XXX XXX - clean = orig // { + removeSelfDep = lib.mapAttrs (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; } else p); + clean = removeSelfDep (orig // { # overrides of texlive.tlpdb dvidvi = orig.dvidvi // { @@ -67,10 +67,10 @@ let collection-metapost = orig.collection-metapost // { deps = orig.collection-metapost.deps // { inherit (tl) metafont; }; }; - collection-genericextra = orig.collection-genericextra // { - deps = orig.collection-genericextra.deps // { inherit (tl) xdvi; }; + collection-plaingeneric = orig.collection-plaingeneric // { + deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; }; }; - }; # overrides + }); # overrides # tl = in lib.mapAttrs flatDeps clean; @@ -109,15 +109,16 @@ let tlName = urlName + "-${version}"; fixedHash = fixedHashes.${tlName} or null; # be graceful about missing hashes - url = args.url or "${urlPrefix}/${urlName}.tar.xz"; - urlPrefix = args.urlPrefix or - http://146.185.144.154/texlive-2016 - #http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016 - ; - # XXX XXX XXX FIXME: mirror the snapshot XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX - # ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"); - #mirror = "http://ftp.math.utah.edu"; - src = fetchurl { inherit url sha512; }; + urls = args.urls or (if args ? url then [ args.url ] else + map (up: "${up}/${urlName}.tar.xz") urlPrefixes + ); + urlPrefixes = args.urlPrefixes or [ + http://146.185.144.154/texlive-2017 + # IPFS GW is second, as it doesn't have a good time-outing behavior + http://gateway.ipfs.io/ipfs/QmRLK45EC828vGXv5YDaBsJBj2LjMjjA2ReLVrXsasRzy7/texlive-2017 + ]; + + src = fetchurl { inherit urls sha512; }; passthru = { inherit pname tlType version; @@ -131,7 +132,7 @@ let in if sha512 == "" then # hash stripped from pkgs.nix to save space -> fetch&unpack in a single step fetchurl { - inherit url; + inherit urls; sha1 = if fixedHash == null then throw "TeX Live package ${tlName} is missing hash!" else fixedHash; name = tlName; @@ -188,9 +189,9 @@ in extraName = "combined" + lib.removePrefix "scheme" pname; }) ) - { inherit (tl) scheme-full - scheme-tetex scheme-medium scheme-small scheme-basic scheme-minimal - scheme-context scheme-gust scheme-xml; + { inherit (tl) + scheme-basic scheme-context scheme-full scheme-gust scheme-infraonly + scheme-medium scheme-minimal scheme-small scheme-tetex; } ); } diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix index bb733568c3b7..e645548e0277 100644 --- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix @@ -2,171 +2,199 @@ "amsfonts-3.04"="hi87s0fxrkcq0w2389kwpxd3zzwsk1zf"; "amsfonts.doc-3.04"="ch872rwfiar58praz8f880rcspy4mjxa"; "amsfonts.source-3.04"="vjiw3vdxv44nl4yvaxqfy4b78girpjs7"; -"bibtex-0.99d"="h5107qs7dxpz783zvlg5shdd1xg1h2rg"; -"bibtex.doc-0.99d"="g4rf1nry7cy8kgb9h63wr74vqd47b29z"; -"kpathsea-2016"="00bd2w674k1bivwws2fddf6mp7nz2d56"; -"kpathsea.doc-2016"="prd9gb6wqkrjjgr9c68ddh9pr70lmymb"; -"cm-2016"="k9yadr0rfgnh1xfyrzqdbj2whpf7sp63"; -"cm.doc-2016"="36wag31jc0lrgncaxhcspiaqpwnw7xvy"; -"dvipdfmx-2016"="ijnr5k9wvwq8lnd22qjrrjmm962la5f4"; -"dvipdfmx.doc-2016"="zfm6n44ifw9ghdqf0ay6r8ppddm89342"; -"dvipdfmx-def-4.08"="mkrj4ld3lklcb36v1lz44j0hyjlp1qjy"; -"dvipdfmx-def.doc-4.08"="4mnp3gi0pnx3labzxrailx760clflgjg"; -"glyphlist-2016"="vhl454v924vw305d171amcg8r7v83d8l"; -"dvips-2016"="chachpfvhjdfdm7fdhmh3pnji2w5bxza"; -"dvips.doc-2016"="n0vmizfvahsnb53mzf28plbsbjvfid12"; -"enctex-2016"="j6lf040j733q0aj90wvx2vwq0x61zwdm"; -"enctex.doc-2016"="p2pad1ncy8izfag44p0pndyvgckfngvv"; -"etex-2016"="mdrs8yrrjf03pcndsr5azzxz7lvk08jp"; -"etex.doc-2016"="xdmkddsi3lykqy5hm03xamxsmmwplmnb"; -"etex-pkg-2.6"="vk8pfjdwh179fc90h4b3b2r7h928fdls"; -"etex-pkg.doc-2.6"="fh9kjif8hy5dvqnjdx090jani7rym0m4"; +"bibtex-0.99d"="ybimfc49fzmgpy88wagy0z55sdsshr50"; +"bibtex.doc-0.99d"="rix5hf785qgd6bwg3bs74hgaybwrid9h"; +"kpathsea-2017"="kx7y408hdbrbv4cnmdga9qq84xfw5ksj"; +"kpathsea.doc-2017"="718rkxi193kflgk43zpsj1xcjqsmjrq4"; +"cm-2017"="k9yadr0rfgnh1xfyrzqdbj2whpf7sp63"; +"cm.doc-2017"="36wag31jc0lrgncaxhcspiaqpwnw7xvy"; +"dvipdfmx-2017"="ijnr5k9wvwq8lnd22qjrrjmm962la5f4"; +"dvipdfmx.doc-2017"="i3il86rkf4mxg3xn2l458bvs4jy4n1z1"; +"glyphlist-2017"="i4nay4q38l3367hlc93rhkgxvrkcmyjb"; +"dvips-2017"="92wx71n0k4ia02l5m44xkmw5z1q22pbg"; +"dvips.doc-2017"="j3zlksmdvfvna32aa7szw49igpb8ka11"; +"enctex-2017"="j6lf040j733q0aj90wvx2vwq0x61zwdm"; +"enctex.doc-2017"="p2pad1ncy8izfag44p0pndyvgckfngvv"; +"etex-2017"="mdrs8yrrjf03pcndsr5azzxz7lvk08jp"; +"etex.doc-2017"="xdmkddsi3lykqy5hm03xamxsmmwplmnb"; +"etex-pkg-2.7"="2p6j6s4jm1y7k82jhh9lrfgcbph03h1a"; +"etex-pkg.doc-2.7"="0xlalpljqrcinaazh35yv9vc2a925h90"; +"graphics-def-2017"="3x5p0y39f8wk5p2gzs99ji6viwpdcl42"; +"graphics-def.doc-2017"="17p42pr5x7w6a1z05f33svxlalr79caq"; "gsftopk-1.19.2"="8fc88z3281crv5743qh5rzr0b51a2l8i"; -"gsftopk.doc-1.19.2"="mja92917pl65qmv7f7hg54q289fzkdbx"; -"hyph-utf8-2016"="zwgllwz4xcwlf6k9pz0j3y5kmcknqf3f"; -"hyph-utf8.doc-2016"="qfgv3nid3fg33jfspgwa5sil0s46as9p"; -"hyph-utf8.source-2016"="fkrng47ghjl9gs4a2wfbpd8980h6z8gq"; -"hyphen-base-2016"="0jyixkv4mh5havwqsiazzbrvnp4kxmiq"; +"gsftopk.doc-1.19.2"="x1f1bi58ilz3nyb3bfwmb11wp4l76f70"; +"hyph-utf8-2017"="zwgllwz4xcwlf6k9pz0j3y5kmcknqf3f"; +"hyph-utf8.doc-2017"="civi2dqdgn66lgzj7c64hxh3mmlxdgg8"; +"hyph-utf8.source-2017"="q34xq8l07hihhx9s6wwd930adsk2vaw6"; +"hyphen-base-2017"="rr6asqxv5s1gk9mv9pwimly27hibfgj3"; "ifluatex-1.4"="ccsyxfkf1qb03cxnkfs6gy7iinz89dwc"; -"ifluatex.doc-1.4"="9k0r0jvfni8g9bvixaban9a33rx1ana8"; +"ifluatex.doc-1.4"="l1inl0smcf6qi7hnlracgq665i63fp2b"; "ifluatex.source-1.4"="8jqb26x3nmbh05ysd93cjklcsj1y5hw3"; "ifxetex-0.6"="llq1x3f5fykh5mg6avzb1a21x1vh2mxz"; "ifxetex.doc-0.6"="1iy2bgx7adrh6dbbrhraskqggr65f7f2"; "ifxetex.source-0.6"="dl81ang1gw395giysn3vk6lv4v5h9xr2"; -"knuth-lib-2016"="cvjgvw8rwhmr98sz0y3azsyawzswcv3n"; -"knuth-local-2016"="g5vihblw8w8p8k8s14nakk959vpdgnh4"; +"knuth-lib-2017"="cvjgvw8rwhmr98sz0y3azsyawzswcv3n"; +"knuth-local-2017"="g5vihblw8w8p8k8s14nakk959vpdgnh4"; "lua-alt-getopt-0.7.0"="s2qkgq8dv65ib6chsah4xcargxh26bml"; "lua-alt-getopt.doc-0.7.0"="xv8zqch612n2ww2pnpfranafcf7jhl96"; -"makeindex-2016"="yzy90d3n087yrdsawabd0bn7iwz3m1i6"; -"makeindex.doc-2016"="wyaqizbq9d01m98696x3l8m3c47ag4cv"; +"makeindex-2017"="yzy90d3n087yrdsawabd0bn7iwz3m1i6"; +"makeindex.doc-2017"="h3ra25m0w19xaxjfdkbspbq8d4m9zn3n"; "mflogo-2.0"="mnn3p5gn5h9yi4inkllswxn142j31mz4"; "mflogo.doc-2.0"="rdirf33m53y719b35aby2d98v1i0jhh5"; "mflogo.source-2.0"="hl5rzcmk83lpc5rxcvy31kzm6qbwx3g5"; -"mfware-2016"="7mwvvyrb9cz2d3k5jl8r1fl238m3gl6n"; -"mfware.doc-2016"="y62ynydxnz5j1y28zbixhiw91krpj81n"; -"pdftex-2016"="s8xr2haf4kzy877b5x4q86hcq4jqg5m4"; -"pdftex.doc-2016"="nma51hqby2lliyhinxn3spjgm79gk7jb"; -"plain-3.141592653"="qnx97q4j70c2gc437zx10ic3pqm24z5z"; -"tetex-3.0"="anc6kg9yvabbkfqy9lr038xaqfik2plf"; -"tetex.doc-3.0"="ic1b3yldangzmdlg422hd00f4vrv131m"; -"tex.doc-3.14159265"="v0v678569k3z5rww2giksg79jsk90ppa"; -"tex-ini-files-2016"="831h7dslin8dnan7llz8mki6zibqfglj"; -"tex-ini-files.doc-2016"="pqfrqdqmlbhmcpjycpf644v4vg0qw7ic"; -"texconfig-2016"="xwh8nsgd940p6fcv28nsfcblp2i81mw3"; -"texconfig.doc-2016"="7ih2f9abksn68yx0anj3bpg2mj6sya6z"; -"texlive-common.doc-2016"="46la74hhzh9wms4mkhkfgbj6nf1f8myb"; -"texlive-docindex-2016"="5j5z0j2qwdlg2v7wxwz8ndmbwql2s0vk"; -"texlive-docindex.doc-2016"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; -"texlive-en.doc-2016"="18m0jknm5l0wfdqglvypslhs3zv342g5"; -"texlive-scripts-2016"="w4ly880hav1fda9hli70807c3kxnxkqk"; -"texlive-scripts.doc-2016"="mhsq1adr0vmx595bnaslnh1llisbaaqk"; -"unicode-data-1.4a"="rcy8dpngq6fi7zjxhv5hwqaxrxxnqh4v"; -"unicode-data.doc-1.4a"="000q3h6pnmq019mfxgd0sjp1whwh5v7a"; -"updmap-map-2016"="d3vqw1p8y1n7r7qmc5svxx1r4ci4k3ga"; -"aichej-2016"="rmm8q17dvb470lyarcvgbpgip24a4fxb"; -"ajl-2016"="j0z05x267dbbw5r8s0ybvlj0hwky6sg5"; +"mfware-2017"="7mwvvyrb9cz2d3k5jl8r1fl238m3gl6n"; +"mfware.doc-2017"="mxl274dzrfxsqmkm2p2v9x8wch6xjvqc"; +"pdftex-2017"="s8xr2haf4kzy877b5x4q86hcq4jqg5m4"; +"pdftex.doc-2017"="bsidnb8y2k3r8fpyspdqvlwv007s9v7z"; +"plain-3.141592653"="my32apfgd55b14vf8bsldaqwdd931gcg"; +"tex-ini-files-2017"="831h7dslin8dnan7llz8mki6zibqfglj"; +"tex-ini-files.doc-2017"="pqfrqdqmlbhmcpjycpf644v4vg0qw7ic"; +"tetex-3.0"="3xinwxa1f811sysm8wfkaf3z052afivz"; +"tetex.doc-3.0"="9z45dnk43l3zxqmi2mprdn5iqv6pnk0q"; +"tex.doc-3.14159265"="nrllj8g488wj426rvminkn0bdaa1r6ww"; +"texconfig-2017"="z7p82x6pd48qy343c6h4l55gwap9ixnf"; +"texconfig.doc-2017"="yyqfzy21sz71bc1p1rh14b5bklrji4i4"; +"texlive-common.doc-2017"="q6vk5jghhn6hsiilg3kn1vmmrvqyrx7v"; +"texlive-docindex-2017"="5j5z0j2qwdlg2v7wxwz8ndmbwql2s0vk"; +"texlive-docindex.doc-2017"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; +"texlive-en.doc-2017"="d2riani75kpgzcn637nb0s9zxbq8xf9c"; +"texlive-scripts-2017"="w4ly880hav1fda9hli70807c3kxnxkqk"; +"texlive-scripts.doc-2017"="8hzllc3qwpnazqhkxjxz57rvw9fnhdvl"; +"unicode-data-1.6"="j31j4xgdfm2rm6qdi1rxym2bvs6lcv9n"; +"unicode-data.doc-1.6"="vqwxrg50xglwypz60qjcqh8z253d0sdv"; +"updmap-map-2017"="d84i10mpqg1xvkphl5p4gd2p67098j2a"; +"aichej-2017"="rmm8q17dvb470lyarcvgbpgip24a4fxb"; +"ajl-2017"="j0z05x267dbbw5r8s0ybvlj0hwky6sg5"; "amsrefs-2.14"="crmn3pm2zy2fcr5d82dwwwxjm42na6j3"; "amsrefs.doc-2.14"="r45n92fihia786v5nsab5vgjvwgmij6d"; "amsrefs.source-2.14"="k1rzn2d509i2nkfwclpbpir3q6a41ya9"; "apacite-6.03"="sj9k6bnr8qhfddlzk7wd0daf12458yi9"; "apacite.doc-6.03"="cbhyw6lwyg7mnx8h421y0hxf3h5m6n4y"; "apacite.source-6.03"="cby7n3f9rzm83736nm4rn1m77km3lr9y"; -"apalike2-2016"="vf25kvilm8g379d8c5mkzv749nd9p8ap"; -"archaeologie-2.0"="3ic62qbfvnqc6n499z74cjn6rvlkldi8"; -"archaeologie.doc-2.0"="ws713lkjd19incaj1kfy8ijhhhak2c77"; -"beebe-2016"="pc70akrf17d452m1f0sma8g91mwgciix"; -"besjournals-2016"="n3ljrkamca5v9w0rk3m38nqw86s1izc8"; -"besjournals.doc-2016"="3swy1ix6cxbp87hjlaf3x4ws4kg8sz77"; +"apalike2-2017"="vf25kvilm8g379d8c5mkzv749nd9p8ap"; +"archaeologie-2.3.3"="k3hc28ivx310rf8j958xv5x8fc4fx5l3"; +"archaeologie.doc-2.3.3"="70bczdifw3nvxvnsg69p7mcdg593byj0"; +"beebe-2017"="bkviiybam488cbp6b7lckfr89p11fzhl"; +"besjournals-2017"="n3ljrkamca5v9w0rk3m38nqw86s1izc8"; +"besjournals.doc-2017"="3swy1ix6cxbp87hjlaf3x4ws4kg8sz77"; "bestpapers-1.0"="15nq2m32h0giv41k6dslrw28han015aq"; "bestpapers.doc-1.0"="mmlnsl83sil5zbdhwq16b6025sxdh9s6"; +"bib2gls-1.0"="c2wjka02kgi250ybbma3qvikfn87x9v5"; +"bib2gls.doc-1.0"="l7vs7jfcipdp6rbg8a53z3x7gz9maj3a"; +"bib2gls.source-1.0"="rrz3pj12r09f95na61lhiwxi64xcrr5i"; "bibarts-2.1"="a7wcn8rhgh4irszdqk86ls1p8hpdnr7l"; "bibarts.doc-2.1"="v2ibi8mncd5sf5x50hwj3gs6yilh1znp"; "bibarts.source-2.1"="x52hqh053yzn25n75z1fr3siqdh7qkwn"; -"biber.doc-2.4"="50hcaaf799k1j01grm9jm7ks4bg3zgyi"; -"biber.source-2.4"="ffkbpnrs26lafa5bq0yzy920mz199cxa"; +"biber.doc-2.7"="i6ilfb9ssnl7879v6vb2awddij1mk4yj"; +"biber.source-2.7"="0z6wkw5hb47klngkf60wsp66y879n047"; "bibexport-3.02"="6gc6r95ph3rkjzq038zk6w12k733qzwr"; "bibexport.doc-3.02"="qapijzk1s6y6z02s4wnlw4vr6p96djxv"; "bibexport.source-3.02"="iqp7q4fagafj6nfclsmj68lxljb8siw7"; "bibhtml-2.0.2"="b0klmx8rd09znlxg7wz5m8b1f8qpxsjv"; "bibhtml.doc-2.0.2"="snqyqvgwdwpkyfqfj69zwd478z96mcj4"; -"biblatex-3.4"="arbzg6pxz2wxwmxmzzr4x9906jhjqln1"; -"biblatex.doc-3.4"="jljqrygd6yrf0d3jifsh7fbj3qk6n3j9"; -"biblatex-abnt-1.0.1"="gyv5dqhndv8linj55dmnhfh4a4r8gsd0"; -"biblatex-abnt.doc-1.0.1"="pznmpr6z85w17qpxqprxj1c4ykc0y63q"; -"biblatex-anonymous-2.2.2"="nqbsvml7r11gfs5ffjyn9ilnxnvawymv"; -"biblatex-anonymous.doc-2.2.2"="cvg6v500xanklkzgqrnxrhpxvghxl6q1"; -"biblatex-apa-6.9"="xcbksf4zlh3wm0aa47rkhk8zcvmmb8nh"; -"biblatex-apa.doc-6.9"="9ribqmqzqy6wa5gja0mnjginmqmwmpqz"; +"biblatex-3.7"="3n06c0bzzwy224mv6zfv1qa6nq6y6a01"; +"biblatex.doc-3.7"="y5l1kpba26y26nd3fcr958jmxs4kbnkl"; +"biblatex-abnt-3.1"="cd3izgad0cg1ig2r2jj96y2j7f625jp2"; +"biblatex-abnt.doc-3.1"="vjf0y47pdqamhmijp2vvjl3y6bdlda1j"; +"biblatex-anonymous-2.6.0"="g2f8zlxm48nqp7q50m2mirwcgz48y4s5"; +"biblatex-anonymous.doc-2.6.0"="79c2p5ffqcgcz9la40kz2x6w5scrir0p"; +"biblatex-apa-7.4"="sfc2icw9nci91lm5bczql0fzxhfpr2mv"; +"biblatex-apa.doc-7.4"="1rn4b8hah99j6xjpy6npsrnffwlfd57q"; +"biblatex-archaeology-1.2"="x99izdvnmpmql3dagcx3ddx0d4gajl84"; +"biblatex-archaeology.doc-1.2"="qp7wbplviaml6lfw5vc51xfpmmkxfw6z"; +"biblatex-archaeology.source-1.2"="g5h0l2mij32klmxrc9vl3qfr0nxcjhgn"; +"biblatex-arthistory-bonn-1.0"="na78ygiqfrgs7nm0qiqa3gk37l2pby89"; +"biblatex-arthistory-bonn.doc-1.0"="5mkh0da7ij87pxs7nplzqx6vya8kkvj2"; "biblatex-bookinarticle-1.3.1a"="bnx6iravlnrkkyqb3ah21p0ikq00ab57"; "biblatex-bookinarticle.doc-1.3.1a"="6shjhb1lajkivsh3mrr2whli5hcsb8b4"; -"biblatex-bookinother-2.1.1"="a9jsnjckpp8kxw6digf9vri7ypa8562d"; -"biblatex-bookinother.doc-2.1.1"="2sxch4m0ny75h9zvlpx5r85mihilg13a"; +"biblatex-bookinother-2.3.0"="gbzlxmidr5cj07wsivg5rsr0n99pc8rc"; +"biblatex-bookinother.doc-2.3.0"="1zvr6xp7bs3nc63dkj4m65xikc00825y"; "biblatex-bwl-0.02"="0a11hlav9gsavdisyjckvnrxkkb4134w"; "biblatex-bwl.doc-0.02"="b7ddxvcabp9qd88mzb6dxvw7sz8dnqfq"; -"biblatex-caspervector-0.2.6"="l1cz3l9hqbf88ff8ihclm5548zmfv8hs"; -"biblatex-caspervector.doc-0.2.6"="s39hsi5vj1bi21v4gk9s9z9byjj3kbj7"; -"biblatex-chem-1.1p"="mwdbl2jcclnkfzvi3f3phwaywl00l8ga"; -"biblatex-chem.doc-1.1p"="ij244309r6klvffyrhgcp0ig69p8yrvv"; -"biblatex-chicago-1.0rc1"="sxwrmsxrm7lf54s9wiqjwxb4dbsz1a80"; -"biblatex-chicago.doc-1.0rc1"="jnnndjzipfnp2ynpbszpqjkg37p8pxk6"; -"biblatex-dw-1.6a"="bspjklyxgav63yy5na9yhzpd7xym44fr"; -"biblatex-dw.doc-1.6a"="2i8x7vwvh5alk2i9dxil9zzhgj9dsc27"; -"biblatex-fiwi-1.5"="p9c24g1nrib6gs9hwaw67gizpvsk8xrr"; -"biblatex-fiwi.doc-1.5"="hfv6hh21vih6avnhyhyj6vkyzcpibmb4"; -"biblatex-gost-1.6"="ry0ydl9hyc60ng2b639y8mxa1ckbh871"; -"biblatex-gost.doc-1.6"="dds7rwsa7lxg7mc1da6lsg44hbyqhpyr"; +"biblatex-caspervector-0.2.7"="sqx24sv7iywy7dljisd4psshq77mvphf"; +"biblatex-caspervector.doc-0.2.7"="f6krv4var945h7c40ml5pqvj202bmzsx"; +"biblatex-chem-1.1t"="pp30qx978jfn3yy7yc53szmvz0gxg9ak"; +"biblatex-chem.doc-1.1t"="ml8yf4k71lbvn4m1mgqlsyxhw00jlknh"; +"biblatex-chicago-1.0rc4"="vkqiha1dxsq5ihfhf458vnf7bq7akjs2"; +"biblatex-chicago.doc-1.0rc4"="x8qzn2a6my6n5w6c45skrdfim8lll75c"; +"biblatex-claves-1.2.0"="yq5s9plvimz4w9san81swl08g2v6pa6q"; +"biblatex-claves.doc-1.2.0"="36qjs0m893389s9wkw5wxai04qp8zxs6"; +"biblatex-dw-1.7"="9nf2hg43q6if3v5hdrfxnpbdww7y06jv"; +"biblatex-dw.doc-1.7"="ppry56vc44c86m47r1z8mq9s7fg77n8m"; +"biblatex-enc-1.0"="ccc2f3rnf7kyavb3r2hmah6pcfl1xivg"; +"biblatex-enc.doc-1.0"="b54x1g0296ln6lkw1zvlbmshhr93vg7y"; +"biblatex-fiwi-1.6c"="82am4z1c20n0n4hway9dr1cq8nis98sv"; +"biblatex-fiwi.doc-1.6c"="bpm6z7lls21qk1czim5v2sbw96qisibx"; +"biblatex-gb7714-2015-1.0h"="7vxdm543rsh3h60d4aka35fldnwd0ksb"; +"biblatex-gb7714-2015.doc-1.0h"="fvhvs3x6vkmkmq0lq2spdv9w51w0y36g"; +"biblatex-gb7714-2015.source-1.0h"="ribwqizim5k9swwfp9w5ny8fq0qrjyr1"; +"biblatex-gost-1.16"="6p4v2qamfrck3k51ilkpil81b45mzrcm"; +"biblatex-gost.doc-1.16"="jcw8mkp5qxyzvcwj0sp18qk7bnygk97w"; "biblatex-historian-0.4"="xp6r6a37ibm9fhdc95b2v3x5kgyz26c8"; "biblatex-historian.doc-0.4"="6280kicfk2n0hwp03pyhl29ljdg911hb"; -"biblatex-ieee-1.1n"="ycgl3h3sk3v16ayq79wz1n80k157lfys"; -"biblatex-ieee.doc-1.1n"="4wdh639nn0x8gwq3xq4jw6qrrsvb5j48"; -"biblatex-iso690-0.3.1"="dx9r21d29l5x7r5l0578j58g6l1f60qf"; -"biblatex-iso690.doc-0.3.1"="l5g65n16flf9hshsr8ghcblm4r49zsrh"; +"biblatex-ieee-1.2d"="wsn3q42la76q691q6myrrd4k39dvvf1z"; +"biblatex-ieee.doc-1.2d"="s12127ig2m4gj9fi3syvmr88h5s6q4ap"; +"biblatex-ijsra-0.1"="179hh36v47xfagjwp5vj3hczc18jkrgf"; +"biblatex-ijsra.doc-0.1"="x3js5mb545xapavsqq4phml7zqiswiki"; +"biblatex-iso690-0.3.2"="y5032mfrc8djxnwsawcpa611rpdhmas3"; +"biblatex-iso690.doc-0.3.2"="rsv82pgp6f8prdw2yqw6zw7q94wk1sax"; "biblatex-juradiss-0.1g"="0smwgi3vg97aiy6w8ya68zmaz711drlp"; "biblatex-juradiss.doc-0.1g"="d4dp9hld95b70k8b5qxlmvcgcsxpv0g8"; +"biblatex-lni-0.4"="zdvp9ryfiqp1lwpd7wykvf35930m8dgl"; +"biblatex-lni.doc-0.4"="03p51dcn30nzhckd6qhl452f8jv670b3"; "biblatex-luh-ipw-0.3"="83gar343q3h1h96h8lzs2bmsp1ba82n0"; "biblatex-luh-ipw.doc-0.3"="yxcknwckw9s58qhrbdd70jz5yrpnyip2"; -"biblatex-manuscripts-philology-1.10.0"="ykpdzd96h4l7yvc3ffyfqfrkamaf6b0l"; -"biblatex-manuscripts-philology.doc-1.10.0"="v2nccq2sfkvgcz6dnmmjmy1siw7yh7lf"; -"biblatex-mla-1.5"="35x2khi3pqi9sgk4l1xlzyy2sn4kkkcr"; -"biblatex-mla.doc-1.5"="3xdx7g47g6swq8h6k3v12mmqdxq1684d"; -"biblatex-morenames-1.1.0"="idn85hlm70nwa1p2riqsqlm8xjhnqbkv"; -"biblatex-morenames.doc-1.1.0"="hmpqyj00xnc623sf919y0k7fh65xqm66"; +"biblatex-manuscripts-philology-1.12.2"="2lhpa7dvfyh0k0zc6rn1vsj3f7ahs6m8"; +"biblatex-manuscripts-philology.doc-1.12.2"="wk9ybwsnxjc3zqxkk0la5kq7x7ccmikh"; +"biblatex-mla-1.9"="1m10jmh42x7qahq16bzi2rwvv7j7biq5"; +"biblatex-mla.doc-1.9"="f6b9nj6xj93vikp4agvkrjddrrgfvjc2"; +"biblatex-morenames-1.3.1"="vbcnaicg2pa0jrqd170cs31wim08yk07"; +"biblatex-morenames.doc-1.3.1"="ksn965q79yv6badima68frbgmycjz9pn"; "biblatex-multiple-dm-1.0.1"="6c7h8i04ksazrq2lbc6hbpcxkjdvih07"; "biblatex-multiple-dm.doc-1.0.1"="j1hb0xn9gz6mywx018i4rq4g5xwi7af4"; "biblatex-musuos-1.0"="dj5nsyf90mbi4dlghyh8aklqr28jvx76"; "biblatex-musuos.doc-1.0"="ypw7naafkwm22kfq1hd4b0z665g4jz9p"; -"biblatex-nature-1.2g"="kfa1pzqk2wmv5lyyvv4dpj8pw1jn71dm"; -"biblatex-nature.doc-1.2g"="cx5yh23k9rl5v8snlqcrz18fk987scqd"; +"biblatex-nature-1.3b"="y20xyps9q45qlg8yrqr690az3w0kw008"; +"biblatex-nature.doc-1.3b"="7vpc38g1zy7jxw074063x57n1v72h7hw"; "biblatex-nejm-0.4"="3sb2kazf4ch1yp415iqjnq30ykn7jd35"; "biblatex-nejm.doc-0.4"="m8km67d5x860465qiwdjxx3vxh8fb7iw"; -"biblatex-opcit-booktitle-1.5.0a"="yp01vwsgsbcfbyyywiwjr3iv5xsg9m67"; -"biblatex-opcit-booktitle.doc-1.5.0a"="yfb5alizf760n7z5xb5cvq1mnmbi7ffb"; -"biblatex-philosophy-1.8"="3af14lxz0vij6z9myf2iaf3bva5p90ls"; -"biblatex-philosophy.doc-1.8"="s91c37yr7b0q86qdpvdc3293zchggkn8"; -"biblatex-philosophy.source-1.8"="iw0ws8yfy5cy09gbg9p5qklzpwr4f1bx"; -"biblatex-phys-1.0a"="j1qihqcyvlzjcnr361c1j7aijr5j33wr"; -"biblatex-phys.doc-1.0a"="ni45y5qnd8kma8z5pppfmk4ckylm5iav"; -"biblatex-publist-1.2"="qxv2694jkv2ki0dz52bz9r6ihbpjc69g"; -"biblatex-publist.doc-1.2"="dp1jbnz404fw35dbvljn1ai0slki410c"; -"biblatex-realauthor-2.5.0"="vm416xgvyqr7lmnrq3k1ripnhsglwg18"; -"biblatex-realauthor.doc-2.5.0"="jivdi043m43cjikym3275kk8ciy6lz5p"; -"biblatex-science-1.1f"="6k9drccf3dz26il0i78xlzpmmf3w5vcz"; -"biblatex-science.doc-1.1f"="mblqxh4vgkc962mnch4jkkvyb0c57lhv"; -"biblatex-source-division-2.4.0"="qp6rqjrn8yx3d0ybyzrxhdvz1a09v7xz"; -"biblatex-source-division.doc-2.4.0"="8zayacsfp5dwafj0f7zqlgwlcz1669zp"; -"biblatex-subseries-1.1.0"="nginsz6gynn9bhra2j74r9zlxsv8vjsd"; -"biblatex-subseries.doc-1.1.0"="bh1nbhzz0h0i1md49lh8bg4lksix5pmb"; +"biblatex-nottsclassic-0.1"="gyisgdfsns506vcbhyr7a20mnbhmldr9"; +"biblatex-nottsclassic.doc-0.1"="mswi2valgb31i1whlspd2mxvfcs1szdh"; +"biblatex-opcit-booktitle-1.8.0"="0lywwxk0m89lf344lhvif3281b8grj31"; +"biblatex-opcit-booktitle.doc-1.8.0"="1l3m97j1dbiy6sbffhivlsqlrhnzkzz9"; +"biblatex-oxref-0.10"="4mr439x90vdc2w03cpidcbwhnhcc8lcr"; +"biblatex-oxref.doc-0.10"="bdj84dpcyh7jpk88xqd2y9mrpp79n2mp"; +"biblatex-oxref.source-0.10"="z6lh0k98qjss3kl3pkvbalc9jjz1sg7x"; +"biblatex-philosophy-1.9.7"="yykxjmirzdm3fkx0j6siwh86frba02im"; +"biblatex-philosophy.doc-1.9.7"="d7706y8iys2jramy0xd72nfgqm8qhg67"; +"biblatex-philosophy.source-1.9.7"="mn31ljxcbl9z40c7hnaa9z3a1bychcng"; +"biblatex-phys-1.0b"="zhp8wd9n07mqvniay7339c6lfv5nhlws"; +"biblatex-phys.doc-1.0b"="pi77vmsc3l3p0y7d17x4rzkz9z6nz1j3"; +"biblatex-publist-1.7"="h1wcwy9gh45hqvwvn937nla5kiw28hx3"; +"biblatex-publist.doc-1.7"="vzdbnrjza5in1n1a3ykqjxqkp3jipmzw"; +"biblatex-realauthor-2.7.0"="lfj0jbnhg8iqc6sv4351sjiz2vx34axk"; +"biblatex-realauthor.doc-2.7.0"="lw2s21r9p9v6x1r5n13djz9xad0isg1s"; +"biblatex-sbl-0.8.1"="425j4iqi1w8ax8han8gyyzayiw0rnr90"; +"biblatex-sbl.doc-0.8.1"="6gbwcv4frd9g9p4r9xy5bv0dgaqymh8k"; +"biblatex-science-1.1g"="a9c3rbxpjgmh94052kn89xfpy9hh5wrb"; +"biblatex-science.doc-1.1g"="yrk1nxnzvwd03ng70al47qvvxfrgc086"; +"biblatex-shortfields-1.0.0"="9k6cvp6v0n8pvl26ikqi1f2db6ga952c"; +"biblatex-shortfields.doc-1.0.0"="2qr31vy4m7dakbni8026gwy76flsbc5b"; +"biblatex-source-division-2.4.2"="kdxm789jnmvyzkx7pi9983jq25p30iib"; +"biblatex-source-division.doc-2.4.2"="4j6h8k98v95n05lzfzp8804gir24vbmc"; +"biblatex-subseries-1.2.0"="v7rfg6wqkqgzm8fwrg0ncwinjzsibcdf"; +"biblatex-subseries.doc-1.2.0"="hgqxbs3qjqya9pxs1spylh2m1clfg5zk"; "biblatex-swiss-legal-1.1.2a"="lp3jw955jpyfjyn6mp6wna8rqwbhsvfj"; "biblatex-swiss-legal.doc-1.1.2a"="23bam0vm3zqrcj1cd10g8bml0jsyvmcq"; -"biblatex-trad-0.2"="1d875vm3whrm4yc8n3infk7b1643j32y"; -"biblatex-trad.doc-0.2"="mnwdxsn51rw7s01lkc9cxvgs3rg63xmh"; -"biblatex-true-citepages-omit-1.2.0a"="qk0ysfx4i0bcgxxxj69xqf5q1fl0dj3h"; -"biblatex-true-citepages-omit.doc-1.2.0a"="8n0irgsi94g8b4my3xl1n05l1raap5m3"; -"biblist-2016"="b565jl60ysccd5qkzgidjb188i509y9l"; -"biblist.doc-2016"="50kjqxwhdncn09c7cx0abkcihvhfzzpl"; -"bibtexperllibs-1.1"="hc5iaz4jjqxqzrs1lay101fj952blr12"; -"bibtexperllibs.doc-1.1"="h4qnqdyvcc4kiccbiq0nf9w9mi0f6rxj"; -"bibtexperllibs.source-1.1"="d6d9jqpml7pdjcg3c2n605rwlmnk6b1m"; +"biblatex-trad-0.3"="9dfzfc2ddpyspwrfbxzcqbs4xkgfjr62"; +"biblatex-trad.doc-0.3"="0vm8qcvzk7v92n5ba2i23ky0gm8bqm0w"; +"biblatex-true-citepages-omit-2.0.0"="y7mg4jqb3fl9mzy93xcpxz3y0l5fw3kc"; +"biblatex-true-citepages-omit.doc-2.0.0"="7cxbqdyazdfp0masgk6a31rr3h9606xd"; +"biblist-2017"="b565jl60ysccd5qkzgidjb188i509y9l"; +"biblist.doc-2017"="50kjqxwhdncn09c7cx0abkcihvhfzzpl"; +"bibtexperllibs-1.3"="fybih5rkcy6fagajbry2zqi0xagjv7jk"; +"bibtexperllibs.doc-1.3"="3n5j7spr9bhfzbwk2qnccj2drnxx9ch0"; +"bibtexperllibs.source-1.3"="wk7r3vgq5g4cxlymbx6ck3brk2pml1ai"; "bibtopic-1.1a"="r3rbv97qik2ikmkp3vx6srw7qf5v704c"; "bibtopic.doc-1.1a"="anrfs022bvwbfwsm05hxl10zgwckidn6"; "bibtopic.source-1.1a"="s32v3bwk7a1aqfkmp1scaf812x6ra9rx"; @@ -176,20 +204,22 @@ "bibunits-2.2"="vkahqz7zjn0g4dkpffvg8rfhjlynvmnf"; "bibunits.doc-2.2"="d6xcf9xdkabjg3jrnyklla7kpbylrg61"; "bibunits.source-2.2"="1hxc8yqjpri8pn512pfvcq7b2m9qnwib"; +"biolett-bst-2017"="c2iw962bwa5815qk2sbhhqjd7z4ygmns"; +"biolett-bst.doc-2017"="7w39z3hdps980l2g1yqbzy8384w4vbqr"; "bookdb-0.2"="b4mqk50dn86zf30w2z8953ms8m8v9lrs"; "bookdb.doc-0.2"="y5sdn2fijycnyx9is1cqc5vx6zkyav62"; -"breakcites-2016"="cvqm5ljgdl47idyjvfs2hg98xmkscfj9"; -"breakcites.doc-2016"="jjqimy63648q6n4mzlwrd7p723m09cbw"; -"cell-2016"="qlg2sy9fj9cv6c8jbdmwzysadl8fhw8b"; -"cell.doc-2016"="61a0456g9i76nxwhpv18fw532nimk2l4"; +"breakcites-2017"="cvqm5ljgdl47idyjvfs2hg98xmkscfj9"; +"breakcites.doc-2017"="jjqimy63648q6n4mzlwrd7p723m09cbw"; +"cell-2017"="qlg2sy9fj9cv6c8jbdmwzysadl8fhw8b"; +"cell.doc-2017"="61a0456g9i76nxwhpv18fw532nimk2l4"; "chbibref-1.0"="7d51sy03z9ww5ns8x0mfiplyk00dgb00"; "chbibref.doc-1.0"="xyypa6w4gx297hpp1ixg8g431rz436qf"; "chembst-0.2.5"="08b5a38p2x2xgv5nw1ibi0xpc4xqixnn"; "chembst.doc-0.2.5"="wgbb4bcl51wnixp4rb94qqqn880mxm7f"; "chembst.source-0.2.5"="360yyds5c6mbcsm60mm3jq8xfxcpnw5v"; -"chicago-2016"="k9y76g5a4nfy88igklw08n27zvnnap2b"; -"chicago-annote-2016"="nyasy7sal5vikd1jysdvhg0ym7hs6q0p"; -"chicago-annote.doc-2016"="8qhd3kj016s9laavhg1wvimy4325zz0g"; +"chicago-2017"="k9y76g5a4nfy88igklw08n27zvnnap2b"; +"chicago-annote-2017"="nyasy7sal5vikd1jysdvhg0ym7hs6q0p"; +"chicago-annote.doc-2017"="8qhd3kj016s9laavhg1wvimy4325zz0g"; "chscite-2.9999"="yc7v9v66md3dy5k2gjswzh58xzxdhwp4"; "chscite.doc-2.9999"="fbcykh46rifs4kvn728sav04fnshr6br"; "chscite.source-2.9999"="vsii846cdlrd9fdmf4npwy8jxh0fcafb"; @@ -198,89 +228,85 @@ "ae-1.4"="zx6mlxrdhfvp0a5ql61jhlj97pcxazwz"; "ae.doc-1.4"="pgvyvlql6hncc8bv2wdf8ja6xxqjjqs7"; "ae.source-1.4"="jzwswwwsb988mvhiiyb7p43g33985n8p"; -"amscls-2016"="ckdbia978nbl0qhcjycgp4gzby2pigp0"; -"amscls.doc-2016"="j6g6qirwzx8ajf08zxgbg8r05hdqjq7g"; -"amscls.source-2016"="im10nfjn3175057rgpplrpka6lbsna0y"; -"amsmath-2.15b"="7nxqn7j9789v8cbki7pr2y3iy60aws1l"; -"amsmath.doc-2.15b"="ijyvzl9n2sqysc6kmsfa9d1vi89dimjx"; -"amsmath.source-2.15b"="g1mjwixbk0zkwqx2paambx9b47i4qjsz"; -"babel-3.9r"="y1jcpy35lrbxxsb5nvfgfl71x2jnlcc5"; -"babel.doc-3.9r"="9k1kf7z5drqb77ndrwzri8962ymqx6n9"; -"babel.source-3.9r"="8qafj8y8srpj5ym7w7c6mi3l5rykww1x"; -"babel-english-3.3p"="5lllx7my4745bs1g4srl2mankxpnvkbi"; -"babel-english.doc-3.3p"="sg3k30f6jrhkm6lfba1s1xm7hpnrbp0p"; -"babel-english.source-3.3p"="qz0n616gcqdbr9db7rfpi7yqns16wbvn"; +"amscls-2017"="ckdbia978nbl0qhcjycgp4gzby2pigp0"; +"amscls.doc-2017"="j6g6qirwzx8ajf08zxgbg8r05hdqjq7g"; +"amscls.source-2017"="im10nfjn3175057rgpplrpka6lbsna0y"; +"amsmath-2017"="ha01if1b84il6v6waq7jb7341v9x9cwk"; +"amsmath.doc-2017"="r8nwf46x2a8fq6zjlllgpbin1cfxzhkn"; +"amsmath.source-2017"="khmk7j3gjbgz4bl4b9j5ws12960qcwqs"; +"babel-3.14"="ds81fjbqn7cdygs1j85svpnd7ndhxdab"; +"babel.doc-3.14"="nmzfx6kdffkf6m606wair11mcgik088c"; +"babel.source-3.14"="8dyncyl8q4syb292s7jqap8k4dhzqv6z"; +"babel-english-3.3q"="lrsz299wwvr17sshfjvsvrzs0s9y2acs"; +"babel-english.doc-3.3q"="y7rp46lrpxsp8z1ridc6msxnbb008k0c"; +"babel-english.source-3.3q"="5sxvprjfcqhw6xb3mv3b0smp2gsckjs9"; "babelbib-1.31"="amkn9a5k0ggifkz1yczzlgl6lxklb1rn"; "babelbib.doc-1.31"="82pbrcmmfxzpzb4aid7a7gq4wd4y0d5g"; -"carlisle-2016"="7clk61fdqxyi8cnqz0bzlm46hax9wkaq"; -"carlisle.doc-2016"="wb32qrbz5x1fqcxlkgafnim881cp8rwr"; -"carlisle.source-2016"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv"; +"carlisle-2017"="7clk61fdqxyi8cnqz0bzlm46hax9wkaq"; +"carlisle.doc-2017"="wb32qrbz5x1fqcxlkgafnim881cp8rwr"; +"carlisle.source-2017"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv"; "colortbl-1.0a"="3l51y7m57n2r8sv2xbz913ljz12pzp28"; "colortbl.doc-1.0a"="28iv8a0ynfn9p7rvw0y21xyqgj5wfk3w"; "colortbl.source-1.0a"="djr5cksady9m5764zdpgiy8103vqvqai"; -"dvisvgm-def-1.0a"="mz5qil6yk9ybpbj8zbsgl92b0z0nb3ir"; -"dvisvgm-def.doc-1.0a"="4y938amq5cpr9ypvyw6g4dzlr37mnndp"; -"fancyhdr-3.1"="ryj6n9yrwwc080xfgdszixxk4mc19ra6"; -"fancyhdr.doc-3.1"="4s6j2icyiwrkm8f9h6mzx8bp37141lzf"; +"fancyhdr-3.9a"="idiiqa9l63m9b3fl8pkf684jwfycadbk"; +"fancyhdr.doc-3.9a"="957y2whhqcyyyqrdyn93xrigryh9shjf"; "fix2col-0.04"="4lr11c6qqbsmm3jixayn7jlyikh65b83"; "fix2col.doc-0.04"="k9hlwbz12vqc446y1ydy045j7c29yzng"; "fix2col.source-0.04"="524zn5yfy3zwy70m11vch4ri5xwrgi0p"; "geometry-5.6"="ja33sy5pvw5lqhmz6yymx7847dacp8vx"; "geometry.doc-5.6"="90sxq2pb4kh0lrid5wh4l2w5gaka7x13"; "geometry.source-5.6"="bjk0zlpgr5gk391fk1va0zsg179njnhp"; -"graphics-2016"="j5fqqxfskyn99y2imkrskcjiia021346"; -"graphics.doc-2016"="q7gg1hwl1rgjgjggdspz7jl7jy3cjz2y"; -"graphics.source-2016"="ycp1bi96vyc3kmlm4s6hn0qxprbbwbb1"; -"graphics-cfg-2016"="j73na78ajl4n50wn2is5wvw7mf27da86"; -"graphics-cfg.doc-2016"="nzdjyk00lx0xhflm04d2kmyn5ya2v487"; -"hyperref-6.83p"="y71r0b5j8079amqdn1zn3c58l10jqzb7"; -"hyperref.doc-6.83p"="ngynic9a1v700jzn0140nrxxm8wl8wp2"; -"hyperref.source-6.83p"="pyc7vjlbz37dqvvz0fdjggpd3xwb5j6p"; -"latex-2016"="z9r2lqch03xjzcb4g5a3pn5k2ik9p1a3"; -"latex.doc-2016"="38961gm5rymzib3591k75x3zwm4d04zp"; -"latex.source-2016"="1z8sbxhb5rqipgplvzrig11lcvlyclbv"; -"latex-fonts-2016"="pw97wy7b4hhzm28r0wl44lacn7nx41ia"; -"latex-fonts.doc-2016"="mv9ivpdxgyjj92fq9141bsw5s306mg83"; -"latexconfig-2016"="rpwazy1znnhn7bdbnrcckqkddmxxqzqv"; -"latex-bin.doc-2016"="ma028w20xvkymhif7cic3d9fyjk2jjx6"; -"ltxmisc-2016"="lf6x6jbl1d3i77wb0dg7lmy26qxk7h8x"; -"mfnfss-2016"="vzpxm3f88p7hv6psh8yfq1r1qhv41xr6"; -"mfnfss.doc-2016"="gv9n8rgdvv564s9n4vynspjdjy1bmc71"; -"mfnfss.source-2016"="401lsgd8dr1avkyw3j0pc1hshfkni5qj"; -"mptopdf-2016"="8a9cp2fz1ayhq8x7c3c609fzjd6dxz1x"; -"mptopdf.doc-2016"="js869531y8rpd1ym7h2k5zb3b8abghkh"; +"graphics-2017"="jfrm2r2qi7yrbp33w9dwzdbal2a7lmml"; +"graphics.doc-2017"="icg1z7610n7jzzn4zsc79hyvcc8ldwz3"; +"graphics.source-2017"="qlfmc40zrrkrawvchsfhnrjbalhgiya8"; +"graphics-cfg-2017"="j73na78ajl4n50wn2is5wvw7mf27da86"; +"graphics-cfg.doc-2017"="nzdjyk00lx0xhflm04d2kmyn5ya2v487"; +"hyperref-6.85a"="j0wbz1dxbs10q347ax0i7amsqlj1kr2n"; +"hyperref.doc-6.85a"="q04jxmffbml3gx6rbq2436d76xxmnv5q"; +"hyperref.source-6.85a"="hzlxzrz1845xjmgydbx3dzyz72b9h933"; +"latex-2017-01-01_PL1"="799njrphqhzmlmx1x6p9d7mzanwqhsjq"; +"latex.doc-2017-01-01_PL1"="w42l2d6f80jbh9n6fx9r48dqkfhgpwl6"; +"latex.source-2017-01-01_PL1"="rii8q3wqkaszhk1wky4bv638s9rbhavg"; +"latex-fonts-2017"="pw97wy7b4hhzm28r0wl44lacn7nx41ia"; +"latex-fonts.doc-2017"="mv9ivpdxgyjj92fq9141bsw5s306mg83"; +"latexconfig-2017"="rpwazy1znnhn7bdbnrcckqkddmxxqzqv"; +"latex-bin.doc-2017"="1zd1sh890fh97zg7ng86071j0aa06psx"; +"ltxmisc-2017"="lf6x6jbl1d3i77wb0dg7lmy26qxk7h8x"; +"mfnfss-2017"="vzpxm3f88p7hv6psh8yfq1r1qhv41xr6"; +"mfnfss.doc-2017"="gv9n8rgdvv564s9n4vynspjdjy1bmc71"; +"mfnfss.source-2017"="401lsgd8dr1avkyw3j0pc1hshfkni5qj"; +"mptopdf-2017"="8a9cp2fz1ayhq8x7c3c609fzjd6dxz1x"; +"mptopdf.doc-2017"="8wb8ykq4zb9hq4gls0kimhbs1j1rhd82"; "natbib-8.31b"="c4fyqph06vxqm37z88r31q84xz5imcnj"; "natbib.doc-8.31b"="fsg1kcjvbp5hfn9h8lwhygnil9wr7awg"; "natbib.source-8.31b"="c4b7bqivps74v8286lf4j36p551jhnzj"; -"oberdiek-2016"="pxpyfj21s6w9hl6l4yi9sx9kq28d2fic"; -"oberdiek.doc-2016"="ihi9wnydggyxcgzhni3360srq6558f08"; -"oberdiek.source-2016"="cz7gw13i5kqscv8h5bslqqa0sjjmc2qs"; -"pdftex-def-0.06h"="hiiqw1v0hxbjgnrgafxf12d6yfry02cx"; -"pdftex-def.doc-0.06h"="692ja5pc2h7lasslyvp2xx9m1kyrv1ad"; -"pslatex-2016"="7apd53ad70mr9pf8ja87iz4cfm41qs9p"; -"pslatex.source-2016"="cqc3yah7p9cgbbsj6var19b4xzyqj01l"; +"oberdiek-2017"="h7dvw4590qs3ag8y44vv4j9lwl0w3kni"; +"oberdiek.doc-2017"="zx0h065n3hdy63mykqphfp2hk1pq8a7s"; +"oberdiek.source-2017"="xdf8q6w4n81y87fa0fsf01vf4xii0w21"; +"pslatex-2017"="7apd53ad70mr9pf8ja87iz4cfm41qs9p"; +"pslatex.source-2017"="cqc3yah7p9cgbbsj6var19b4xzyqj01l"; "psnfss-9.2a"="a4gfps30ywrjdah9m5dknsv5yl80h0gz"; "psnfss.doc-9.2a"="pbiaqsf1gqrwic9pf499k89aw757wr9m"; "psnfss.source-9.2a"="vi285d52bbvq01x4yan9md3cck4dc1lh"; -"pspicture-2016"="siqi85kfmyg91cf7nggs71jh38g2aicl"; -"pspicture.doc-2016"="h26v6akzzgg6hn4ay096fvg2qw6l2ww8"; -"pspicture.source-2016"="fclpkng5q7dhd1vfzv2031r4l3f3vh5y"; -"tools-2016"="da72nx807mqdf4ajymfgf4nkd8ngp4dr"; -"tools.doc-2016"="zw1bikxzdl6xvjvpnrhg95cjxhr0aypf"; -"tools.source-2016"="9zqy7rfbh7d4jsxzblx46k5l90n67faf"; +"pspicture-2017"="siqi85kfmyg91cf7nggs71jh38g2aicl"; +"pspicture.doc-2017"="h26v6akzzgg6hn4ay096fvg2qw6l2ww8"; +"pspicture.source-2017"="fclpkng5q7dhd1vfzv2031r4l3f3vh5y"; +"tools-2017"="ix2dwlynqjpfpagpy8mf1n4igcr969jm"; +"tools.doc-2017"="h06m306z56r9if23j4qi4cg6cn7cdv5w"; +"tools.source-2017"="8yf12zh425cjv5wn8mwf387m53wab91h"; "url-3.4"="vf34zjwlv43kcw53sdla9052x7x0kn7y"; "url.doc-3.4"="ii3z3l7xkmrkxb8dkgk6lcqyb34niirc"; "collref-2.0b"="jmwqf978ivqbik8vdkjq374icxs8w84w"; "collref.doc-2.0b"="1dzrqml74f983hxjvnpznzk5rbfl6745"; "collref.source-2.0b"="irvbzhsbnifgcacs9sw9142c2b93yqb2"; -"compactbib-2016"="5365y0lxziirnp7rraxwbcksrky9hr1m"; -"crossrefware-2.0"="chq7m59gshllpglg9b65h11lz0nph1yx"; -"crossrefware.doc-2.0"="wnjjp99z9r3x7dhjc6c9imm895jldy2r"; +"compactbib-2017"="5365y0lxziirnp7rraxwbcksrky9hr1m"; +"crossrefware-2.1a"="04infm58pjlq62rkza8gp79xz46yfbck"; +"crossrefware.doc-2.1a"="0f8h460yw6qc5mg1mi5a8bkrpyzv734f"; "custom-bib-4.33"="9vqjbilzlsqg3f609hnz27pwmrl5gfg5"; "custom-bib.doc-4.33"="nz1gxi8ixypxpf4cv7nilabq1ivr6fiz"; "custom-bib.source-4.33"="vmak3xkin0hmg92mmpxj53dgs2f2yihg"; -"din1505-2016"="dc7lv2c8zid1c6pklllsiac390hx0v4c"; -"din1505.doc-2016"="fhdc3badjmz3zylmgahy34fbzjgkss0m"; +"din1505-2017"="dc7lv2c8zid1c6pklllsiac390hx0v4c"; +"din1505.doc-2017"="fhdc3badjmz3zylmgahy34fbzjgkss0m"; "dk-bib-0.6"="yvbpqypgxkh6i47yvkk0cp7qsfy083gr"; "dk-bib.doc-0.6"="px69q4pi9444kwmw6fpmajvdwl8ivw9i"; "dk-bib.source-0.6"="1jmv0pg8x913y6y0xjb888s0zg91iw1l"; @@ -289,31 +315,31 @@ "doipubmed.source-1.01"="mz2ld43x7sp8np0qmcs86p5lc09nl4dr"; "ecobiblatex-1.0"="ikxp3jlzlsnc7jh7vcxcfq8wvpd5r8ll"; "ecobiblatex.doc-1.0"="y5hifg3r0xkgv6zklw7l9j7shl87fnf0"; -"economic-2016"="xw85nd7v6i1d2ma0airnc7bwf1fdsipp"; -"economic.doc-2016"="pv3irnv3gj70q22ac3kr858hac50vrbz"; -"fbs-2016"="h6ghp5i14cqy46hzp9i481c8gvk2ddza"; -"figbib-2016"="imp65i6ddqyw5xck7k6gzb976glq9xj8"; -"figbib.doc-2016"="6v3sj56vg039mrm7kk71wdjhp04h1rf6"; +"economic-2017"="xw85nd7v6i1d2ma0airnc7bwf1fdsipp"; +"economic.doc-2017"="pv3irnv3gj70q22ac3kr858hac50vrbz"; +"fbs-2017"="h6ghp5i14cqy46hzp9i481c8gvk2ddza"; +"figbib-2017"="imp65i6ddqyw5xck7k6gzb976glq9xj8"; +"figbib.doc-2017"="6v3sj56vg039mrm7kk71wdjhp04h1rf6"; "footbib-2.0.7"="xhrwnw5kvs3rxp32a8awv8ma7098cv6h"; "footbib.doc-2.0.7"="dzyra0rwf5hl2g6f7c2pw88d78f7yls1"; "footbib.source-2.0.7"="xj3agjgzfnwnfzzbzk4xjfk90fr1a6fm"; "francais-bst-1.1"="zz8wcr2ymwd7m721qr94l1k799mi9cia"; "francais-bst.doc-1.1"="qmq30903zrvvw6bprngklx5pwq9c1cqd"; -"geschichtsfrkl-1.4"="wanhb5jfd1pskmhm3a0mc19y04jbr33w"; -"geschichtsfrkl.doc-1.4"="nilw1mm9li8s71acl2236mpqq681kd25"; -"geschichtsfrkl.source-1.4"="jrlm2xjadsg8w3fxdsqb5q9gfy72q63m"; +"geschichtsfrkl-1.4"="94vlnvvfy0py3ig3mjjizxbnp3xcnpv6"; +"geschichtsfrkl.doc-1.4"="212pcrypha38lk3nri43fvj12fgjlqzm"; +"geschichtsfrkl.source-1.4"="ak3n8j6n1wx9pgawvyr4diklq9971wx1"; "harvard-2.0.5"="yhk8zvlhgd1knzfdndba31whwj7ixh1j"; "harvard.doc-2.0.5"="c3jps721d0cndqjqgqkhcz4n7xvaj1f2"; "harvard.source-2.0.5"="kjg78fvynjjna03hh2xzcrqvsm8d9yjw"; -"harvmac-2016"="30iiq3zikvmyy87j98knxbc9iak232bb"; -"harvmac.doc-2016"="3q1j6s2rdz18fg3hknp7ifyzixgmwr8h"; -"historische-zeitschrift-1.1a"="bsz5pyq1j058apgdwa6x7k2rnin8iy3g"; -"historische-zeitschrift.doc-1.1a"="k758py90dfdvblb6nfcz64i4ljlhirv7"; +"harvmac-2017"="30iiq3zikvmyy87j98knxbc9iak232bb"; +"harvmac.doc-2017"="3q1j6s2rdz18fg3hknp7ifyzixgmwr8h"; +"historische-zeitschrift-1.2"="6zli1x9hz1dsy8p4hpi9rdb0hs35vka9"; +"historische-zeitschrift.doc-1.2"="y76j031x8zym5i6sqr0r67ws0z49q306"; "ietfbibs.doc-1.0.0"="mqqb9qjrk1lg7w85w8jbhizmh1qh4zqa"; "ijqc-1.2"="ry2ydiqc71zjfkb46l4fvlxa1h6wnq1c"; "ijqc.doc-1.2"="zz9ai19qd2rxvpw5kx1k1rd3ndndjv6v"; -"inlinebib-2016"="gkr44f3f9m92bx42gcvwgzclbjya5gdm"; -"inlinebib.doc-2016"="bpfx7h4w0zqr7xdxn51glllzf20qj24y"; +"inlinebib-2017"="gkr44f3f9m92bx42gcvwgzclbjya5gdm"; +"inlinebib.doc-2017"="bpfx7h4w0zqr7xdxn51glllzf20qj24y"; "iopart-num-2.1"="92jbzj605pi9chj3ymfxm9ii2dh62haz"; "iopart-num.doc-2.1"="smix69mc1n89q45nw3rl18lasn2c2kwa"; "jneurosci-1.00"="r5k91lza98jn52s8fmgrbclslb6zps08"; @@ -327,6 +353,12 @@ "listbib.source-2.2"="266hzszszrdwa0x6hk5xrz9gjs1srsb8"; "logreq-1.0"="4kl4g8kjy4zch0rdn8aj2mr5yxpssdc0"; "logreq.doc-1.0"="8s7ly9p9m270mhhh16gv5p71r10cpnzv"; +"ltb2bib-0.01"="mid475rg33jg29rxq0ci49vq4y81j4ng"; +"ltb2bib.doc-0.01"="7k2q8zzzhf5zf71fw0yinyghlb1kwqy7"; +"ltb2bib.source-0.01"="8py2zhz04b0hals44ypv67m2c71b1j0p"; +"luabibentry-0.1a"="lm4x9gqyj8ha0cjwmmy7h4yffnd8wymx"; +"luabibentry.doc-0.1a"="psn62xnv0l494i67jzsc0sbij0r2kcvb"; +"luabibentry.source-0.1a"="9l96kjwd1kwkj7rjcrlq3vcyiylbawrl"; "margbib-1.0c"="315vswcfl035s528hmj5wvl43iar5d0p"; "margbib.doc-1.0c"="lix6xbc2in8r6cc1yvdb565nky1f6jq3"; "margbib.source-1.0c"="gnjk0pwcdim1mnbsyq9mmkmrqw75a771"; @@ -336,8 +368,8 @@ "multibibliography-1.03"="3svp5l6al4k7adk99d6fcy7m54qbfbqy"; "multibibliography.doc-1.03"="1bl112qsviy7jzhm1qdvn42x0lvcnjkd"; "multibibliography.source-1.03"="65bvyr4gr7sdwhsraq9rmbv16d4fi6qc"; -"munich-2016"="0a6hgpvjyd8hzvmrf5bjc6rniwj39bx8"; -"munich.doc-2016"="22c6rhm479c1gg7df9mzza2vl7jgb3ij"; +"munich-2017"="0a6hgpvjyd8hzvmrf5bjc6rniwj39bx8"; +"munich.doc-2017"="22c6rhm479c1gg7df9mzza2vl7jgb3ij"; "nar-3.19"="iaann8dbnvignc32m1wnlz4j77i7ngx8"; "nmbib-1.04"="mbz1wjyaxsx3cn4wymvz4w9wf10580da"; "nmbib.doc-1.04"="s6bbxc8lyp7kbrpsi0i4jrvda00260ks"; @@ -345,23 +377,24 @@ "notes2bib-2.0k"="q8dvcbf4dla1x8lrpsr6lmd4racfkfps"; "notes2bib.doc-2.0k"="mw3vsv53vpng36nqwiwdw4aj49gq6rq1"; "notes2bib.source-2.0k"="zllxh9jj5yakjw8pswdj5mv7cmm99lf8"; -"oscola-1.4"="nxly86hdzdgsa9dx3326p1f4n0awrjmq"; -"oscola.doc-1.4"="a90ssnpb6znbm9xv1lp19j4b0b26q1gd"; -"perception-2016"="pcwr35lpv0zksvw7nw9hk08m81xq6mgx"; -"perception.doc-2016"="2c1l0ffxvmy5ac8h1zilfl381igqi15y"; +"notex-bst-2017"="x4042ry48i6p1qr2l4yv0d52x4wmjarg"; +"oscola-1.5"="v2cq7pnq79yc15iha9mb4q9avcywfga4"; +"oscola.doc-1.5"="0a1yd9jz5snmzjydnawr6d154ad1ylbz"; +"perception-2017"="pcwr35lpv0zksvw7nw9hk08m81xq6mgx"; +"perception.doc-2017"="sn4m1gc1s04h1crw3gbaahbxa6b76npy"; "pnas2009-1.0"="k4xy9dabg8i4mf18317wf8mp3hrlpmqy"; -"rsc-3.1e"="yar1wy5z37hly20lkp020ghj3d9l922f"; -"rsc.doc-3.1e"="bwykjz238m66pawn9vjx6f2fydqjfrm5"; -"rsc.source-3.1e"="ni4kd6sp7z7zxclbi6vd7pk7wsffpshd"; +"rsc-3.1f"="4hhv7zw4v3w8sslxwj14pk4azil1cdhh"; +"rsc.doc-3.1f"="d20wkd2qw8dabh30gdpasxqacn193f1b"; +"rsc.source-3.1f"="rfsxjn597ylr3m2vl72dh7fa8x2a08yw"; "showtags-1.05"="hbxk7ijniaffjnk02hkjwgw8gwgnx5qb"; "showtags.doc-1.05"="q22k5ckq0q4228ssvqnz9n139x32a5iq"; -"sort-by-letters-2016"="4m8cm6rnhgsc40liy2yhfc4r76zpdnsq"; -"sort-by-letters.doc-2016"="3z4kw7hvnjmp7hlfjw2gchraw69zyx09"; +"sort-by-letters-2017"="4m8cm6rnhgsc40liy2yhfc4r76zpdnsq"; +"sort-by-letters.doc-2017"="3z4kw7hvnjmp7hlfjw2gchraw69zyx09"; "splitbib-1.17"="az1n021wdajs8dc0q93wgfb1r0jcr2h2"; "splitbib.doc-1.17"="qsb89h2ch89qhbxir7f90xx5sqvgm1px"; "splitbib.source-1.17"="c9m7hp7fh86qj53qwaqxh8xj8yf3gxdy"; -"turabian-formatting-2016"="6ilq7k0bf1kyphx469dmy0mbbnnsn3yj"; -"turabian-formatting.doc-2016"="c7sjd5z1kgkw3gm3kklzqg5s7drjh45x"; +"turabian-formatting-2017"="95gqjzlj1hq9cz8g33a8l93hkzchjylb"; +"turabian-formatting.doc-2017"="gmxadhwnw5qpc00ajwqgl84w023kvqaf"; "uni-wtal-ger-0.2"="i4nr7hq5gym5rcs2pc43qclci7jy9y4m"; "uni-wtal-ger.doc-0.2"="a4r7w5m71h1kfgzxgpmb84hndnhrxhhy"; "uni-wtal-lin-0.2"="8cdd4qcy3i5bvf25nn89kdaqph3a6fan"; @@ -372,79 +405,85 @@ "usebib-1.0a"="4b8sv3fknxfaz9cgnvn3l5wf9c8c76wx"; "usebib.doc-1.0a"="ba1nqv90zkfzi8n17xlk7rkx2s92lkd9"; "usebib.source-1.0a"="967j287dsb1j4wa5k9sxsv4xp7194q3b"; -"vak-2016"="7ar45am5q9mhv8liz1zvix9wgcwqgjhl"; -"vak.doc-2016"="sr1gi7csll74iw13j24r1hdwn3gql9ak"; +"vak-2017"="7ar45am5q9mhv8liz1zvix9wgcwqgjhl"; +"vak.doc-2017"="sr1gi7csll74iw13j24r1hdwn3gql9ak"; "xcite-1.0"="fpgsqqg3rliap6chn99xzlj676ll25hd"; "xcite.doc-1.0"="wvhx1d2wkws7fcrplh55v9fsq1r8a3hw"; "xcite.source-1.0"="8n5kfjr7xfjicd1hw6hlhcrn8dzicp5q"; -"a2ping-2016"="srb9jfjnp85rzq42m6wvi0nkp1wk78s3"; -"a2ping.doc-2016"="ycdwjcmhp91ciqfcvhgyg3sw6aprvwmz"; -"adhocfilelist-2016"="l8ayz7mqaa5lma2bvqb2brc879y0viij"; -"adhocfilelist.doc-2016"="gm20nhwq88s1cmch3pcgkqnyahb5gnri"; -"adhocfilelist.source-2016"="3qx23im0z07cnk2bd5vrskl153zxy6ff"; -"arara-3.0"="hmvlrlz9l47n1qq648bdz6dr3vm1w48l"; -"arara.doc-3.0"="syfx2srkh3cjylv4d08dcs6fz98mkqlr"; -"arara.source-3.0"="2si87nvpwmkk0jk0ysk60dydrc7ncrcw"; -"asymptote-2.38"="7g9mhb1jgg5pxh58wnd7yr1a7rjq7yfd"; -"asymptote.doc-2.38"="i06yz2sf464xpn38l8crmsb67x8ns475"; +"a2ping-2017"="srb9jfjnp85rzq42m6wvi0nkp1wk78s3"; +"a2ping.doc-2017"="ycdwjcmhp91ciqfcvhgyg3sw6aprvwmz"; +"adhocfilelist-2017"="l8ayz7mqaa5lma2bvqb2brc879y0viij"; +"adhocfilelist.doc-2017"="gm20nhwq88s1cmch3pcgkqnyahb5gnri"; +"adhocfilelist.source-2017"="3qx23im0z07cnk2bd5vrskl153zxy6ff"; +"arara-3.0a"="4knq382wxz5prqpyk95wmipv6rj8ds2b"; +"arara.doc-3.0a"="kdm1mx8kx9zp13j782ir5mm6d09a2q9c"; +"arara.source-3.0a"="wbarmjwzncvjvkdz07yvspa318r7m3kw"; +"asymptote-2.41"="qcwqjls6lb6k68skkxxr29ri363lz53h"; +"asymptote.doc-2.41"="g4plldqchmzpfygf9sarlcrn3mxzfbwj"; "bibtex8-3.71"="sri58vnydvfpv947gmlxd1s3c2056fp1"; "bibtex8.doc-3.71"="glkl9d9h57q9q6dpyszcqc3axcxbw888"; -"bibtexu.doc-2016"="yppzw0banxngki9dzgm7dlm8cr9vnxya"; +"bibtexu.doc-2017"="yppzw0banxngki9dzgm7dlm8cr9vnxya"; "bundledoc-3.2"="k3x1sdf7244dr1zi3san9xmvislq7k8x"; "bundledoc.doc-3.2"="fkw0kw3wzyrl2gs3rdq5hrrk8yjsjznd"; "checklistings-1.0"="a2gvh85pcmrc82wq4h6n9ycqj86z9f8d"; "checklistings.doc-1.0"="ymkplhp7331fs0kq4qcpmh9la0wxj5lq"; "checklistings.source-1.0"="8ya9yd2by50zppk7rrqjkc34ans6ffb0"; -"chktex-1.7.5"="8a92aw3pmfm3jwyjyx4w67igj60hnyr3"; -"chktex.doc-1.7.5"="wg15dgnb4kmqyzdkcvni7ab6vlgwvd6d"; +"chktex-1.7.6"="4khiza97qvhdbzdlz7pacnr16zmi9b9d"; +"chktex.doc-1.7.6"="0ffsh4bndkm9drzpzknzyd7zd3a0sgnp"; "ctan_chk.doc-1.0"="m4i1vj19h48zyk9pxadfq1qrwmvqy3i1"; -"ctanify-1.8.2"="fxspqr86acczkl6wvdy93agsswbf684k"; -"ctanify.doc-1.8.2"="rx9lxz858882x18iz99aqnnbczri9kdk"; +"ctanify-1.9.1"="y939628500ks8apq2qdzcbj490y0c4bb"; +"ctanify.doc-1.9.1"="dfah3y6kn3r18mjj39p13mq7y6zpalqb"; "ctanupload-1.2c"="jmvh3rrdy0hyvdxz55gydlgsh7xzp4vv"; "ctanupload.doc-1.2c"="38wlhcxvvpbk01sj6vhwjs9mccw1xs14"; -"ctie.doc-1.1"="08rlrf1l28ycdrp03g25j2kpxqk5wfyy"; -"cweb-3.64af"="qfn7marr781bq5vy496zicz3imjg24b2"; -"cweb.doc-3.64af"="3xg96jicc1240g0chvlx5wry2cwdkbss"; +"ctie.doc-1.1"="2w328many5w4sk7cvm67s98sxgsd4ynh"; +"cweb-3.64b"="dn4jxisghqqp3skrd0f8s6wm57n6cakn"; +"cweb.doc-3.64b"="si9039yvfh8zw3wspssjpm9biyrgxgly"; "de-macro-1.3"="mscrdz5y4zdxszz37dnh6kw4hmwm185q"; "de-macro.doc-1.3"="hdmn9ds4kiqsalhx5r2l4adv19ijf5f2"; -"detex.doc-2016"="j41jppc49fya3fwafmq57d0cay765a3n"; -"dtl.doc-0.6.1"="8vwjgqqsp0s1bwhphrv8n61kria31s4s"; +"detex.doc-2017"="459gxrcdkp05jaqhzw124idzyhhyb26r"; +"dtl.doc-0.6.1"="dbhwn4gqav1lb668ab2s9f28qys7aln4"; "dtxgen-1.07"="nl5dq5v54hww8rwyxrq6l6vrimzh352q"; "dtxgen.doc-1.07"="n9c7x9ga79p3gvgb6g3mhn3j3xxy63zw"; -"dvi2tty.doc-6.0.0"="d3hmmzg8cnk02cldkrgqd7brj2436qbd"; -"dviasm-2016"="pz59qa1ljm0cgwzi1q7im03s3c31kd9d"; -"dviasm.doc-2016"="wj8a3skfwd5i6d1hb8v3dghijlgmbmdc"; -"dvicopy.doc-1.5"="2wif61ghjgkbkhrzs02ccfbxqyki9avj"; -"dvidvi.doc-2016"="yr9n3isdhnyy09kz8126znxaxvng7816"; -"dviljk.doc-2016"="4lv3bh32ph3vj6xp4lrqrwhs4q47hpvr"; -"dvipng.doc-1.15"="p1dq8vzamrf597d1fsbby57954ci2ccw"; -"dvipos.doc-2016"="l03yrdyj7hkidr86wmjdmg6j3fmra4js"; -"dvisvgm.doc-1.15.1"="qsrmvbj87di5rpalvbd97csyb2jyahh5"; +"dvi2tty.doc-6.0.0"="fk7i1hmrh59c35sn75ac3rszdg5q5a4x"; +"dviasm-2017"="pz59qa1ljm0cgwzi1q7im03s3c31kd9d"; +"dviasm.doc-2017"="wj8a3skfwd5i6d1hb8v3dghijlgmbmdc"; +"dvicopy.doc-1.5"="05smd46wjm51qhv8fcli1xckvcw61dhf"; +"dvidvi.doc-2017"="gijxnmfql8qbfmwnm3f4fnv88qbkaqs1"; +"dviinfox-1.04"="zjbfw4kzwfqnvlwzvjibsgim855fc30c"; +"dviinfox.doc-1.04"="1n52la52nchv27j82lisrh8q7wygx6lp"; +"dviljk.doc-2017"="yi82grx6xf3fs8lzq2f8sgwnq7fb78gr"; +"dvipng.doc-1.15"="al9qswqhylbmx8yiys2987fq8ls74kg7"; +"dvipos.doc-2017"="mlcjd10k7j9da0d4scbpxnyz7a0hwn7g"; +"dvisvgm.doc-2.1.3"="qsrmvbj87di5rpalvbd97csyb2jyahh5"; "findhyph-3.4"="4kc8qj2hs4hf7h25xb031fy5m9j8jygv"; "findhyph.doc-3.4"="zm08ngcn8q60iyajq11iqyw14304lq11"; "fragmaster-1.6"="r6wbba0qjxr5shfrf5ia8984dcrijpir"; "fragmaster.doc-1.6"="vwmmc7jmhxfvblz3fpdj0saxjs75bgia"; "hook-pre-commit-pkg.doc-1.1.2"="0rf4zqwdix7npi9g6nlcpp95mdpxana5"; -"hyphenex-2016"="1ak1ymbmsfx7z8kh09jzkr3a4dvkrfjw"; -"hyphenex.source-2016"="n4rvv61jcw6s91mydy65qq90clva5zrs"; +"hyphenex-2017"="1ak1ymbmsfx7z8kh09jzkr3a4dvkrfjw"; +"hyphenex.source-2017"="n4rvv61jcw6s91mydy65qq90clva5zrs"; "installfont-1.7"="ds2zbs2f6kasda98jn1k8i0ym5168ax8"; "installfont.doc-1.7"="jmwwjkliwr7wl1gyx8fzpyslscsnlqlx"; -"lacheck.doc-2016"="s8b9z7glzz22bfs97nwa55k5852aq0mi"; +"lacheck.doc-2017"="4fd90j89kvc2bhcq0jpzbgwxzj9zfd91"; "latex-git-log-0.9"="samiv870lgj4smwh80l5ck8q6q8m1yqm"; "latex-git-log.doc-0.9"="1hjp3dx0d0yhj2c3n02cdk4fdg6iv6nc"; -"latex2man-1.24"="2k736vyphfpggvfa8p8knx6hh3jh3hj0"; -"latex2man.doc-1.24"="gfmjl0zxh8djqza5bxgnbz2a3hgnnp6m"; -"latexdiff-1.1.1"="c7lagi437g7k223h8jk2alkw9y69dsjb"; -"latexdiff.doc-1.1.1"="7j4wax3ijxzfq1m3fdb7h9wzdg7r63zg"; +"latex-papersize-1.62"="c2qx25bgknw9350pi7vr5hdnnj3i2ak6"; +"latex-papersize.doc-1.62"="8w0cczb884w53zzv3dwra31zcvjh4jzf"; +"latex2man-1.26"="42pz4w3p49xlwkkydrkhj2n3f4k919sc"; +"latex2man.doc-1.26"="skad8nf2kni95jx1q0af78g3bi8hpnpk"; +"latex2nemeth-1.0"="6lm0m47d60zzq67xcdh5yh6i7s7m66a1"; +"latex2nemeth.doc-1.0"="23zq3c3z098dzbc2j4mji2hsyqf1kq2a"; +"latexdiff-1.2.1"="ifd6bq1ndzrcrx21rv9xrx0556z3zav5"; +"latexdiff.doc-1.2.1"="gr2r3r3s4aaldg8ghxpcbz0pn3585k5w"; "latexfileversion-0.3"="79yrcgv4lj33pavgn48ycvsd9a1x49s3"; "latexfileversion.doc-0.3"="c6n7z8c3lzrhk2g1fn4v05l2y6299sr8"; -"latexindent-2.1R"="vpwykpks3flh8dxkp8wlp1iqgc709nhi"; -"latexindent.doc-2.1R"="8ba0c2md6qv0cq15f7gchmg27w60ppga"; -"latexmk-4.45"="0a2mxkbd84iqbfw9i09fjnfj13sm4bwx"; -"latexmk.doc-4.45"="r90hvlxjnkbq4din73wbbsfv86qi8lqs"; -"latexmk.source-4.45"="m32pbzkr0my5gv38jw54bancbk66r15c"; -"latexpand-1.2"="g5a9hla9v09jrj4c6cvk72w3ghdpzfs7"; -"latexpand.doc-1.2"="kkqdsfzlbrr90118b9v8i87218x05m1g"; +"latexindent-3.3"="8n5qiqlmqk3y7mahhn8lrg5kfsk0v02c"; +"latexindent.doc-3.3"="vfkyx6xrf5mmylkiqm4ankn6qcc91xmi"; +"latexmk-4.52c"="k0bndjcxbrsq6bqcybfhc5l015gphqa9"; +"latexmk.doc-4.52c"="413lavmrs2i1znbp6glmhfdri22w22ip"; +"latexmk.source-4.52c"="v506lymxp4vk76hsfk90r3m1bipp9ffq"; +"latexpand-1.3"="zhwgsn4b1b4vhp6d22g8x47wpznc4gpp"; +"latexpand.doc-1.3"="kcyvwzar8pvv9b3178pn1wkdkam1g4bp"; "listings-ext-67"="zbinp0czaglig761svs0s13np81qpsr6"; "listings-ext.doc-67"="slcbwzsy505nhjriszn993pgqlmdlfib"; "listings-ext.source-67"="95y2zv6bcfkvqmwf6cpa4piaydlkjwz5"; @@ -452,27 +491,29 @@ "ltxfileinfo.doc-2.04"="rbqwgb89q514rih3hf5bv613xqw1gbci"; "ltximg-1.2"="rsnmw4ck0cw4xwfk8pcyp7jk27c1mx3j"; "ltximg.doc-1.2"="0micalj6rgcxqv6kj4wa5xz0g9mdx19q"; -"make4ht-0.1b"="h7qwybbp89dsyp9jmlzbi2miwn109xf1"; -"make4ht.doc-0.1b"="8jrsi5q919cc6wracgqgbhngn9mbm5wq"; +"make4ht-0.1c"="75l8zv99hzai5ibd5p5mlbs52vgb5lh9"; +"make4ht.doc-0.1c"="hjcd4ghm9kmxa2i2jv4xqclhfq900qhz"; "match_parens-1.43"="hahwx0ca506ykknc9plsnrfg6fsb5rs4"; "match_parens.doc-1.43"="1h445p7nl5n70rskvq4d10b15kb8058k"; -"mflua-2016"="m43zjnf3p7aygr3cmhcwm7hg2cprd32d"; -"luatex-2016"="ggq2cynx3zmyvh3cfyb1nrga09idwilw"; -"luatex.doc-2016"="7afsbb0xpfx72sjy6j20f0kkavvjb8cd"; +"mflua-2017"="5l61gh5fwi3kqilawfhzp77y8qq9zb9r"; +"luatex-2017"="vhr825nzdmkqlca1x89b6mwnq3znfq99"; +"luatex.doc-2017"="svm2wr0hxpfw5dm61zrn84a3id31jwkf"; "metafont-2.7182818"="sxdr5v17hpv8g1562g06lhn26c1wbs8f"; -"metafont.doc-2.7182818"="8b75fzwgmf7jlsk7ayi9nk9py0y5lxl2"; +"metafont.doc-2.7182818"="f1mmyxxy0jfn0jc2pxxzlsva8kq7zq17"; "mkjobtexmf-0.8"="raq7ql17c3fdqqpaqbd53r0dg7kjrvh2"; "mkjobtexmf.doc-0.8"="3cgxbgxpha9139jfz4v3478ny7yv3xm1"; "mkjobtexmf.source-0.8"="dky5rv3xrbjqj7pg8spdjsllggpq61k9"; -"patgen.doc-2.3"="g8ydfaymp0adr7h5ww21qvfa6lynlzfh"; +"patgen.doc-2.3"="lncanhqr5czrpcm9i3c50wbah5xli13n"; "pdfbook2-1.2"="nkfll8ynix954j2rplv72avzq9pw93f1"; "pdfbook2.doc-1.2"="7wi87df5sfhk1pxk3i8kkk3w1ym3z2pd"; "pdfcrop-1.37"="mr2zg2ji7gqm14zq5xsf8wk081fbdwdn"; "pdfcrop.doc-1.37"="28jgvjwk6v7dvldqgqd4ry32ccd8avgn"; "pdfjam-2.02"="p9l1q18vqf1yjaxxdyizz9b9rgr1kv4w"; "pdfjam.doc-2.02"="c6aawcwvnijzmjakmlnlzbnhq0yx2vmx"; +"pdflatexpicscale-0.31"="qsf9dh0wc62qp7wviqn926hyhwqm8d9z"; +"pdflatexpicscale.doc-0.31"="j6llqi6vma6ph4zf94iiyvjh7hl6mdfw"; "pdftools-0.86"="a8nv2mqs26gb1dinymxa9kwk4baqch7l"; -"pdftools.doc-0.86"="cahyyj76ssk42sjfq1k8skz8kc56w6l9"; +"pdftools.doc-0.86"="cpmnjq5f9lm3cl982qy7lndp10vzm3yh"; "pdfxup-1.30"="r29ka6pw53vdscrpxbaar5g8x171c0l2"; "pdfxup.doc-1.30"="kc5qc6a8q4f8yn2xa7cbabidk9gxg6sh"; "pfarrei-r36"="n351xhnwd12vvy4b4zv2r9cqx1crd435"; @@ -484,144 +525,155 @@ "pkfix-helper.doc-1.4"="gljfwywrvwin5fl5szfnpa095cr2r0m5"; "purifyeps-1.1"="qmwy8zk8h0kzpsknp0430gdxq0zqj4hf"; "purifyeps.doc-1.1"="4fj0jj42mjldhg90pkvj7bsd1b682x0c"; -"pythontex-0.13"="clnfvxaxa33sfdxd87kwddph57wwy50l"; -"pythontex.doc-0.13"="s4npxmwi4qnrhp6szvv41waqcj5lwlyr"; -"pythontex.source-0.13"="x70cyckwy1gjwq99is6sx55m8af729v3"; -"seetexk.doc-2016"="fadjwbzngmk4pgs6gkl8k7hyvi4hmf4w"; +"pythontex-0.16"="pzh8qkl7j7s5431cvifd70r5lywhzrqc"; +"pythontex.doc-0.16"="ifnkz8rfy2mb0hff6rv6ngp8fivr6v73"; +"pythontex.source-0.16"="wnszvmjiwgfppnxw5aq0lxd3mfdwi6l7"; +"seetexk.doc-2017"="7axhlb5pj0vj5hfldpqmsk3azdvlwc6n"; "srcredact-1.0"="dzxdwnn9l06gngyvaarf10h6ws8aa73y"; "srcredact.doc-1.0"="m028dd5fqv2x9xcxq7vhdsaz2xcyxwl1"; "sty2dtx-2.3"="irvwyxk3ggfbc8p4b8s70v5704lqmsib"; "sty2dtx.doc-2.3"="s9qzsp01129wgi8qfh0ljxkaj9jvdr65"; -"synctex.doc-2016"="vq6lvvy33vhgkv39rcp1g7x9jj9mpl9d"; -"tex4ebook-0.1d"="ziac161s7pb1pr00a0z9p4sxn371whmm"; -"tex4ebook.doc-0.1d"="0j25czpd19iigfdhajqwixb0rlbn0r92"; -"texcount-3.0"="6hqqsgp87bj4s58ggcm5v9mgi2lih33j"; -"texcount.doc-3.0"="0q7fyfhkvfz0q64648xjr540gmid6f19"; -"texdef-1.7b"="2jkmi5xiakxd9hvd9dibgnvgn9xxixj5"; +"synctex.doc-2017"="5bwnhhgg7cgirdzp2zy1nafkf3jdk851"; +"tex4ebook-0.1e"="ymrsjbisr5s0h84cg5a5fqmdsfdswcwc"; +"tex4ebook.doc-0.1e"="4b9f6d9s34xdn804crny20d747nw0v7z"; +"texcount-3.1"="1aqqrw4nhnqimpfnbfypadfny68v9mbm"; +"texcount.doc-3.1"="ip2s9f7ifgrdnr2mfa37mx5wl15ich26"; +"texdef-1.7b"="ap417mmrki8dys1li7sky5g830zjdfhv"; "texdef.doc-1.7b"="1x0bfw080n35j4vm7qw166x19342s9nx"; "texdef.source-1.7b"="f4jg6vw88fzww1c8v7qq6cjihysp6w24"; "texdiff-0.4"="83vghxcac89m0kji1rr4ry3fy55im9sa"; "texdiff.doc-0.4"="r9wsmivjyiwdnav7qc35kydk9b8pbcz8"; -"texdirflatten-1.1"="dr02ipy52xafic3zsayng64gr5n4dvvl"; -"texdirflatten.doc-1.1"="wpbapbq0kbw4r6565rq09c92pkv6i355"; -"texdoc-2016"="fk9fxxj10bkv6c4b2mclg7jdvg9q677v"; -"texdoc.doc-2016"="2kgq8xjj3yxwjdxlzg12iw4nlmb8ydac"; -"texfot-1.32"="wkgm3qch76zqwka8149a8snn9qg352qc"; -"texfot.doc-1.32"="hqqs56irih2h6gipzwk69yqkyql6pk4s"; -"texliveonfly-2016"="8csnp69s8i4bs18r18qqr2cmkqhgx437"; -"texliveonfly.doc-2016"="ic6vdfmbvl34zjqrn0lvp59armsin54n"; +"texdirflatten-1.3"="135358h2mb608wg3ni93rrsvvqgxm4ya"; +"texdirflatten.doc-1.3"="n9jxdwjiylvwy6n55vgci9a32qi10xhl"; +"texdoc-2017"="fksji7awh16r8pqi50j4yhdz7wdgsq23"; +"texdoc.doc-2017"="631py6mvsh9i9krxsa3xvn4zl6fzwxdp"; +"texfot-1.37"="fbpbc24dbh8wvzyybjwb3vgc6w7mhlxw"; +"texfot.doc-1.37"="7vdbypvsmllg0frxh59rsb4iig3lvg5l"; +"texliveonfly-2017"="8csnp69s8i4bs18r18qqr2cmkqhgx437"; +"texliveonfly.doc-2017"="ic6vdfmbvl34zjqrn0lvp59armsin54n"; "texloganalyser-0.9"="8dlsnkjvsic0xyaxjwixrgm4pf40snpz"; "texloganalyser.doc-0.9"="yh3y429s0fbkjai3kmh3z1q4f1pja6g3"; -"texware.doc-2016"="xdvklav90mbqvc1vhhcs2v0d5raryjs8"; -"tie.doc-2.4"="s0izfaivkm6r134sif1z3ar3m3s99cgc"; -"tpic2pdftex.doc-2016"="vipa4nyqs18ajq1pn2306xgnv90q24sn"; +"texosquery-1.6"="8f8lapbim73bxwfmzgi07jl5qg5d0n6g"; +"texosquery.doc-1.6"="rph058iy26cxdk6n0i7kbgxv43rkmfx7"; +"texosquery.source-1.6"="6r8grnnhqr2jcmns2vrcxq6gai939nhb"; +"texware.doc-2017"="6w4s19cbzpcyh8vmqhh2q4mq0bg89sdy"; +"tie.doc-2.4"="rgh26xw8mkkr9ka7if47m62wrzgqd9gc"; +"tlcockpit-2017"="4m39d7vdwnqbhmclk6by5dxmy8bgc4v6"; +"tlcockpit.doc-2017"="grnf976zra1n804l293hyixhbbqx8s27"; +"tlcockpit.source-2017"="s26ybabzbpf5rqn4smq2pmy16ik3adcp"; +"tlshell-2017"="y5kamcjrmp87wxzmk6gjclzw40nirbmk"; +"tlshell.doc-2017"="bfk5yhh81yyhdim9pjj8kp3x2z9j7xi7"; +"tpic2pdftex.doc-2017"="aa27lpifw428qjn3vwwar246dnz5k2i3"; "typeoutfileinfo-0.31"="vjs333wmdxb9s1vd215af0vryplvb8hl"; "typeoutfileinfo.doc-0.31"="qdrwm9hi7qk7hxzcz0grv7cfl4r9k4v6"; -"web.doc-4.5"="h1dsslv4cv5f6rw8rgva5ywy1ipc38nz"; -"xindy-2.5.1"="wjrg2d83y422lr1y5f5nk1jy1fkgj819"; +"web.doc-4.5"="w90y1dgqrbq4zvfnlflfincymbvz7kyl"; +"xindy-2.5.1"="rp60v85lrsbllzkwvhhz5sprxalf6kxp"; "xindy.doc-2.5.1"="akx5bx8m387zsaxd7v6xh97nglbzd9k6"; -"context-2016"="j3wd8n0yxqlpfnfx7d3888p1idvk76ms"; -"context.doc-2016"="b39pl7vgjalcv4xpmmmsasz4p8k1cr95"; +"context-2017"="k39kcxd8cv8r7by9p9svkv5f6ar0f9jb"; +"context.doc-2017"="mlydklf44c027f7gyrii910bzw5ll7na"; "lm-2.004"="ci5dpznkzlal3bkn0dcd2m5i05aws66g"; "lm.doc-2.004"="w3g5xn4pfqhri4glpbh66rs8d6nbrd02"; "lm.source-2.004"="bw69srvx8mprnj8d5f48bq3mg1ysfk1n"; "lm-math-1.959"="j995x0y357lac8mn1kzn9v8p3v995bz7"; "lm-math.doc-1.959"="bgfq2c4l1shm9453822cnmq7yq6hlknq"; -"manfnt-font-2016"="isk7hkf6lfg41mjli9sgn77kvn6fkl96"; -"metapost-2016"="jl9jq1d4q6713wf0grl3wm0s6ynr5gig"; -"metapost.doc-2016"="vjm5yax9ll20cn0xqwyimmyvmznc13vc"; +"manfnt-font-2017"="isk7hkf6lfg41mjli9sgn77kvn6fkl96"; +"metapost-2017"="jl9jq1d4q6713wf0grl3wm0s6ynr5gig"; +"metapost.doc-2017"="j6wspd5l31i9ii0wiz2v4vjix9zs4q38"; "mflogo-font-1.002"="m5lb3rhr5yighsixjb0k6zp2hx8fxvr9"; "mflogo-font.doc-1.002"="va6f9qjbh5ah4zvlmc4wi9m395x3bhpr"; -"stmaryrd-2016"="shivgpyz8sa63sqkmpgqvw1v1iyc0g35"; -"stmaryrd.doc-2016"="r91xmqmmm6i6jka78qyaiilas94xc5hi"; -"stmaryrd.source-2016"="ch2gj89jxrqysjsl24s40za3y5z03yan"; -"xetex-2016"="yyxc5gpk71kycmbzz1dmx4rn57sp6glz"; -"xetex.doc-2016"="pgjl5nnfbbsjmy1g6agvyd44v4y7whqa"; -"xetexconfig-2016"="2wjm3wl2975pd1d3ql2qd3yhhdh3gvmp"; -"context-account-2016"="85lpl8g1by9mvqnmxy6v9iasvgmjnazr"; -"context-account.doc-2016"="aapc2j5rv491xlvd6dc39n958g4zx0dg"; -"context-algorithmic-2016"="zvjfp5dzy3saz67hcfl2n1haxjdkavml"; -"context-animation-2016"="lg4cn50cshxd9qg2i7hd54lcgsy8zwyz"; -"context-animation.doc-2016"="qkn6afd3l4qv2wzwp40ak1jx9vgiv5p1"; -"context-annotation-2016"="vgnpr8wv2l93qcwifsyslyanyd9hp1vz"; -"context-annotation.doc-2016"="4c24xshvmvm0n52jn9h75yskzm9xib03"; -"context-bnf-2016"="pzpk8q0zc179zbpj2l9w5fw3r8gmhq82"; -"context-bnf.doc-2016"="mv3l2if454kaysry03g8l8i9nb7dakjd"; -"context-chromato-2016"="721l06z298fqfaj6rcz9sh66jshq447s"; -"context-chromato.doc-2016"="2alifsrasv86j0nmki6n7db9bkvy2ql1"; -"context-construction-plan-2016"="b42ncfcmywfwwnvzy2z58pig0spz39g2"; -"context-construction-plan.doc-2016"="75fsq59xl9p59srgc37zr73cgb9argnb"; -"context-cyrillicnumbers-2016"="iwzzhbrrkf377k54rfbna7zfbhdal6g6"; -"context-cyrillicnumbers.doc-2016"="ciqzhpl4kj13b589bfk62j8pafv2fpry"; -"context-degrade-2016"="d7fvjlrj0gya4ycpy01b3xw96cqpgmw7"; -"context-degrade.doc-2016"="r0pkaf0g56fp06d9wh64h4fwfchfj8na"; -"context-fancybreak-2016"="dkqfx16sjcxdl8a50al6x87rhwbrz61z"; -"context-fancybreak.doc-2016"="qd9bzk1r7ck0c4vzixzjl5vr6wlvb3r0"; -"context-filter-2016"="ibgpvqsjlvbww998alidwhgbfpiarfpk"; -"context-filter.doc-2016"="hr5rvq043d1r9ffy92c8cr1ny5ydgq0w"; -"context-fixme-2016"="api4qw16hz3dij83w76f3ng8chwjih7j"; -"context-french-2016"="f44vj4in9b4kry17a7cw7ad11ygmnvkr"; -"context-french.doc-2016"="b90ks4xkxf4505q57bbx2lhr3c20xlr1"; -"context-fullpage-2016"="ilgp4dafzi7qm1lwlz2znrwrp850i9dj"; -"context-fullpage.doc-2016"="jxv7mcyjkc7rjhg2rxm3bx680g9ldq94"; -"context-games-2016"="s4r0cl65hpvy01v1ng6fqxs1b0bh6ahv"; -"context-games.doc-2016"="5fbf4rq0f76k6bfhlzh9lqr3ks31f2wi"; -"skaknew-2016"="8by6yv9rgn4zbzlq0szcm4yvg8pqfaf6"; -"skaknew.doc-2016"="0p383qca6f0f56skhgvjcwprpb04gldj"; -"context-gantt-2016"="v50p405xz9ddwlqb0q1hi9m8wbx0c01g"; -"context-gantt.doc-2016"="bm6n0qa3h5s3lp8z5x5093f994vk8zz6"; +"stmaryrd-2017"="shivgpyz8sa63sqkmpgqvw1v1iyc0g35"; +"stmaryrd.doc-2017"="r91xmqmmm6i6jka78qyaiilas94xc5hi"; +"stmaryrd.source-2017"="ch2gj89jxrqysjsl24s40za3y5z03yan"; +"xetex-2017"="yyxc5gpk71kycmbzz1dmx4rn57sp6glz"; +"xetex.doc-2017"="pgjl5nnfbbsjmy1g6agvyd44v4y7whqa"; +"xetexconfig-2017"="2wjm3wl2975pd1d3ql2qd3yhhdh3gvmp"; +"context-account-2017"="85lpl8g1by9mvqnmxy6v9iasvgmjnazr"; +"context-account.doc-2017"="aapc2j5rv491xlvd6dc39n958g4zx0dg"; +"context-algorithmic-2017"="zvjfp5dzy3saz67hcfl2n1haxjdkavml"; +"context-animation-2017"="lg4cn50cshxd9qg2i7hd54lcgsy8zwyz"; +"context-animation.doc-2017"="qkn6afd3l4qv2wzwp40ak1jx9vgiv5p1"; +"context-annotation-2017"="vgnpr8wv2l93qcwifsyslyanyd9hp1vz"; +"context-annotation.doc-2017"="4c24xshvmvm0n52jn9h75yskzm9xib03"; +"context-bnf-2017"="pzpk8q0zc179zbpj2l9w5fw3r8gmhq82"; +"context-bnf.doc-2017"="mv3l2if454kaysry03g8l8i9nb7dakjd"; +"context-chromato-2017"="721l06z298fqfaj6rcz9sh66jshq447s"; +"context-chromato.doc-2017"="2alifsrasv86j0nmki6n7db9bkvy2ql1"; +"context-cmscbf-2017"="nwk7dqb2kxbj9y6ijlpa3ack1an9d5f8"; +"context-cmscbf.doc-2017"="2lylyv07hbmc63vjrqchz4w2zvpccgf0"; +"context-cmttbf-2017"="dgrblidva7k2q8yvmkdb0kg2n4bzln1k"; +"context-cmttbf.doc-2017"="pazl5rnlnr48lsm7w2n7l5s365hb9dx9"; +"context-construction-plan-2017"="b42ncfcmywfwwnvzy2z58pig0spz39g2"; +"context-construction-plan.doc-2017"="75fsq59xl9p59srgc37zr73cgb9argnb"; +"context-cyrillicnumbers-2017"="iwzzhbrrkf377k54rfbna7zfbhdal6g6"; +"context-cyrillicnumbers.doc-2017"="ciqzhpl4kj13b589bfk62j8pafv2fpry"; +"context-degrade-2017"="d7fvjlrj0gya4ycpy01b3xw96cqpgmw7"; +"context-degrade.doc-2017"="r0pkaf0g56fp06d9wh64h4fwfchfj8na"; +"context-fancybreak-2017"="dkqfx16sjcxdl8a50al6x87rhwbrz61z"; +"context-fancybreak.doc-2017"="qd9bzk1r7ck0c4vzixzjl5vr6wlvb3r0"; +"context-filter-2017"="h17pg4jm2wxs1hazc83mm831rvjv1mw2"; +"context-filter.doc-2017"="i64i4p350fvp8a8lh5kryf1faymkhsps"; +"context-french-2017"="f44vj4in9b4kry17a7cw7ad11ygmnvkr"; +"context-french.doc-2017"="b90ks4xkxf4505q57bbx2lhr3c20xlr1"; +"context-fullpage-2017"="ilgp4dafzi7qm1lwlz2znrwrp850i9dj"; +"context-fullpage.doc-2017"="jxv7mcyjkc7rjhg2rxm3bx680g9ldq94"; +"context-gantt-2017"="v50p405xz9ddwlqb0q1hi9m8wbx0c01g"; +"context-gantt.doc-2017"="bm6n0qa3h5s3lp8z5x5093f994vk8zz6"; "hatching-0.11"="kngng0rbi2q99417zr3vv3jl0zzjwh6l"; "hatching.doc-0.11"="5c0n8fhchwpa3vgby9v6dzcg9v834xgr"; -"context-gnuplot-2016"="21gc0nq12aps3d3333yxll6xllnlw0x2"; -"context-gnuplot.doc-2016"="jmvmp62hyky011xfpp8b4ydxrzgd2ag8"; -"context-letter-2016"="yfvrgw5xnzp7g56fvnzyvqv5ccy9m8a3"; -"context-letter.doc-2016"="ma7bfvxzv0ibcz906fgz82cjld7mvw8s"; -"context-lettrine-2016"="wmfy4c9c13jj525hmrf742kzkiqqmwgk"; -"context-lettrine.doc-2016"="h392gy06m6d8x3cjxsha4z0r7p5vmmb2"; -"context-lilypond-2016"="nkrpscdv626ciy4fcank0vc7w823l8dr"; -"context-lilypond.doc-2016"="pdw3wfwd12k7xkx7h4cg9ihnx9frq4ak"; -"context-mathsets-2016"="5gxx8rbkp1znjh8ycd0k8nflhjcm25kw"; -"context-mathsets.doc-2016"="bvwf1q4azmbbh74dqa89hs5x3yb9zksb"; -"context-notes-zh-cn.doc-2016"="x85l6d8ydz6nw51z8ak3a7cvpc6c45lz"; +"context-gnuplot-2017"="21gc0nq12aps3d3333yxll6xllnlw0x2"; +"context-gnuplot.doc-2017"="jmvmp62hyky011xfpp8b4ydxrzgd2ag8"; +"context-inifile-2017"="fmf14m6wz9ya4lxy3w6mxjzqk491jdd4"; +"context-inifile.doc-2017"="nkbvqhcmry12h8ffpz8d0sikifh8pxhd"; +"context-layout-2017"="438mv86y37wbxdv9js2s3clnkl7866ff"; +"context-layout.doc-2017"="7qqmwwhin466y4ksyq73lzfsc93s2z0s"; +"context-letter-2017"="yfvrgw5xnzp7g56fvnzyvqv5ccy9m8a3"; +"context-letter.doc-2017"="ma7bfvxzv0ibcz906fgz82cjld7mvw8s"; +"context-lettrine-2017"="wmfy4c9c13jj525hmrf742kzkiqqmwgk"; +"context-lettrine.doc-2017"="h392gy06m6d8x3cjxsha4z0r7p5vmmb2"; +"context-mathsets-2017"="5gxx8rbkp1znjh8ycd0k8nflhjcm25kw"; +"context-mathsets.doc-2017"="bvwf1q4azmbbh74dqa89hs5x3yb9zksb"; +"context-notes-zh-cn.doc-2017"="x85l6d8ydz6nw51z8ak3a7cvpc6c45lz"; "context-rst-0.6c"="5mwhydc35iywmkdz759sdpz53wkqa64x"; "context-rst.doc-0.6c"="dml4y9nr6yb8f5kwjm3mm8l8s5rjxxkr"; -"context-ruby-2016"="jrwrrwhcvb4bbia0g2lnl6rr0yydh6ix"; -"context-ruby.doc-2016"="sja43p8lpcarwnnqpahd0zr2k82sf8pj"; -"context-simplefonts-2016"="5h1qrkcjlkdbd5rc888xrp2nfksyf7x5"; -"context-simplefonts.doc-2016"="6vcxb9xxs5sd8i7f6rqqcysiz4dwjhxh"; -"context-simpleslides-2016"="idd4q63cvh7qqiv5wzkq3xgrxwhm9z87"; -"context-simpleslides.doc-2016"="y0q5pl3chzcn7fp2kjm4bshfcj5x10g2"; -"context-title-2016"="df6skzmz548nvbdxsf57ch48jxgfbhpa"; -"context-title.doc-2016"="6v51cy1zng7rjb1137n8kvxxdkz8asfv"; -"context-transliterator-2016"="q0klk1fqlky9drg0ak4xlcn3xpsi4kyr"; -"context-transliterator.doc-2016"="l1zwqsqb4rg9iafzkzhxmi4hy28six20"; -"context-typearea-2016"="ck1fbjmlyq93id8a15nrn81cd10jlcib"; -"context-typearea.doc-2016"="8w38fwqaysqyxmlzdf4slv48yrhjgmx1"; -"context-typescripts-2016"="q33whgk69qflc06i9q8jpb5lnwvdbhr5"; -"context-typescripts.doc-2016"="yk83aari9jj7xw58blrh1nxx4m6ga7lc"; -"context-vim-2016"="5ij37c36xww5l8g1kaafq15783fxk460"; -"context-vim.doc-2016"="jjh0l20lkwbnahdr6k7minycm9fpc03p"; -"context-visualcounter-2016"="sh6jnhkfbi4rpw34zw489148rgwsb14r"; -"context-visualcounter.doc-2016"="2zllwd7h5f7ja9877vyiznvw5prbgh8k"; -"context-visualcounter.source-2016"="7wbyascsdwh2m9hpwm3c7sd0q5940fd1"; -"jmn-2016"="sxkb92pakb4lx5d9pjpang6mhfrgm4b5"; +"context-ruby-2017"="jrwrrwhcvb4bbia0g2lnl6rr0yydh6ix"; +"context-ruby.doc-2017"="sja43p8lpcarwnnqpahd0zr2k82sf8pj"; +"context-simplefonts-2017"="5h1qrkcjlkdbd5rc888xrp2nfksyf7x5"; +"context-simplefonts.doc-2017"="6vcxb9xxs5sd8i7f6rqqcysiz4dwjhxh"; +"context-simpleslides-2017"="idd4q63cvh7qqiv5wzkq3xgrxwhm9z87"; +"context-simpleslides.doc-2017"="y0q5pl3chzcn7fp2kjm4bshfcj5x10g2"; +"context-title-2017"="df6skzmz548nvbdxsf57ch48jxgfbhpa"; +"context-title.doc-2017"="6v51cy1zng7rjb1137n8kvxxdkz8asfv"; +"context-transliterator-2017"="q0klk1fqlky9drg0ak4xlcn3xpsi4kyr"; +"context-transliterator.doc-2017"="l1zwqsqb4rg9iafzkzhxmi4hy28six20"; +"context-typearea-2017"="ck1fbjmlyq93id8a15nrn81cd10jlcib"; +"context-typearea.doc-2017"="8w38fwqaysqyxmlzdf4slv48yrhjgmx1"; +"context-typescripts-2017"="q33whgk69qflc06i9q8jpb5lnwvdbhr5"; +"context-typescripts.doc-2017"="yk83aari9jj7xw58blrh1nxx4m6ga7lc"; +"context-vim-2017"="5ij37c36xww5l8g1kaafq15783fxk460"; +"context-vim.doc-2017"="jjh0l20lkwbnahdr6k7minycm9fpc03p"; +"context-visualcounter-2017"="sh6jnhkfbi4rpw34zw489148rgwsb14r"; +"context-visualcounter.doc-2017"="2zllwd7h5f7ja9877vyiznvw5prbgh8k"; +"context-visualcounter.source-2017"="7wbyascsdwh2m9hpwm3c7sd0q5940fd1"; +"jmn-2017"="sxkb92pakb4lx5d9pjpang6mhfrgm4b5"; "Asana-Math-000.955"="qvk5bdn6hq6ci0v4l45rbwd3s4nazmsd"; "Asana-Math.doc-000.955"="q0c7d8fs11sqdxs0drjd9g6l0bkbnvln"; -"academicons-1.7.2"="4inj52lgqpaaadhrp5jh2wwzb5rmz3kk"; -"academicons.doc-1.7.2"="imsvcdprhhks92409gdr26sxk1fv3dpr"; -"accanthis-2016"="3ai0zz1fwlq9v25dsfz63if6i7wgrhp3"; -"accanthis.doc-2016"="zlxlfbawiicbkminjw2laximsn07zpi0"; +"academicons-1.8.0"="4g6rhkw9mnyqzv2cx7iyi9wcl2jlndng"; +"academicons.doc-1.8.0"="lfrrz9a5h50gr2b1n5cqyfmq4azlb1yd"; +"accanthis-2017"="3ai0zz1fwlq9v25dsfz63if6i7wgrhp3"; +"accanthis.doc-2017"="zlxlfbawiicbkminjw2laximsn07zpi0"; "adforn-1.001-b-2"="ykyh10gfssql3zh4845gw8g8ayijvlla"; "adforn.doc-1.001-b-2"="idfbpikb68y2n424xjdf3nppbz5cziib"; "adfsymbols-1.001"="ijgwy7svr9pn69r2vwi5pzkdbc7q0p3h"; "adfsymbols.doc-1.001"="kb61cwldva4ziv006ja9y66a27926508"; "aecc-1.0"="0vpb9yz2qx0sc15kxzhgqadkcjyr27c5"; "aecc.doc-1.0"="mn7j1f7j3z5d6pnss9mlhvbw4ahn94ka"; -"alegreya-2016"="7vin6alzrxrhk9prd23r50g4zqc7z0ll"; -"alegreya.doc-2016"="bpwxcgjn1lqbnl8mmgj4nb65paji6kjg"; -"allrunes-2.1"="nsgbhsp0jhh0iydnzlx3r893pcw0y8lj"; -"allrunes.doc-2.1"="5ng2q004dra8c729sldlq2vkghjwcrzi"; -"allrunes.source-2.1"="fkw8hdml9rz7qzrshpardwxr0f8z853p"; +"alegreya-2017"="21905bvl7i0m166hfl1jdvrk0wj1m64m"; +"alegreya.doc-2017"="ib2mm08hhh7lyqlh6kls6f8mvkzrg04l"; +"algolrevived-1.01"="81kfc6aj2fg7db11sxb5w3a0zw2p25f8"; +"algolrevived.doc-1.01"="yxd16nwxlz4jlcqbim2w1kvhdfs9145b"; +"allrunes-2.1.1"="yxijvmvgjl2q05v667fmqisbyd7xsjpr"; +"allrunes.doc-2.1.1"="b0sc4d9kla5sg792zvwqjzszz17w19iv"; +"allrunes.source-2.1.1"="n986ppx466mparm30mlv7cn5mmjh74sy"; "almfixed-0.92"="kcaraz14gg5k8ws8zkrjfvvn22njv759"; "almfixed.doc-0.92"="34f4a82gsr0vq47bp9wbdd4wkhhr984j"; "anonymouspro-2.1"="5396jmzi4ihjdiwpgm8ghi669ipk6dzd"; @@ -631,12 +683,14 @@ "antiqua.doc-001.003"="36kkp06c9grcgz7py0k7fnr5a56cvsgk"; "antt-2.08"="ln7vvpz0p5lz4sikwky7f7zmkg08zmcv"; "antt.doc-2.08"="2449s2gpspkwfmyhvvl8g5h1dqn8bg72"; -"archaic-2016"="jvj1s2dcgkwgi9ywg48vw7i14gmlmq7n"; -"archaic.doc-2016"="mb0z3xq325y48yv0bx4xsz8x5f790c60"; -"archaic.source-2016"="j05dan5d8xxzg43iay4v76vbcdscc6zn"; -"arev-2016"="xc3i2264d5w0ijv10n6ka53311bgnib0"; -"arev.doc-2016"="s39jgnizjbpnh1czr3ck5yd32bxks476"; -"arev.source-2016"="msk58av5fwg6hi4mzpz8abgzigqyskf2"; +"archaic-2017"="jvj1s2dcgkwgi9ywg48vw7i14gmlmq7n"; +"archaic.doc-2017"="mb0z3xq325y48yv0bx4xsz8x5f790c60"; +"archaic.source-2017"="j05dan5d8xxzg43iay4v76vbcdscc6zn"; +"arev-2017"="xc3i2264d5w0ijv10n6ka53311bgnib0"; +"arev.doc-2017"="s39jgnizjbpnh1czr3ck5yd32bxks476"; +"arev.source-2017"="msk58av5fwg6hi4mzpz8abgzigqyskf2"; +"arimo-2017"="1z5ij30qfbd4y2c0292aai2dsg87n1rm"; +"arimo.doc-2017"="2fr1vjv5386lvixzs8idr0wyf9ghlg1f"; "asapsym-1.0"="gbn04lk9k66wj689vna4kgxq8gddhwca"; "asapsym.doc-1.0"="qfbaary485cs3q5azl6d650z53kd9s73"; "asapsym.source-1.0"="g9m2vwmd438fwfczm8xwhv4wdp2aj114"; @@ -647,8 +701,8 @@ "aspectratio.doc-2.0"="xv7z3aa40dn6fzchrhqwg03356r2znjf"; "astro-2.20"="isnx9q009wchs33xq4bphi4cp4cnb2m9"; "astro.doc-2.20"="xa1szbc33k2yyahgwy294mgiiyi5yiy4"; -"augie-2016"="w863x04n1ks9jkmaw8fm4hd6a1390s3x"; -"augie.doc-2016"="dlmy9i2fh0db4aghd8dqsv9227cqk4d9"; +"augie-2017"="w863x04n1ks9jkmaw8fm4hd6a1390s3x"; +"augie.doc-2017"="dlmy9i2fh0db4aghd8dqsv9227cqk4d9"; "auncial-new-2.0"="nnaar0yvi6r1fynyzxmqhw7mnify474d"; "auncial-new.doc-2.0"="jvyica87kxg5gm3zb8kmka9ja87f28si"; "auncial-new.source-2.0"="hfdl71c7lx3lpb9rkwfz5vpaq0s19bh6"; @@ -657,66 +711,70 @@ "b1encoding-1.0"="cxsgg97c3bsw9dl2aj9c9rb8vlpyn4s4"; "b1encoding.doc-1.0"="mcm5yr55av0rj342bxdljkdid5qxyv97"; "b1encoding.source-1.0"="jdnzzki5929xpzvpfvx5a9z51dk40pvs"; -"barcodes-2016"="8j88bc82j5a0xhm46671mj0k439zm5da"; -"barcodes.doc-2016"="7729a4f9hn4qzx2cndyxv04wwpchpjax"; -"barcodes.source-2016"="yh5ci4axi82ps6hbm6f0a08alrnapxiv"; +"barcodes-2017"="8j88bc82j5a0xhm46671mj0k439zm5da"; +"barcodes.doc-2017"="7729a4f9hn4qzx2cndyxv04wwpchpjax"; +"barcodes.source-2017"="yh5ci4axi82ps6hbm6f0a08alrnapxiv"; "baskervald-1.016"="igfnj3pwvb6443c531va9kzylizxm9vs"; "baskervald.doc-1.016"="mq8ms68crhv6afh9ld6scyx2xn2ik6jk"; "baskervald.source-1.016"="7y8d5vqbd1bp3gri0rhzk3cb12cwchr1"; -"baskervaldx-1.07"="dy6c3y2jb46ni9hw84ckcva5s9q0c7dp"; -"baskervaldx.doc-1.07"="1cf6q6a3g0vhfmwar0icsz0kbw0zwafc"; +"baskervaldx-1.072"="jjwb2m99l3vwzcpr7dzd8z360cv4qib6"; +"baskervaldx.doc-1.072"="bprkagqwmczadxymgadg1d98d6g2l4xq"; +"baskervillef-1.043"="l51z3yp3s1pxw1lvxw6n9kyr1smfmhlg"; +"baskervillef.doc-1.043"="3pydf77gbsi6xaphq3cbhxigfpb9bn2g"; "bbding-1.01"="8kh5c0chlw1f2pqzh9pc7zx8y2jcgh0g"; "bbding.doc-1.01"="zjngi582jrb99j6w1amwbyvjmfvsk40d"; "bbding.source-1.01"="axvp8f0zag6bkr9v3fg22j4h5gcbcgzx"; -"bbm-2016"="ayg703c4frfpv9mhahz36f9zs11y9vxc"; -"bbm.doc-2016"="bzfab62k5j167p5qzs79gps14hbpq7nq"; -"bbm-macros-2016"="lbvpxxa0rzhl0z0081s6wfdvmx3vlhv4"; -"bbm-macros.doc-2016"="ncijdxbxfk9xkrnvvsk937ji5nd60z1s"; -"bbm-macros.source-2016"="39wj6mqzn9qcvavqr8p5ny4ajjxm9m8w"; +"bbm-2017"="ayg703c4frfpv9mhahz36f9zs11y9vxc"; +"bbm.doc-2017"="bzfab62k5j167p5qzs79gps14hbpq7nq"; +"bbm-macros-2017"="lbvpxxa0rzhl0z0081s6wfdvmx3vlhv4"; +"bbm-macros.doc-2017"="ncijdxbxfk9xkrnvvsk937ji5nd60z1s"; +"bbm-macros.source-2017"="39wj6mqzn9qcvavqr8p5ny4ajjxm9m8w"; "bbold-1.01"="s88rwky3f2jjcg6w00g7s5lkvviqkwpm"; "bbold.doc-1.01"="sa83x4g1n5b2lafj9n61cggkyk7h1z5v"; "bbold.source-1.01"="ki3gxl970iirhkckqblr490jlznl0kc7"; -"bbold-type1-2016"="00rizb6fky3rsyn1id4p1dik8963bhwr"; -"bbold-type1.doc-2016"="lnpyln41q3qdsmzdkini0q1wqx7v2n7h"; -"belleek-2016"="8y1nbwn46cgyzfyd3and8aws7mqclsfa"; -"belleek.doc-2016"="8d258516ak2b5va5smkfc87ipyj329f9"; -"belleek.source-2016"="n6fypvkn7cq1c1l7jqvjb6cfjyqrq0wv"; -"bera-2016"="mq0j1sn7fg1qk7qd7x1l4ixqddyp3rjg"; -"bera.doc-2016"="6iv3gc8kfqcw909sa4x7msc7dsxndy8i"; +"bbold-type1-2017"="00rizb6fky3rsyn1id4p1dik8963bhwr"; +"bbold-type1.doc-2017"="lnpyln41q3qdsmzdkini0q1wqx7v2n7h"; +"belleek-2017"="8y1nbwn46cgyzfyd3and8aws7mqclsfa"; +"belleek.doc-2017"="8d258516ak2b5va5smkfc87ipyj329f9"; +"belleek.source-2017"="n6fypvkn7cq1c1l7jqvjb6cfjyqrq0wv"; +"bera-2017"="mq0j1sn7fg1qk7qd7x1l4ixqddyp3rjg"; +"bera.doc-2017"="6iv3gc8kfqcw909sa4x7msc7dsxndy8i"; "berenisadf-1.004"="2ci0vxfqyc18anpy68r6anbdz76nrf2b"; "berenisadf.doc-1.004"="00vx76lkvv0vf68a7sck05ls3l5va5gj"; +"beuron-1.1"="x2n8gb04pajxc79v23c13l98vchv64jh"; +"beuron.doc-1.1"="g7yj4gnd92y0kivxby605idbk733wn89"; "bguq-0.4"="cgq4fhairknzbp65cmhv0m19zn0cnkgp"; "bguq.doc-0.4"="9rwhzxijcyl4zzrc88dg8730p11hkm4q"; "bguq.source-0.4"="7856n14czw3z30maxv7m4xz6js47rkbj"; -"blacklettert1-2016"="hzd441k3wi58rrysk0h48yklnp5i776p"; -"blacklettert1.doc-2016"="8n61621w6273ik991i2asvsm4w8xlimx"; -"blacklettert1.source-2016"="ir0cn80nw9jgchx4kisv9j27gpgykhvc"; +"blacklettert1-2017"="hzd441k3wi58rrysk0h48yklnp5i776p"; +"blacklettert1.doc-2017"="8n61621w6273ik991i2asvsm4w8xlimx"; +"blacklettert1.source-2017"="ir0cn80nw9jgchx4kisv9j27gpgykhvc"; "boisik-0.5"="xz0hk8fwnrwnydy9dglm93c4gzrqpz87"; "boisik.doc-0.5"="wsssy9bh8wi35x67ifgnj9wrjx0vpmvy"; -"bookhands-2016"="n9nmpfa24pgwgc9faxb5s882p1sbd3lf"; -"bookhands.doc-2016"="kg72nkz71vwhzbv6hw0r7zr3qr3njh9k"; -"bookhands.source-2016"="l4d2zzfsd39mzww0ssa79wc76abd60l4"; -"boondox-1.0"="x091nq80imrxdgz9p3jg50vsv5rlnszi"; -"boondox.doc-1.0"="vw6g6d8w9jq1aw722s6512dywp91ycnk"; -"braille-2016"="slk0qzcahb3qkmq91jcrm5gakcwa7czv"; -"braille.doc-2016"="00dv14s64fm8g5jy8b30dx813a304nlh"; -"brushscr-2016"="342p5p6h8v377mnbrv1f56kicbbjfcdx"; -"brushscr.doc-2016"="hikb5s9iv60pfq2kjdbfiq1216d3rabk"; -"cabin-2016"="fhxddnhlqmc7r2bi25widryyc3jpp59j"; -"cabin.doc-2016"="15l49blfqvd2rqm91f1zdi9hq5s53x3p"; -"caladea-2016"="1rb8sq2yh4hizlcjp8zd68ayb7cx6275"; -"caladea.doc-2016"="9qr79slzxmnnvvh2iy310ypqj9g11s4b"; -"calligra-2016"="cisw7fvdys863szqvsxzm164vina8al3"; -"calligra.doc-2016"="36bzakyiw9awp36v7c6dyb3vwl01shb0"; +"bookhands-2017"="n9nmpfa24pgwgc9faxb5s882p1sbd3lf"; +"bookhands.doc-2017"="kg72nkz71vwhzbv6hw0r7zr3qr3njh9k"; +"bookhands.source-2017"="l4d2zzfsd39mzww0ssa79wc76abd60l4"; +"boondox-1.02d"="i1hwfxc7ji83724177ir5hdgfn6cbcqr"; +"boondox.doc-1.02d"="wwa8ar557myv3rfjkw9jlw1pxs26vwbh"; +"braille-2017"="slk0qzcahb3qkmq91jcrm5gakcwa7czv"; +"braille.doc-2017"="00dv14s64fm8g5jy8b30dx813a304nlh"; +"brushscr-2017"="342p5p6h8v377mnbrv1f56kicbbjfcdx"; +"brushscr.doc-2017"="hikb5s9iv60pfq2kjdbfiq1216d3rabk"; +"cabin-2017"="ah9gwv11siszsnk4fabc7kpxk5h1wsb8"; +"cabin.doc-2017"="amjf9c0qjqydklx5yfdv50pgzkp2szmh"; +"caladea-2017"="1rb8sq2yh4hizlcjp8zd68ayb7cx6275"; +"caladea.doc-2017"="9qr79slzxmnnvvh2iy310ypqj9g11s4b"; +"calligra-2017"="cisw7fvdys863szqvsxzm164vina8al3"; +"calligra.doc-2017"="36bzakyiw9awp36v7c6dyb3vwl01shb0"; "calligra-type1-001.000"="2bl0g899jhyspyhyzh45xdkkis88ja46"; "calligra-type1.doc-001.000"="3zza4sgsnvcg2asdv27gd7y6jmab5j4y"; "cantarell-2.4"="sy4spxn3hfp0wqs5imhnm5bkw42qfnxn"; "cantarell.doc-2.4"="dwd1ndl5ghz9rcgmjrl6zmaxzbaxr3rd"; "cantarell.source-2.4"="vdz4m82y34lb60vx066j68l0kgc2clvc"; -"carlito-2016"="7v0571swhiw0pbsqcb1a4sj7izdincb0"; -"carlito.doc-2016"="bs67zjydc9fcigiaaf9y9lm05lkgw68a"; -"carolmin-ps-2016"="rx6y9nb8l3cslla44c422jzwjlqw7ilz"; -"carolmin-ps.doc-2016"="hq8477r3q2cg2laafi8ryvjan90wxjcg"; +"carlito-2017"="7v0571swhiw0pbsqcb1a4sj7izdincb0"; +"carlito.doc-2017"="bs67zjydc9fcigiaaf9y9lm05lkgw68a"; +"carolmin-ps-2017"="rx6y9nb8l3cslla44c422jzwjlqw7ilz"; +"carolmin-ps.doc-2017"="hq8477r3q2cg2laafi8ryvjan90wxjcg"; "ccicons-1.5"="xjc6brxlg7976hpqdap76i6db6zq8zhw"; "ccicons.doc-1.5"="lh9qj4y5nfw77vb9rv24ygz3rq9lhqcg"; "ccicons.source-1.5"="ymfaakz19k4s32c2fh2qgvr1c537skrj"; @@ -725,15 +783,15 @@ "cfr-lm-1.5"="7y9qg3jnq6xnlq0f1wqm6493qax92cc3"; "cfr-lm.doc-1.5"="cfshavfcmpkig5p9kypglmrs55rl5lsb"; "cfr-lm.source-1.5"="nglav2q22aybb23snhm6x17dxz3976sc"; -"cherokee-2016"="hmmaav3k7vd1rh6rm26l2nal48r1wxz3"; -"cherokee.doc-2016"="zaq092r56asdcf62a7zscfp4zp7a5lwq"; +"cherokee-2017"="hmmaav3k7vd1rh6rm26l2nal48r1wxz3"; +"cherokee.doc-2017"="zaq092r56asdcf62a7zscfp4zp7a5lwq"; "chivo-1.0"="96gxnm243xbkrhx8mcs4vip8qaj1q5f5"; "chivo.doc-1.0"="f9ibwq6r1y2i5n5bp9s5v91mw32hkl5m"; "chivo.source-1.0"="ssqn1c68z13ap31rahx8c0m00n2jwbs6"; -"cinzel-2016"="zd9fzvkabmdz25gmi2zj0aj0c7fp89kf"; -"cinzel.doc-2016"="82f080qw29yir7z12zjx6ibjfrfgnm9b"; -"clearsans-2016"="x3dasd6qdqjdw2v99kkh00srz44pz6ma"; -"clearsans.doc-2016"="bbfm2zw5czzwm3msr112wzlg686bh8jj"; +"cinzel-2017"="zd9fzvkabmdz25gmi2zj0aj0c7fp89kf"; +"cinzel.doc-2017"="82f080qw29yir7z12zjx6ibjfrfgnm9b"; +"clearsans-2017"="x3dasd6qdqjdw2v99kkh00srz44pz6ma"; +"clearsans.doc-2017"="bbfm2zw5czzwm3msr112wzlg686bh8jj"; "cm-lgc-0.5"="wnmmrhnlldps15r2v360bdvlfyjd1fpn"; "cm-lgc.doc-0.5"="wb18g3w86wfb7fv2iaaxm0j2amrws9yf"; "cm-unicode-0.7.0"="wmmgwafdisxnkgdh571y2mlcybjlnvf6"; @@ -741,97 +799,103 @@ "cmbright-8.1"="rjlqiwya67ispglypa4gmix8hyk6f2h3"; "cmbright.doc-8.1"="wsjakpl6b7zyv3j9yx50v9hjm3sgx317"; "cmbright.source-8.1"="vwgnzs47an6mjgw898scvdp8dc3m1w0w"; -"cmexb-2016"="jxb62ixs1vqaqscv1ixg27vv1p7na0p1"; -"cmexb.doc-2016"="92888gd06jfx2q4xd01n45c1yyhnp03l"; -"cmll-2016"="bipbbgh6jc5r1imk467r5pvj4m62a85k"; -"cmll.doc-2016"="k2sshj6rp40m29fm29jd7jy492gcrwcf"; -"cmll.source-2016"="lbaw2209cz5ymklza36486jzfpq1cqc5"; -"cmpica-2016"="z5mc7yl40mzwk5bcjs3lb1ifqsr7x4s1"; -"cmpica.doc-2016"="9bl7bhpb9dhp58p9hxay8xka0nz2cg2l"; +"cmexb-2017"="jxb62ixs1vqaqscv1ixg27vv1p7na0p1"; +"cmexb.doc-2017"="92888gd06jfx2q4xd01n45c1yyhnp03l"; +"cmll-2017"="bipbbgh6jc5r1imk467r5pvj4m62a85k"; +"cmll.doc-2017"="k2sshj6rp40m29fm29jd7jy492gcrwcf"; +"cmll.source-2017"="lbaw2209cz5ymklza36486jzfpq1cqc5"; +"cmpica-2017"="z5mc7yl40mzwk5bcjs3lb1ifqsr7x4s1"; +"cmpica.doc-2017"="9bl7bhpb9dhp58p9hxay8xka0nz2cg2l"; "cmtiup-2.1"="k6sk5isdzms460hm17lkx5b6p6p9wz1g"; "cmtiup.doc-2.1"="ycj4il7cxfnigs8sxxwga045g9v8rv8h"; -"cochineal-1.03a"="zrimqkfr3hxgwbwj5gcljj5iddk10j5c"; -"cochineal.doc-1.03a"="pglyv21ajzinr8mxmv90radc0ap465ym"; +"cochineal-1.042"="xvglmqsbra4z61gf33bw4rj8ghdf4ybr"; +"cochineal.doc-1.042"="nznyb19j6gly4wq00jx64kr5dfknxah1"; +"coelacanth-2017"="98nhwkyx82x0q39b7d4f9bq8g8hmhjzs"; +"coelacanth.doc-2017"="2v7chnqn5pw6h9x9k01h218cwp0z9lyw"; "comfortaa-2.3"="k4w8lzk1lbd0hlrvkr83p4s737410vk3"; "comfortaa.doc-2.3"="cmh2d3939a515h60ajmhbivqmbn2xmw4"; "comfortaa.source-2.3"="jp7dh6r0zcpz3mkfkgafjays8jx9hbqf"; -"comicneue-1.0"="pq9gcdw39hs9ss82386m7szb07xldh1q"; -"comicneue.doc-1.0"="nixs57zgzkz7smr4rybz4gg2ln4rv0p9"; -"concmath-fonts-2016"="875viaxzrrljcarkg11cb830fmq5321f"; -"concmath-fonts.doc-2016"="q2wyl5cw03rbk4602vg18jrxg3j133lj"; +"comicneue-1.1"="zsv445k74adkzqnas2g8p3i6c49bccqf"; +"comicneue.doc-1.1"="9il2nyy63bx62n603j1kwaagvplwndps"; +"concmath-fonts-2017"="875viaxzrrljcarkg11cb830fmq5321f"; +"concmath-fonts.doc-2017"="q2wyl5cw03rbk4602vg18jrxg3j133lj"; "cookingsymbols-1.1"="qhjzkivpxbk3rk6pricxsxpdk7c40rxc"; "cookingsymbols.doc-1.1"="8l7yii9vvmaxfnf0h2snis7476k18mlc"; "cookingsymbols.source-1.1"="z7r8n2lhgaqzgpx0jz8xq4sd4zzigbs9"; +"cormorantgaramond-3.00"="n1zswym4jgqhsj65z8kngkfad1djyba5"; +"cormorantgaramond.doc-3.00"="ph1qspmc6h6axlhvw5rb4c1kb6znigzk"; "countriesofeurope-0.21"="va17md98pqibrig3nznlipv9rypqm6bg"; "countriesofeurope.doc-0.21"="2hbp9xshmfm0k2izqbds1h2835yldznh"; -"courier-scaled-2016"="qrm6a468azlw2s89v7j992wxs2mkqfv9"; -"courier-scaled.doc-2016"="1bwlrdxpl1fj4f9ml688ybimig5ylxwv"; -"crimson-2016"="z2l4gyq1ikxclxf3i8lrk8liqvpdi3mx"; -"crimson.doc-2016"="k212a6khl2yg8p4n1bvl3shcg8rcaaf2"; -"cryst-2016"="56jlp0hk9vrfxbhlfjnpim398ggxccjg"; -"cryst.doc-2016"="qazhz2hzgpqlghbg67fnmf8adba1wl5d"; +"courier-scaled-2017"="qrm6a468azlw2s89v7j992wxs2mkqfv9"; +"courier-scaled.doc-2017"="1bwlrdxpl1fj4f9ml688ybimig5ylxwv"; +"crimson-2017"="wwvxgknvkd3ycswpp9wnlp9dlkilj7wz"; +"crimson.doc-2017"="wnxfzc5llkk38ky7bf8hkn7zsdawpr2x"; +"cryst-2017"="56jlp0hk9vrfxbhlfjnpim398ggxccjg"; +"cryst.doc-2017"="qazhz2hzgpqlghbg67fnmf8adba1wl5d"; "cyklop-0.915"="5ksv3v36mc6557jckr5gk22pbqr30wnr"; "cyklop.doc-0.915"="d85643zgnh0r0j53gfpi84qsx4694xpv"; -"dancers-2016"="qlpshkppzr84rr3smqpwch5j11klm3a7"; +"dancers-2017"="qlpshkppzr84rr3smqpwch5j11klm3a7"; "dantelogo-0.03"="iiqbbimigxpj8kg628sj694xha98q0fw"; "dantelogo.doc-0.03"="d42k8bqdvp20af1wzilbcjfd1b7ywim5"; "dejavu-2.34"="90lkxdpj8ihrs68355fal0h0a1dp3v67"; "dejavu.doc-2.34"="2v6nhxrkny5haczrpvqjzcal7bixngas"; -"dice-2016"="916yfiq60a1qz7d0jn1jd9slck7rjwy1"; -"dice.doc-2016"="rfkm493k3g4slyjsy6bcgljxjsy88z76"; -"dictsym-2016"="lc5sz8d50hirk5yqg9baj2vhj4f7cf8x"; -"dictsym.doc-2016"="d13rhwg29k9gd4ymlipbp5ink908sdnn"; +"dejavu-otf-0.02"="nxlgcc7pdqf1ckzrsqbzqm1pd5yfs1hn"; +"dejavu-otf.doc-0.02"="1s0fc2f1p945k6baig6iifbawx00v73d"; +"dice-2017"="916yfiq60a1qz7d0jn1jd9slck7rjwy1"; +"dice.doc-2017"="rfkm493k3g4slyjsy6bcgljxjsy88z76"; +"dictsym-2017"="lc5sz8d50hirk5yqg9baj2vhj4f7cf8x"; +"dictsym.doc-2017"="d13rhwg29k9gd4ymlipbp5ink908sdnn"; "dingbat-1.0"="9yc0zy6qlxi9zmpyi3wd5irgq89shanr"; "dingbat.doc-1.0"="z4km9f9xrw1n44ylh16872lzq8r4zvy4"; "dingbat.source-1.0"="rq7v2cny05d4f8bkxbs2z6kj36q5bwfd"; "doublestroke-1.111"="z58ah73655dsas48b432ahkkags5n8wv"; "doublestroke.doc-1.111"="403diym6rx34bwmrh63zaka3xdhzs2dp"; -"dozenal-6.0"="liizjwlab7x8mc2f9c78yifhmb5rpcj1"; -"dozenal.doc-6.0"="icglr7fpvm1i8fgrdp2qps57wsgmjvjg"; -"dozenal.source-6.0"="7dzlsiy3x0s95226zlyzn188jg6d9fdx"; +"dozenal-7.1"="s3saa5scxgcbsbwc8hma6xkgf7qzgxvh"; +"dozenal.doc-7.1"="46zl1f91v0jsw5a7xn6w6h6rk67g552z"; +"dozenal.source-7.1"="2sw48xy7hmpgmn1wi0vj40hs9m8kcgfh"; "drm-4.4"="i8782x71pbzgag927fqjqgw2w7zdisvj"; "drm.doc-4.4"="vs4rq0w6c2yyyzv4g4qk1pn25z0czs8l"; "drm.source-4.4"="g1n0k02ma60mrb12cdq20qfw8khgdpmm"; "droid-2.1"="0l4lmkxp92l2a36n7hy75hsl3iafdxjd"; "droid.doc-2.1"="0pd2n8l6rsxv4m3ni74q5xzqiaiph133"; "droid.source-2.1"="mfz3ac4jrl5x53ak5473ri39srd9gvkr"; -"duerer-2016"="vbldf1vbzs3if3mp2lcl65afgiqa54j4"; -"duerer.doc-2016"="75dd80vmi5wx804zkrq48z12y3alihqc"; +"duerer-2017"="vbldf1vbzs3if3mp2lcl65afgiqa54j4"; +"duerer.doc-2017"="75dd80vmi5wx804zkrq48z12y3alihqc"; "duerer-latex-1.1"="nwigxc3gb4phmv584bma819dcrrafsmx"; "duerer-latex.doc-1.1"="9nkvhaa662x9la2spm3iwmni9bj86kll"; "dutchcal-1.0"="6gpi804yy8xyiznzwyy2nqg7qvq6q2rd"; "dutchcal.doc-1.0"="s0m4n06xg8h0jmlj31w27la569vkl1im"; -"ean-2016"="m0gkapni85n6zw1armbn1y770n8aj0rm"; -"ean.doc-2016"="1b7rkp30r8k0dgk9clz71jp8dlsvhrqc"; +"ean-2017"="m0gkapni85n6zw1armbn1y770n8aj0rm"; +"ean.doc-2017"="1b7rkp30r8k0dgk9clz71jp8dlsvhrqc"; "ebgaramond-0.16"="dxr5fag5sy6nyy492cw8w8cld7ac00cb"; "ebgaramond.doc-0.16"="99fx6j9qd77xi16z6rh4hd174jmniahi"; "ebgaramond-maths-1.1"="gkmdw2r9w43z1yfl1gp0cbsm0s2wi4a0"; "ebgaramond-maths.doc-1.1"="x80h1zs21mnipvpzkcg72g2sjvib1zvz"; -"ecc-2016"="0g013kqml9jfkqq94v7zi46mhrwdzdck"; -"ecc.doc-2016"="v9al4v4j1qlrc9w7ph6ww1h1mc6flqsz"; +"ecc-2017"="0g013kqml9jfkqq94v7zi46mhrwdzdck"; +"ecc.doc-2017"="v9al4v4j1qlrc9w7ph6ww1h1mc6flqsz"; "eco-1.3"="7ycccps2kab77rr3cpwsbpi2cpl40kl7"; "eco.doc-1.3"="1r1jxijx9wk6q2124xjwrmsjps7446fp"; "eco.source-1.3"="4kcml0rm4pkg827qpfvhywnzrrx5p7dz"; -"eiad-2016"="m3n9a3rawxsj5gm64vggw7xvrq4cy4ry"; -"eiad.doc-2016"="z3wss8sc5vnawaqkz7kagwm1gv4l1czv"; +"eiad-2017"="m3n9a3rawxsj5gm64vggw7xvrq4cy4ry"; +"eiad.doc-2017"="z3wss8sc5vnawaqkz7kagwm1gv4l1czv"; "eiad-ltx-1.0"="0zq83567n75h8zxlag2qas2q8li6vyqn"; "eiad-ltx.doc-1.0"="7kymr597yg8j8291gy7jz16a89aqmqny"; "eiad-ltx.source-1.0"="illi6i1hp4lmx7ylxazrmmzi89ymh9cs"; "electrum-1.005-b"="6hdyjv1dakcj5zxn6p8rrksdvc7jl0sb"; "electrum.doc-1.005-b"="c11jl0zjq8nva5nl96p9qyq3nrvgx0zn"; "electrum.source-1.005-b"="67i1gwyiwwarncpbnj47fmws4dc42bii"; -"elvish-2016"="wp858zclk17yrhpf1yrgd3c4srh07vcj"; -"elvish.doc-2016"="mwgvj8fzb806dsjcx01zs6lhdygx35r8"; +"elvish-2017"="wp858zclk17yrhpf1yrgd3c4srh07vcj"; +"elvish.doc-2017"="mwgvj8fzb806dsjcx01zs6lhdygx35r8"; "epigrafica-1.01"="mc08k5ajn2lr4k30lzhsn2si922frq9c"; "epigrafica.doc-1.01"="vv1fqij6w2fir3myffcafyyrdckvvi4q"; "epsdice-2.1"="xbz7jkdzzsqrskdi4vhb0ra7m62hk9q1"; "epsdice.doc-2.1"="7lc7wwfxwxnjfgf13br3wa6n8j25ml6w"; "epsdice.source-2.1"="6px6gazxv7pr9cagfrg7mzx1w3z2nxn3"; -"erewhon-1.06"="s1fg77dkhx889z6znnh0ks42r5yf2gci"; -"erewhon.doc-1.06"="glapqkilkl35sxnka8nmvrj2kk9lkfs7"; -"esrelation-2016"="zhs9fa75r0wr060cfsk4gmmvn06mywmy"; -"esrelation.doc-2016"="08i1bczpz8sccj5lf32axfl3c5ix1sri"; -"esrelation.source-2016"="r1ylhybcbbxjkyvs07m6csmqgz14rrcv"; +"erewhon-1.08"="sg3iqrvlrxlqkvpziyibhm45yxy2x815"; +"erewhon.doc-1.08"="c1x91p3ydy3yw9q32x13idpwds8rfjrv"; +"esrelation-2017"="zhs9fa75r0wr060cfsk4gmmvn06mywmy"; +"esrelation.doc-2017"="08i1bczpz8sccj5lf32axfl3c5ix1sri"; +"esrelation.source-2017"="r1ylhybcbbxjkyvs07m6csmqgz14rrcv"; "esstix-1.0"="0ddmfrgh39pwcd2n8rggma4pqwgamp7s"; "esstix.doc-1.0"="5pf3r0xhssrgkp779n06a63yjb5cdg6a"; "esvect-1.3"="dd9wb3zgs99s93z0jig2z5pwccxh3vvk"; @@ -840,42 +904,44 @@ "eulervm-4.0"="ica20j8a3ljzxrmp03k60y6f4kpcbiy2"; "eulervm.doc-4.0"="g5fxzw7dvnff2w9ys2gpgnvr2x8dabx6"; "eulervm.source-4.0"="ifvn5n0dvcr4qpcv1yp4xvnx9lj26krg"; -"euxm-2016"="pb3kg627b3skhbi0prgik6y9n9zgk8s0"; -"fbb-1.11"="3nn4lab2cf4d8ahv5fm0dy8x443vy5x1"; -"fbb.doc-1.11"="w74f97zdb73f4y02dylkfvlkxhrzfnbf"; +"euxm-2017"="pb3kg627b3skhbi0prgik6y9n9zgk8s0"; +"fbb-1.14"="ai9024x530swbm9r2lnfps5qijy0rvsq"; +"fbb.doc-1.14"="34dvrfj52ylz45x9kj80p1i61iyyffvc"; "fdsymbol-0.8"="hx8wp66hsznj0sj8jkz0vdah0bp9vvyb"; "fdsymbol.doc-0.8"="n457nji3718qh1nrjr9wbj9zqj21nkw0"; "fdsymbol.source-0.8"="3n6d2j9wh5cxakdmxg087mznnrdkjw27"; -"fetamont-1.6"="b1jqkg3ms7gl1i2xx1gz7i2v988h2qqj"; -"fetamont.doc-1.6"="mvwfb10r72m4xggvlya8g5b9r7yz13pp"; -"fetamont.source-1.6"="5nc615ggwa9s5x313csql70id28j1k7b"; +"fetamont-2017"="4b0n4awl8k1zz1pn0pnc2hic5shsyb2h"; +"fetamont.doc-2017"="vq97fpky2mf9p09zwqvk6vkl5k9swkbb"; +"fetamont.source-2017"="j6zizdhly6lam1y4f37sy8py5ibaz4xz"; "feyn-0.3.3"="8dj19lvi2c2vna95mdw689d1h44l6ym3"; "feyn.doc-0.3.3"="6s6vyfbq3zb83fm0b8l7xb3pq335lhza"; "feyn.source-0.3.3"="ncnbfggbsqdr418s53908b8k33ka9iby"; "fge-1.25"="59jqqyl11vinxa29f6gmalv30q6zfbzi"; "fge.doc-1.25"="49bgdsclk4zlpdfj9pimffpr4qkd2z7q"; "fge.source-1.25"="ak2gj4nk82ya7dfbi2vwp60lvnqlvnzl"; -"fira-4.1"="2xmp3d4vbb30qhm6n303n585dmz9n8i0"; -"fira.doc-4.1"="rih92f4p5fy8wv0iaxib2q8bkzjjbjrd"; -"foekfont-2016"="wha0shrvr3lv9ll9d3gv60mcav605vcc"; -"foekfont.doc-2016"="n91sl0xzglqfbdyb9mzv7wav3y4zv9sx"; -"fonetika-2016"="firgrcsksy4jdk632aqfwlaki3xxgmak"; -"fonetika.doc-2016"="ahz61pg6qnn2dpi3c9iz2kh2f4fvywbl"; +"fira-4.2"="jmhwqnxchiqkk076c498ck9h7vgi4vba"; +"fira.doc-4.2"="0j3hpld29a4098kl2q32m2lmxm90s3ym"; +"foekfont-2017"="wha0shrvr3lv9ll9d3gv60mcav605vcc"; +"foekfont.doc-2017"="n91sl0xzglqfbdyb9mzv7wav3y4zv9sx"; +"fonetika-2017"="firgrcsksy4jdk632aqfwlaki3xxgmak"; +"fonetika.doc-2017"="ahz61pg6qnn2dpi3c9iz2kh2f4fvywbl"; "fontawesome-4.6.3.2"="0n13dha58d0w511pzzckcq51fal6zxgl"; "fontawesome.doc-4.6.3.2"="x7hzlyxv5k2zjz5lk8hy15pnvbhhhijj"; -"fontmfizz-2016"="c8k7306gjkypslf6micsyfcx9n5zh4js"; -"fontmfizz.doc-2016"="4rnghy9z5azspczc1hxman3305k5wdn4"; -"fonts-churchslavonic-1.0"="hb1bzipyz5wcqnska4q5rjf0hy0w658j"; -"fonts-churchslavonic.doc-1.0"="nwv56rckkxza8n1mv5wxk6bpkgw3cdx2"; +"fontmfizz-2017"="rkf93c9imj2wd7aps85m6450zbd9p3yl"; +"fontmfizz.doc-2017"="y70dshapwj7xp7h9b6sbjipv6v9k02wg"; +"fonts-churchslavonic-1.1"="3d67nxsgrrv480997rlbrzz5siyb2gvj"; +"fonts-churchslavonic.doc-1.1"="arcilr5n1w0rg97zkxy162kx21ygns31"; "fourier-1.3"="rl6alzjlkyyhhk0gbra08b99fb3aax85"; "fourier.doc-1.3"="6b2bnjvp45lqxmjbp0pj5yd4m39kgg6y"; "fourier.source-1.3"="dcl6cw6vfsd0xjpic29161iswkv52gm4"; -"fouriernc-2016"="9pxp21fllg7yh9jfa8nzpy6ifa3w6y18"; -"fouriernc.doc-2016"="dn9wfy53asfp1bbxnfa9nxvnfy3z9nn1"; -"frcursive-2016"="fs9aw12gfd5gs55fhqxg2p06c50i9s1v"; -"frcursive.doc-2016"="r0bj4g91m2w3yl8q8kim6ldm4d8lyziy"; -"genealogy-2016"="hdl046d3paihjmlkh2q3crfj1n88fsyv"; -"genealogy.doc-2016"="7115cwa2l6nsnyijcdik7kw513q3a41h"; +"fouriernc-2017"="9pxp21fllg7yh9jfa8nzpy6ifa3w6y18"; +"fouriernc.doc-2017"="dn9wfy53asfp1bbxnfa9nxvnfy3z9nn1"; +"frcursive-2017"="fs9aw12gfd5gs55fhqxg2p06c50i9s1v"; +"frcursive.doc-2017"="r0bj4g91m2w3yl8q8kim6ldm4d8lyziy"; +"frederika2016-1.000_2016_initial_release"="bl8g27dfv6xsqfwlr2i6w9yar7916qnn"; +"frederika2016.doc-1.000_2016_initial_release"="ncd2plzgwdwcv1many94alkvbjh7xjf6"; +"genealogy-2017"="hdl046d3paihjmlkh2q3crfj1n88fsyv"; +"genealogy.doc-2017"="7115cwa2l6nsnyijcdik7kw513q3a41h"; "gentium-tug-1.1"="icijmw31g5lsgqlkam4d6z33fzprpxi8"; "gentium-tug.doc-1.1"="i9l2xy7kwymvrzhzd1p17qgq3n3s4ay0"; "gentium-tug.source-1.1"="fjd2j35fn1jbl3zw6nix2hz6mbbcr6m5"; @@ -885,97 +951,98 @@ "gfsbodoni.doc-1.01"="cbw698q7jmg09k301zwbnnqig853c14i"; "gfscomplutum-1.0"="bic1cr1c3dii9nlfmhlgsm6rpj3g0im7"; "gfscomplutum.doc-1.0"="ddz279xl7glgi201dizr2gdkcgiy77qz"; -"gfsdidot-2016"="haagb5h8bpqyjh2pp4bxqz664rfafmq2"; -"gfsdidot.doc-2016"="y69qjiffbc2vmy8rzbfrg0d9nc6nq9ca"; -"gfsneohellenic-2016"="az5rq4d44zysnvcqlky0hr5qb7bh3nza"; -"gfsneohellenic.doc-2016"="04y313wjm59sgg4xlnili0kfw3dwljp9"; +"gfsdidot-2017"="haagb5h8bpqyjh2pp4bxqz664rfafmq2"; +"gfsdidot.doc-2017"="y69qjiffbc2vmy8rzbfrg0d9nc6nq9ca"; +"gfsneohellenic-2017"="az5rq4d44zysnvcqlky0hr5qb7bh3nza"; +"gfsneohellenic.doc-2017"="04y313wjm59sgg4xlnili0kfw3dwljp9"; "gfssolomos-1.0"="wq24prphxxnn94n0nd4xmrf23f5yqchp"; "gfssolomos.doc-1.0"="rq87k1bymgyb837k103ps50w9krmxca8"; "gillcm-1.1"="42vc5sx8shjzqkc10qv7gyq9689bzlgq"; "gillcm.doc-1.1"="4rmm7nn5z0bw3qgn8gfkl86bblkvkh6g"; -"gillius-2016"="fw49hi1cvp9zknv23xccgffkxyqwimqv"; -"gillius.doc-2016"="dhkvy2y5v117xzm4lan27k7q2rcdvs5p"; -"gnu-freefont-2016"="1zqn27grz5h290g4fk4q8kd9pf4l05ag"; -"gnu-freefont.doc-2016"="3saxb0d0h7dn8a1f7l8ax0dj5ic8piib"; -"gnu-freefont.source-2016"="716drmmfwyq7pabpgagk0zwkj77lrhda"; -"gothic-2016"="6wx2xl7wrgnai3wwqgpggwyggyg5hid1"; -"gothic.doc-2016"="1cpvmj3vn26ji5cl1sfxvdh6qv7ix92f"; -"gothic.source-2016"="6gh7hma17066gk20ri4qjvml8d424c1h"; -"greenpoint-2016"="qlqfkgcn8gc1hy7gmfajqliriilf68ck"; -"greenpoint.doc-2016"="xf889ii8gmck30vlpwkfp7d9242ivffr"; -"grotesq-2016"="rqv47whzwig31vfd8581ncd87ja7pb82"; -"grotesq.doc-2016"="rim68sz4x0r1m6j69zryv98gfgvpkbz0"; +"gillius-2017"="fw49hi1cvp9zknv23xccgffkxyqwimqv"; +"gillius.doc-2017"="dhkvy2y5v117xzm4lan27k7q2rcdvs5p"; +"gnu-freefont-2017"="1zqn27grz5h290g4fk4q8kd9pf4l05ag"; +"gnu-freefont.doc-2017"="3saxb0d0h7dn8a1f7l8ax0dj5ic8piib"; +"gnu-freefont.source-2017"="716drmmfwyq7pabpgagk0zwkj77lrhda"; +"gofonts-2017"="zpgjyb4435mfsjdk5n2c1c2nyqqix88f"; +"gofonts.doc-2017"="dzy2jb8iyr227sil5wj14sxv5v1w95bc"; +"gothic-2017"="6wx2xl7wrgnai3wwqgpggwyggyg5hid1"; +"gothic.doc-2017"="1cpvmj3vn26ji5cl1sfxvdh6qv7ix92f"; +"gothic.source-2017"="6gh7hma17066gk20ri4qjvml8d424c1h"; +"greenpoint-2017"="qlqfkgcn8gc1hy7gmfajqliriilf68ck"; +"greenpoint.doc-2017"="xf889ii8gmck30vlpwkfp7d9242ivffr"; +"grotesq-2017"="rqv47whzwig31vfd8581ncd87ja7pb82"; +"grotesq.doc-2017"="rim68sz4x0r1m6j69zryv98gfgvpkbz0"; "hacm-0.1"="jvhbypj31pcc0imgwlmzpv8nmb1n9dxk"; "hacm.doc-0.1"="0dys4q83mfgxlwrz16fsm2cx2vgcn5ly"; -"hands-2016"="570kl4m7mximvq87lfqa6fim30hmjjqz"; -"heuristica-1.08"="fdwjz528185ff5gq6fwgxpf67w81q1hs"; -"heuristica.doc-1.08"="bawl4m510k3mzvxcf6vwq6id91fs21xj"; -"hfbright-2016"="j8vk71r5c8iyhfmfwqspj1c4iczl2p0f"; -"hfbright.doc-2016"="wqqxw523sh1yjl0hnh31902wap7xcjwm"; +"hands-2017"="570kl4m7mximvq87lfqa6fim30hmjjqz"; +"heuristica-1.09"="s1khk82w1g5q53iaj29viqgi1bssfvx2"; +"heuristica.doc-1.09"="vlm8a9a4g4vbqiana67r4dfyv3g1fk0b"; +"hfbright-2017"="j8vk71r5c8iyhfmfwqspj1c4iczl2p0f"; +"hfbright.doc-2017"="wqqxw523sh1yjl0hnh31902wap7xcjwm"; "hfoldsty-1.15"="79zmah1m2xg56m7cvfybzw68kbfcf5c5"; "hfoldsty.doc-1.15"="16gmfqd9kwg0isf4wp1nlndfwn5132ph"; "hfoldsty.source-1.15"="vyly65j4d7wl49gmm8wgpxrnv1s2ygq2"; -"ifsym-2016"="qy3w8h8slb44vg4s7q7ddb9db2fd9s06"; -"ifsym.doc-2016"="wpnp4ykxz7qa1ycwzkfpp5sjrs49np12"; -"imfellenglish-2016"="y1vkapnwlqxwb3via4yhpszgfmlyqa9q"; -"imfellenglish.doc-2016"="g7r6rv584d412gqassqba30jfg3i1490"; -"inconsolata-1.10"="ym7yy9m5m8jghqchkng5112fd5knsgx4"; -"inconsolata.doc-1.10"="kp397xs358bc6d0ir50063js699iqh77"; -"initials-2016"="sd0v18xidrmnllf1ihmgk02jz3v2qw8j"; -"initials.doc-2016"="6nhvprdk8nd8gxmhq2hb8s41rpjwmv4g"; -"ipaex-type1-0.3b"="zvrlkrnny2f16db0vkl5aw4bv575h4lw"; -"ipaex-type1.doc-0.3b"="3z3qbzn77nw7lmdknl8j3w9qqf3qqaah"; +"ifsym-2017"="qy3w8h8slb44vg4s7q7ddb9db2fd9s06"; +"ifsym.doc-2017"="wpnp4ykxz7qa1ycwzkfpp5sjrs49np12"; +"imfellenglish-2017"="y1vkapnwlqxwb3via4yhpszgfmlyqa9q"; +"imfellenglish.doc-2017"="g7r6rv584d412gqassqba30jfg3i1490"; +"inconsolata-1.113"="68gy7gcs8vcd9ch65lgywqi8hg4ww6ad"; +"inconsolata.doc-1.113"="xn6cdxhg6wk7h5w135ba9ak72vyddail"; +"initials-2017"="sd0v18xidrmnllf1ihmgk02jz3v2qw8j"; +"initials.doc-2017"="6nhvprdk8nd8gxmhq2hb8s41rpjwmv4g"; +"ipaex-type1-0.4a"="9grlfg36zanjfrnaw0f2hb3cp4jpbpab"; +"ipaex-type1.doc-0.4a"="wpskfd5mjp5a7k2210m8x9fw7y5zdgkn"; "iwona-0.995b"="l8pylg2zq5pvxs7czq17b3v1xpar4qkr"; "iwona.doc-0.995b"="piyd7fk40bqwdb3fxshkcwwrdi8gra32"; -"jablantile-2016"="7fh0mnp320r5b8740vs3z19dg1l0i4ds"; -"jablantile.doc-2016"="yml29hq7xcawh3zkd6b32dbsk0aj024q"; +"jablantile-2017"="7fh0mnp320r5b8740vs3z19dg1l0i4ds"; +"jablantile.doc-2017"="yml29hq7xcawh3zkd6b32dbsk0aj024q"; "jamtimes-1.12"="mdyyd5fy4hhi74rpc5hb7bmrxwdsk9k9"; "jamtimes.doc-1.12"="c9849k8v23lrfrchf00yvrvq5q7g1gq0"; "junicode-0.7.7"="s9grb6y7k5mxsfaxxyp1aj8c289cdb2r"; "junicode.doc-0.7.7"="b66ag5n2apfdkwlhqsvg6aq1p8pdbiyn"; -"kixfont-2016"="b9z3zajxsqs84zh5k15rx3jgkwwgwa40"; -"kixfont.doc-2016"="xp8ai67z856fmkzcssavksidg7n7j2yj"; -"knuthotherfonts-2016"="cglkahxrv3ai8ia8gh59wcf8wiz6p671"; +"kixfont-2017"="b9z3zajxsqs84zh5k15rx3jgkwwgwa40"; +"kixfont.doc-2017"="xp8ai67z856fmkzcssavksidg7n7j2yj"; +"knuthotherfonts-2017"="cglkahxrv3ai8ia8gh59wcf8wiz6p671"; "kpfonts-3.31"="6bkrblgqpv8vn18vfjqlqq7g7q8df2an"; "kpfonts.doc-3.31"="9ss49c1srgdxc4z0q94jdjyrfd9lyxmq"; "kurier-0.995b"="dadp8vkzvblj60424k75bchravcr0338"; "kurier.doc-0.995b"="a4hw3w7qg492qnf4kivjsdfxqyrq669b"; -"lato-2.2"="y4f5785drk1k6khnx3wjzymjavl34pkv"; -"lato.doc-2.2"="7rj3h5khq16b49s50nh8lkqql1wq3qv9"; -"lato.source-2.2"="pss3k4q1z1d91nv6wqmd4s6d6dxd0i4s"; +"lato-3.0"="cay4x21jfm7mzs18f21ymwaa3gbqpdiz"; +"lato.doc-3.0"="kh4a3qzwkrvx3my0qx0vxk4c5ixfz3ag"; "lfb-1.0"="kqspj6w9i4bzbxcngqdfk8rnw33j0yyd"; "lfb.doc-1.0"="ikbhi6ahzxlplvizphmpimf9ah2ninqg"; -"libertine-5.3.0"="s5zba27ij7ixsaw4c94q2c3qvnzlblkm"; -"libertine.doc-5.3.0"="pz9mx44zjcwhimj9qn1wqw9c9hfk2rm4"; -"libertinegc-1.00"="2z6bzrh2cp8rvvp5ywbd9c46ng2v4l8c"; -"libertinegc.doc-1.00"="vqwmf4b2gm8m1g5qmmq2ws9hkdr6qy2k"; -"libertinus-6.2"="dfi1hiv622j0z116whfxdlmprgxqv1an"; -"libertinus.doc-6.2"="cfn8l7zq50m0v39z5g2h2ny05691zlw0"; -"libertinust1math-1.00"="fh7vadpk9183v23a2i46976gvl8lf145"; -"libertinust1math.doc-1.00"="j0a0wy3f5znn1bsgfsl1grzk1anpd5yi"; -"librebaskerville-2016"="2dc8cilcgmmp0wrla8ayyyh4khhh7lfl"; -"librebaskerville.doc-2016"="5yargvzlnq9sckyy629jzsmi17gb8h7n"; -"librebodoni-2016"="1znd7g37rmm1qsv35dd9kvkmkfj4d3w5"; -"librebodoni.doc-2016"="hzihx71p9ggdp2pxrjvck7lhx2mrgdmj"; -"librecaslon-2016"="rpnd5xnxi48r8xy7jiqaw0z62j2bgnsr"; -"librecaslon.doc-2016"="6n2yvfsmqybr3baq7njvdk4hv0rgwfll"; +"libertine-5.3.0"="pjygmbrr2rarji49h49mckqjshc7ikvy"; +"libertine.doc-5.3.0"="nf0ydl0wv6m4vlc9bbcn186krs7cjmzw"; +"libertinegc-1.01"="jmz5hjyld04g175sgg322lrlazcbmbz7"; +"libertinegc.doc-1.01"="qf8q9c30ljq44kqh8l855xdkq9i4w857"; +"libertinus-6.4"="fcxj427j1s2j7hk6ph4s07v2kfkrljkb"; +"libertinus.doc-6.4"="hjmsbr1p7xwwjwdiamhldp3mb0igkqmd"; +"libertinust1math-1.1.4"="qjy1v4162pqfv3yszb4vwvjkmq55m21q"; +"libertinust1math.doc-1.1.4"="yn7nspw8k3qi75jaaplf4zy00nm2xiyj"; +"librebaskerville-2017"="2dc8cilcgmmp0wrla8ayyyh4khhh7lfl"; +"librebaskerville.doc-2017"="5yargvzlnq9sckyy629jzsmi17gb8h7n"; +"librebodoni-2017"="1znd7g37rmm1qsv35dd9kvkmkfj4d3w5"; +"librebodoni.doc-2017"="hzihx71p9ggdp2pxrjvck7lhx2mrgdmj"; +"librecaslon-2017"="rpnd5xnxi48r8xy7jiqaw0z62j2bgnsr"; +"librecaslon.doc-2017"="6n2yvfsmqybr3baq7njvdk4hv0rgwfll"; "libris-1.007"="fi5cn5ag6zgprgc0iqgk4iln6kb8knv8"; "libris.doc-1.007"="82p29lh7cbavrshdx4s0pvqpgbvb21d4"; "libris.source-1.007"="gd4aiv3pxy5as8cwfy9m1f4a8jp7v6d1"; -"linearA-2016"="fs5s95s31qczmlr0m3dk16c7gl4kpn3z"; -"linearA.doc-2016"="6b5jz6pfmv5f88gkwj5642jvd35ga3gm"; -"linearA.source-2016"="zdfpl9gwgrxwvs9ymj3vngfxdc23vv0q"; -"lobster2-2016"="lx95j46k68gz8jbcxam8a3xy4jgxy9jk"; -"lobster2.doc-2016"="psr2bid2fjynzfvwb4s86biamv1r6q9l"; +"linearA-2017"="fs5s95s31qczmlr0m3dk16c7gl4kpn3z"; +"linearA.doc-2017"="6b5jz6pfmv5f88gkwj5642jvd35ga3gm"; +"linearA.source-2017"="zdfpl9gwgrxwvs9ymj3vngfxdc23vv0q"; +"lobster2-2017"="lx95j46k68gz8jbcxam8a3xy4jgxy9jk"; +"lobster2.doc-2017"="psr2bid2fjynzfvwb4s86biamv1r6q9l"; "lxfonts-2.0b"="3s303f06r7561x3x38sy3c9nr80x8gdq"; "lxfonts.doc-2.0b"="swgvazf325j99kjrcb94r8611fs6jmqv"; "lxfonts.source-2.0b"="sxn1hl96bsg6ai8fafskxj8palg8vpk7"; -"ly1-2016"="vikl1r4353fvx09h3iiq5r9r6wnhj57g"; -"ly1.doc-2016"="iw3amhkw5vjcmrq43cwqg653nyc3ks1p"; -"mathabx-2016"="qgy1qqn1bk43nk938d7bvbyj75v4fz57"; -"mathabx.doc-2016"="q0n88v61h3bqf0vvldd1lb03d6i1z8mc"; -"mathabx-type1-2016"="z96jirmwabbav354qlyphhjvxnsgjqxl"; -"mathabx-type1.doc-2016"="yq8n84cpw8kqvqivham4pqxq1740z36w"; +"ly1-2017"="vikl1r4353fvx09h3iiq5r9r6wnhj57g"; +"ly1.doc-2017"="iw3amhkw5vjcmrq43cwqg653nyc3ks1p"; +"mathabx-2017"="qgy1qqn1bk43nk938d7bvbyj75v4fz57"; +"mathabx.doc-2017"="q0n88v61h3bqf0vvldd1lb03d6i1z8mc"; +"mathabx-type1-2017"="z96jirmwabbav354qlyphhjvxnsgjqxl"; +"mathabx-type1.doc-2017"="yq8n84cpw8kqvqivham4pqxq1740z36w"; "mathdesign-2.31"="30x7w3a7v1654a9n5mcj5kdak8i2qxw2"; "mathdesign.doc-2.31"="sgp7bi4m5480jvsdj9n2pq933cfjkiqr"; "mdputu-1.2"="6wr48jgiyfprwwrla53qshm2817zrmm2"; @@ -983,95 +1050,103 @@ "mdsymbol-0.5"="hjaz8ph3zrnl7x0545k3937yl5a0ghqh"; "mdsymbol.doc-0.5"="g8m1964gq8gnn3cc3ij1iqhc4akwmc3q"; "mdsymbol.source-0.5"="7hy2zpaw41c46i7kd4m65lhzgbpkn5xv"; -"merriweather-2016"="57d530k5j2lngknni5abyzls4nlaadpk"; -"merriweather.doc-2016"="wfsrrdn7gfh7ih5fqsd4lxy55hmc9wwh"; +"merriweather-2017"="57d530k5j2lngknni5abyzls4nlaadpk"; +"merriweather.doc-2017"="wfsrrdn7gfh7ih5fqsd4lxy55hmc9wwh"; "miama-1.0"="v8l2d3rkr08hpxbvb1yw18afbcr3mqb3"; "miama.doc-1.0"="xwqi0jxadac5vxcv1zcn8irfmfi3c34r"; "miama.source-1.0"="9qf3ffnir6bn31gcdzrp00bryijrmw5l"; -"mintspirit-2016"="wc4wyi1dfc7ql5sdcyycyqxjfir4g97r"; -"mintspirit.doc-2016"="w1ld9009591p4inkky5jfppjaiy0ja8s"; +"mintspirit-2017"="wc4wyi1dfc7ql5sdcyycyqxjfir4g97r"; +"mintspirit.doc-2017"="w1ld9009591p4inkky5jfppjaiy0ja8s"; +"missaali-1.004"="yv5k1an5kf5fygdjphwyg34k7yxzhvfm"; +"missaali.doc-1.004"="dwrqnc25398agbnc9nqmmiviray9fgw3"; "mnsymbol-1.4"="gmjs2ra3yb01bxw90gjdri3p6n7kbc6l"; "mnsymbol.doc-1.4"="7ngazrr147x9gdadm651fv9hjr1f87i2"; "mnsymbol.source-1.4"="7bf82bljx9w783jg3kibc5rn2l9j0ym2"; -"mweights-2016"="prx1hbwa7bmr92ihxylmp49g7b4farwq"; -"mweights.doc-2016"="nigr91h85nl0ykivaxl33qi8s8sx6gsw"; -"newpx-1.295"="y86mz7l525jhx1pbi8bpdkypv4hswgng"; -"newpx.doc-1.295"="8zs8077x8pkjfk9w8561pjw8kxdx8pi1"; -"newtx-1.466"="a56lf6psqy42gqxi9as7c3zggacdgp9i"; -"newtx.doc-1.466"="8am97hv3vjj383xdz6rbzlv742wi6g8c"; -"newtxsf-1.04"="38365p5pmaxqm1wa4b8iz4fhl404f66w"; -"newtxsf.doc-1.04"="c5xd5vqh6b9jn6fa0jfp3snkcs2kqvlr"; -"newtxtt-1.052"="asl7klidnx8cf7p0ms9ia0kyc9j4zs4i"; -"newtxtt.doc-1.052"="3g7k3zxj66xwpn095a3h2z4pgqm5giax"; +"montserrat-1.01"="69sgwbg4w8kxgl2sixbx2p5l8x09m95i"; +"montserrat.doc-1.01"="qs93cxc3d97zzny9702zm5gydz9p45f9"; +"mweights-2017"="6rwqdlv6x82pskdga8yzzz61yfxgvzpq"; +"mweights.doc-2017"="w719n3h6cg10izpzgcqd4n0i5gbm644a"; +"newpx-1.321"="d12yaqn9jk8z82rl50z1i2q507snsdvs"; +"newpx.doc-1.321"="4q8cyg65h9biyizjszazbyb8j6fyfgwc"; +"newtx-1.527"="qz5r1mwyyaxqyp03nhc1xf003pabrqpw"; +"newtx.doc-1.527"="1aszp7mxbsh17097nw2v4p0n5ch0hrsw"; +"kastrup-2017"="qdr5cacl37ans3zd5jlzwr2356xxgswy"; +"kastrup.doc-2017"="mvq3abnsjmzb3kv4c2z116apbzgfh2dw"; +"kastrup.source-2017"="13vj32k48f0ahs5694zrsvk953kxjrwc"; +"newtxsf-1.05"="p5i2031dbbv3nn7djsw2p6hxrck6bfpx"; +"newtxsf.doc-1.05"="jhm8sl1nbrp1xnn32ilqgjsq30dh774j"; +"newtxtt-1.055"="7v1rd11ryiynfmwzrmwywd2m9qc5i3fh"; +"newtxtt.doc-1.055"="zblj8j85biikhm989slz2hwbvkhq5yf2"; +"niceframe-type1-2017"="0kr9sg5vnawjrd2aw8vbf8mg975sifl1"; +"niceframe-type1.doc-2017"="12bn96xfs68zy9sfxi5q67mnaqkl1v2a"; "nimbus15-1.00"="wrnw56g5wf7g0443fwdbv05cca3yr9gl"; "nimbus15.doc-1.00"="q2qwgrdmc69r2yq7kf8nak62smz536ay"; "nkarta-0.2"="g55hn51ys8zd7in6c6z46mwva577s6qd"; "nkarta.doc-0.2"="59na8icxp6l11jk6nsp53c1y5gqyjsff"; "nkarta.source-0.2"="jqh4ghyi8ry5w9x909w3kscg9p6m1279"; -"noto-2016"="x9dqxjy2zfmq4m521glh2pr04ckz35jr"; -"noto.doc-2016"="39s1yf547yqhm9r4wvsyq0ynqzs8igb7"; +"noto-2017"="jbjzwfv0gm2ik3j267gfcrq34h1aab5y"; +"noto.doc-2017"="0iqwpxg6ph4z08470dfp04g3rq9dbgdy"; "obnov-0.11"="49j5a74f298hw84np3ih4xd0hnh6r1wh"; "obnov.doc-0.11"="m9c4z3ckj08ai2cdb3hhiv040y6n1bfl"; -"ocherokee-2016"="1fg65c5gpjsx8vv9vsdg8szagf1xmg6a"; -"ocherokee.doc-2016"="p9lx15xl112908b004y0y6nlfxzgam24"; -"ocr-b-2016"="q1id788vglvlc7lsfr35gvzf0xmgr22n"; -"ocr-b.doc-2016"="lgwx91waimda6cdr05fi2jdwh4x18fqf"; -"ocr-b-outline-2016"="b8hhnggqxzs8285f55ixpwcpd7hb2dym"; -"ocr-b-outline.doc-2016"="bl1m2hny1zvs3wy4i4pndd2vxq7jhd9j"; -"ocr-b-outline.source-2016"="pf5dql2llykwb6x5a2s3scg4kc5r2f77"; -"ogham-2016"="22q1nc2fd6vv7hr7l4iryxi5bp6hqfnb"; -"ogham.doc-2016"="awnlhhzp2ch289lpnwybhz1k3zqwqq5d"; -"oinuit-2016"="n4di43fhkw1zcmy9xgxn7g4wl23qinyi"; -"oinuit.doc-2016"="s5hi4bk5yc19fb5lhmnc2vvxpr3ahd2k"; -"oinuit.source-2016"="caij5pbyylnhlhx149kl2h5sj4qda57z"; -"old-arrows-1.2"="phrvizrvr5iwqb1f3w4ymn8wcafm85z9"; -"old-arrows.doc-1.2"="91c6am0jj3jhdzfncc2cj24phb4xkji8"; +"ocherokee-2017"="1fg65c5gpjsx8vv9vsdg8szagf1xmg6a"; +"ocherokee.doc-2017"="p9lx15xl112908b004y0y6nlfxzgam24"; +"ocr-b-2017"="q1id788vglvlc7lsfr35gvzf0xmgr22n"; +"ocr-b.doc-2017"="lgwx91waimda6cdr05fi2jdwh4x18fqf"; +"ocr-b-outline-2017"="b8hhnggqxzs8285f55ixpwcpd7hb2dym"; +"ocr-b-outline.doc-2017"="bl1m2hny1zvs3wy4i4pndd2vxq7jhd9j"; +"ocr-b-outline.source-2017"="pf5dql2llykwb6x5a2s3scg4kc5r2f77"; +"ogham-2017"="22q1nc2fd6vv7hr7l4iryxi5bp6hqfnb"; +"ogham.doc-2017"="awnlhhzp2ch289lpnwybhz1k3zqwqq5d"; +"oinuit-2017"="n4di43fhkw1zcmy9xgxn7g4wl23qinyi"; +"oinuit.doc-2017"="s5hi4bk5yc19fb5lhmnc2vvxpr3ahd2k"; +"oinuit.source-2017"="caij5pbyylnhlhx149kl2h5sj4qda57z"; +"old-arrows-2.0"="7s0s5g2vif8hkzj768a0zgg46xjh57y6"; +"old-arrows.doc-2.0"="n9ly98pmz304gymkiafs3fncs9qq29mb"; "oldlatin-1.00"="dw53za52apri5agrh2jpxrw0qvnk1mbd"; "oldlatin.doc-1.00"="ngf614psg11qa2gmda30c6an4f371lda"; -"oldstandard-2.0.2"="qxmy4i2hxk7nxpy22yjcwz9mblsfr940"; -"oldstandard.doc-2.0.2"="8c13b9w1g3yfmadcyrh1cgclb8r7kkk8"; -"oldstandard.source-2.0.2"="zldfvfqaph84h7i1gjjziqmfsv7kxyq1"; +"oldstandard-2.2"="iqi5gsgi0n4hzwaxwz00vz2wq43xhfgk"; +"oldstandard.doc-2.2"="vh7gsp5wf33yzfmdklh41nl0dlrn9vwb"; "opensans-1.2"="96p8jrsz9bp7lmyvi1yyq8k6g8x7041h"; "opensans.doc-1.2"="6wh2f3idlc9s717la12bhj92xwniyd1j"; "opensans.source-1.2"="4idpv3dnr2p81jrbdfxqxanyyzgaxbrc"; -"orkhun-2016"="fmazxvhmc0r0m96ms6a234wj139g00iy"; -"orkhun.doc-2016"="mgamvmayvdi43vxfqmxgbgzfahpn3d2l"; -"overlock-2016"="xnfcanjszrd5bdrdszdy0lj4d73wb7jg"; -"overlock.doc-2016"="08zkifgzjdfcb9q85dz0xi7q5q558aq0"; -"pacioli-2016"="ka7a174yd3q3mymkbfyqbi7hhzpbhgvv"; -"pacioli.doc-2016"="5pzk9mjcdlzcnxwfkba4hzn23bzlhfh9"; -"pacioli.source-2016"="wwvfswngg0rrng6f3xck0f4qyg5m3shk"; -"paratype-2016"="877hrpz9vdgw6hsi6zf9d44bwnqjd6cb"; -"paratype.doc-2016"="12a3wq98sk2sb66rd08sx3f3vqvyqsr3"; +"orkhun-2017"="fmazxvhmc0r0m96ms6a234wj139g00iy"; +"orkhun.doc-2017"="mgamvmayvdi43vxfqmxgbgzfahpn3d2l"; +"overlock-2017"="xnfcanjszrd5bdrdszdy0lj4d73wb7jg"; +"overlock.doc-2017"="08zkifgzjdfcb9q85dz0xi7q5q558aq0"; +"pacioli-2017"="ka7a174yd3q3mymkbfyqbi7hhzpbhgvv"; +"pacioli.doc-2017"="5pzk9mjcdlzcnxwfkba4hzn23bzlhfh9"; +"pacioli.source-2017"="wwvfswngg0rrng6f3xck0f4qyg5m3shk"; +"paratype-2017"="877hrpz9vdgw6hsi6zf9d44bwnqjd6cb"; +"paratype.doc-2017"="12a3wq98sk2sb66rd08sx3f3vqvyqsr3"; "phaistos-1.0"="5vv58ibkgjmpih67p2qgm9vdiqh4ag6m"; "phaistos.doc-1.0"="z69jyiz7nm44yg9qy5vfhrzwby903g3s"; "phaistos.source-1.0"="clhmyfpd5l1zx29352smmnyhal3lpa5q"; -"phonetic-2016"="1ha5wc46jqc3r9ziq7wmx0va8svybyjk"; -"phonetic.doc-2016"="xa7kxz7lh1sqmb6x9n4sh7bjpr9mvzqp"; +"phonetic-2017"="1ha5wc46jqc3r9ziq7wmx0va8svybyjk"; +"phonetic.doc-2017"="xa7kxz7lh1sqmb6x9n4sh7bjpr9mvzqp"; "pigpen-0.2"="d6rr06gpzr27134dqh8rv6h6g4i9hg4x"; "pigpen.doc-0.2"="gqnp68lkhnnyh1ib0sa34cxjg52jj0rs"; -"playfair-2016"="1rmwab0wdfbivgzkjkdlnkm57bvccgw7"; -"playfair.doc-2016"="2aaqnm4gmjl2g1v4a046hlx90xjwb8jf"; +"playfair-2017"="1rmwab0wdfbivgzkjkdlnkm57bvccgw7"; +"playfair.doc-2017"="2aaqnm4gmjl2g1v4a046hlx90xjwb8jf"; "poltawski-1.101"="ipqjw12syp38hj1pw4b9g03kx07l40vn"; "poltawski.doc-1.101"="g3shi2lp499x96az1f77y5bf8mhrgzl2"; -"prodint-2016"="vgqm1rmgqqvn7d4akab3x7jqz89kb0hq"; -"prodint.doc-2016"="fclf35r9hmfq76bvxwz5df0q18zms1sm"; -"punk-2016"="1bqwz8g3apk49mhg7m63qsynrxjxg76x"; -"punk.doc-2016"="1gc59v1xvh9sls0nr2ypmifripdspd1l"; +"prodint-2017"="vgqm1rmgqqvn7d4akab3x7jqz89kb0hq"; +"prodint.doc-2017"="fclf35r9hmfq76bvxwz5df0q18zms1sm"; +"punk-2017"="1bqwz8g3apk49mhg7m63qsynrxjxg76x"; +"punk.doc-2017"="1gc59v1xvh9sls0nr2ypmifripdspd1l"; "punk-latex-1.1"="i1gqgbivxd8yl1rwjbssf2g0ib9nvb57"; "punk-latex.doc-1.1"="8nzibnm4247rapxb9kfkyv5i49w19ipk"; "punknova-1.003"="0q3dx65cyb1kh2iwbs9if8p6943m3gw8"; "punknova.doc-1.003"="hjlldk6yr4hjh4chwcxmzq761h1ygwnq"; "pxtxalfa-1"="rapvsla1cgyinabn1w9cshpm3y5af13r"; "pxtxalfa.doc-1"="fg8arijrsm7gc3liyf3036pj014w0243"; -"quattrocento-2016"="49ifrqysm27xbwqmy4k0h7k65gxk4c9w"; -"quattrocento.doc-2016"="3rbp50ihgm2bhv78xa7839j99m4q45qr"; -"raleway-1.3"="5z34lhbcmxzqf0pyfmckcl3g5xqj348k"; -"raleway.doc-1.3"="w2dwii6y5sjm5wqahfhvmwwc723snayk"; -"recycle-2016"="4fgfdk09nzljd5a6vz52nvv8b23xk8rw"; -"recycle.doc-2016"="3wazkwncn9gh1lpcax4hb8x38jr6ynxd"; -"roboto-2016"="i7m39dj9qxjlyjgs0zypcamn1lz9bi2k"; -"roboto.doc-2016"="f4mpzazg7x4bjsmq9wja9hd7i4pbv2hj"; +"quattrocento-2017"="49ifrqysm27xbwqmy4k0h7k65gxk4c9w"; +"quattrocento.doc-2017"="3rbp50ihgm2bhv78xa7839j99m4q45qr"; +"raleway-1.4"="qyqkxw2r0kjdc5ccq6ixlsjgv75gcmhv"; +"raleway.doc-1.4"="kw13y1533fwj7lgjc986ydb97plij1vh"; +"recycle-2017"="4fgfdk09nzljd5a6vz52nvv8b23xk8rw"; +"recycle.doc-2017"="3wazkwncn9gh1lpcax4hb8x38jr6ynxd"; +"roboto-2017"="i7m39dj9qxjlyjgs0zypcamn1lz9bi2k"; +"roboto.doc-2017"="f4mpzazg7x4bjsmq9wja9hd7i4pbv2hj"; "romande-1.008-v7-sc"="v5sf9cqkvd7wmbrrb48dffi59m048kal"; "romande.doc-1.008-v7-sc"="bf5a3jzcqr74l7qp2im80r9x73rk3asy"; "romande.source-1.008-v7-sc"="g2p0didwlqqf9gsdzrhmh0f9543wdwwz"; @@ -1080,31 +1155,33 @@ "rosario.source-1.0"="zy5bkfdxj9j0gca23hk0d0vmbrnwv8h2"; "rsfso-1.02"="3n75qwpji7z995wb2r3dqwrszkw6m61m"; "rsfso.doc-1.02"="vga3jyv3s730mgx97mqw92igvvypbyb4"; -"sansmathaccent-2016"="i74c6yiwx5g1ilgjw2i0wsf2ip5ym9dp"; -"sansmathaccent.doc-2016"="dxbr7vs0j710wz9ym4n7wb3930kcrccj"; -"sansmathfonts-1"="s66jmw29jdnkk79lbl970a2d2qkcn2bl"; -"sansmathfonts.doc-1"="1f6bxfc97jzd4j663cbkzdx9dxs9m0ya"; +"sansmathaccent-2017"="i74c6yiwx5g1ilgjw2i0wsf2ip5ym9dp"; +"sansmathaccent.doc-2017"="dxbr7vs0j710wz9ym4n7wb3930kcrccj"; +"sansmathfonts-2017"="27328mjiv4hp1d24c3yf9bw02602x3r2"; +"sansmathfonts.doc-2017"="wbkv1hkr1l7gdk3kxfjx4dxmzgjjin38"; "sauter-2.4"="flw49y2l5355jpvq7f3q3vannwcfni3f"; -"sauterfonts-2016"="kciqmij0w173na214ix5yhngc18likch"; -"sauterfonts.doc-2016"="x2lc53r2wnwrjfainmngafdsg39zyf48"; -"sauterfonts.source-2016"="kfi5301zd7pwmnr1fhqc6kfni0nr5d4m"; +"sauterfonts-2017"="kciqmij0w173na214ix5yhngc18likch"; +"sauterfonts.doc-2017"="x2lc53r2wnwrjfainmngafdsg39zyf48"; +"sauterfonts.source-2017"="kfi5301zd7pwmnr1fhqc6kfni0nr5d4m"; "schulschriften-4"="3g5c3l5mnpp3a6472ayj0iykriini807"; "schulschriften.doc-4"="ad6v7vnksqfglwb18via23p45xm2hr81"; -"semaphor-2016"="rb37ln7zq51ck9k6g0wj1cx1q02x2i35"; -"semaphor.doc-2016"="5lc0796kh9slmk1hrm3720mcnqjlqrcv"; +"semaphor-2017"="rb37ln7zq51ck9k6g0wj1cx1q02x2i35"; +"semaphor.doc-2017"="5lc0796kh9slmk1hrm3720mcnqjlqrcv"; +"shobhika-1.04"="1iqj5p7vljw0yv43i6y54s4ghbx3f662"; +"shobhika.doc-1.04"="5kn3dz79s0z5mr9k6an01j2p14bpfms2"; "skull-0.1"="hv1lxixs6dv2sagmj4rnjpkhc4s2i3mj"; "skull.source-0.1"="szzd5b98j04aj4f4aq5av7fs7316156m"; "sourcecodepro-2.6"="md57f5a305c6w98036ll1lpi7qh84qq1"; "sourcecodepro.doc-2.6"="bksqxgy7iax59nisn8zs6a1b5ig76r7q"; -"sourcesanspro-2.5"="k9plmdm99gncpdl368kd41qik8cdvhi7"; -"sourcesanspro.doc-2.5"="wvcnbyvqip64x46vwp2xdijzwrxrnrfp"; +"sourcesanspro-2.6"="z54yjkharb2lcq260in8q07d2d1s5w8n"; +"sourcesanspro.doc-2.6"="cwyk6i4sdl4iag4ggdxm0c3l8ndz7cd7"; "sourceserifpro-1.2"="zjimb4v67h1nf7rcnxxxwzjc5906ik8d"; "sourceserifpro.doc-1.2"="p92ynwbxnbij2s8nr12p4hvyycvfy405"; "starfont-1.2"="phdad9yy6nvcxi7ym1chdvz0vvb309ag"; "starfont.doc-1.2"="96h183mv5rmxmnkgy6766519cz5nff6g"; -"staves-2016"="9vcnfl7q4czfhyl3zxadig3nzdxg900r"; -"staves.doc-2016"="rn25a0syl0d0n89jp09906y30679mr7v"; -"staves.source-2016"="2vby0srv43ikzb1br9wgnsyxmgqpfrv3"; +"staves-2017"="9vcnfl7q4czfhyl3zxadig3nzdxg900r"; +"staves.doc-2017"="rn25a0syl0d0n89jp09906y30679mr7v"; +"staves.source-2017"="2vby0srv43ikzb1br9wgnsyxmgqpfrv3"; "stix-1.1.2"="cmrg4yppj3k7ybbnszq2hhijw5ilzz8l"; "stix.doc-1.1.2"="52plvj0qamq4mxx5f7hh5dkacdk3izdb"; "stix.source-1.1.2"="vyhrjinlcay2vv5qq23ys653xcc35ya9"; @@ -1123,6 +1200,8 @@ "tfrupee-1.02"="2srhr23mwajngahy1hcihhivix7x6af3"; "tfrupee.doc-1.02"="pvmd0anqdv38a904hhafsr9mq5hy7f5d"; "tfrupee.source-1.02"="sz4z2j5kzk9431pvdhj2l11b8qsw3mlv"; +"tinos-2017"="c1b84zg78hqp8fm15cgr59qrksqd5prp"; +"tinos.doc-2017"="09w8iyqc8538x1d7cm8jcwk1mkmv93vx"; "tpslifonts-0.6"="6d6zngl99bgbzqidn4249bv3p3ykz5pb"; "tpslifonts.doc-0.6"="64fr89dkcr0zzxcmshmhpczvbc4byp22"; "tpslifonts.source-0.6"="0267nah6ffiwph29ay6cpfl9zqm4vgbh"; @@ -1132,23 +1211,27 @@ "txfontsb-1.1"="lspmvs805a2sjf5my3py4dkai740n05k"; "txfontsb.doc-1.1"="cgi4jnv4ks21p7m4y4ry4wajzcgkws8g"; "txfontsb.source-1.1"="4zypgg4dchni1zh8sx4wh4sb5fdh8x98"; +"txuprcal-1.00"="8yk9lvdxj1ap0lcnywllxhzdz8hplk78"; +"txuprcal.doc-1.00"="pmlz2hhjd7a2q3bdbz01yd61w3hf2i79"; "typicons-2.0.7"="0mmcwr2xcx7hdb4yllndrzq7bxava3yb"; "typicons.doc-2.0.7"="6bcmldiywvwfhknmdvpj8fdz0fmdizkp"; "umtypewriter-001.002"="4k8n89mabkcc3pyc6vhj47hvxncz40zm"; "universa-2.0"="m43cqqy103c1rh5yb8i756mm4nrmrizp"; "universa.doc-2.0"="a5nmwpyz7v6zbk7s1pq883nb9mhn6ann"; "universa.source-2.0"="5h127gz30jy4plcbhz11zk2az782v629"; -"universalis-2016"="fwhl8bzgbw53ka6j71zbpc2fxsb20896"; -"universalis.doc-2016"="4w17vpjjhk2wwmc4m6z2n67814fdlrdx"; +"universalis-2017"="fwhl8bzgbw53ka6j71zbpc2fxsb20896"; +"universalis.doc-2017"="4w17vpjjhk2wwmc4m6z2n67814fdlrdx"; +"uppunctlm-0.1"="snyyw4gj0736fqykkf94fhkp9d31ml9q"; +"uppunctlm.doc-0.1"="h6cblhxd6xb6nnp3szb0fwv1r7pdwg99"; "urwchancal-1"="kk9r6rk48qqq9s8l4k42fgj6c84912bw"; "urwchancal.doc-1"="z0p6cn21n3cxi4mjijy39z9hacfhkk5l"; "venturisadf-1.005"="nnn3pq2sx0rayjhhsh2pyavkf7c4i7jw"; "venturisadf.doc-1.005"="gjzclw11zah2cpmgjdpknflrfsaahq9h"; "venturisadf.source-1.005"="6yz4vcq9mzzm52ca19kcvgj8fg7js28g"; -"wsuipa-2016"="h05k2wwr89dak3ifgvjgjw0zyvlkyyjz"; -"wsuipa.doc-2016"="nrlpxbqgccmccncqa3xx8l3zlbalkcvm"; -"xcharter-1.078a"="6vzrjx6lylcqiyqjjh8sykggfw9mg94q"; -"xcharter.doc-1.078a"="szak9v5061d04k12fqg71xn9pl9cci98"; +"wsuipa-2017"="h05k2wwr89dak3ifgvjgjw0zyvlkyyjz"; +"wsuipa.doc-2017"="nrlpxbqgccmccncqa3xx8l3zlbalkcvm"; +"xcharter-1.1"="qp5cisn9qldwv26vg4hd50px5fq81acy"; +"xcharter.doc-1.1"="0bq5bm1zcygyijqkw7p3rgi3k9j04g5c"; "xits-1.108"="dgkldqj163pdlfy3gmjza6hb8lcanzbn"; "xits.doc-1.108"="bnvwmf9q9r8z9f1w338xadknd9hpywcm"; "xits.source-1.108"="zpy513c9qwxjdk7rg0qqkq69j719fx35"; @@ -1161,14 +1244,14 @@ "yinit-otf.doc-1.0"="7rhfxzlfdwl3g0bdlxwsyzzf83f24xx2"; "zlmtt-1.01"="s9fvrrpb7d5d0590p37xzkky0x9536vd"; "zlmtt.doc-1.01"="psz0nrmif6hfl96kjmqi0mpbdw1i710v"; -"avantgar-2016"="6x48hsg7wdw4qmf0pyqvb7zmqpn6izqr"; -"bookman-2016"="r9bkd40g0hwcbjhfa2n637i0qyk6ahyf"; -"charter-2016"="1iha6fak3i1mwa6pa6fps80vzik65a4c"; -"charter.doc-2016"="fvn827jh9gfdbs6gnnm83s2yialawz7l"; -"cm-super-2016"="wqamwks565frzn4nf6pq9skasdx5jbmy"; -"cm-super.doc-2016"="246p6vn62gq68n7bnxh1iz258gn3wi85"; -"cmextra-2016"="kqywbrwmg5w0xj0r0qffh1y9z9hlvlaf"; -"courier-2016"="f3rhv0jy01gfhn1rdnai7693y2xy90d4"; +"avantgar-2017"="6x48hsg7wdw4qmf0pyqvb7zmqpn6izqr"; +"bookman-2017"="r9bkd40g0hwcbjhfa2n637i0qyk6ahyf"; +"charter-2017"="1iha6fak3i1mwa6pa6fps80vzik65a4c"; +"charter.doc-2017"="fvn827jh9gfdbs6gnnm83s2yialawz7l"; +"cm-super-2017"="wqamwks565frzn4nf6pq9skasdx5jbmy"; +"cm-super.doc-2017"="246p6vn62gq68n7bnxh1iz258gn3wi85"; +"cmextra-2017"="kqywbrwmg5w0xj0r0qffh1y9z9hlvlaf"; +"courier-2017"="f3rhv0jy01gfhn1rdnai7693y2xy90d4"; "ec-1.0"="kjq23jms9m9h5af2ri4bxd65w82lli3v"; "ec.doc-1.0"="a8mvwdx6s8swxhagcc1p36dsy335fhby"; "euro-1.1"="mpzw5yyqlyb864cqx4wczdnbln4sv4b2"; @@ -1181,79 +1264,103 @@ "fpl-1.002"="4005wr24r6a2n90469fzz547kid3271a"; "fpl.doc-1.002"="d7577p5pki08lnv8w6qrcw5qq6kq28hp"; "fpl.source-1.002"="62kfl70bai91q9zl65pgcpbcmf45nibv"; -"helvetic-2016"="q4xi3bdpp7195sqlkbfgnnccq879v86f"; +"helvetic-2017"="q4xi3bdpp7195sqlkbfgnnccq879v86f"; "marvosym-2.2a"="pn8zahcj87ab0rgiz9inp97randgz890"; "marvosym.doc-2.2a"="wqd4660d0s4kxgasi3gv09fbjnbqmwsq"; "marvosym.source-2.2a"="zygnnzkxxsfxvhnkvkq4v6gis1k7lc6h"; "mathpazo-1.003"="d950j9d7ywwx0air9b1awwxr0a7486qz"; "mathpazo.doc-1.003"="zna30q1bzd255h9yjnf35ldaiql0b142"; "mathpazo.source-1.003"="0ly3fqq1s2sf0zva0jx3llbwkqjm0jv4"; -"ncntrsbk-2016"="r2sgybivplsnj8iqwd62wr0ixhlc8x13"; -"palatino-2016"="xp5kg58y1lzsqba3bv9dz4f8rqi3xysd"; -"pxfonts-2016"="9lxhr2mzcx8qkbhqgqx3y8a4pyhfad5a"; -"pxfonts.doc-2016"="q0zqikbb5d4d8wma6xspga1k20bjx8dz"; -"rsfs-2016"="c6wq6zd58x1dqi2l6p4ljkj3p30lfh1y"; -"rsfs.doc-2016"="2rq51dizzivym4mjl4x7lhw7mg6xmcgy"; -"symbol-2016"="3w7a6aib8mdrap257pxjw8x39lck4nyc"; +"ncntrsbk-2017"="r2sgybivplsnj8iqwd62wr0ixhlc8x13"; +"palatino-2017"="xp5kg58y1lzsqba3bv9dz4f8rqi3xysd"; +"pxfonts-2017"="9lxhr2mzcx8qkbhqgqx3y8a4pyhfad5a"; +"pxfonts.doc-2017"="q0zqikbb5d4d8wma6xspga1k20bjx8dz"; +"rsfs-2017"="c6wq6zd58x1dqi2l6p4ljkj3p30lfh1y"; +"rsfs.doc-2017"="2rq51dizzivym4mjl4x7lhw7mg6xmcgy"; +"symbol-2017"="3w7a6aib8mdrap257pxjw8x39lck4nyc"; "tex-gyre-2.004"="85dj8qn0i080sa68i5r60y3xd8an1g91"; "tex-gyre.doc-2.004"="vkzy18djxwbw86msmpw66r5jqp4qm738"; -"tex-gyre-math-2016"="z84v3wzsjwjx7b6wnwnpqmz7xy5v2bic"; -"tex-gyre-math.doc-2016"="41g7sn49g1kxa1dmy5vrv0fzk3rd4915"; -"tex-gyre-math.source-2016"="0wkvmjwxy9ws1h9j1rn0j57dah6z9jvm"; -"times-2016"="jjlr4lksbyjb8z2v21yy9ig0w6x246vk"; +"tex-gyre-math-2017"="z84v3wzsjwjx7b6wnwnpqmz7xy5v2bic"; +"tex-gyre-math.doc-2017"="41g7sn49g1kxa1dmy5vrv0fzk3rd4915"; +"tex-gyre-math.source-2017"="0wkvmjwxy9ws1h9j1rn0j57dah6z9jvm"; +"times-2017"="jjlr4lksbyjb8z2v21yy9ig0w6x246vk"; "tipa-1.3"="h92fnvz5cv34vdyrpq52pn79z9lq6s0l"; "tipa.doc-1.3"="s923q6n8h73f74y77cf171xj9w3mrd69"; -"txfonts-2016"="5fbs9mb86nll7k3j9d37p0bfa08b8nb1"; -"txfonts.doc-2016"="80fli8zzv88yh6rbv99dzsihxbrhmxkp"; -"utopia-2016"="cq5h07i2v6n1d5l4x2gjb0qn7594w5f9"; -"utopia.doc-2016"="sla3qhf9ks0020wq82iv1d3mivpbx79v"; -"wasy-2016"="m5fy0m7fkc0rb3alrvy7hv72659szlsi"; -"wasy.doc-2016"="ig05zmll75wy50l3cwpz51cl8p6prpba"; -"wasy2-ps-2016"="rfx65vba7w8kqvmf0ld02ydr7flyl17f"; -"wasy2-ps.doc-2016"="1ac408160y6br39063cswn8ahp2c9rq4"; +"txfonts-2017"="5fbs9mb86nll7k3j9d37p0bfa08b8nb1"; +"txfonts.doc-2017"="80fli8zzv88yh6rbv99dzsihxbrhmxkp"; +"utopia-2017"="cq5h07i2v6n1d5l4x2gjb0qn7594w5f9"; +"utopia.doc-2017"="sla3qhf9ks0020wq82iv1d3mivpbx79v"; +"wasy-2017"="m5fy0m7fkc0rb3alrvy7hv72659szlsi"; +"wasy.doc-2017"="ig05zmll75wy50l3cwpz51cl8p6prpba"; +"wasy2-ps-2017"="rfx65vba7w8kqvmf0ld02ydr7flyl17f"; +"wasy2-ps.doc-2017"="1ac408160y6br39063cswn8ahp2c9rq4"; "wasysym-2.0"="zmiwhd64zrf8fa9v2iqch0ksj81q5r1n"; "wasysym.doc-2.0"="a1qr9h6d7s46a074ckxygm9iwyycbyw9"; "wasysym.source-2.0"="r9iq0wx65zmc2kp7880hw3ws73xb63xf"; -"zapfchan-2016"="4saylq91v4il4ch3cp3lw7dv8x6sf296"; -"zapfding-2016"="6prjnqim0yrvzj1ary8i5761byqi0ca9"; +"zapfchan-2017"="4saylq91v4il4ch3cp3lw7dv8x6sf296"; +"zapfding-2017"="6prjnqim0yrvzj1ary8i5761byqi0ca9"; "accfonts-0.25"="vnff63f9g4z5bsgrila75lr6lhdl3jhn"; "accfonts.doc-0.25"="5v97adjwkwxpy4dgw6qiankxfrlz67ab"; -"afm2pl-2016"="vpay128xrpp8jkhyz6kjah0r4vgm2d4y"; -"afm2pl.doc-2016"="ykgp2g6nl86hqgbkxkk0a57g2bqxq1k7"; +"afm2pl-2017"="vpay128xrpp8jkhyz6kjah0r4vgm2d4y"; +"afm2pl.doc-2017"="6qd9phxcw0pw00z3xp8xqcm8nimmsl74"; "dosepsbin-1.2"="f00pl9rcgapb03h76g4578za2p0awqh9"; "dosepsbin.doc-1.2"="41pqpdppqi9658cacc0zhg72cp1pa00x"; "dosepsbin.source-1.2"="0g1nbmyry93ikcgqhcyg48agnabnzpsk"; "dvipsconfig-1.6"="llmyk9rhvxs90j3jbjrqz76dxxvzdyp4"; -"epstopdf-2.24"="bmp7pw43fdqb16951cwgvj08868dw2n2"; -"epstopdf.doc-2.24"="k3p79k5n5l9maz99ii4j6axqkajvv3bh"; +"epstopdf-2.27"="skajgh4yy7v22v5id7j71x969b38a5gq"; +"epstopdf.doc-2.27"="w27k85cm2c6ia0mh2vdwr1sf32ixmvii"; "fontinst-1.933"="ynk1l44cw00x0cxmfxvn0kwixgnaah4d"; -"fontinst.doc-1.933"="1738sk9zfwj6fs98j2qj7iw1301hbgyl"; +"fontinst.doc-1.933"="hmwfa3i37nrblgr5amgj79lmp2rjzsrr"; "fontinst.source-1.933"="cvbp2ml5kiq35qjnyzbpi8p7h1n5m2l6"; -"fontools-2016"="kyvwv19bifbgd5fp5dklsd51i390p5ss"; -"fontools.doc-2016"="8xx7vwvqm0whj1vq79xhp6yi1z99p2hm"; -"fontware.doc-2016"="gqvg71nvxyvgbkqyajlp31fa04fkwicd"; -"lcdftypetools.doc-2016"="4rs86cpyybrr48bppk19s3sqxyxy202y"; -"metatype1.source-0.55"="infq9kahz9ljr5kk338xbww0g4ifg8cq"; +"fontools-2017"="hrh8pzz614i0hxaw0rlnbz73nhinflss"; +"fontools.doc-2017"="38s99cdyw0r9473cqzapflxqx1iashk4"; +"fontware.doc-2017"="fhpys2nypchp67196m2zgckvy1z8182n"; +"lcdftypetools.doc-2017"="r01isdxwq55a5x2mdr904l0m1gv1bzjp"; +"metatype1.source-0.56"="infq9kahz9ljr5kk338xbww0g4ifg8cq"; "mf2pt1-2.5a"="d57jv2y04fsln3q3znw2qi16j7dfq3ap"; "mf2pt1.doc-2.5a"="gc2i9fp30877ycz5l3wgphwlg9kpfqp7"; -"ps2pk.doc-2016"="nbgga0zmrwkw010iwgdxngwvzayasyn1"; +"ps2pk.doc-2017"="848kr47vj1a62qqajjhy19jdvawynnkk"; "pstools-1.68"="pqsq3y183pf9330bk78l7v42jxiywkga"; -"pstools.doc-1.68"="13plmzij9rj94k5vb6q2796z118dl55b"; +"pstools.doc-1.68"="rrhgvrgw0jjwh91az5m2w57p5pmlf4yb"; "psutils-p17"="g8ci3q98i9cvpw1s7l3mqsv39wqx3gac"; -"psutils.doc-p17"="5rack2s9z5rgq8wb1wbnim6m3fzbmjxh"; -"t1utils.doc-2016"="kkzpmbwxjylggv3xgk0j3h2xsn4bplbp"; -"ttfutils-2016"="hzj3dljvfr9ypzpjgpwxadxf225yi8zj"; -"ttfutils.doc-2016"="nawdsilkw98qwx0zsnsv8vp6dllzvvai"; +"psutils.doc-p17"="rqqrncyk9zsp4dpys7x9i8rwhk5g6y1p"; +"t1utils.doc-2017"="pw6r9p8dy7na42m2xcg7dh88851xqxyf"; +"ttfutils-2017"="hzj3dljvfr9ypzpjgpwxadxf225yi8zj"; +"ttfutils.doc-2017"="ydzjsk34ghbbaxcg7lq1znh3r4xjrw6a"; +"aleph.doc-2017"="jxxnmx8cs1dlr38bzspfh98rp7a2ivsg"; +"antomega-0.8"="jxriw18jifvf24fz8nqql5izp67p8z5a"; +"antomega.doc-0.8"="q9jb5ks7gfxg5gjhkpng5bl0wwbwp2ph"; +"antomega.source-0.8"="l2gs7sapppwxiy712i8vkwfmmc96ch1s"; +"omega-2017"="0v7wvg0vkrwbarcxfnp8k6w09j86y1pv"; +"omega.doc-2017"="zily3hjd30g14zrvj67hdp8nkxk9l5g2"; +"lambda-2017"="ykxajgkmkbqp7l79c4bcm5qg4xnyilxp"; "edmac-3.17"="29h8y4lna3sv0k7wqmbgrb0mvdxwz330"; "edmac.doc-3.17"="il4k6vswcqp00005n0084nf99bwxp809"; "edmac.source-3.17"="90wdkd3rhm8ymi2w9hb64acsy2bzqgg6"; "eplain-3.8"="s7f9x73rzb5yf4b4hh5z74s8fymilfck"; "eplain.doc-3.8"="77i8dzdl4pijzdxmv45nqlj61skvyqqd"; "eplain.source-3.8"="xwq0gc7jb427nf5yjm77gfng5z56bpiy"; +"jadetex-3.13"="79dd0y9m791m62b48pnkyw4352271a6d"; +"jadetex.doc-3.13"="ix7992xnb7xb1789n6d48dv98imfc4m2"; +"jadetex.source-3.13"="3716mhagkrr60rjj9whznfh3v5qwvyv9"; +"cyrillic-2017"="1ydilc1c5h6bzsxd5frnjiaz3vhi06g8"; +"cyrillic.doc-2017"="a5mg6w5509iwaaikdkb4ln43kg8assqb"; +"cyrillic.source-2017"="10264p9pik69h97mjl3h8ah6g4pfdbf2"; +"cyrillic-bin-2017"="h64b7gacxv96hbs0mjxx0s65s4z5znrh"; +"cyrillic-bin.doc-2017"="h5rrz5y4bnd1lqwggi6w78858rz5d7i6"; +"passivetex-2017"="arr43134jllipw1jl9cbrgnnk1gav4d9"; +"ulem-2017"="cissyhv0gisjf9lpwzxm18ffwxmlnndy"; +"ulem.doc-2017"="b2hvc7p6b57q1qqn44pfrchxrb5ybzas"; "lollipop-1.07"="c71n12rvjhafkq26bca7q7hxjy5b9xdv"; "lollipop.doc-1.07"="18wdsl5kq7xwsqhr6v6ldwz66b8xk60z"; "mltex-2.2"="kkc5ssb6rd3f4kig16sc30npjayw4ab2"; "mltex.doc-2.2"="qqr7ia4wp66zgasb8sm0bd0qclw6zn7l"; +"mxedruli-3.3c"="f866q8w776cr7k7mxll72va7zb0avsl3"; +"mxedruli.doc-3.3c"="vhcvl3k5lzb1f0g0ghz1rf3cnsy0cp58"; +"omegaware.doc-2017"="nfj0j0r0afccsyx18v3q10wv5pnl3qbm"; +"otibet-2017"="66pn5bmsfw3d7l1prcr8p5v6w93lqfrm"; +"otibet.doc-2017"="i308lrxhgqi1gpsh5b5961xisbb9i3si"; +"otibet.source-2017"="hspwgiv9bs4ncmy1yi02jw8ghw2lxcpm"; "psizzl-0.35"="qx0mhll90g0l0aqzfsjqbn43gxfincyp"; "psizzl.doc-0.35"="pd8v22iq76j5gkkv9k286yz9i71j8xcn"; "psizzl.source-0.35"="9i1m36bp80bif8k74q7572j311xxbjlq"; @@ -1262,8 +1369,11 @@ "startex.source-1.04"="x6bhcd76532n0sfy3cs74whhyw6gy3p3"; "texsis-2.18"="0mlgxg5a7q80hvpigvz6sl2f6lnkfmls"; "texsis.doc-2.18"="wawynbj4gxlxbcg8wddrwdlicnlhia14"; -"bartel-chess-fonts-2016"="2mdy450109a2lz95qv50y6wxhhif4nr5"; -"bartel-chess-fonts.doc-2016"="xj41i6y3ssxdpqy3j60pdx2scsf3qx35"; +"xmltex-0.8"="0i9h1jakwdh439bi4wq5i4mzfcgmyd8p"; +"xmltex.doc-0.8"="7xl5q081558wnfdyb2r225kckb0wd32x"; +"xmltexconfig-2017"="bm9ibaf0skn5g3ykwpn8gyg8hr80v59v"; +"bartel-chess-fonts-2017"="2mdy450109a2lz95qv50y6wxhhif4nr5"; +"bartel-chess-fonts.doc-2017"="xj41i6y3ssxdpqy3j60pdx2scsf3qx35"; "chess-1.2"="j9hxdp5kz4dv6wwgy6azrw6yjhdq7384"; "chess.doc-1.2"="n9xxs3zgzz1vhl7y1d8qxk4cj8fglhpx"; "chess-problem-diagrams-1.12"="l704rprn6ybj2x2gn469z8zj1kyw8gas"; @@ -1286,13 +1396,13 @@ "gamebook-1.0"="wnylf38d512bq82hi5jwsf9gxdlb9gai"; "gamebook.doc-1.0"="f7p5nzs88ps42vwnhcph7vd36s5xfrxg"; "gamebook.source-1.0"="hgbz9v0wg5kni2lc43yb179b8xqh8mmr"; -"go-2016"="an0cdspxjbbirkz0isbyvknics2pmkmg"; -"go.doc-2016"="17frpsmqhyai4y23xb2zm9qsl18xmynf"; -"go.source-2016"="lw82s14fw0y1yfdhvmmhwy0msyawbcal"; +"go-2017"="an0cdspxjbbirkz0isbyvknics2pmkmg"; +"go.doc-2017"="17frpsmqhyai4y23xb2zm9qsl18xmynf"; +"go.source-2017"="lw82s14fw0y1yfdhvmmhwy0msyawbcal"; "hanoi-20120101"="ini1mf0dqm44vabqlqqiw52wpcx3qimh"; -"havannah-2016"="ypcxnwirfyjp28wypyz8gp6zysb26cn7"; -"havannah.doc-2016"="4spiw588y9cw8vvr2b81qp0q61kfbjjf"; -"havannah.source-2016"="jkbnv839cn0i9dnl2v0v9djp630cdzdk"; +"havannah-2017"="ypcxnwirfyjp28wypyz8gp6zysb26cn7"; +"havannah.doc-2017"="4spiw588y9cw8vvr2b81qp0q61kfbjjf"; +"havannah.source-2017"="jkbnv839cn0i9dnl2v0v9djp630cdzdk"; "hexgame-1.0"="w9isbb0mqra4kkg0cflryikhm172b7yb"; "hexgame.doc-1.0"="5xr1vlivrwzhk0zrb2ri8lfc5n1i3zcq"; "horoscop-0.92"="xw7yniakff9y6f8vsp3rjh9dpx4lidym"; @@ -1302,18 +1412,18 @@ "labyrinth.doc-1.0"="xm6sjrs773g8l7x04m6k16a8vzb8nfd4"; "logicpuzzle-2.5"="7ynzg0ycgp17rqxf4wv3vkxbkwwyh9c3"; "logicpuzzle.doc-2.5"="snzhcidhpnkjwbrb25lb9g18bc13bl5w"; -"othello-2016"="fp9s19jk73qrplyhjnicv8q066a98jli"; -"othello.doc-2016"="q1dqp0zdi9ixxchxnlk60zwfyszbx0ry"; +"othello-2017"="fp9s19jk73qrplyhjnicv8q066a98jli"; +"othello.doc-2017"="q1dqp0zdi9ixxchxnlk60zwfyszbx0ry"; "othelloboard-1.2"="ymadc4vpkzc0lkl2ws340jf5vzjiq1i9"; "othelloboard.doc-1.2"="1vi1lc9c75r9qqrhmjp2j7d7p94asbv6"; "pas-crosswords-1.03"="90v61cxl5ab12bvgnj4k9dc5q6v3zg72"; "pas-crosswords.doc-1.03"="pm76nswngl127k5c2vwm9nwscci1dcng"; "psgo-0.17"="487m1ggdz7a554viflmp4cg2kgdw9ghv"; "psgo.doc-0.17"="cw2v9zzpbmqqw8k8hdq0la2dhdggip3d"; -"reverxii.doc-2016"="2w8l7rs761h556il3d875k0sc86xll98"; -"rubik-3.0"="hihhq6z4ir4x34b1ch02inpnk2n6d3iq"; -"rubik.doc-3.0"="3jaix5apbc5nws8smcfw2872vi2slnkd"; -"rubik.source-3.0"="x1j6imfbqyfm8sv27xd6qkq5lsjnhsx8"; +"reverxii.doc-2017"="2w8l7rs761h556il3d875k0sc86xll98"; +"rubik-4.0"="pq67zjd2psblb2yfnvy3bqxzbsx29f3q"; +"rubik.doc-4.0"="p15d91hwnm9fxkdw8qhjkqck9vq81hdn"; +"rubik.source-4.0"="pfvjcnkrvf3grzj9f0v8sfbhc46mbw22"; "schwalbe-chess-2.1"="jnx18kdrnb81sd144pc1a1w88vy5i5cl"; "schwalbe-chess.doc-2.1"="2n2sk0m2y8q51bps8y2l4b9mw0scc1qc"; "schwalbe-chess.source-2.1"="bg76f4xg21jwq205qw2dg79z72dcjw4x"; @@ -1321,6 +1431,11 @@ "sgame.doc-2.15"="pm7psgqwg5prx0qfj6wh234raqw849wa"; "skak-1.5.2"="1rqlk8zdwjhzzjbd7ns4z1a9mhmf0ki5"; "skak.doc-1.5.2"="2krfcl1wnh40knsnpk775rj6snphih9m"; +"skaknew-2017"="8by6yv9rgn4zbzlq0szcm4yvg8pqfaf6"; +"skaknew.doc-2017"="0p383qca6f0f56skhgvjcwprpb04gldj"; +"soup-1.0"="q2i8ygqvpl9mjmcc41ramm2f51h2hp7v"; +"soup.doc-1.0"="sdh5hcm7sl6slkl45pnahimcbfr7f97p"; +"soup.source-1.0"="qarjlwwpzgr3ih2dskaqa83dy2zdgka2"; "sudoku-1.0"="584gyns58jqsm1ya8l1z63a1wifrgnlj"; "sudoku.doc-1.0"="rsn0w51h0s7j9w988mmh2q455cx7amqw"; "sudoku.source-1.0"="cpylv1bwk5yjjfzx8kfz3nha8yfjj2x7"; @@ -1332,147 +1447,11 @@ "xskak-1.4"="was0g67s4bifg8ykdbf4a53p0g6486gx"; "xskak.doc-1.4"="4jnczqr0bqxchwmaibg5i23vja39hrjj"; "xskak.source-1.4"="x0ab6f461xbcw6k3dydxaif29rdzc0s5"; -"abbr-2016"="n55llxl7fjmx6p1z3ckjfj94dxkg1n0v"; -"abbr.doc-2016"="9lgcwpp4fw2zjx2rsp9w5szi6v2pdsn4"; -"abstyles-2016"="2zmzwsgwh4rv6ysnjjk35cihbifs0jir"; -"abstyles.doc-2016"="xba8x95rimsa16xhr7nziglk7djzv6w8"; -"barr-2016"="rsgsgzki68jgx8d4r05qj1awvi02rm33"; -"barr.doc-2016"="jfhxfjazvlpcvrl6zjd1sw2ghmcsscmr"; -"bitelist-0.1"="22q3ivacwl5p0c8plgg1gjz8413l601b"; -"bitelist.doc-0.1"="n00mlj88l6djwcxzj0l6pxiiba94kpl3"; -"bitelist.source-0.1"="w38ccrprx1rn0pc34mr29bnx7gaxa7k8"; -"borceux-2016"="ls6xjxrggjzphr4pl71m2va9mndh1r7v"; -"borceux.doc-2016"="zdg5n9rxc2sfkyi1am8jka05avi7hyng"; -"c-pascal-1.2"="m4x5kfq1vm6vzv0ic910fqi1qijn7g34"; -"c-pascal.doc-1.2"="v6wqph0gaibfv4cwph5w0axp5sf70m6w"; -"catcodes-r0.2"="haljpnhhzvyhmnda9vgk77md5zm88773"; -"catcodes.doc-r0.2"="4227wyg04xryg33b39d81nlh6aaja1lq"; -"catcodes.source-r0.2"="6ljn2lwg4bzr9c02d01vh0saja9sz9yf"; -"chronosys-1.2"="qswnnwyghvsbjf3ddvbl7nl00qxwhs6h"; -"chronosys.doc-1.2"="m11jpa7crg095qf03qx7gcrvcb41f83a"; -"colorsep-2016"="il1sig8hzmvq8q0hlbh6fir15rrl5zc7"; -"dinat-2.5"="a1gcgwkj0pd1lqdm20356fbjram3wpa0"; -"dinat.doc-2.5"="6dzss5231fdqjzs8j7z4gfx5iga4m895"; -"dirtree-0.32"="xgxmz79hj1q6qyfkdvgj5nm26865dfmm"; -"dirtree.doc-0.32"="im2rhm2fmqk1snrhvrsm112jw1hwcyw8"; -"dirtree.source-0.32"="pyfcid8hir7vvm6fpwimlfgs65dgzfm1"; -"docbytex-2016"="m4jkx2gf05q3ffwfkrk4x9bcwf9f3dmw"; -"docbytex.doc-2016"="01w9mkddxm1l9i12i5n5i5ar81xfn9b5"; -"dowith-r0.32"="vdgkjxphpmycfcsimxih7gnhv58hd9vs"; -"dowith.doc-r0.32"="ql8hdyxcgss7rvlp1913rp52wn4wjvxn"; -"dowith.source-r0.32"="xq0r5c58clz8qzbhz01gv2ph1rs9wg1n"; -"eijkhout-2016"="hdb3ag2knc67ksx39hmax8x83l0d41kl"; -"encxvlna-1.1"="kz3nvz29czk573cxbi5a5l3mbjs3vfkh"; -"encxvlna.doc-1.1"="gv5k36s89g2zslq75s2j7ffvwdiz4lkb"; -"epigram-2016"="0mg36ybg934n4jxgpf88lnvvc0za59ya"; -"fenixpar-0.92"="61jkr83g6i0bqmp0qg4w09gj7gwcdn96"; -"fenixpar.doc-0.92"="95h02nbzq72mmblzawgqsk8530wi1dpb"; -"fltpoint-1.1b"="q48n0d38d8y8m4z6lgmfza4gh1mrzkjn"; -"fltpoint.doc-1.1b"="6ljc5c3g53ig6yj7blcfqy43yvlw5fqf"; -"fltpoint.source-1.1b"="l5ybd1xn6abfhq5kjhvig8zsp721ldzg"; -"fntproof-2016"="bkh1b1j8zlbzmhpif5ji82gwmvg0aprj"; -"fntproof.doc-2016"="hhhxpfkwqpdj0wz78pzg4nbfyzh3j82f"; -"gates-0.2"="awaxppd6dhv239x03vpwy2hn2zwldmna"; -"gates.doc-0.2"="qqmjk1276kdv0rvsv86gi7ysl3warg95"; -"gobble-0.1"="6hlqjaz609rn1q7v2vacb428m3prpdq3"; -"gobble.doc-0.1"="5h4fnic16yz5x517wsfr5l0wna69an8z"; -"gobble.source-0.1"="mxi6gci6g3y41ywya5cq1vrdqzc83jab"; -"gtl-0.2"="qgz26n49hlpc5s3ckkbxciamp1qvii9w"; -"gtl.doc-0.2"="wk69mj67d9nfqvyk3cw2crczk4mnjffq"; -"gtl.source-0.2"="4cza716i596dxxd0byx4jb7xgy6sc4wz"; -"ifetex-1.2"="nwg19z2dwa5jm6s0yczb1kiqdpmgrmx0"; -"ifetex.doc-1.2"="gimfp74mz131q7ldvfbvqscbi9qwk0fc"; -"ifetex.source-1.2"="67xfw4zg52v5m44d1kw6i32rb81k2yb8"; -"iftex-0.2"="3amzn5jjz9l90w90rhrrq75shl1v731z"; -"iftex.doc-0.2"="n514jbc0x2jxsk39lhayr74xpzfgqvn1"; -"insbox-2.2"="n1wbssqq7h2g00jmvy1g9cx2pb8lp8n3"; -"insbox.doc-2.2"="i5c06kh17g5ghsjivlxsipgkd0ab05x9"; -"lambda-lists-2016"="kpvnf57b1s1whhrrrng7j0zvf0cka90v"; -"lambda-lists.doc-2016"="ai0gzwilj0cm1129pl5nlwc9ddsgpchk"; -"langcode-0.2"="6fwjx029l2nalfz81qfn1k7yp0z7iycb"; -"langcode.doc-0.2"="vq8m73ckjicm53q7v8q5k0rhldq55hkc"; -"langcode.source-0.2"="nk07pqb0mfq3vzpdddhb8w3w85svpbq9"; -"lecturer-2016"="4014kfbhxnf4wb9ndfh0qfwbbrvz0wwa"; -"lecturer.doc-2016"="avsvzihsa6jn0abvd4122k358w5sf4y0"; -"librarian-1.0"="5siy7c2xclp1c305vqiayp0n5dzil1gh"; -"librarian.doc-1.0"="8nxz7ac5hdp9820nsfkvhvv0bn55idq2"; -"mathdots-0.9"="6avfq6dlhbqw1i3jrjgcdbdzx2a0w5nq"; -"mathdots.doc-0.9"="syy0i8rjssr81sy26xcx43jbripqx9d9"; -"mathdots.source-0.9"="zpl4xjhcq4hs18hqiyljy3lfyx9xbng3"; -"metatex-1.1"="jidirfi30wf0b4aq279lim2pylirmv3r"; -"metatex.doc-1.1"="b0rgim8d9dns88zvf283czk4zgsvvi3b"; -"midnight-2016"="5zah5lcyxgq6zxdpazqy3lqv7vxl9dcr"; -"midnight.doc-2016"="cl4ff07jfflwqpmbi7d1phc65hvhaif7"; -"navigator-1.1"="0q23aqjf31y78hxmlhx4mf04c95rwdn3"; -"navigator.doc-1.1"="vxgrfimg900qa0ibwpbwcbv63rbaplp3"; -"ofs-2016"="1vqjznrdyjqn6ygq61h8rnwjymkx5kpj"; -"ofs.doc-2016"="8i8acpk75frksj5wshpjpcazbd93whzy"; -"pdf-trans-2.4"="f2qw1mx9qql6xqsnnwcvqx59baz3gzyl"; -"pdf-trans.doc-2.4"="vbg7kp37w1p727nia0p1imyvxhqgzgna"; -"plainpkg-0.4a"="xsvwz9z9f2jirfyzggiv49y0rfmhmnaj"; -"plainpkg.doc-0.4a"="b0c8mi4mr6bjdhrwbcplwjw920l4zmbc"; -"plainpkg.source-0.4a"="lcrm6734c3dv44wqcf4sp1c1aic0vqqw"; -"schemata-0.8"="3qik2nhhwhpgkwnay4rsmglh6kffm1pz"; -"schemata.doc-0.8"="7rggpri0l5pj9rppz8ynd8d6jz0v7ssp"; -"schemata.source-0.8"="qixmvsyiaj3yl78053y2s8xgp8ba06f5"; -"shade-1"="4ywc6gkvkgm5fiq6avik748vzj7f23g2"; -"shade.doc-1"="ax6w6sfryrzmjdff803hp6qfc9x7knkf"; -"systeme-0.3"="z5imn7jxp57sqqh6qhliinmacb8krj3j"; -"systeme.doc-0.3"="p4w018mvrms7kv9q23ff3wq6bjz1a220"; -"tabto-generic-2016"="libhmc3f9mcs93xzi22qhk8nyy0vzv4x"; -"termmenu-2016"="b9z1s2xibg6vcrd5qv1n1zlparqlwf3h"; -"termmenu.doc-2016"="0fqaygp9h3wr9x8ghfkxnsi9w1wfjis6"; -"termmenu.source-2016"="xygav2l9gll238dyqa8126sn9hc1n1w2"; -"texapi-1.04"="4ysk0vfpgxfdkpaag4982k7ni4qkksjd"; -"texapi.doc-1.04"="l2753w2z702418c8shbami8hzdsyz4lx"; -"tracklang-1.2"="6v9dxcrrxw78k5hqcpzdni50028vly6y"; -"tracklang.doc-1.2"="z8krkiscbk7jlhzigyjbhzxfi7g92l6y"; -"tracklang.source-1.2"="d2xbwissg3bpynl63d7rfq7jdwr3bdzc"; -"upca-2016"="hfay60269pv5n1r64q1r9d0lqljih70w"; -"upca.doc-2016"="czzbjifd9bdw0g9c8s2b76sq1cmw3hjp"; -"xdvi-22.87"="k7hd911mlpzg8z52gybrgglkix8jxq3p"; -"xdvi.doc-22.87"="r94flfw1kfqmmsawj2dc89wkfr06jfqn"; -"xlop-0.25"="qmjl0i78m1d4xz6bhjaq4p36wc5pg0jp"; -"xlop.doc-0.25"="m63jci5hk785fjq29p7hr5455gc0np71"; -"xlop.source-0.25"="64yfba0h51w4zrp2ps6x0x3xv9x2i15p"; -"yax-1.03"="7kwmcvp6dlxj4jp0xp599f6469zhwnwl"; -"yax.doc-1.03"="4fh5pdqkifpv1zynkl1ycw0xi817wy5h"; -"apnum-1.6"="sg23pp5g0fk07k7dzrx7s9l5apvpis88"; -"apnum.doc-1.6"="rgdcfmfi5ds10py28mvyb25dld6hisgv"; -"epsf-2.7.4"="55vrh3nmvb5p1nkkpwhrq9glsf64bc3k"; -"epsf.doc-2.7.4"="b78n5gm14qk3brywpz4prglkqnpx9fpg"; -"fontname-2016"="sczdif1wria35c8rn5d5lp89pmwf2qp7"; -"fontname.doc-2016"="d7n633f3c9jagmc0yr7439m681ff4yxj"; -"genmisc-2016"="wyk31w93k04bqfqik1ad1q7bx88m6v4b"; -"kastrup-2016"="qdr5cacl37ans3zd5jlzwr2356xxgswy"; -"kastrup.doc-2016"="mvq3abnsjmzb3kv4c2z116apbzgfh2dw"; -"kastrup.source-2016"="13vj32k48f0ahs5694zrsvk953kxjrwc"; -"multido-1.42"="xvw8537j730srqyigrb1q367g73zh29q"; -"multido.doc-1.42"="qp7jdx0jca995df559f1ji2l32jz2h12"; -"multido.source-1.42"="qc1473wf17ppqxy11xgz226w4d8zrxk8"; -"path-3.05"="gxlifrd0kfxajy8viylk3wsfkycd96xv"; -"path.doc-3.05"="0pbd67di200vghv2a4bp7vwss7bsbkjv"; -"tex-ps-2016"="jnzaqr3pc6a2bfh7jlsysc8hy30cq4xp"; -"tex-ps.doc-2016"="g377qq7n63mqil18vlfgimfd589pa1qm"; -"ulem-2016"="cissyhv0gisjf9lpwzxm18ffwxmlnndy"; -"ulem.doc-2016"="b2hvc7p6b57q1qqn44pfrchxrb5ybzas"; -"classpack-0.77"="dybfkvi6ykzw4s03xgz8r7n88xir9zzb"; -"classpack.doc-0.77"="390v2v6vabq679gr2yqvmyq26x6l6lz0"; -"classpack.source-0.77"="mr188ykwygc0gsznl43vlbx33wa2imyd"; -"jadetex-3.13"="79dd0y9m791m62b48pnkyw4352271a6d"; -"jadetex.doc-3.13"="ix7992xnb7xb1789n6d48dv98imfc4m2"; -"jadetex.source-3.13"="3716mhagkrr60rjj9whznfh3v5qwvyv9"; -"passivetex-2016"="arr43134jllipw1jl9cbrgnnk1gav4d9"; -"tex4ht-2016"="3mawaapvhb44dismhmc026a9mhkvbj26"; -"tex4ht.doc-2016"="hi6p91idcncr8n8hiz6vb4fpwggm1d78"; -"xmltex-0.8"="0i9h1jakwdh439bi4wq5i4mzfcgmyd8p"; -"xmltex.doc-0.8"="7xl5q081558wnfdyb2r225kckb0wd32x"; -"xmltexconfig-2016"="bm9ibaf0skn5g3ykwpn8gyg8hr80v59v"; "adtrees-1.0"="1x6lr97397fgi6gapxaa99m9d1a095si"; "adtrees.doc-1.0"="9rpilrcmiz6js9r3mf3d574aflbbq9pj"; -"bibleref-1.14"="7ckd78aachgynx0h7b6ssrfj34wmnv28"; -"bibleref.doc-1.14"="10xq523fj3v68dwdy3k63zxnbsqc2d1h"; -"bibleref.source-1.14"="cg9pqpxdg8lxbl7i6r8kzxgcp65wlpcl"; +"bibleref-1.17"="iy1di86ln0py3vcb8jrg286m81391a3p"; +"bibleref.doc-1.17"="im96s1905v3bb7ziayp32lgf1ykvfcmg"; +"bibleref.source-1.17"="m44k34q55b94s5mmyrip25gzq0ra5bgp"; "bibleref-lds-1.0"="adlzl3qk74vn1z0zdqn9cm6xqbwd8j6x"; "bibleref-lds.doc-1.0"="cxvgzvgkicpnam43l53vfw9za8gigszv"; "bibleref-lds.source-1.0"="8ndhf2vnjjii0xywr848janqh7xzdhn3"; @@ -1481,8 +1460,8 @@ "bibleref-mouth.source-1.0"="drlwpv0xvyrb259ipq71p68929cmp6ka"; "bibleref-parse-1.1"="ddxzanvw07cnj984ylsmjybwvyl41sg3"; "bibleref-parse.doc-1.1"="jcsy831ih2d4scdsydj4m9mzlyahqlip"; -"covington-2016"="s1fv64s9jz5swxkkg960dfqx37i0wvvi"; -"covington.doc-2016"="xiv3ymrc8s2hdn54qk2j88daikfb114h"; +"covington-1.4"="3jzwqlh20n9m5hw9sgadnh0rqwd5vshv"; +"covington.doc-1.4"="aj2qfrwfmr40i8jisj49911g2hpgg24d"; "diadia-1.1"="p95dkjaf17pn4qm3syrd2wm4680qxa86"; "diadia.doc-1.1"="s8q9nnwajrravg7418bldainfxpm874j"; "dramatist-1.2e"="r8ldaql5igwpsv1bm35jgcgpnlr817m1"; @@ -1504,36 +1483,35 @@ "eledform-1.1a"="34050azcglr1nl4ppvq8f01dffc3hlpm"; "eledform.doc-1.1a"="qdp4sms5cf7wzi1kdm49fgifs3845whs"; "eledform.source-1.1a"="53dda59p3czslircl0a23d1dqfh2r45k"; -"eledmac-1.24.11"="4060zpp37i1dkg0g8vv20fbyryblshzz"; -"eledmac.doc-1.24.11"="hfvjyx4zlfvdgd2fdvmjr5bqrqfqln85"; -"eledmac.source-1.24.11"="58gmmb590i32xkniy30p9kzn2hcpgjgl"; -"expex-5.0b"="f26q32yg6rr36snjiphy6k96qr9jsb7l"; -"expex.doc-5.0b"="8jlksa4dlzalhqw576lvl1l77vb2ckmb"; -"gb4e-2016"="bzbpagrikdh6z5pbs416l090s559v7i5"; -"gb4e.doc-2016"="72mcbwb79gj584p24lpxbvvqj3pbr77x"; +"eledmac-1.24.12"="327rpi6mzwx3h2nln4zra3pnyfnmg92a"; +"eledmac.doc-1.24.12"="3hygl6qp9sf8gnn02p78bny40bnnmgc5"; +"eledmac.source-1.24.12"="kiqy5wz8qyzxxszhf6k37ricjh13asca"; +"expex-5.1b"="xl0jyizia4cwch1z399dl0r5xz4anxgy"; +"expex.doc-5.1b"="a903i8yj7kqr49jf3f40rrf74j4bn1cb"; +"gb4e-2017"="bzbpagrikdh6z5pbs416l090s559v7i5"; +"gb4e.doc-2017"="72mcbwb79gj584p24lpxbvvqj3pbr77x"; "gmverse-0.73"="9cx4zlykh23lwblr7q2hbd8d5dffvw8q"; "gmverse.doc-0.73"="zbq9drljrrh0ms8k5z7ndldilzgd2l0w"; "jura-4.3"="bparkzmzy3lj0ddqiaw3696msam3v0b4"; "jura.doc-4.3"="hzgy1v1yl2yrnvi91j2hbs8jhd1x3djh"; "jura.source-4.3"="0z6qb08mpblnl0jhjx8cmhk0vrciz0f8"; -"juraabbrev-2016"="mb4ikhwg3fjpdrsf8azzvy964gihs0ja"; -"juraabbrev.doc-2016"="i9w4ykaf8q152pc6zag4wykdlfvnkl0l"; -"juraabbrev.source-2016"="9ixz4m7y6cslk2977n0nh792nhqa6l6s"; +"juraabbrev-2017"="mb4ikhwg3fjpdrsf8azzvy964gihs0ja"; +"juraabbrev.doc-2017"="i9w4ykaf8q152pc6zag4wykdlfvnkl0l"; +"juraabbrev.source-2017"="9ixz4m7y6cslk2977n0nh792nhqa6l6s"; "juramisc-0.91"="w2nzviyg6498v4x8vqqp8kc9p2cr2fyb"; "juramisc.doc-0.91"="0yczb9jcva6i9wvkdpwfd0l9c522krnc"; "jurarsp-0.52"="bwldii418vmf3b37gnm56f65bzyjrfhj"; "jurarsp.doc-0.52"="2rqnnrbk56p5i1bi7r9l5y9q8mbdmiip"; "jurarsp.source-0.52"="0gwifinaym6yjkimyf2m3dg10pld0i4z"; -"ledmac-0.19.3"="b5bn57g4dldnpifavq4kl1n3i6ax3drn"; -"ledmac.doc-0.19.3"="86gh96hqr941l2hk01q1jv12xmlzb0rk"; -"ledmac.source-0.19.3"="g8cfs3hrv640ir2n58zjzq0x17cjxvg9"; -"leipzig-1.1"="j4bfc0j26a00gl4f6xg615jqj03biw7r"; -"leipzig.doc-1.1"="acccmkfq874v3bybyqhh49p31lrm0p04"; -"leipzig.source-1.1"="3kixknndj9jc07khwxfa58zywm8yz2hm"; +"ledmac-0.19.4"="kxh78l0ap8zr2rncqg5j4vl7h2f7ajb1"; +"ledmac.doc-0.19.4"="qqziv44yv5fzpk5dnfhjrzdfi4v63558"; +"ledmac.source-0.19.4"="z6n9h86q7yk9rfq87v6ks03b5kqw7cyg"; "lexikon-1.0c"="ifdy5rb6ggar6w643y94y729bbn75h41"; "lexikon.doc-1.0c"="52hidkd52nx6dz7ga1lipv6r9l3kcnnh"; "lexref-1.1a"="4av5iad393sb2vqplzfra63wl1g3pwpd"; "lexref.doc-1.1a"="3nzknrs8c80yxhw9hf0qpzgx3lpj4hsg"; +"ling-macros-2017"="166zs29qcy5bs1ml9bl5q4ydvx15yhlz"; +"ling-macros.doc-2017"="7b31g3wp6vks8b3h01pf2ifnqgr1r1rn"; "linguex-4.3"="srm8cr4dr0s29ydpvwf2mhm5gplgv18q"; "linguex.doc-4.3"="w7jgr0hkj6m368p6x2l3b37m9px04b4f"; "liturg-1.0"="73vvqhnk6ll3ibzl2gk7znkfm57k0286"; @@ -1542,53 +1520,57 @@ "metrix-1.3"="9k344dp2nr280nwyk9h2pl5s0jncil9q"; "metrix.doc-1.3"="y4v418yjxn4c1468i822ms96wlnp1m7c"; "metrix.source-1.3"="bzri3z7xy4k63z4wsy5yri6cfc4m3hng"; -"parallel-2016"="d8gik6iva6h6l2imix4bxb5w9p8j87ka"; -"parallel.doc-2016"="n3dww00ms1a2m3v6fflm637hiazdrqrs"; -"parallel.source-2016"="vkx4q8liyqx0n70dpq6pqv515x1gbr7f"; -"parrun-2016"="3b2gnwqll6qf6x5f6gzh9ym1vsba6522"; -"parrun.doc-2016"="8v8338i5c6lcdgcdcwhfkb0d5brc3n2z"; -"parrun.source-2016"="2bvqjwsq7ngr7n11vnqnwhqzldrb73ri"; -"phonrule-1.2.0"="yj046x5dcl3gfnmyf6nf3z0f27a03f6m"; -"phonrule.doc-1.2.0"="nvdv1ca4qk6h6h0w2n90r87qmlz2i4qg"; -"plari-2016"="nhdf38fv3h24zqq0bzwax05bfvrzmx5z"; -"plari.doc-2016"="i09il1b9f8cchmhc9pj6ndngyym5vd4w"; -"plari.source-2016"="5n2x3k1mf9palhxxlqpqkffd3ms3zrfz"; -"play-2016"="r6ryb6v6svlfv9i9j6r2a7ciks2k53bv"; -"play.doc-2016"="b5kjgd2gvgz5228m98l3lhaawmdfp40h"; -"play.source-2016"="jk04llsraw9d9gl5grvr019rjnkha1h3"; -"poemscol-2.72"="y5xvi7bqj3949x8bwj25777dydk0zyjk"; -"poemscol.doc-2.72"="szj0ga2m9dbs2dpsj1p8q2q4kyky10rl"; -"poemscol.source-2.72"="08a02nsdnqilyr91c32q1snycd7gbw2n"; +"parallel-2017"="d8gik6iva6h6l2imix4bxb5w9p8j87ka"; +"parallel.doc-2017"="n3dww00ms1a2m3v6fflm637hiazdrqrs"; +"parallel.source-2017"="vkx4q8liyqx0n70dpq6pqv515x1gbr7f"; +"parrun-2017"="3b2gnwqll6qf6x5f6gzh9ym1vsba6522"; +"parrun.doc-2017"="8v8338i5c6lcdgcdcwhfkb0d5brc3n2z"; +"parrun.source-2017"="2bvqjwsq7ngr7n11vnqnwhqzldrb73ri"; +"phonrule-1.3.2"="7gxkh4k5g2znwdrrdy394iw08khwnkvd"; +"phonrule.doc-1.3.2"="h353x4isnarn0bja89cb7104n4wda95l"; +"plari-2017"="nhdf38fv3h24zqq0bzwax05bfvrzmx5z"; +"plari.doc-2017"="i09il1b9f8cchmhc9pj6ndngyym5vd4w"; +"plari.source-2017"="5n2x3k1mf9palhxxlqpqkffd3ms3zrfz"; +"play-2017"="r6ryb6v6svlfv9i9j6r2a7ciks2k53bv"; +"play.doc-2017"="b5kjgd2gvgz5228m98l3lhaawmdfp40h"; +"play.source-2017"="jk04llsraw9d9gl5grvr019rjnkha1h3"; +"poemscol-2.85"="dvin112nvf10shz0dffwsmvcbyi0sdcc"; +"poemscol.doc-2.85"="vrssdpn4wp33nr78yqdmdywnjahl9y5x"; +"poemscol.source-2.85"="mzx3063zqfb0dxcc2xqwlm0b1bs076q4"; +"poetry-1.0"="ckm7xicsk5caj917wd5fvhxv7pjy9mpn"; +"poetry.doc-1.0"="7ywichrisj21yrc3h88wrxq1l8amjixr"; +"poetry.source-1.0"="g5aqwyc0r4f1qsnj4lzc2k559jh3knq9"; "poetrytex-3.0.1"="a7a68naj2vngygl078qcy6qpyvgjqp87"; "poetrytex.doc-3.0.1"="d7vp6y5vm8sw1vq3j723ksvivdk3v2a2"; "poetrytex.source-3.0.1"="v4ynl1n0sgg2n5g0ya2ncm7k1fibfmgg"; -"qobitree-2016"="jxxsb3s665887m15a2v9q4ybdzc86x9k"; -"qobitree.doc-2016"="xi15qg62q42sgh4115gp2mcnv7nriwiz"; +"qobitree-2017"="jxxsb3s665887m15a2v9q4ybdzc86x9k"; +"qobitree.doc-2017"="xi15qg62q42sgh4115gp2mcnv7nriwiz"; "qtree-3.1b"="d2wip0zniiihfnm77v0rzd95f4zvf9dp"; "qtree.doc-3.1b"="pzpwi4bdw8sxhmyyx16g59nmi0zj8ijg"; -"reledmac-2.13.1"="50db96br7h8k8z24g3l8dy2al7z4fmkd"; -"reledmac.doc-2.13.1"="vj99pavxcys3b1dqix2qim9vp1vxc18x"; -"reledmac.source-2.13.1"="gn2m39a3454pzbyn590azy4vmm1nb1xg"; +"reledmac-2.24.2"="bcrkllx03w77zwzsr47wi7iqjw844frs"; +"reledmac.doc-2.24.2"="fcbndmjzg92q873xfvia4vnpwfrzyiqi"; +"reledmac.source-2.24.2"="3gd7wvfavb0vv3ma6367v8c8km4kc3sc"; "rrgtrees-1.1"="gijgmkpg84730ywfcangcf301kff14n5"; "rrgtrees.doc-1.1"="l557gafpfn0vm4ajcaynvqf14axn1rrq"; "rrgtrees.source-1.1"="al765qzv8rz1gd9dw672j29q1i27gf2y"; -"rtklage-2016"="j7v1rhi19ly8i5h2j306nvhnhp3wjx8p"; -"rtklage.doc-2016"="02dpc8m2pyxqmpvlls86k2gy0yp8gqyp"; +"rtklage-2017"="j7v1rhi19ly8i5h2j306nvhnhp3wjx8p"; +"rtklage.doc-2017"="02dpc8m2pyxqmpvlls86k2gy0yp8gqyp"; "screenplay-1.6"="c4jv8c3zrqqjp25nxv1wwp47jy26vdd0"; "screenplay.doc-1.6"="7vlv28kmw3pag35r1p9q1mhvz005gwv8"; "screenplay.source-1.6"="88zp5a7raa7ic4474yghk67jj31k3377"; -"screenplay-pkg-1.0"="526jcwcrw60akkjhxnry6d5a7zrpc93q"; -"screenplay-pkg.doc-1.0"="93g2kvshlhib0h5k25dw9rb63rm9810x"; -"sides-2016"="4by0j8k8xj6baip7kdvjr5x3srvz4wbf"; -"sides.doc-2016"="7kcin18x8z42axnrmlqldkzqqbvsjzvl"; -"stage-2016"="1wpd0k36spjfcv2scplqvh5k9cds7m43"; -"stage.doc-2016"="2hjnsmbv7aj48r05wb1gn43r5hlxjlpr"; +"screenplay-pkg-1.1"="567syh6jgvm16ch9hhlirgxav4k424ns"; +"screenplay-pkg.doc-1.1"="gvd3ma5bmmcpiq1jpi8081lcvk6zpfgi"; +"sides-2017"="4by0j8k8xj6baip7kdvjr5x3srvz4wbf"; +"sides.doc-2017"="7kcin18x8z42axnrmlqldkzqqbvsjzvl"; +"stage-1.00"="bi5p7sggcnkfmzmjj4535qbraan5yfdm"; +"stage.doc-1.00"="hwjzdlnzybkv0jvgbldansab25ixggnj"; "textglos-1.0"="lfdr25rxphjmck47gv10zr6dwiwyczla"; "textglos.doc-1.0"="k8945zjmlx6n8szzighhs4fa1z8zc340"; "textglos.source-1.0"="mvxkgnsda7v23v765zh7mzg1fzcn0hdn"; -"thalie-0.8"="zp108xap1cvfjgyw8c2945003bk2i1c0"; -"thalie.doc-0.8"="jpkzqic1i7l6ijg5wnayiz5fkrm1bc6b"; -"thalie.source-0.8"="k8b2w93ghagarwdl3k9r7sbhk5f7py9q"; +"thalie-0.9b"="f2022r23gjdy0pbl4xa72whzciclqwbr"; +"thalie.doc-0.9b"="74w8j84cfkv34jr3xw4lsc7z6vmwfdwm"; +"thalie.source-0.9b"="34xmqafgkjg0si9z84znva7nbhpygvgk"; +"theatre.doc-0.1"="lrajd4fl8ib6kabsjpxjr38pdb2gr83q"; "tree-dvips-.91"="rh2g20j87hg69iym0in6b1jdg5icgina"; "tree-dvips.doc-.91"="5lwva5wns5mwp1yq94pd31q165gianwp"; "verse-2.4b"="ip7glx9gvf1c1ggjvkn1ip1vdxycn7wc"; @@ -1596,29 +1578,22 @@ "verse.source-2.4b"="9yx8ry4p1d0nvzwzh360xa8828mhgfwn"; "xyling-1.1"="rxnynyg4j3xzzh27zb23q4qh3w2gy5r6"; "xyling.doc-1.1"="k41kmgmzw7358f3nhq2ixbxafiq5kir4"; -"ethiop-0.7"="fd4kynb70wkja5fxhi10n52mff3s2a8q"; -"ethiop.doc-0.7"="cabq6vprpklsmzi68af6nb4qiwbrwmzf"; -"ethiop.source-0.7"="yv6pwmbkvahpy2h4vnijnqag2rv09k5l"; -"ethiop-t1-2016"="f73j35aqlr29gmh9k00d3s0jzkmk6zq3"; -"ethiop-t1.doc-2016"="92ly98mz1iim1gfh4cm8hjwc17j9kjhl"; -"fc-1.4"="iyjlb5q55khnp515n1snhpnfrrmfn1pm"; -"fc.doc-1.4"="wd9bn967d6nzzvdrvim470l711v1jkg6"; -"hyphen-ethiopic-2016"="nixwv8azmh1p1av7alhrzbxqqihcgndy"; -"hyphen-ethiopic.source-2016"="dg6qij9y5la6kr6izwb2ap1mih84bcdd"; -"amiri-0.108"="cs1gys4fmdh07y383wgar0qbaz0irwin"; -"amiri.doc-0.108"="k746sdm0f3cb43lnh9va70bd21ksdn48"; -"arabi-1.1"="6z4lwmawzbm63ln0qkpsscv4a0pwnpfi"; +"alkalami-1.000"="v7sl553x9mw57qsnh66rf7mba26h6m8x"; +"alkalami.doc-1.000"="kg4kz16hp3sylfwrprr4ilc2y4rzrji6"; +"amiri-0.109"="0mhv35551dzldy7dqrqjzais3lbsyb0c"; +"amiri.doc-0.109"="q1jnsnvi8rdpyf5agv8hwmffjrfk2igw"; +"arabi-1.1"="rr1si2q0lih2l2qpascr4kyzy313zyba"; "arabi.doc-1.1"="cpsn1fgrlivbwqb4n9qrpq3q69kdy3nj"; "arabi-add-1.0"="djln5r1i53rqvih7wp016j8ga2wqc7dn"; "arabi-add.doc-1.0"="vwbgh52x3yh6yxhfx6p7m0ljmsrmr4qz"; -"arabluatex-1.3"="cd15byj4sl9i2b6lmywy8q9bssm398jv"; -"arabluatex.doc-1.3"="wn5d0k51clvmilknw8fsv3n6fq53wnyz"; -"arabluatex.source-1.3"="vljdnblrklhc1mza0kdbii7n0c1xwkln"; +"arabluatex-1.9.1"="wp27y4y9gjpjjwsizx7i8ybyz0ckzg0n"; +"arabluatex.doc-1.9.1"="yq37z6xwsfsb0mdlll0sc5yajacpfqhm"; +"arabluatex.source-1.9.1"="a8q032cijlf0157a0d21ivl44s0h6wcx"; "arabtex-3.17"="fr7avfkwpdbx619kq7h1y31bx4nmkp5v"; "arabtex.doc-3.17"="b5ng3w5g40m9c3x87nih862msx5nw292"; -"bidi-19.6"="s3hxsfapbfi2bdcl0570dmykzcnqh03a"; -"bidi.doc-19.6"="xpirv3r9y768bx1h3h4j7gi9j8y51vhk"; -"bidi.source-19.6"="apgl35xa1lg8gv02b7bs1ixm3vabdp91"; +"bidi-31.5"="g7m4mcpa5yi2mc0m2fzbyx6n3ax2127i"; +"bidi.doc-31.5"="47rszl3fr8isw36dqvxmkly9f4c3pah4"; +"bidi.source-31.5"="mmwicgbcdklawzb7h1mnbjw5xddzaygv"; "bidihl-0.1c"="kwa5li9yi8wb452g12y2h0ar6lpqdmmr"; "bidihl.doc-0.1c"="558l7z4b7giwqqzj5496r7nkzv1wrnqq"; "dad-1.1"="yq0xfr4sfvvwzsi9crp6bqagcbnz7lkx"; @@ -1628,215 +1603,242 @@ "imsproc-0.1"="ylf3kd1bc5rafzfyil4y7wxp6vd9nsm3"; "imsproc.doc-0.1"="3kv8qk7pnfg2w7xm3lqcimi8vhx8jwf8"; "lshort-persian.doc-5.01"="hba2q0ni1c873gpg2qp835csinw78yi8"; +"luabidi-0.2"="8af0f67k7hj72wsfrxxdxzl1p39byasy"; +"luabidi.doc-0.2"="9fdkj79aasj5vskrqqnr7c9zdy8vb8c7"; +"na-box-1.0"="vfrchq5jqb5s18zgngk2qsb0svmnc7p9"; +"na-box.doc-1.0"="7s4wcsg6khlv2lgakqgph9livd38fil9"; "persian-bib-0.9"="sakc18mdqnzymfvgkwsxvrjd9b5a7dqm"; "persian-bib.doc-0.9"="q8vjf93qjdkm6qz099464mwdl4w4gjqi"; "simurgh-0.01b"="n8bv87n12x5xv3h41487vyqpbigv3qkc"; "simurgh.doc-0.01b"="z3qq4jx25qyxqmnfbpsdsayi59fkaff6"; "tram-0.2"="7wcas9syxfvm8pc7wnp817zd9y4q941l"; "tram.doc-0.2"="ppbq1g4k1swjv7y9qkqhcr0m25knssk5"; -"arphic-2016"="zfax00567h7mdlfkpxihy379cwqmy8ng"; -"arphic.doc-2016"="55lcjk7s78qa39dqd0wj0za5f6hcnkxd"; -"asymptote-by-example-zh-cn.doc-2016"="czm77scbklkpdjgk93w1g8ilchpx3vpr"; -"asymptote-faq-zh-cn.doc-2016"="yzyywm1hv1hs9ngddhdgk7frrpnrbsr8"; -"asymptote-manual-zh-cn.doc-2016"="86bz3am5w7xx9si2a09s432xh882ix9a"; -"cns-2016"="3m0fbs91x53iiqvzl0hs68cks7y3m3q7"; -"cns.doc-2016"="1ddyimvshda2zf3mcs6rk1n4py2aglfq"; -"adobemapping-2016"="k1wb93my2d3ps88i5j1s69sc9pbdc1dq"; -"c90-2016"="jfyd605szid7j3a757fihxhlvaqvprdd"; -"c90.doc-2016"="1v14l7vqrdbc6nhg2k2gshq7p7cqzyk7"; -"c90.source-2016"="l4kfmrrqbnq3y6xbs0izdccvikpsw314"; +"xepersian-19.3"="r6419pwmmpwjbvayj99gxnn4jbarvk12"; +"xepersian.doc-19.3"="30ar997ynv45vmkw5fkmpm9akascg7h0"; +"xepersian.source-19.3"="przaraj7wpvszh9iw1n2lxay382s7j4p"; +"arphic-2017"="zfax00567h7mdlfkpxihy379cwqmy8ng"; +"arphic.doc-2017"="55lcjk7s78qa39dqd0wj0za5f6hcnkxd"; +"arphic-ttf-2017"="s5kckgwzz84bm3px9cmnw2zgvmaq27yh"; +"arphic-ttf.doc-2017"="s7y95hay8ygbb1viv250vkzf0wbm9s3b"; +"asymptote-by-example-zh-cn.doc-2017"="czm77scbklkpdjgk93w1g8ilchpx3vpr"; +"asymptote-faq-zh-cn.doc-2017"="yzyywm1hv1hs9ngddhdgk7frrpnrbsr8"; +"asymptote-manual-zh-cn.doc-2017"="86bz3am5w7xx9si2a09s432xh882ix9a"; +"cns-2017"="3m0fbs91x53iiqvzl0hs68cks7y3m3q7"; +"cns.doc-2017"="1ddyimvshda2zf3mcs6rk1n4py2aglfq"; +"adobemapping-2017"="dx0wf18v0mzip5237353hcgqnsvglkam"; +"c90-2017"="jfyd605szid7j3a757fihxhlvaqvprdd"; +"c90.doc-2017"="1v14l7vqrdbc6nhg2k2gshq7p7cqzyk7"; +"c90.source-2017"="l4kfmrrqbnq3y6xbs0izdccvikpsw314"; "cjk-4.8.4"="zdw3lfngj5zg5d118xjndaj5gg7r0wy2"; "cjk.doc-4.8.4"="rlwcxn7lnyxc28v9gjscp3p7p9mgzwhs"; "cjk.source-4.8.4"="i9g2nbr71gnvx71a55aj07qrgw67vhs8"; -"garuda-c90-2016"="d9m07vl6glf3zjb44whqb3flsirwwcx1"; -"garuda-c90.source-2016"="rjy95hqlvbds6pn29r26kh8sshxnd21a"; -"fonts-tlwg-0.6.3"="63j0k5x00c9ajw5spz3c7gs159lpjc6a"; -"fonts-tlwg.doc-0.6.3"="n5388643xf206hj2mm9msw06mfa3kpy3"; -"fonts-tlwg.source-0.6.3"="kllrh73pzkjlx090wchdq2zzfcm1c0lq"; -"norasi-c90-2016"="d0972qmh7nk9isx54d46f7jscg6mwcrz"; -"norasi-c90.source-2016"="f0z1ppqy8szazpnwmg2ml8cgasdf5ivs"; -"uhc-2016"="viphfgiqfb1w9kb8103znmzy09n6i45n"; -"uhc.doc-2016"="hp3z13z2yxkrgr7z3qa8pyf4d98rd37z"; -"wadalab-2016"="cpc689ywzaqil8xz78nkzwx30qmqixh5"; -"wadalab.doc-2016"="9gjsw3c2hlxnc1wxvky9mmqi6dyq4i9j"; -"cjk-gs-integrate-20160115.0"="a3qlz5ajnhb5d5s9pk3bazmvq63cbcxa"; -"cjk-gs-integrate.doc-20160115.0"="fw3h6jrprbp2aqbzxwb5szh7hcsr363x"; +"garuda-c90-2017"="d9m07vl6glf3zjb44whqb3flsirwwcx1"; +"garuda-c90.source-2017"="rjy95hqlvbds6pn29r26kh8sshxnd21a"; +"fonts-tlwg-0.6.4"="haf1gakfkncsdh7wgi80mq1115fj5333"; +"fonts-tlwg.doc-0.6.4"="m3ryi6hz0zg69vhdxcfwrq2chpvkxqbq"; +"fonts-tlwg.source-0.6.4"="s00vd0mdjbfz481jl5p1qy8akkypj7kb"; +"norasi-c90-2017"="d0972qmh7nk9isx54d46f7jscg6mwcrz"; +"norasi-c90.source-2017"="f0z1ppqy8szazpnwmg2ml8cgasdf5ivs"; +"uhc-2017"="viphfgiqfb1w9kb8103znmzy09n6i45n"; +"uhc.doc-2017"="hp3z13z2yxkrgr7z3qa8pyf4d98rd37z"; +"wadalab-2017"="cpc689ywzaqil8xz78nkzwx30qmqixh5"; +"wadalab.doc-2017"="9gjsw3c2hlxnc1wxvky9mmqi6dyq4i9j"; +"cjk-gs-integrate-20170624.0"="6fvwwbz5k5fcy1fy7c0527dxx1yisvb3"; +"cjk-gs-integrate.doc-20170624.0"="h2m9dpagvafh81r8pz92jwjxvzlkmabn"; "cjkpunct-4.8.4"="8hwj54qw1xrvs5bn8bncdynich00d0ss"; "cjkpunct.doc-4.8.4"="c8wmkh6h45an46jqph2s9ljbgfyw1mf9"; "cjkpunct.source-4.8.4"="0qfm89f4l8jfmgimhrh8vvskca0d866k"; -"cjkutils-2016"="8w069zvnnpkr2qcmsqxh6p64db57b82g"; -"cjkutils.doc-2016"="8g8smldqy9pcaawf71vwlmn42ilxm6i0"; -"dnp-2016"="jf1zsbg60d074ksrz0xk9ihybbabda1f"; +"cjkutils-2017"="8w069zvnnpkr2qcmsqxh6p64db57b82g"; +"cjkutils.doc-2017"="lrnnk0nr0bmijyn0817jvmmbgzi7jmwh"; +"dnp-2017"="jf1zsbg60d074ksrz0xk9ihybbabda1f"; +"fixjfm-0.6"="4hncyzsvmsb3b22qyd3k9b862rxg9rr5"; +"fixjfm.doc-0.6"="grq5h3vchbliqx7zjvj5mb3dk4f0lipw"; +"jfmutil-1.1.0"="pvqsmrs8c4y1xak1gq06021ai9qi4zmf"; +"jfmutil.doc-1.1.0"="5bl3kq493w6xkz0hxz4izz89qv1z0a10"; +"pxtatescale-0.4"="psd9rlxh4i4rqxgii61r2s43sqy3kibx"; +"pxtatescale.doc-0.4"="bfd49446kr82v3h06mq5hsm1ji2jwzck"; "xcjk2uni-0.6"="m5sash3j9q3zpbgqia4zm95nvayrrc4w"; "xcjk2uni.doc-0.6"="a6h7x2drbavppgrj2mzw2z9k4dm1pzd0"; "xcjk2uni.source-0.6"="wjass2mkxvv3k067b6bpmjz4m7lswdk2"; "zxjafont-0.3"="i9wmw8gl8rdqj2jyngwpq58cb9rfm4k1"; "zxjafont.doc-0.3"="xb1hihnd54i9sdknskskmiaz3kp6rzh7"; -"ctex-2.4.2"="d2xgsig85rwfp7vm90k0pvzh7b6m1a6m"; -"ctex.doc-2.4.2"="a36w3cg1qw7cz3hfwcgnbldhbs270lvb"; -"ctex.source-2.4.2"="c72433ss2h6w7nfqq6a7psf9v0gc1xh9"; -"ctex-faq.doc-2016"="vjxcdrg7i6p9fgrgzfvykibjghpigrz3"; +"ctex-2.4.10"="dfgbbf23yvab0m0cj9hvdcm6f128nfx3"; +"ctex.doc-2.4.10"="007xy77dhxgaa44j63nq3cpcyqvy67h1"; +"ctex.source-2.4.10"="vq0sd0jj1hpzdyjlrk9p9xrgwz1ccdpi"; +"ctex-faq.doc-2017"="vjxcdrg7i6p9fgrgzfvykibjghpigrz3"; "fandol-0.3"="lxnjp8m4fcj3pv2hnhib6gjdh90q1ncz"; "fandol.doc-0.3"="fm0ac37apm0dh1073lp1frja9xbsrv4l"; -"hyphen-chinese-2016"="bb5vy7sg5vdimz5zy225syns093jv15g"; -"impatient-cn.doc-2016"="8k1gcnqs5gghbarikj17ykh4vgahpqbw"; +"hyphen-chinese-2017"="bb5vy7sg5vdimz5zy225syns093jv15g"; +"impatient-cn.doc-2017"="8k1gcnqs5gghbarikj17ykh4vgahpqbw"; "latex-notes-zh-cn.doc-1.20"="qx777fwi8k06qvknnll3crc1j0yvraxs"; -"lshort-chinese.doc-5.0.5"="r2afk3zy2mgv4qg9rjqc8q1j2hy2l56w"; -"texlive-zh-cn.doc-2016"="fiwldjr3g6ig8azl4xi3p4xqpkkaj71x"; -"xpinyin-2.3"="6s94myl9fscrkahcgijkhnj2d7gh5kgq"; -"xpinyin.doc-2.3"="qlm6im1c243s4g5kkjpja79l6zdqx2jd"; -"xpinyin.source-2.3"="6nfnsdz238cfnw5913c40nkf46ddpjrv"; +"lshort-chinese.doc-5.10"="sx5wrymrq7scy12pharmnk0rik4i2c05"; +"texlive-zh-cn.doc-2017"="qafxi9mqhiwrcybpljlxz8jkswxf55h1"; +"texproposal.doc-1.4"="8fnrxmyg4wd11kmdh4jw8l1313h0sgqr"; +"upzhkinsoku-0.2a"="wm6azc59isvwpfkqkiy7d9cqwqg76538"; +"upzhkinsoku.doc-0.2a"="xxm1dd5z6l1ggpzs5m8zdk50cjqfn8bg"; +"xpinyin-2.5"="wdxg0njahylmbgzx1lq9v5wm21xm3pyg"; +"xpinyin.doc-2.5"="p6agjiawiaz82yp2ji0599350iv11mbm"; +"xpinyin.source-2.5"="qjx432y45n4y8glikv9dr7lp7n4zk5cx"; +"zhlipsum-0.4"="brgff2c90nff1fvk76zi1krg4ryan1w4"; +"zhlipsum.doc-0.4"="126m738q4x5iha0piwql8n1x5jfgakws"; +"zhlipsum.source-0.4"="wsaszl2w0yq4pfyszylf5nb5j9p1syx7"; "zhmetrics-r206"="2li2anrf74242blfd59cxfyn13iwmfxs"; "zhmetrics.doc-r206"="njh801caaxkfyw5nsfv3q36gkcql14pj"; "zhmetrics.source-r206"="ls3gazkf44sdal0f0k8n46ml2fgigfsm"; "zhmetrics-uptex-1.0"="d3r2n6ndjd8zsmlq4hgm1x3gvyvrfnc1"; "zhmetrics-uptex.doc-1.0"="qqzvr4mf5fg5r8bg6j87yk94nznhrscl"; -"zhnumber-2.4"="6r4hyip11nlfidviq69am27mhxxrmjk2"; -"zhnumber.doc-2.4"="9jldh03zd4z1xihxb5d8ads1q29h4cj8"; -"zhnumber.source-2.4"="j2li7vixsi7873v8fjv57n1ckbchkamx"; -"zhspacing-2016"="p7w7cisgid16ndk1mipdmpn5v7nc1kzf"; -"zhspacing.doc-2016"="kjnyalnxmb2f0kj8w52nvm97a9m1dfsa"; +"zhnumber-2.5"="c5w1kfy838x08ivpffl2rb0wbaw7nk73"; +"zhnumber.doc-2.5"="vhdjrv5xiim959pli8a8073g34gdf5rh"; +"zhnumber.source-2.5"="x1x7qcfbz6v0lcipa1cjs5ba8q88aw5j"; +"zhspacing-2017"="p7w7cisgid16ndk1mipdmpn5v7nc1kzf"; +"zhspacing.doc-2017"="kjnyalnxmb2f0kj8w52nvm97a9m1dfsa"; "babel-belarusian-1.3h"="qklajmxksgpl95fy5ip730lqflw4bqka"; "babel-belarusian.doc-1.3h"="vpg2ygixw31mg3gk42sqr0f2m7bmwdcx"; "babel-belarusian.source-1.3h"="lnz94hc62fa4yq83kb1s3y8qrvwyrxds"; "babel-bulgarian-1.2g"="4c5cdn8lijfw1qhkfz69pvlvl2hcg5hz"; "babel-bulgarian.doc-1.2g"="pyikwcg47yj8nh416g6wdzwk7a7f460p"; "babel-bulgarian.source-1.2g"="km3vz4iykb1pckz9bgllgd6xxc77k2c9"; -"babel-russian-1.3h"="7lcvbhgq9z3x4zjkylpvsjk1crk17mss"; -"babel-russian.doc-1.3h"="6yjz7sskbvxs749rdji9ickq8z72xzan"; -"babel-russian.source-1.3h"="vjfnvy6qm0sdqf7j3lzr3m390q2qz46p"; -"babel-serbian-2016"="8acj740xh1syd4ch9jpfkpx3sclddqw4"; -"babel-serbian.doc-2016"="5jh97wmn4nhjbwaxdbrazk4dxsddx9q2"; -"babel-serbian.source-2016"="fcwf73qgjrdrc2vhzkhiaf7kj19n72vf"; +"babel-russian-1.3j"="chw7lj98rp10jkin4l03d1gx12a8ki5h"; +"babel-russian.doc-1.3j"="i56cj5h3h40ml8an2sbbj8dzyazacwd9"; +"babel-russian.source-1.3j"="cnwygpq3mb5y2araady6kr86wl2bbgdn"; +"babel-serbian-1.0d"="8acj740xh1syd4ch9jpfkpx3sclddqw4"; +"babel-serbian.doc-1.0d"="5jh97wmn4nhjbwaxdbrazk4dxsddx9q2"; +"babel-serbian.source-1.0d"="fcwf73qgjrdrc2vhzkhiaf7kj19n72vf"; "babel-serbianc-2.2"="prhig05xnqc5hqqm3hf0bjhv2qzj02yw"; "babel-serbianc.doc-2.2"="w6d72ix2a6gk6zcxbrx5nm9rin7b6i20"; "babel-serbianc.source-2.2"="lp9zcsmpqk0l5ai17wy4cwbivyq2703w"; -"babel-ukrainian-1.1l"="kpr5104ghbnxcvr4vfv3s6zx7nwx5yvn"; -"babel-ukrainian.doc-1.1l"="bpnckmkny20arqw13br8bglmbvdpfsn0"; -"babel-ukrainian.source-1.1l"="wri5g10m0mpiicdw7m696pa8kj68b70s"; -"churchslavonic-0.1"="cwm6df50pmwhhzjkckhfxbf83yfzi4la"; -"churchslavonic.doc-0.1"="xa2vdbaniy85pa88a11ybmcwixfqiph0"; -"etoolbox-2.2a"="9zfdrr4mr3rjp9ckg8hhf3xfy6042q5m"; -"etoolbox.doc-2.2a"="9yxfzhjj70xd3xwdnqsv30qxkyjn3wnz"; -"hyphen-churchslavonic-2016"="k5mb2wlfjnyc4yxy2mga6wm7wkgxsm08"; +"babel-ukrainian-1.4b"="vmv1lxsnmg5dhwqckbl4hpn9pdpb2v07"; +"babel-ukrainian.doc-1.4b"="jzr6ygkv7vm6nh89yayid5v8n6zf09jj"; +"babel-ukrainian.source-1.4b"="z01cvvy9id3bazmrp4k9qafmmf83zhwm"; +"churchslavonic-0.2.1"="5pgxy858w0nr769mn4g6832fc0687vfp"; +"churchslavonic.doc-0.2.1"="pz4wqhar8vfzyy8aw4szas78hqs018lw"; +"etoolbox-2.4"="yhk13blngmpksskhcyc35sf6qs761qz8"; +"etoolbox.doc-2.4"="rkmvzzz31gf3q83niyn74bf1k2xa2mpz"; +"hyphen-churchslavonic-2017"="dbbg7zzqhy49qgvklp1kakaq1w7grpff"; "xcolor-2.12"="d4hv07lqr1p36mkph8s45w93ykk2i0jg"; "xcolor.doc-2.12"="50k9wrkrb7gaf8dhpq4gbsbyfpbm6dz6"; "xcolor.source-2.12"="zgpsq8x4n6m23a9d1m5m06davpxv76id"; -"cmcyr-2016"="ba4hsn5a22k73rhiaip6dv560wk5sxv1"; -"cmcyr.doc-2016"="1j63xbl85z8izha2jl2klagny3hk5wf3"; -"cyrillic-2016"="1ydilc1c5h6bzsxd5frnjiaz3vhi06g8"; -"cyrillic.doc-2016"="a5mg6w5509iwaaikdkb4ln43kg8assqb"; -"cyrillic.source-2016"="10264p9pik69h97mjl3h8ah6g4pfdbf2"; -"cyrillic-bin-2016"="h64b7gacxv96hbs0mjxx0s65s4z5znrh"; -"cyrillic-bin.doc-2016"="wa6xkjd4q7b8i5lq3qpb23gmv6qi2k4s"; -"cyrplain-2016"="dh1vcz2wdwddkjdqihpc2rlsqjzm4cmm"; -"disser-1.3.4"="8c9m2p2lzr2qhdlqh96aifi1pajkdvzn"; -"disser.doc-1.3.4"="w8a7chm6g13zl2p3nywnrqqi3rjd2138"; -"disser.source-1.3.4"="a5rjx5mq43blavlxg1n8ih6g5y481ql6"; -"eskd-2016"="63ack7kfjg5gf6xv76yfla2z0k9cxzv7"; -"eskd.doc-2016"="g3wsmrvwfz2lm30w2fys9md9nqv5k8jq"; -"eskd.source-2016"="q70i7jl8dkf9vakj558fgwqfbn8230q0"; +"cmcyr-2017"="ba4hsn5a22k73rhiaip6dv560wk5sxv1"; +"cmcyr.doc-2017"="1j63xbl85z8izha2jl2klagny3hk5wf3"; +"cyrplain-2017"="dh1vcz2wdwddkjdqihpc2rlsqjzm4cmm"; +"disser-1.5.0"="m0gldqzdx2idh4ivy43jd13fgmgcsr94"; +"disser.doc-1.5.0"="6s5g533qr53rg2ha6a7p7xr4phcn11iy"; +"disser.source-1.5.0"="h4f1z0azxfnbv1cba1f8z5wfy25hfvg0"; +"eskd-2017"="63ack7kfjg5gf6xv76yfla2z0k9cxzv7"; +"eskd.doc-2017"="g3wsmrvwfz2lm30w2fys9md9nqv5k8jq"; +"eskd.source-2017"="q70i7jl8dkf9vakj558fgwqfbn8230q0"; "eskdx-0.98"="b2dx9jv2rg97hmlf3gx4h4l3ci16chr2"; "eskdx.doc-0.98"="l1r5bapnlsz61yasg9gyrzp6za8iw0nf"; -"gost-1.2d"="zijb6zxnq6aa226jp0zf7374arpsrg9i"; -"gost.doc-1.2d"="f8nd6zjvmkqlrvcx2g63h6nzvgfm5gqr"; -"gost.source-1.2d"="x3zwj9rz8kybdi0rsksljcn9jv7z29qy"; -"hyphen-bulgarian-2016"="3vs5k6vh44rjp1vi541gvl6qizmlp7yw"; -"hyphen-bulgarian.doc-2016"="73rgmlh3pbp2b534ln4avz8knspyjzhs"; -"hyphen-mongolian-2016"="x0q9kl6x25slrxdmm64b2j8ah7k83krm"; -"hyphen-russian-2016"="36r2dwl04v8yv5lci4gasyr2ylw9x6fa"; +"gost-1.2i"="i4ymhad9kyybwc4072yhc204pr9hfw3p"; +"gost.doc-1.2i"="vwsvpn0p9d4888107r2qj7rghl3l50xg"; +"gost.source-1.2i"="fawqr3q9mk5ki6qgqzv3xa4kz5ak2srq"; +"hyphen-belarusian-2017"="rzsbxs89fqwqp7dsqpmqw13lj0bl3bd4"; +"hyphen-bulgarian-2017"="3vs5k6vh44rjp1vi541gvl6qizmlp7yw"; +"hyphen-bulgarian.doc-2017"="73rgmlh3pbp2b534ln4avz8knspyjzhs"; +"hyphen-mongolian-2017"="x0q9kl6x25slrxdmm64b2j8ah7k83krm"; +"hyphen-russian-2017"="36r2dwl04v8yv5lci4gasyr2ylw9x6fa"; "ruhyphen-1.6"="3d6lyf95cgi2yc8lsy9dz6z5vmvcx1l9"; "ruhyphen.source-1.6"="i6x3fiidyvl2zkly1p4s7qzgzzza1in7"; "hyphen-serbian-1.0a"="8mn7gqfqnbhpsszhg3048qrf2ar1vkch"; -"hyphen-ukrainian-2016"="fsqvhakdhhcnwz2ld469n9g38iw4nad5"; -"ukrhyph-2016"="l60kvxf1mii3imnl0swqskcrz0bizb5v"; -"ukrhyph.doc-2016"="4mycq4cykkinm5h946xmrng59jghvbp4"; +"hyphen-ukrainian-2017"="fsqvhakdhhcnwz2ld469n9g38iw4nad5"; +"ukrhyph-2017"="l60kvxf1mii3imnl0swqskcrz0bizb5v"; +"ukrhyph.doc-2017"="4mycq4cykkinm5h946xmrng59jghvbp4"; "lcyw-1.1"="0bxzb7w4z0w04b9c1cvak8i2cp3f4h74"; "lcyw.doc-1.1"="5kk74h4902f2zjlid26h1rg3fvw0sq9z"; "lcyw.source-1.1"="3jq3gmm85lr494mm8j61z7shr3c11jg5"; "lh-3.5g"="h0kq2pb7iay15i1b3sjx3q2yk63pycp7"; "lh.doc-3.5g"="xzbkgxqjzbr2cx6q5xqqzgynk25jvkvh"; "lh.source-3.5g"="mh8zzabsf553ml0al618ycym6igh9qyg"; -"lhcyr-2016"="3nj4zxpcahn2ryz47v7nh4k05j1lv6di"; -"lhcyr.source-2016"="kvid1h3vgbzmpn65sdjs0b8dspm5xvyh"; -"lshort-bulgarian.doc-2016"="r2yc6zzq44wddndp762a3hg78ihv013l"; +"lhcyr-2017"="3nj4zxpcahn2ryz47v7nh4k05j1lv6di"; +"lhcyr.source-2017"="kvid1h3vgbzmpn65sdjs0b8dspm5xvyh"; +"lshort-bulgarian.doc-2017"="r2yc6zzq44wddndp762a3hg78ihv013l"; "lshort-mongol.doc-4.26"="5pj0i8wxlyd35sd3z7npwypicklc0nl3"; -"lshort-russian.doc-2016"="d2sgyyi8aic1j35fqrniim2bcpgk4q0a"; +"lshort-russian.doc-2017"="d2sgyyi8aic1j35fqrniim2bcpgk4q0a"; "lshort-ukr.doc-4.00"="4g85cmgwa4y64rbc51zdw42m2f3m55ps"; "mongolian-babel-1.2"="2bjw94a6r5wyn2i5gsclrn5fadh60jfg"; "mongolian-babel.doc-1.2"="darkanaxxhcx7r7nd4mph37m3r29y7gl"; "mongolian-babel.source-1.2"="cfdxndayfrj10xn000ckxhiaa1qdvypd"; "montex-IVu.04.092"="ig3y6y6vksci0567g91hkgf8pkn5x56v"; "montex.doc-IVu.04.092"="phm1049anhqvppklp4cwczfadjmakda3"; -"cbfonts-2016"="bzgl9s6zv9fqpg5m9gicxmpscw7m3z1d"; -"cbfonts.doc-2016"="6cj35wgyk4ss36wc0szhfyqcj3diyd50"; -"cbfonts-fd-1.1"="r5h2xhylssxazjrrx83zmgvbacwvjs0p"; -"cbfonts-fd.doc-1.1"="kafqyi78qi6dvib1cy4wr2c4pwf8h7hk"; -"cbfonts-fd.source-1.1"="5mxfnqh7jv38jgda9klsg3fd1avd11qg"; +"cbfonts-2017"="bzgl9s6zv9fqpg5m9gicxmpscw7m3z1d"; +"cbfonts.doc-2017"="6cj35wgyk4ss36wc0szhfyqcj3diyd50"; +"cbfonts-fd-1.2"="mybny72ksiflq3lq2y23059lzxidwz70"; +"cbfonts-fd.doc-1.2"="rsxf6gy62snszkcpdzry9gy44falx6ml"; +"cbfonts-fd.source-1.2"="73f27d7a4c2frvvhp1r2z4ia84qrh1cw"; "mpman-ru.doc-1.004"="6l3vqm4sxcvb5nxy582g2nbr9mwvz1dz"; +"numnameru-2017"="c3fn4n2asbh2lqrn9y44g6yxad9f7469"; +"numnameru.doc-2017"="ibrlw13zibhvhr8mipw7hs2ik1f96z73"; "pst-eucl-translation-bg.doc-1.3.2"="cqxppyh4546ybhnlk1z4fjkdyw9ij5x7"; -"russ-2016"="981kkq2xmx0r6k095308270hjvmdsm3h"; -"russ.doc-2016"="878fl0cyka7jj5cvdvq19fvlfic3izi9"; -"serbian-apostrophe-2016"="q4n9k2fn70hxcf9chy6a5jw07pq2cllp"; -"serbian-apostrophe.doc-2016"="0yxbbv3xz0jf63g0kvq5dbdv2myc4rks"; -"serbian-date-lat-2016"="3s5yc0xcg6fsaisn7aq0nv16fj69wmws"; -"serbian-date-lat.doc-2016"="pa9rvzpbczmfm4w0977xx05c5sbl6mxg"; -"serbian-def-cyr-2016"="k46ahhqbdg23mx4ld0953dnsws1imhwm"; -"serbian-def-cyr.doc-2016"="zl8x855zmhry6n754l5x9fz8hjn27bls"; -"serbian-lig-2016"="a1672qd2rm39mxrbm6g9w3sayzysy9iq"; -"serbian-lig.doc-2016"="0423yai3rmbq3kkfdyy43r18gvw7mdzd"; -"t2-2016"="djv7453h3ip2p5nr0x02158drb4gl6hw"; -"t2.doc-2016"="5rs62ka021ngnnhm7v7hcr3nicm42v98"; -"texlive-ru.doc-2016"="n2y8hncfirzbzvd2qhcmn624sig5vbih"; -"texlive-sr.doc-2016"="y35ka74pcqbf858l7fi25kby788xp0vs"; +"russ-2017"="981kkq2xmx0r6k095308270hjvmdsm3h"; +"russ.doc-2017"="878fl0cyka7jj5cvdvq19fvlfic3izi9"; +"serbian-apostrophe-2017"="q4n9k2fn70hxcf9chy6a5jw07pq2cllp"; +"serbian-apostrophe.doc-2017"="0yxbbv3xz0jf63g0kvq5dbdv2myc4rks"; +"serbian-date-lat-2017"="3s5yc0xcg6fsaisn7aq0nv16fj69wmws"; +"serbian-date-lat.doc-2017"="pa9rvzpbczmfm4w0977xx05c5sbl6mxg"; +"serbian-def-cyr-2017"="k46ahhqbdg23mx4ld0953dnsws1imhwm"; +"serbian-def-cyr.doc-2017"="zl8x855zmhry6n754l5x9fz8hjn27bls"; +"serbian-lig-2017"="a1672qd2rm39mxrbm6g9w3sayzysy9iq"; +"serbian-lig.doc-2017"="0423yai3rmbq3kkfdyy43r18gvw7mdzd"; +"t2-2017"="djv7453h3ip2p5nr0x02158drb4gl6hw"; +"t2.doc-2017"="5rs62ka021ngnnhm7v7hcr3nicm42v98"; +"texlive-ru.doc-2017"="7r86aqsvzgq8l4my6x5jkgkap8k9iicy"; +"texlive-sr.doc-2017"="5br9avk3c0ggl03sw5l8gvsykcdw04kl"; "babel-czech-3.1a"="gdcs2xpcgblb3v0m6jf3ppx643s3cj6r"; "babel-czech.doc-3.1a"="g2km6r7d90d3f60mfhw4a7m9s0090sg5"; "babel-czech.source-3.1a"="5s1n9fykrbzppgb36pvybjn9jmj7cxxf"; "babel-slovak-3.1a"="cl43hp1pnxc1gp4ndrqwv1cv3fh0h47c"; "babel-slovak.doc-3.1a"="igrg8syk1kd3mq4sm4jrdgsmsr1y9jb1"; "babel-slovak.source-3.1a"="gvlkvq0zmhdf57a6vpfxlvmvz7ma48af"; -"cnbwp-2016"="whwdam81dc6g8pq664mrmnbxz4f0iwdj"; -"cnbwp.doc-2016"="qv1fxhmq1pig9rq3swhvwlwpm4lmwrjy"; -"cs-2016"="2c2075d3z1hsim0b32hx2adj34vk9v1b"; -"csbulletin-1.0"="habpdy1zg2z2xw12xya90lvkns8zcd14"; -"csbulletin.doc-1.0"="cpp8rympnbz2p3m8zk6qrbj9vm9m9hfq"; -"cslatex-2016"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh"; -"cslatex.source-2016"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq"; -"csplain-2016"="30pkjvf17m7q5xgknksd9cp8r7cnrmcl"; -"cstex.doc-2016"="b1jpd5fjkw7hchqb0ldmkr40w3jkzbsa"; -"hyphen-czech-2016"="hgqj7s2x8307ap6bbw0i7nmw95w84i8k"; -"hyphen-slovak-2016"="4v3xn4ap1yhfgrvlh9ypmdwvj7yii077"; +"cnbwp-2017"="whwdam81dc6g8pq664mrmnbxz4f0iwdj"; +"cnbwp.doc-2017"="qv1fxhmq1pig9rq3swhvwlwpm4lmwrjy"; +"cs-2017"="ks76xw08rrkrcxg7rv72w18glx2vncfk"; +"csbulletin-1.1"="m9d1x0828b0bkkwwz7pp7vncj5mjc9zy"; +"csbulletin.doc-1.1"="pf2nrqiwk3jag8gyn429f1d867xg2v9d"; +"cslatex-2017"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh"; +"cslatex.source-2017"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq"; +"csplain-2017"="va7s716mqc1gpdp23r7n33a0gyskjkf0"; +"luatex85-1.4"="ka3px4aiyi8gq487i085s31y9l95jzp1"; +"luatex85.doc-1.4"="ac2agmy9dkavln2vnd63fmavv7xnkdrw"; +"luatex85.source-1.4"="wpm4dw7j6fikz3dqa4zk3r5avg4isxr8"; +"cstex.doc-2017"="b1jpd5fjkw7hchqb0ldmkr40w3jkzbsa"; +"hyphen-czech-2017"="hgqj7s2x8307ap6bbw0i7nmw95w84i8k"; +"hyphen-slovak-2017"="4v3xn4ap1yhfgrvlh9ypmdwvj7yii077"; "lshort-czech.doc-4.27"="2z8dygvm9ilvahsx005zb7z5ss8hxbsf"; -"lshort-slovak.doc-2016"="qnj433q5hfg9cpy0z281zq17z7dr5vh9"; -"texlive-cz.doc-2016"="f2qhp83816s6rglini5mgn7ry1p30dq1"; -"vlna.doc-2016"="q7y30cplqdmwmbi512j0bld8q4gz3cvd"; +"lshort-slovak.doc-2017"="qnj433q5hfg9cpy0z281zq17z7dr5vh9"; +"texlive-cz.doc-2017"="lvcyklb0wmng9189ya9w532f9697aqsi"; +"vlna.doc-2017"="l7prd2dp3ldxq91rr1j5a6n65jwcml8b"; "FAQ-en.doc-3.28"="vvzrv99q1hxcck399g2n96qfl1dc0fln"; "MemoirChapStyles.doc-1.7e"="r54d4g3nh30k5x99nfphvzg7k1jxrijn"; "Type1fonts.doc-2.14"="jgjs1127jqdrrgnkv3r8p1wirc8lb2gl"; +"amscls-doc.doc-2017"="7vysfiq2571jmyqdar2y15824l31yk3n"; "amslatex-primer.doc-2.3"="9d9pxr0jbjm6zwqd51f7m2bzysdq5gv7"; -"around-the-bend.doc-2016"="a6jilpw0nw27vlj1shnhxfv92yn86ys2"; -"ascii-chart.doc-2016"="9x2srgi2sjd6zjjz27p6hs1w9sj73bcx"; -"components-of-TeX.doc-2016"="7sc5ryfj785jifvw9b44yni2ifmssr7f"; -"comprehensive.doc-12.2"="pnjp9bc1a0910j9mx15w3mng9afwm826"; -"dickimaw.doc-2016"="jqva0skw6ivc4ikc8m7awd7pgfaxgci7"; +"around-the-bend.doc-2017"="a6jilpw0nw27vlj1shnhxfv92yn86ys2"; +"ascii-chart.doc-2017"="9x2srgi2sjd6zjjz27p6hs1w9sj73bcx"; +"biblatex-cheatsheet.doc-2017"="vcmb6x1w0cfgvyx0hl8fsv1nh2ffhg6g"; +"components-of-TeX.doc-2017"="7sc5ryfj785jifvw9b44yni2ifmssr7f"; +"comprehensive.doc-12.3"="gs2ygl6aw4np0kh7av2qg9797nxh32qx"; +"dickimaw.doc-2017"="jqva0skw6ivc4ikc8m7awd7pgfaxgci7"; +"docsurvey.doc-2017"="zvczpqq3wfd1hrsfhnkczzvbsb9bcilr"; "dtxtut.doc-2.1"="108k3lyvja5wmg8gxyvqskbz8wwh0cyw"; -"first-latex-doc.doc-2016"="8vcday36pq5hlr075kjk6hb82ypazjd9"; -"gentle.doc-2016"="mpxhsl7g4za410b65awmbb5zlc58h24n"; -"guide-to-latex.doc-2016"="8lw0kcinfq2yd6vkbd531zakby60k2wf"; +"first-latex-doc.doc-2017"="8vcday36pq5hlr075kjk6hb82ypazjd9"; +"forest-quickstart.doc-2017"="gyacc77yw1l6kksi62y5plxsvkqbf6yv"; +"gentle.doc-2017"="mpxhsl7g4za410b65awmbb5zlc58h24n"; +"guide-to-latex.doc-2017"="8lw0kcinfq2yd6vkbd531zakby60k2wf"; "happy4th.doc-20120102"="svmy37c032cvip73n4b98c8kh4hvnh9g"; -"hyphen-english-2016"="4vjl8scc743bbjbjzhprgpmxnz58ph29"; -"impatient.doc-2016"="172g4hvk6d4z4013h44nr5may3a51gb4"; +"hyphen-english-2017"="4vjl8scc743bbjbjzhprgpmxnz58ph29"; +"impatient.doc-2017"="172g4hvk6d4z4013h44nr5may3a51gb4"; "intro-scientific.doc-5th_edition"="qx170vpq4ahipljnmhkvbrxv1xdbbii6"; -"knuth.doc-2016"="2w5hzwaxcl1i2pp3ms0kshmza0p5nqi6"; -"knuth.source-2016"="6dr6qqw0ih676vxc0rj6qgjc0zpac89p"; +"knuth.doc-2017"="2w5hzwaxcl1i2pp3ms0kshmza0p5nqi6"; +"knuth.source-2017"="6dr6qqw0ih676vxc0rj6qgjc0zpac89p"; "l2tabu-english.doc-1.8.5.7"="j7m684bvmpv1jaa6s856dj9aknrwlqiq"; -"latex-brochure.doc-2016"="azp69yf9xkksqan9n096wabgxlk9hgsn"; +"latex-brochure.doc-2017"="azp69yf9xkksqan9n096wabgxlk9hgsn"; "latex-course.doc-2"="km59hhadaad0hlpa07rqmx91036h123r"; -"latex-doc-ptr.doc-2016"="1dsc8ym34nlj315aln3npfibx37n9c3z"; -"latex-graphics-companion.doc-2016"="70mixdsyyx6jf6dc46qp5kgyx9qwkma2"; -"latex-veryshortguide.doc-2016"="k179hnvfkwshfbyqyi6r0ijmm4kq0s3k"; -"latex-web-companion.doc-2016"="wzj6qw8bhwr82ipsph640ya62mpj6k3r"; -"latex2e-help-texinfo.doc-2016"="ckcmkgpqkqin3qwzvw89yqg7qzzh0pjh"; +"latex-doc-ptr.doc-2017"="1dsc8ym34nlj315aln3npfibx37n9c3z"; +"latex-graphics-companion.doc-2017"="70mixdsyyx6jf6dc46qp5kgyx9qwkma2"; +"latex-refsheet.doc-1.2"="9gvmiiqg78xn8348cymz3wfzi45mf8xz"; +"latex-veryshortguide.doc-2017"="mil8qpv4ka19wym6cqz3r5np3n7nzw5r"; +"latex-web-companion.doc-2017"="wzj6qw8bhwr82ipsph640ya62mpj6k3r"; +"latex2e-help-texinfo.doc-2017"="vnwvlpnj4gwqq6y6akq8ixn7jz597r8d"; "latex4wp.doc-1.0.10"="bxffry3cy7vkcjhdm5yzn4hipma74jdp"; "latexcheat.doc-1.13"="iav6gzdcadndwli0jar6d7i1711ssq41"; "latexcourse-rug.doc-1.1"="fxz46xn5hazqy707qrf2mkgk121m6ywv"; @@ -1845,31 +1847,31 @@ "latexfileinfo-pkgs.source-0.22"="b7h771sg8f6c8fq8j7vjbq0yhsp836a5"; "lshort-english.doc-5.0.5"="ryw0yzw8kc62y4340nvvky1cxddnji70"; "macros2e.doc-0.4"="mn48jzqmxgjafpqai2ssnfi6z3sr5a2z"; -"math-e.doc-2016"="jl3c0l594dii8wjylbc9nmaw6bqkmxvy"; +"math-e.doc-2017"="jl3c0l594dii8wjylbc9nmaw6bqkmxvy"; +"math-into-latex-4.doc-2017"="0k2w8mjvn4h6jplrks9mxj6m1bnfmlz0"; "maths-symbols.doc-3.4"="xi1pjz6rhyw79b10fpdfaa8vc5sf1wlf"; -"memdesign.doc-2016"="wiphi37w652d45ikn5kgd1qzh358rj3r"; -"metafont-beginners.doc-2016"="7ql41977dp698l2fjlq2xyf221y6xn2f"; -"metapost-examples.doc-2016"="ljbvw9v7xilmkzmifm1vx18dfvqlw6k6"; -"mil3.doc-2016"="x3dxysarnz0pz9inb8g9w66njzsnsw7q"; -"patgen2-tutorial.doc-2016"="3wv4sk7yw0mpy0rsd1j04m8mqsbi465n"; -"pictexsum.doc-2016"="mcxxxznqh0a94sip9vpdbjv5nv83j66s"; -"plain-doc.doc-2016"="5bqxdfbl4fvgvw42033vg9w3kjn7pn49"; -"presentations-en.doc-2016"="b2j47x2qg2rhn4d5pv7413fca2jd7fb9"; -"simplified-latex.doc-2016"="mmxjkyv4x0am911mkxmjs1l5ql5z19h9"; -"svg-inkscape.doc-2016"="l8vizn8al3rzgxxamdfqm6hsrh46xm8m"; +"memdesign.doc-2017"="wiphi37w652d45ikn5kgd1qzh358rj3r"; +"metafont-beginners.doc-2017"="7ql41977dp698l2fjlq2xyf221y6xn2f"; +"metapost-examples.doc-2017"="ljbvw9v7xilmkzmifm1vx18dfvqlw6k6"; +"patgen2-tutorial.doc-2017"="3wv4sk7yw0mpy0rsd1j04m8mqsbi465n"; +"pictexsum.doc-2017"="mcxxxznqh0a94sip9vpdbjv5nv83j66s"; +"plain-doc.doc-2017"="5bqxdfbl4fvgvw42033vg9w3kjn7pn49"; +"presentations-en.doc-2017"="b2j47x2qg2rhn4d5pv7413fca2jd7fb9"; +"simplified-latex.doc-2017"="mmxjkyv4x0am911mkxmjs1l5ql5z19h9"; +"svg-inkscape.doc-2017"="l8vizn8al3rzgxxamdfqm6hsrh46xm8m"; "tabulars-e.doc-1.0"="3vrlw3x3h5k0awnns1q06bwzl3ff6mpw"; "tamethebeast.doc-1.4"="14cs89g2l3bn3xhfrhrw9pfdf65c2xcy"; "tds.doc-1.1"="fmmdgblpf26x9ajn16g024sn5sbwwy0s"; "tex-font-errors-cheatsheet.doc-0.1"="4a38bjpzdbj91msw8kaxmk3c6qahq1r5"; "tex-overview.doc-0.2"="bj9pak1z31fwblcv5bj2imd4p33bi79s"; "tex-refs.doc-0.4.8"="ad80b3r5rgj7n4m2hc5r6ccjczikff3v"; -"texbytopic.doc-2016"="vcr4rwfg8m85mrlsp0hg3ic0gmd0zcdw"; -"titlepages.doc-2016"="g0fvssp703yk3c2icdb8qgalxikm0xq9"; -"tlc2.doc-2016"="k8qb9ak5wx7k4c4j5g5i681di8cc8p5s"; -"visualfaq.doc-2016"="mdskjr2m6y0ljhczhqmfm50xsv8x4k1m"; -"voss-mathmode.doc-2.47"="ahg4d5zk33mk5bv1s889mflqh05k65xn"; -"webguide.doc-2016"="xbp0q21rqfq5gmckdfkc671kbr6gj1n8"; -"xetexref.doc-2016"="4j55bp8li1sjq281wsdmqwpqbq092ppy"; +"texbytopic.doc-2017"="vcr4rwfg8m85mrlsp0hg3ic0gmd0zcdw"; +"titlepages.doc-2017"="g0fvssp703yk3c2icdb8qgalxikm0xq9"; +"tlc2.doc-2017"="k8qb9ak5wx7k4c4j5g5i681di8cc8p5s"; +"undergradmath.doc-2017"="kp1xxp209mbvyhpmh62yp53c6q8ppnwk"; +"visualfaq.doc-2017"="mdskjr2m6y0ljhczhqmfm50xsv8x4k1m"; +"webguide.doc-2017"="xbp0q21rqfq5gmckdfkc671kbr6gj1n8"; +"xetexref.doc-2017"="ng54q8km6dahcmh77lwwkz9qplw2d46l"; "armtex-3.0-beta3"="vg6qlgg6nzci26mnphkbcpc8vak9jwbq"; "armtex.doc-3.0-beta3"="fam9bkmfjn2v54v3f2xjxjarbrf3adhz"; "babel-albanian-1.0c"="1dasgklnjx05y74bk0pcwn1ivghswmvs"; @@ -1893,14 +1895,14 @@ "babel-estonian-1.1a"="pn52pj8gprmsqf7f7i97vllrkjjm2bbh"; "babel-estonian.doc-1.1a"="nchqv4ahbhjrh6g49fj8xpjv1ghlqzn9"; "babel-estonian.source-1.1a"="8d3nvwgv9bvhhxsgdicdlf3gsrscaxsi"; -"babel-finnish-2016"="j5w0s8qa0jnwgrw5z208bh3afalx7vzy"; -"babel-finnish.doc-2016"="3fajpl6c9jaxnm2bf7ccls1nqdhva2jg"; -"babel-finnish.source-2016"="gyss1ciz8xazmhfg67yz6z2s9g63p190"; +"babel-finnish-1.3q"="j5w0s8qa0jnwgrw5z208bh3afalx7vzy"; +"babel-finnish.doc-1.3q"="3fajpl6c9jaxnm2bf7ccls1nqdhva2jg"; +"babel-finnish.source-1.3q"="gyss1ciz8xazmhfg67yz6z2s9g63p190"; "babel-friulan-1.3"="xjbsgl2xyfqfrdyv83c6g5h2qnjzw7vf"; "babel-friulan.doc-1.3"="m4n4fysx9qxf13c39jm4xq624y6jkagd"; "babel-friulan.source-1.3"="yf6xqza856qdbxdysw08v707h0pcj7sq"; -"babel-hungarian-1.5c"="6kv77z2ac5krdm24f9n8g0fb3b28v9fv"; -"babel-hungarian.doc-1.5c"="y2xr9g48zya34i5qnmz66j4a7j741cd4"; +"babel-hungarian-1.5c"="ziiivvv3n2allw091gzqkd35af46r5nl"; +"babel-hungarian.doc-1.5c"="czi272jfp95lckd97gkq46lrvz3r63wl"; "babel-icelandic-1.2b"="bv8jkqsb9ikbk4g861n0hn00j7dh87kw"; "babel-icelandic.doc-1.2b"="b2pxcd5sczr0a3a8ww2rjfyw3r1783jc"; "babel-icelandic.source-1.2b"="37xz4jan0xjrz8aj2sci17x8m8h8f613"; @@ -1916,9 +1918,9 @@ "babel-latvian-2.0a"="li1cr89si5w51frv1nvw4ildv7msssq6"; "babel-latvian.doc-2.0a"="2vx8r37s33r9hhkbyn3ckn1lmv639b97"; "babel-latvian.source-2.0a"="navm1a1r3kqhimxz7c70x9kqnmq1p0xi"; -"babel-macedonian-2016"="y443c0n5dygb6pf923kwj4fv8y991gg7"; -"babel-macedonian.doc-2016"="gk8d4ijhz5dhnlv9jdc6v48fm9zfcai6"; -"babel-macedonian.source-2016"="jfr605jrv1sywgpkhi05v6n6s96vfyq2"; +"babel-macedonian-2017"="y443c0n5dygb6pf923kwj4fv8y991gg7"; +"babel-macedonian.doc-2017"="gk8d4ijhz5dhnlv9jdc6v48fm9zfcai6"; +"babel-macedonian.source-2017"="jfr605jrv1sywgpkhi05v6n6s96vfyq2"; "babel-norsk-2.0i"="3a2xqwwyj2pv7ndgaxk11wvb7qanc9qk"; "babel-norsk.doc-2.0i"="dhi39fgchh0ll1hl2si5qgygi2qsg8bj"; "babel-norsk.source-2.0i"="qyx1rcxw0zghnc8wrh94yr9i5jkh142k"; @@ -1931,9 +1933,9 @@ "babel-romanian-1.2l"="76cg7sfsq7lg72c4lqfinv3gjpbwpvri"; "babel-romanian.doc-1.2l"="5i46fii2472x7ka1xxng45s7n0rgl2s9"; "babel-romanian.source-1.2l"="pm44w7529qaa4s9n7jyc33qwsfj6vwsb"; -"babel-romansh-2016"="2k6ik89i06j3l29bl8yp7dbm79qgzcb3"; -"babel-romansh.doc-2016"="risjnmxysc7r7va4f3mapz7kvxi01xc9"; -"babel-romansh.source-2016"="hnlwwjxzrv9fsanajh23pr8wirlp87gh"; +"babel-romansh-2017"="2k6ik89i06j3l29bl8yp7dbm79qgzcb3"; +"babel-romansh.doc-2017"="risjnmxysc7r7va4f3mapz7kvxi01xc9"; +"babel-romansh.source-2017"="hnlwwjxzrv9fsanajh23pr8wirlp87gh"; "babel-samin-1.0c"="2vg2wrjl0pllgbppkx4bcykcjil8driw"; "babel-samin.doc-1.0c"="k69nnc0vsw2xhrkqilhqzqv9v4h5fy99"; "babel-samin.source-1.0c"="p7ywdk038cryll8rr2sy8d8m4qb09k5l"; @@ -1952,64 +1954,62 @@ "babel-welsh-1.1a"="dcjbzz80i41bpzb99wdhb84h60y5qg1r"; "babel-welsh.doc-1.1a"="5p0mqvs4npnz3g6a08hqkf03n2w4pdc1"; "babel-welsh.source-1.1a"="9fx2i5lxyf8qc0brlrgas2ajzf013m6j"; -"finbib-2016"="aja1ihjvva3aa86xi1f8d563xvlcj5mb"; +"finbib-2017"="aja1ihjvva3aa86xi1f8d563xvlcj5mb"; "gloss-occitan-0.1"="sha467dmibkfwwdnwrq5da744vfz3p5g"; "gloss-occitan.doc-0.1"="8wfn7as272hvm7nxz0i5m48bf94b5m0z"; "gloss-occitan.source-0.1"="qv9zd6r6rmjbfsndm7qgsz7x6xkr14ms"; "hrlatex-0.23"="7dr0g80mp71nmvrnwahpshawi44s2s9x"; "hrlatex.doc-0.23"="lrx3m4bg9wlqlrcd08mh90wal16fvilg"; "hrlatex.source-0.23"="s5ajy6yi6nzivfwafk5ymav4j2dcgif4"; -"hyphen-armenian-2016"="mdffnpk1ry6sw0xs8h5adzzz11dr7d8z"; -"hyphen-armenian.source-2016"="0b2gny5672fkb5sd8vb2g3fapx9pl7z2"; -"hyphen-croatian-2016"="3ncl8rzkilf9v25d3knjpv05s23366rw"; -"hyphen-danish-2016"="cb0mgkx8v9zb9xpm23ys4cykdx81fm8y"; -"hyphen-dutch-2016"="yad9a54d57s5fqaw203z8p587am163pg"; -"hyphen-estonian-2016"="kxvkppf091jzvq35f1694s8zwws8smy5"; -"hyphen-finnish-2016"="34sljx5z5frjbdmdjfk0gby66lrsk8d5"; -"hyphen-friulan-2016"="cqkjqpaajflmjxmbb010nf6b6qhx291d"; -"hyphen-hungarian-2016"="rjcm5vh5imrvhq5vm67ldrx4vpwfyj0c"; -"hyphen-hungarian.doc-2016"="a9fpid878wd5s3qadgxg8acv6jwl86ca"; -"hyphen-icelandic-2016"="p0nh6hmjsq8qz9bq2jr94aivygc74k3p"; -"hyphen-irish-2016"="8pgd00kg1280xb3nf238z95vjca579n1"; -"hyphen-kurmanji-2016"="s8x6afi0m4p7ypdd59bv48p5wdpc230i"; -"hyphen-latin-3.1"="zyask1cwsh2ggrk2k8dlfj2gkf3388dn"; -"hyphen-latvian-2016"="ysdrd68nsbqcahr1sxdaf5swlibi9zym"; -"hyphen-lithuanian-2016"="a466wij0mk9h82h6dkl4a048zwc8iwci"; -"hyphen-norwegian-2016"="5a71qrcnmaq9d9yk25p8i47cdz8kw830"; -"hyphen-occitan-2016"="rpqyqccljn7sfzkc1q8cil6ihc86d5qm"; -"hyphen-piedmontese-2016"="785rz1pgg937vbvry6l5a6m1ibvla7vf"; -"hyphen-romanian-2016"="5mby6h9g3rdbw6sw0nbrl5ig2kdjzjwg"; -"hyphen-romansh-2016"="m2d5ilq6nrn7v02xfm64y0p9a68fnnzx"; -"hyphen-slovenian-2016"="h7mqlrlpxrs7vcf357myvxdjj40xvja9"; -"hyphen-swedish-2016"="0lhl6pgggkp4hirzakbcpc167dv6klcd"; -"hyphen-turkish-2016"="q4p56y47qx2c7mjvkj945qgacblj13sr"; -"hyphen-turkish.source-2016"="4xv9azgkq91m4afsp9kvsq0f9ajxqfvl"; -"hyphen-uppersorbian-2016"="rr9kvhrf60s2rpq7478mbd751kwzl0w2"; -"hyphen-welsh-2016"="g3hsz81k297agiclv8ms1zb2hgkmlqcf"; -"lithuanian-2016"="w9v6qwl2xjqb3wpfnfsnh8rbmaw497cl"; -"lithuanian.doc-2016"="8vyaya9n1xq7igvhgqzpvb9cbhk62f3z"; +"hyphen-croatian-2017"="3ncl8rzkilf9v25d3knjpv05s23366rw"; +"hyphen-danish-2017"="cb0mgkx8v9zb9xpm23ys4cykdx81fm8y"; +"hyphen-dutch-2017"="yad9a54d57s5fqaw203z8p587am163pg"; +"hyphen-estonian-2017"="kxvkppf091jzvq35f1694s8zwws8smy5"; +"hyphen-finnish-2017"="34sljx5z5frjbdmdjfk0gby66lrsk8d5"; +"hyphen-friulan-2017"="cqkjqpaajflmjxmbb010nf6b6qhx291d"; +"hyphen-hungarian-2017"="rjcm5vh5imrvhq5vm67ldrx4vpwfyj0c"; +"hyphen-hungarian.doc-2017"="a9fpid878wd5s3qadgxg8acv6jwl86ca"; +"hyphen-icelandic-2017"="p0nh6hmjsq8qz9bq2jr94aivygc74k3p"; +"hyphen-irish-2017"="8pgd00kg1280xb3nf238z95vjca579n1"; +"hyphen-kurmanji-2017"="s8x6afi0m4p7ypdd59bv48p5wdpc230i"; +"hyphen-latin-3.1"="76n3a6vx9fbwlzqifdd4na39s8hyqya5"; +"hyphen-latvian-2017"="ysdrd68nsbqcahr1sxdaf5swlibi9zym"; +"hyphen-lithuanian-2017"="a466wij0mk9h82h6dkl4a048zwc8iwci"; +"hyphen-norwegian-2017"="5a71qrcnmaq9d9yk25p8i47cdz8kw830"; +"hyphen-occitan-2017"="rpqyqccljn7sfzkc1q8cil6ihc86d5qm"; +"hyphen-piedmontese-2017"="785rz1pgg937vbvry6l5a6m1ibvla7vf"; +"hyphen-romanian-2017"="5mby6h9g3rdbw6sw0nbrl5ig2kdjzjwg"; +"hyphen-romansh-2017"="m2d5ilq6nrn7v02xfm64y0p9a68fnnzx"; +"hyphen-slovenian-2017"="h7mqlrlpxrs7vcf357myvxdjj40xvja9"; +"hyphen-swedish-2017"="0lhl6pgggkp4hirzakbcpc167dv6klcd"; +"hyphen-turkish-2017"="q4p56y47qx2c7mjvkj945qgacblj13sr"; +"hyphen-turkish.source-2017"="4xv9azgkq91m4afsp9kvsq0f9ajxqfvl"; +"hyphen-uppersorbian-2017"="rr9kvhrf60s2rpq7478mbd751kwzl0w2"; +"hyphen-welsh-2017"="g3hsz81k297agiclv8ms1zb2hgkmlqcf"; +"lithuanian-2017"="w9v6qwl2xjqb3wpfnfsnh8rbmaw497cl"; +"lithuanian.doc-2017"="8vyaya9n1xq7igvhgqzpvb9cbhk62f3z"; "lshort-dutch.doc-1.3"="rswbmzd9fkb0bwbc054pb0raa8zv2lfx"; "lshort-estonian.doc-5.05"="2xqk5n14f2lizqdisir199mark4y5v2k"; -"lshort-finnish.doc-2016"="5jp8rkaw7qvrv8mpdnbmhg0m53566n8c"; +"lshort-finnish.doc-2017"="5jp8rkaw7qvrv8mpdnbmhg0m53566n8c"; "lshort-slovenian.doc-4.20"="1w0g2p1l4p456wsx86ihdpadm8lhhcgn"; "lshort-turkish.doc-4.20"="py0d16ij5gswbli1bgi4z63vajsahwjp"; "nevelok-1.03"="v5hds3a09c91d79iac1qsyf0mr6lpaqg"; "nevelok.doc-1.03"="biq2dbyv6mak992s0cqb834k119xfa0p"; "nevelok.source-1.03"="5c03z6r25gidf0bncaanw1259n1hcdw0"; -"swebib-2016"="5z0719m62712flc3ylrnp5223gbsk98n"; -"swebib.doc-2016"="m23nfcdd5ddlgicd8hzlyfnr042y3bjp"; +"swebib-2017"="5z0719m62712flc3ylrnp5223gbsk98n"; +"swebib.doc-2017"="m23nfcdd5ddlgicd8hzlyfnr042y3bjp"; "turkmen-0.2"="r8ryr694sxginv96wy2ibwg7mjwckmy0"; "turkmen.doc-0.2"="ry7di8dm2nk9gbylnm58zrmlpilbch55"; "turkmen.source-0.2"="jab2389x3cj6hhg0imkfbjcglclqap2s"; -"aeguill-2016"="2qlipazg1v8pj58aym9zwqqzfvprw29f"; -"aeguill.doc-2016"="q4gvvin01hkwmcc2llrkd61pr6dsmwp8"; +"aeguill-2017"="2qlipazg1v8pj58aym9zwqqzfvprw29f"; +"aeguill.doc-2017"="q4gvvin01hkwmcc2llrkd61pr6dsmwp8"; "apprends-latex.doc-4.02"="fy3lj0gsk1nkcfp2ssyfm26a7ih2ysf5"; "babel-basque-1.0f"="dasllbbd2k1yhqdwm41i38870lzp9caa"; "babel-basque.doc-1.0f"="av6dd29g89fsq2hgva9fj4h2myj95jxk"; "babel-basque.source-1.0f"="mvvhhqj4jd107zicv0gv8yhgjkjhxl33"; -"babel-french-3.2c"="f4lxyn2bxns51psdl31kqlr1jdf79743"; -"babel-french.doc-3.2c"="xncdfxfqmm2x9bylp9r3wrwkvll0hmls"; -"babel-french.source-3.2c"="sr02cii907bjlddm70zi8167h41n1dxl"; +"babel-french-3.3d"="hsm5wz2xvhkc80f2mg67r577l766ra2i"; +"babel-french.doc-3.3d"="q27dr2353bpj3ykkcxsjf4zjpwckjmnp"; +"babel-french.source-3.3d"="5ffk5z6w4wsmndwmbcn6n9a05csm1sbz"; "basque-book-1.20"="6gmya3w1jnv20p9zyn3b8b095csb45cj"; "basque-book.doc-1.20"="njw9j7s7mlx35ckjg0z404fizyxpn74n"; "basque-book.source-1.20"="wydda9ij2ibwnhd8b0pg48bf2f1g969f"; @@ -2024,24 +2024,25 @@ "booktabs-fr.doc-1.00"="8nmky9zjr4s9s8kikir9l4w6y69yk1vr"; "droit-fr-1.2"="kqd2m29if8y21y5l72z5k0f6dafm95sj"; "droit-fr.doc-1.2"="ss2xw9f26frzv9m2xvwbmvgagdhabc69"; -"e-french-6.0"="nypq6nv53vwf51nbaqa2kfnicc5z3235"; -"e-french.doc-6.0"="3dpx2bd8h02phkjmrgpxxlng56ss8zac"; -"epslatex-fr.doc-2016"="7kqdhx5drijbah1yl3vrwax3cnxg5zdk"; -"facture-1.2.1"="mpfjw9dbwx9w7cyf5xx0f7cwlb3g8vi5"; -"facture.doc-1.2.1"="88diy88xmmrm8krhgmx79acxlp5zmwh2"; -"facture.source-1.2.1"="xf3fjga3y0zga4z6gkqf7x2nhq9872vi"; -"formation-latex-ul.doc-2016"="7qwn3vhd31ynb7bwfvvynqdps24xmsmz"; -"frletter-2016"="4vqb93fvw2jmyxv1f269f6icnk4wbwpl"; -"frletter.doc-2016"="pg2pg5gsjpp0iyzapm6k1m4p95fkbi4h"; -"hyphen-basque-2016"="cf8qx0sgavyb7y615yrxh5is1nzfd6lq"; -"hyphen-basque.source-2016"="vq3bxdrcsgdmiqfjxfcy9w5jihxf78qf"; -"hyphen-french-2016"="ilb1im99f9qr7nzgk4daw3zc262wr3q3"; -"impatient-fr.doc-2016"="sjzbiaxr5cvnqxn7bylr5zhrkq46l1v8"; +"e-french-6.01"="w0gb3mb4i7yp73ammlwpd515q2hyxgni"; +"e-french.doc-6.01"="lvxzb7rnp45ylj2jk32qaccyg73xmza0"; +"epslatex-fr.doc-2017"="7kqdhx5drijbah1yl3vrwax3cnxg5zdk"; +"facture-1.2.2"="ys1fq6vkml8gnfc6bjkx2lkbdw2w0fsn"; +"facture.doc-1.2.2"="ij99my45fi9m1lcc79rj6kyxggmv4v3r"; +"facture.source-1.2.2"="aywgffiyigrwxv9lipf7a131mycjp839"; +"formation-latex-ul.doc-2016.11-3"="rs68mnwbwwgn4gs8z4w8cr3w04indrf4"; +"formation-latex-ul.source-2016.11-3"="lrk1fnmfi50ihqr6bi5s3896qf0gqvr0"; +"frletter-2017"="4vqb93fvw2jmyxv1f269f6icnk4wbwpl"; +"frletter.doc-2017"="pg2pg5gsjpp0iyzapm6k1m4p95fkbi4h"; +"hyphen-basque-2017"="cf8qx0sgavyb7y615yrxh5is1nzfd6lq"; +"hyphen-basque.source-2017"="vq3bxdrcsgdmiqfjxfcy9w5jihxf78qf"; +"hyphen-french-2017"="ilb1im99f9qr7nzgk4daw3zc262wr3q3"; +"impatient-fr.doc-2017"="sjzbiaxr5cvnqxn7bylr5zhrkq46l1v8"; "impnattypo-1.4"="yi9xrsbs2crfwwjjgnxg0sybn8ygjr32"; "impnattypo.doc-1.4"="cai1yyf5ipgjips10l1nsid8dz09kvg8"; "impnattypo.source-1.4"="r7n5sihj35zm708k6cxs4xs71gz4msvn"; "l2tabu-french.doc-2.3"="ncl8is1rmnk3n9ybrsav882w5qsb1w2k"; -"latex2e-help-texinfo-fr.doc-2016"="cyx158kxv3wp1igjgyqw64cx1832a3x4"; +"latex2e-help-texinfo-fr.doc-2017"="0n3q8gzd8xjhl92yyq2526sjsgl3jhid"; "lshort-french.doc-5.01fr-0"="33vkjmz23zk2jrzyw99zri58jm0cpxax"; "mafr-1.0"="vl6jgzlqqyn70cndvj91nnkmcxas15j8"; "mafr.doc-1.0"="v44yahqn2gnnfbnf1ayqr96va6y49aij"; @@ -2051,28 +2052,30 @@ "tdsfrmath-1.3"="5nz3qrfq13xyhabzww6092mb13014rhj"; "tdsfrmath.doc-1.3"="8nnvlh3hw79z3k6c6vsvgnvkq814ldsv"; "tdsfrmath.source-1.3"="3hfid9ih338p675pz6440f3ds5r3s646"; -"texlive-fr.doc-2016"="v9rr1d6l3np4k3s880abf9l51j2d5055"; -"translation-array-fr.doc-2016"="yia92yfpyrwv26vh12kks8arbsda05z4"; -"translation-dcolumn-fr.doc-2016"="acapy2zx06rsxwg810avmphyjjxca6gi"; -"translation-natbib-fr.doc-2016"="8yvcb3s928s5lldgy65idpfw23pb46z2"; -"translation-tabbing-fr.doc-2016"="64ix6i3bvaniiw7xj42bhqqmzv474lfy"; +"texlive-fr.doc-2017"="fgh4avb433fl6p3s80azqgghwgc2yl63"; +"translation-array-fr.doc-2017"="yia92yfpyrwv26vh12kks8arbsda05z4"; +"translation-dcolumn-fr.doc-2017"="acapy2zx06rsxwg810avmphyjjxca6gi"; +"translation-natbib-fr.doc-2017"="8yvcb3s928s5lldgy65idpfw23pb46z2"; +"translation-tabbing-fr.doc-2017"="64ix6i3bvaniiw7xj42bhqqmzv474lfy"; "variations-0.3"="md5bnc4jaiva00gkdjyd63x67hyd09si"; "variations.doc-0.3"="pxbpjpnsfz728czc4pjfy2nfr88dzmr8"; -"visualtikz.doc-0.62"="q6rcdvbhxlh7gpgx8l591qlvvhhbakip"; -"babel-german-2.7b"="3q1skv5l1srcpshqi3vwcsqk52vx986n"; -"babel-german.doc-2.7b"="yl3var6ggdyrrh9vrm05hybccmwiyxmm"; -"babel-german.source-2.7b"="7i7wk8m7z0g5wbfxqlwlc1hamg463j12"; +"visualtikz.doc-0.64"="knc5xl622da5m056f6005l6m8csrrldy"; +"apalike-german-2017"="9r1xvzpzfmbg9wjrp9s88xs3cihcjy5q"; +"apalike-german.doc-2017"="fqxqp783bx2lr618nl3618s9b21qkfkg"; +"babel-german-2.9"="kv71g0avz61jjxkqn015ixrj75lfmb8d"; +"babel-german.doc-2.9"="q4y448qcnbilib4r508labfjclhfmh4h"; +"babel-german.source-2.9"="7qk1zpw0gbp6lgk1q2n0hjwknfzm825a"; "bibleref-german-1.0a"="wd8gzs1hrjyq9dmsjy6ss1qg0krlrzyd"; "bibleref-german.doc-1.0a"="yc6vn69gsdsl3vxhg6klip8m6wkffyy0"; "booktabs-de.doc-1.61803"="wcz4xqg22sijz3rczwk6nfnb0pk074ih"; "csquotes-de.doc-1.01"="bksp4f2zywwkv5qw4njincxbpgcvz7dg"; -"dehyph-exptl-0.40"="iw2i5m02ln7j62kssf9hmwrks5fl3vxr"; -"dehyph-exptl.doc-0.40"="df8ac8qhrwbpgzw2wz5a35mj1jfv013z"; +"dehyph-exptl-0.41"="z2gdw39k65w2dcqhij29nyqn5ga6kp21"; +"dehyph-exptl.doc-0.41"="ddjmxir7ha94j4xf7j83vzfm21ajkrh4"; "dhua-0.11"="4n8cvm61marrsbxd7308xw089j0q2wlj"; "dhua.doc-0.11"="kisr6kymm9v5kk9nfxi0ckdf6k8mhr91"; "dhua.source-0.11"="a9ap1rwrqqwh394c6hjqx5nlw070iwp6"; -"einfuehrung.doc-2016"="x668r5llhw28bqdr3k32yynf3720bdna"; -"einfuehrung2.doc-2016"="mwzp79i9w8ci8dxpnk4z4k6l9akj1qf8"; +"einfuehrung.doc-2017"="x668r5llhw28bqdr3k32yynf3720bdna"; +"einfuehrung2.doc-2017"="mwzp79i9w8ci8dxpnk4z4k6l9akj1qf8"; "etdipa.doc-2.6"="cid5wjvbs4hl5lwczp1s1wbdwxfwr24n"; "etoolbox-de.doc-1"="z53x50c71bvipgvgklp42n1yb50fq8gx"; "fifinddo-info.doc-1.1b"="d7l7nsb4aj2b7nin8whkif0m5pcv11py"; @@ -2081,52 +2084,56 @@ "german-2.5e"="mwin3zb743v74c97aizyiy86zj1pmdi2"; "german.doc-2.5e"="invdh78rq8chiirzdlvijssdah8hsyk2"; "german.source-2.5e"="zs1qxbd8r3bfyq77vaak9srxjxxn213v"; -"germbib-2016"="g11ayb7d5hj8s77kn9zvkvgfhdb0f4nf"; -"germbib.doc-2016"="vskc1hanqpmdm6p0v2np2slblpy8cf70"; +"germbib-2017"="g11ayb7d5hj8s77kn9zvkvgfhdb0f4nf"; +"germbib.doc-2017"="vskc1hanqpmdm6p0v2np2slblpy8cf70"; "germkorr-1.0"="szywjh1bj2jqc6zqs5d1y1dwxq9h8540"; "germkorr.doc-1.0"="bycbcbfrqs1r8l939kdm9f6s395rc5fh"; -"hausarbeit-jura-1.4"="f23zvm9zjx9c2qn8ijz94bsh5h731492"; -"hausarbeit-jura.doc-1.4"="w4csyql7k1q1mb59wnz1mnn06pdrz4hr"; -"hausarbeit-jura.source-1.4"="cv7y2f34zj9azaj72kw3jlcpr9gywr38"; -"hyphen-german-2016"="8q3v0w76pg2pdbzr0v3vxgm4nf173p30"; -"koma-script-examples.doc-2016"="36v70yqhhs5mjl0mf0vj708k4pjgbc5k"; +"hausarbeit-jura-1.5"="0pifqdiq22zs94z9ywfdirgljp11a2g8"; +"hausarbeit-jura.doc-1.5"="9vvkmp35qa1ygwj0isib5wsf12nnfs4f"; +"hausarbeit-jura.source-1.5"="zc6g0yd997syp0j8dlkbzkvk29syph7b"; +"hyphen-german-2017"="wrbsgmnn84g6ma3qdzrv3pac81ab3f5x"; +"koma-script-examples.doc-2017"="36v70yqhhs5mjl0mf0vj708k4pjgbc5k"; "l2picfaq.doc-1.50"="35c7cwi94qazkf5351kj5hl58xil9nms"; "l2tabu.doc-2.4"="4sab9w752r7xr6l9a6sxig4q0sdfvfxr"; -"latex-bib-ex.doc-2016"="51d5jw2dmp9rvy8bqxzw6clls5aqi189"; -"latex-bib2-ex.doc-2016"="rggjiidvpwxfd978rkmkwmg70w7amnpi"; +"latex-bib-ex.doc-2017"="51d5jw2dmp9rvy8bqxzw6clls5aqi189"; +"latex-bib2-ex.doc-2017"="rggjiidvpwxfd978rkmkwmg70w7amnpi"; "latex-referenz.doc-2"="463iyb1dhx6kdsqqb4crgdh0xgmrckpp"; -"latex-tabellen.doc-2016"="9y8yqyrkv49pj1v58nmf5qyibyphnias"; -"latexcheat-de.doc-2016"="fjpnrnl8fkv5lnvhg6rmijic0k2yshrf"; -"lshort-german.doc-3.0a"="blzclzyzpg9jhwvjkzr79j93c56x98cr"; +"latex-tabellen.doc-2017"="9y8yqyrkv49pj1v58nmf5qyibyphnias"; +"latexcheat-de.doc-2017"="fjpnrnl8fkv5lnvhg6rmijic0k2yshrf"; +"lshort-german.doc-3.0b"="nib38mz0rhy352w9zvdbnrlay9kahp06"; "lualatex-doc-de.doc-1.0"="9l7ac63knl5cd6lxmrbnmjj8s0nwp5bh"; "microtype-de.doc-2.4"="22zsps3wqlz58x3x1i3wadbn5jp9mba7"; -"presentations.doc-2016"="rczfpy5ayw0h07xlqhw4k2isp080g2ar"; +"milog-1.0"="lz3w4rhsgbl699hh8431yw6a9si6y9yy"; +"milog.doc-1.0"="zf9qx558g8z5xl906x391c6hylz57x8x"; +"presentations.doc-2017"="rczfpy5ayw0h07xlqhw4k2isp080g2ar"; "r_und_s-1.3i"="8vn7cjc42dvny30pkgp768yy87z9d2b8"; "r_und_s.doc-1.3i"="pk63m1jl1yzz2xqiwynpph3nrlri1hkl"; -"templates-fenn.doc-2016"="yy9rn7m9r0paxvya3icnbqwccpjkkbij"; -"templates-sommer.doc-2016"="6n6saza6xd8mjys1ckfy0362sdya4616"; -"texlive-de.doc-2016"="as5pa5g7fy3ml5wiq5wf9gx0wy1pa4d5"; +"templates-fenn.doc-2017"="yy9rn7m9r0paxvya3icnbqwccpjkkbij"; +"templates-sommer.doc-2017"="6n6saza6xd8mjys1ckfy0362sdya4616"; +"termcal-de-2017"="xqflkf5rvhsfhsbgbpvbaqz52gma049z"; +"termcal-de.doc-2017"="0kc2ab7ndmva6pdrgjrifbc4i5dhgvhb"; +"texlive-de.doc-2017"="aal1ki9d4f0mbr89b18dcdwk1f77rrnd"; "tipa-de.doc-1.3"="aa0msh91ynxxigmbxwy72i05g095fwxg"; -"translation-arsclassica-de.doc-2016"="xayn50bvfkyf5fh93426fg2m6mmvpdwc"; -"translation-biblatex-de.doc-1.0"="0kpsk44bah4ckxxhzdxzkmn5iqz0h5z6"; -"translation-chemsym-de.doc-2016"="khd057lr5p42wqz3p6n58d2z25jdknrp"; -"translation-ecv-de.doc-2016"="7yrn8n7071yasf0lpswz8dis0vkjg33g"; -"translation-enumitem-de.doc-2016"="8c46h1y6mpz736w2nh01jkh96n0ar2jx"; -"translation-europecv-de.doc-2016"="541qkhphqn2f3bba6prrf2npqxl022ah"; -"translation-filecontents-de.doc-2016"="9c59fnc6krcsswc3hsd4aimzfvycqp59"; -"translation-moreverb-de.doc-2016"="1j0hyf240k1q27li0dnnw0cs4mi2j86w"; -"udesoftec-1.5.2"="9h9fxz76s3ddcqpcrk37v84q6vd6fl80"; -"udesoftec.doc-1.5.2"="9s28bifqpwimsviciaqb2d38dzy9wja1"; -"udesoftec.source-1.5.2"="kv2y35sl60d2jav1daki5fgrvhfz9bff"; +"translation-arsclassica-de.doc-2017"="xayn50bvfkyf5fh93426fg2m6mmvpdwc"; +"translation-biblatex-de.doc-2.0"="zy7syskywyw0ndm1s6j8vp1q59c65aim"; +"translation-chemsym-de.doc-2017"="khd057lr5p42wqz3p6n58d2z25jdknrp"; +"translation-ecv-de.doc-2017"="7yrn8n7071yasf0lpswz8dis0vkjg33g"; +"translation-enumitem-de.doc-2017"="8c46h1y6mpz736w2nh01jkh96n0ar2jx"; +"translation-europecv-de.doc-2017"="541qkhphqn2f3bba6prrf2npqxl022ah"; +"translation-filecontents-de.doc-2017"="9c59fnc6krcsswc3hsd4aimzfvycqp59"; +"translation-moreverb-de.doc-2017"="1j0hyf240k1q27li0dnnw0cs4mi2j86w"; +"udesoftec-1.6.0"="w9avxxzylmpgvxkgz5q803vf8bn77b6l"; +"udesoftec.doc-1.6.0"="yv9w3pds1xmr7p1lapmk01c7qc02zymj"; +"udesoftec.source-1.6.0"="x8000k76ca8iq8717a13g7ahbxaz3n87"; "uhrzeit-0.2c"="5fwbnq0kjdcd88bmf0yscqvz1q47rlgx"; "uhrzeit.doc-0.2c"="22iimwpxs90xz0c6l9v7aq6l4wqm39bl"; "umlaute-2.1"="097i2xib6dk7g0pbn7h5blv9jnny07b0"; "umlaute.doc-2.1"="hkjv5ym6954i5l2qxv3jm3p1prbn55h9"; "umlaute.source-2.1"="p6217bas6hm8kksip8jkb2bhdpa9p91w"; "voss-mathcol.doc-0.1"="f15dshkczyv9r9a6vzps3ls1cz95sk8v"; -"babel-greek-1.9f"="gnx9s4l8viykx9f9fda0x6zcchfsvncd"; -"babel-greek.doc-1.9f"="j3mdbk02dww390316r39lldjyfcqm213"; -"babel-greek.source-1.9f"="9f8l0w2hpj2g5q09sf54zn9jbmg0fic2"; +"babel-greek-1.9g"="bm4k91lz9a1pfnl4jpn04idl2c08lyd0"; +"babel-greek.doc-1.9g"="y7jwlw980gigm0n059d2xsq1f93v2h9k"; +"babel-greek.source-1.9g"="qm52xxg59kdwbn680zrr9qdziagr69jk"; "begingreek-1.5"="7v94fdb2kxzwgvcsjfd5gnqpjhsrgp9i"; "begingreek.doc-1.5"="rgiglmyfkxghz1w9g67lyx28rvk2bwgc"; "begingreek.source-1.5"="jscz6nq9n7aq1l3j86xyvki200ja40p5"; @@ -2145,11 +2152,11 @@ "greekdates-1.0"="zm8cfpsxp12s6n38n7lgzha482124m7v"; "greekdates.doc-1.0"="lyhisq5vmvxpmc1g59dxnpkxnvziddzk"; "greekdates.source-1.0"="dy4cbvglp6fv0fd13mlm4x5wjfg97889"; -"greektex-2016"="zmms6d4vix6nzw6jc06iir73wj9swvir"; -"greektex.doc-2016"="p5f90xphw0ck7p6iw2gz6anki05v2b9y"; -"greektonoi-2016"="agnjlz6cdb3figh8g8kfnqah4ppzqqci"; -"greektonoi.doc-2016"="8mh04p3y9jizn5zdm63vr50nzk0rjcyv"; -"hyphen-ancientgreek-2016"="y52jhwd37cwc0fnvn1zrhqb7hxklsjlm"; +"greektex-2017"="zmms6d4vix6nzw6jc06iir73wj9swvir"; +"greektex.doc-2017"="p5f90xphw0ck7p6iw2gz6anki05v2b9y"; +"greektonoi-2017"="agnjlz6cdb3figh8g8kfnqah4ppzqqci"; +"greektonoi.doc-2017"="8mh04p3y9jizn5zdm63vr50nzk0rjcyv"; +"hyphen-ancientgreek-2017"="y52jhwd37cwc0fnvn1zrhqb7hxklsjlm"; "hyphen-greek-5"="b8drw54lc48kn8dwwyr4bpfsv5cxarjp"; "hyphen-greek.doc-5"="r6v8qyqkrvnqn6729i7p3ah3vmgxnzrn"; "ibycus-babel-3.0"="m0m76cgm1k930h85s6hi9qnlh86gf8z9"; @@ -2157,60 +2164,32 @@ "ibycus-babel.source-3.0"="samw380w28p4621z2f9fav06i9dzj3b0"; "ibygrk-4.5"="3xwia8yqznfai0wjz7rc63dizdfc3n94"; "ibygrk.doc-4.5"="ydy3swiwjr9r1j40fhkwhd2d7z614ipa"; -"kerkis-2016"="ydv39ycvib03pkw5pvvnv6mjyvrij0rc"; -"kerkis.doc-2016"="admp7blm0nd44qcnqqxd0bpwxskz7dqm"; -"levy-2016"="isfhykz3fkajjygnpl7psd2n9n9lzfwy"; -"levy.doc-2016"="y92455xr0yq62ppxd650vvxaknkb5qym"; -"lgreek-2016"="64pdy6vj1q7sg23xg31pw0mfznahcvzw"; -"lgreek.doc-2016"="iwa1xfg3sawwblifpgkc3na1r3hld02r"; +"kerkis-2017"="ydv39ycvib03pkw5pvvnv6mjyvrij0rc"; +"kerkis.doc-2017"="admp7blm0nd44qcnqqxd0bpwxskz7dqm"; +"levy-2017"="isfhykz3fkajjygnpl7psd2n9n9lzfwy"; +"levy.doc-2017"="y92455xr0yq62ppxd650vvxaknkb5qym"; +"lgreek-2017"="64pdy6vj1q7sg23xg31pw0mfznahcvzw"; +"lgreek.doc-2017"="iwa1xfg3sawwblifpgkc3na1r3hld02r"; "mkgrkindex-2.0"="v5hb36lspx6xyzzpm8ryprr7mwwpcrm5"; "mkgrkindex.doc-2.0"="mfpkm8mm8n0nqhzgnm70yjy16lzjvvhd"; "teubner-4.8"="7h0mh95kwrp8l3im9fq4m4my65hxcwpd"; "teubner.doc-4.8"="w0ygcfsjgrw6r5z49ciwxfwyxzpf6gfg"; "teubner.source-4.8"="l0syr53r8jk5cjh3lx8bf279hlgwsps1"; -"xgreek-2.7"="bvnzps4v0g12w7rg6i666f2ricnfwbxb"; -"xgreek.doc-2.7"="6sdy2idqj2wqzh1zmxp8si3kfa3y0x3b"; -"xgreek.source-2.7"="kriy6p17jib8p34mwzhk0f1kh7i76ksq"; -"yannisgr-2016"="0pjpl0qghjh6qdgy7snalxyxw6ca6cwk"; -"yannisgr.doc-2016"="jx7mj6aw24ff9k4qcr51kdlk7xwpiflc"; -"bangtex-2016"="cn3ss5r73gr19dbjlrnvb7icfpbb2aig"; -"bangtex.doc-2016"="7dwz3jgliyn649ns4iqmgjnqn80bv3xr"; -"bengali-2016"="xv6b2ya4hn8bhhfwmi7sziq9qwmhx6qb"; -"bengali.doc-2016"="f6c5pyzrih551k2p50vqy9jfx4ar3svx"; -"bengali.source-2016"="s77yi86avqzhp5lin4dwhbavb41g4q0n"; -"burmese-2016"="gymkq1rr5pmwaaid3dpks3f8ngz3525f"; -"burmese.doc-2016"="yirjf8crgj2a89451jh8iv66qhdqdrr7"; -"burmese.source-2016"="ixz9y2ck9awijs6w9rz005nkvl613811"; -"devnag.doc-2.15.1"="1ds3q2b6vhgds001haimf60xw9zcp7b5"; -"ebong-2016"="mhlr9r7i2zf3rm905m527hbnydppaiar"; -"ebong.doc-2016"="pqr96lyawpif4fzp0izw8j0506gnf06f"; -"hyphen-indic-2016"="s567k5d9h58s4a1203a5a8h34hwdxk8z"; -"hyphen-sanskrit-2016"="smb3iyryyb5p0fcrb083q6cnzh362ps8"; -"hyphen-sanskrit.doc-2016"="a2pncv9fz35p3bbj6mll93vqcyagsmbq"; -"sanskrit-2016"="scnnwa1xsfnpv0w7xp8ry49ps6s5pw8w"; -"sanskrit.doc-2016"="b7fyy6ghxy4i0r3yyhphbfanw660hpv4"; -"sanskrit.source-2016"="lyf2xns9lj8ip4zhvrk2lbjh2kmhpklg"; -"sanskrit-t1-2016"="lwnbgg4flg35ndf7p0iii468sf6avylv"; -"sanskrit-t1.doc-2016"="h7licx4ivjwnvbym7724rdj3vrcaak5i"; -"velthuis-2.15.1"="10lr5jgiy28w3diqwwj9qlmfrlhicg17"; -"velthuis.doc-2.15.1"="a4ha4kphbfin4xbqz8lmiv3v6cca3pcv"; -"xetex-devanagari-0.5"="v4gi0agfvxz808s3mapzf2ylxhv5n8a7"; -"xetex-devanagari.doc-0.5"="b3kz558m6h9avjwalwpw1nnr68q47sjr"; -"wnri-2016"="z6010l0pydl50vy5jnrg5fh2xki5fi6a"; -"wnri.doc-2016"="clpx7kcx1hp0qy30v5nlfz10kd5hmqcl"; -"wnri-latex-1.0b"="y9n4dac8cbzm2gwhcfan32rbv3dyhr0s"; -"wnri-latex.doc-1.0b"="f1m11fnp49h90f3djiml0awlxqcnxkdp"; -"wnri-latex.source-1.0b"="zd4smslq18sp693fgay24m503v01v3bk"; -"amsldoc-it.doc-2016"="3xqg4bjhsk0r27g7absrq84nwy6zy265"; -"amsmath-it.doc-2016"="mrz7iav2jpify9h3vz703x863km3vb9r"; -"amsthdoc-it.doc-2016"="bpi907wji0gimbc22s86vg3fwv6fkpsq"; +"xgreek-3.0"="gl8gam8ndsfvdgcksgh0zvgfpyc99128"; +"xgreek.doc-3.0"="kmb4zmz5q6yzh4iwdbwrxaijq0y9v7y4"; +"xgreek.source-3.0"="z66y54im2xrvgmx5nmj3ajh5z3x2nmjq"; +"yannisgr-2017"="0pjpl0qghjh6qdgy7snalxyxw6ca6cwk"; +"yannisgr.doc-2017"="jx7mj6aw24ff9k4qcr51kdlk7xwpiflc"; +"amsldoc-it.doc-2017"="3xqg4bjhsk0r27g7absrq84nwy6zy265"; +"amsmath-it.doc-2017"="mrz7iav2jpify9h3vz703x863km3vb9r"; +"amsthdoc-it.doc-2017"="bpi907wji0gimbc22s86vg3fwv6fkpsq"; "babel-italian-1.3n"="zc8zwrjbpcjp57il9zjpqs5hhzrk0y1a"; "babel-italian.doc-1.3n"="z8gv41rw62chkmxvkw5a83i7vznsbsqv"; "babel-italian.source-1.3n"="9gyf05wa96w7xhwh1xyfs4rnl2iax3lc"; "codicefiscaleitaliano-1.2"="gqzlc6agkwysk75lzdxbkz4azawzyrjh"; "codicefiscaleitaliano.doc-1.2"="c7spaihgf2fdimihsg5cf7xn5bczkw97"; "codicefiscaleitaliano.source-1.2"="vxi0halq6yx9gwd0vkcmjx6am7dnjjg1"; -"fancyhdr-it.doc-2016"="nl2xsg3mppyni8ns9zij452dkkw4ayj0"; +"fancyhdr-it.doc-2017"="nl2xsg3mppyni8ns9zij452dkkw4ayj0"; "fixltxhyph-0.4"="gkadi0h5794bxkkb809162a1z7aicw78"; "fixltxhyph.doc-0.4"="l2xq1rsc95fbk3saqnx86l9d73mvm92v"; "fixltxhyph.source-0.4"="4nhcwfdf5gs7fc5iy5fph8yiq4wavjp3"; @@ -2226,80 +2205,100 @@ "layaureo-0.2"="7qqhm139n1afxdpsmikzdyn7pn09hv9x"; "layaureo.doc-0.2"="pf22ypfazq7hwxpfiidcvkd24zs1gys3"; "layaureo.source-0.2"="3q0ixl7rw7sz7n2bfd8gyfnglfcq2hcs"; -"lshort-italian.doc-2016"="n79a6mw3xc3ar3adan0l1xpr4xg8wrid"; -"psfrag-italian.doc-2016"="xb8qlcz7f0za963yybhjvbyjq37z516f"; -"texlive-it.doc-2016"="bbim7p2q4q784i1lxxaadsc02k4zdi50"; -"bxbase-0.5"="a15adjgil68cxdysrijbp9acmbqa0y27"; -"bxbase.doc-0.5"="0rbdki8mbd6z16xz2wapachnxm8yncxj"; -"bxcjkjatype-0.2c"="ab1xwylw4sijrmxf9ri6skvg79xahsc9"; -"bxcjkjatype.doc-0.2c"="v0h7kjrfcpswvw3rr2hf99gk90wbi9sr"; -"bxjscls-1.1e"="8dhffc4warg6h7h6ihcpr66sqxmakhn7"; -"bxjscls.doc-1.1e"="p4kmrya3jxk4y736k31m171sljnd2xyg"; -"bxjscls.source-1.1e"="v593smvfnqwnqm3x405w68cs18g0n5vf"; +"lshort-italian.doc-2017"="n79a6mw3xc3ar3adan0l1xpr4xg8wrid"; +"psfrag-italian.doc-2017"="xb8qlcz7f0za963yybhjvbyjq37z516f"; +"texlive-it.doc-2017"="vxqvdibyhil9anvlywb1yqqq8x9mcpwb"; +"babel-japanese-2.1"="jvwjzk00mbywd64cjgchn58lcvvdm2lz"; +"babel-japanese.doc-2.1"="xy5s8j84q60va5jm7b39lmncjrxyr4c1"; +"babel-japanese.source-2.1"="mi0ahdg238r2ra2l91vp4wpfad32ahsa"; +"bxbase-1.1"="9qcjdyngscll1bkc1g0i9d50hjrvnbjv"; +"bxbase.doc-1.1"="icyayz4cr8p3zgbby8zaypclximpiyqf"; +"bxcjkjatype-0.3"="94n8gv2433510cq05vl97zrna0gyya1z"; +"bxcjkjatype.doc-0.3"="z6rarps2vgxp061w0q8amki68j51yqlx"; +"bxjalipsum-0.3a"="d6svafibkkjc5p3hjzrc8ibb2fwmm05c"; +"bxjalipsum.doc-0.3a"="srwc07mapyqn9hq6hy26gxaj6khy9ffh"; +"bxjaprnind-0.3b"="8pfq18sbkvqzb2may5j4n8xadgjb8a9l"; +"bxjaprnind.doc-0.3b"="1vsxn97w48hn05il79byfms5w6749xpc"; +"bxjscls-1.7"="1hgja444lxjrm4jjkrj0shkpvvx8m4vx"; +"bxjscls.doc-1.7"="ykz4rbm0qah2rk26kf7l2zgabcwkvd6h"; +"bxjscls.source-1.7"="74cic57mzsbshnz7gm2447jdivr5mx60"; +"bxorigcapt-0.2a"="16ri8j6fyqc1rf8jmjja41vdxpqnvckq"; +"bxorigcapt.doc-0.2a"="i91ilxpc4f37qihbn9wa6ajvn00ya60r"; "convbkmk-0.10a"="nzdsi8as7xpp83w064r6hwv9lv41fiq7"; "convbkmk.doc-0.10a"="481fahf0p919gl9rl46qpp4xi9s9xbqm"; -"ipaex-2016"="rw3p5qiwbw8csvmxmx6gzd5pn58wgld0"; -"ipaex.doc-2016"="ik7n8w57ix8himq7z26llc52gl07f767"; -"japanese-1.3"="bhx7258l34dp6rnim62i8hfjdpdaa3yp"; -"japanese.doc-1.3"="yg6si864mkna4svdlmrv0hbs5ndrdgd0"; -"japanese.source-1.3"="vgpac9smlyfli4fz4k1m807s0l9qmq6d"; +"ifptex-1.2c"="g067kqkal711mapnw2lfqspj557ddr9j"; +"ifptex.doc-1.2c"="x22bmp95nh3g718b8b9ls535vv1nkzck"; +"ifxptex-0.1b"="b4594mp983rcvzjf9ga6jl4zm0szh4xf"; +"ifxptex.doc-0.1b"="1mng0d5rg93q63xai5034xdmp8g534n8"; +"ipaex-2017"="ib3p210rjr3h73257p7swchy3w1in5bh"; +"ipaex.doc-2017"="1rvvg102vks3ai8pf8yykckd3c9jhmz1"; "japanese-otf-1.7b6"="gg3a77f64a0hikr7vy72sbkbgalrafp2"; "japanese-otf.doc-1.7b6"="4q54k2hdnq3yqwrdvj782ys17d9y019b"; -"japanese-otf.source-1.7b6"="9crkbzn6bn2r9b40ms5fs4hc5hrvaxw7"; -"japanese-otf-uptex-0.17"="nyxs33g2s0ra3p5glc2bixs99d2y21gj"; -"japanese-otf-uptex.doc-0.17"="dhh6vvdlj2ynw5gkaqibj6gb32ymi2xw"; -"japanese-otf-uptex.source-0.17"="c2nhgc2a9h9yxhvjgdva1gyvb4a7ni6x"; -"jfontmaps-20151002.0"="3nr06l8xz4f6dbkv41arnn2lr85b6g6l"; -"jfontmaps.doc-20151002.0"="9vzwyilzslxiff1cbnjrivgkcczvphg9"; -"jfontmaps.source-20151002.0"="fbpi1hz2hn9lxd2xn419bwb3yrhk3dxw"; -"jsclasses-2016"="ll9ymhjaym0ip3b1hicfanaqnp964571"; -"jsclasses.doc-2016"="hcnrfmk77v35h6mq8c5is8fscvbi80g3"; -"jsclasses.source-2016"="26v2qml65yd158p2x9jr42w0asfpivm1"; -"lshort-japanese.doc-2016"="5b8svqq4w1ipn3737s73pk969s8yv63d"; -"luatexja-20160618.0"="y9fa72kg3d4y7i544v13976fnqxmrdks"; -"luatexja.doc-20160618.0"="9cgwbgf2iprakwm54c9mda239q41z9ax"; -"luatexja.source-20160618.0"="cqmwfwl8gx01iqa2k12krdya66fz0ny1"; -"pbibtex-base-2016"="nix33k8m51bymsgnmfz69mwpllkk9rhq"; -"pbibtex-base.doc-2016"="vgmw5w68b5y2rhwsjssm3bx4dn96ix7n"; -"platex-2016"="x1z2syyv0623500bfx5i55j5f2wv82z2"; -"platex.doc-2016"="2n7xgi5cfshdcfk6n4asb7kbxah4k2bf"; -"platex.source-2016"="wb5fnxsrh9p00bc147ih2bfh34kab7dp"; -"ptex-2016"="x0555j3scclcqr7qzzi9vxf5iqirajdm"; -"ptex.doc-2016"="fxd4wrfgdfrxp5bamywg78phlb1gfac7"; -"ptex-base-2016"="55wwpashqmwca7iz7q84l7kjj8ixpfga"; -"ptex-base.doc-2016"="cw7jprmh9gn8jzs4mdkhb0rj7a75ipzv"; -"ptex-fonts-2016"="ygpza762nrl05i590p60q8nyqxn42ks2"; -"ptex-fonts.doc-2016"="13hvfwppj9fdya0wlj0sv5db5bzr5sw5"; -"ptex2pdf-0.8"="v4z8kvf5hz5jig8c1fv8aliaczxf3aya"; -"ptex2pdf.doc-0.8"="sjp97aka09xpkq16chn1rd0xvjbkd45l"; -"pxbase-0.5"="cfs2rdlj1wsmjnr63pvm49dvhxhjzm42"; -"pxbase.doc-0.5"="a9m3kywik9d25vwjlg87bbarx3pd5by5"; -"pxchfon-0.7h"="bji0lsjvxfdi6z8xd4ql17lzkg08kryp"; -"pxchfon.doc-0.7h"="bbhykif867fd2qjnwhv10wqhvxm8m21v"; +"japanese-otf.source-1.7b6"="pvan5wp1hhq0dqm2x97kwa43c6qc4lrw"; +"japanese-otf-uptex-0.18"="39mga89mi6sjx8m9f1wds2vb7dxkgh9d"; +"japanese-otf-uptex.doc-0.18"="qynw8kr676ziw58s9d6xsddrs70ak4xd"; +"japanese-otf-uptex.source-0.18"="3fn8rrnjy25l185997kijl7pl85n3j4f"; +"jlreq-2017"="ljpxap8lmg4rin18gx7yb8dj23qybdjw"; +"jlreq.doc-2017"="8apgk3zjg4d4qwmnchghwk3y6nf1dcqc"; +"jsclasses-2017"="fp6d5ngzlikw8hcwrzxjzd5d0i26a2v3"; +"jsclasses.doc-2017"="pkvvkbd87mmd16dd8q582p1qlpq75371"; +"jsclasses.source-2017"="8mncfg6rspk5d2z4dc312zkjgvbcxm61"; +"lshort-japanese.doc-2017"="5b8svqq4w1ipn3737s73pk969s8yv63d"; +"luatexja-20170904.0"="axn9g52f6apx06r0rb4iwyjcf3bgjasa"; +"luatexja.doc-20170904.0"="0y8la2x2mmp9lkjwfv6w5f3cd28xvsgc"; +"luatexja.source-20170904.0"="g41i6xvj5c2b2wzrvv3rx4l1cc40g40r"; +"mendex-doc.doc-2017"="4wkds7kkvz3mhbvs8xzh4ngrm0r0yx77"; +"pbibtex-base-2017"="nix33k8m51bymsgnmfz69mwpllkk9rhq"; +"pbibtex-base.doc-2017"="vgmw5w68b5y2rhwsjssm3bx4dn96ix7n"; +"platex-2017"="x5sb8df71kw00nfzir5zxqx1jx6rsm66"; +"platex.doc-2017"="hxndm30avbn4hga129anfm7n1agly6hd"; +"platex.source-2017"="9y1cd3wn7kqfifbw8fvx41pjf5m1n50a"; +"ptex-2017"="x0555j3scclcqr7qzzi9vxf5iqirajdm"; +"ptex.doc-2017"="chzqsyz5qqbr22q5kkqirqdjgllg217v"; +"ptex-base-2017"="2014gdh1r3xvpc1zmz2smd3d06h88d45"; +"ptex-base.doc-2017"="xxvf7g44g2p40mlaqm4sjrp1i29ywd2c"; +"ptex-fonts-2017"="90hb2mblilkzdz3nqkj2a81bkhli0n41"; +"ptex-fonts.doc-2017"="0q2kl6r1y06kafjfgvyzpgvlw0y0y93g"; +"platex-tools-2017"="xrvccbdblczim03gxf3iaaggm87zdgkf"; +"platex-tools.doc-2017"="3f9k9prxavf4xsm2csbngn4na6a0jm47"; +"platexcheat.doc-2.0"="cipznb3854pnlvzrvxrxnwx5127gm5c9"; +"ptex-fontmaps-20170624.0"="nqcwmyasci6f12kan5pjpszjpr01lkmk"; +"ptex-fontmaps.doc-20170624.0"="v7vh5f8r20krpp5r416iid7qxf48x5rk"; +"ptex-fontmaps.source-20170624.0"="75v1ldqccndrs2r0visyz17j50lnj7r6"; +"baekmuk-2.2"="5rhc42dabpd99i92hkdmkjzgr3jqhg16"; +"baekmuk.doc-2.2"="4syhh948m1jw14xlhq6dbpdw5p5p198h"; +"ptex2pdf-20170622.0"="5zpcvc07hqncglb19x8m0k7bs4nklg6l"; +"ptex2pdf.doc-20170622.0"="4rrbqj997yvh83wzkcwwh2sqsdxn58yj"; +"pxbase-1.1b"="92jsnxmiqmpy56dhdjaark80zsbb5vxa"; +"pxbase.doc-1.1b"="n5ns9b3vpa52b78hhgbvg0114faw0dgi"; +"pxchfon-1.1b"="227z9k89r1d0qi5lhyriw3mzg4m469rw"; +"pxchfon.doc-1.1b"="i3h7adlmw907vhcjv5scqx6jxfyxx0m5"; "pxcjkcat-1.0"="dzfnrrf8f727a0jhk1fq0w10jqv189fc"; "pxcjkcat.doc-1.0"="05wz2shwxan0crgahavbgpki8kvvq6lm"; -"pxjahyper-0.3"="gnmm16rnsj53989hvwrr3zbrdagqgsr9"; -"pxjahyper.doc-0.3"="kv5755ff29b9qq4krldj34dr7y8d11mq"; -"pxrubrica-2016"="715qrv98q1p45igh4i8vdbahjiirn6cd"; -"pxrubrica.doc-2016"="x8sahrizyfs3fsrcj0ir2kp62cd7bvfa"; -"pxrubrica.source-2016"="m3pwdsq4d4d8wr1ansgf3l8lv1dsks0w"; -"uplatex-2016"="jcp920r12y0ycpn3vcbrqpqkyz9h6cap"; -"uplatex.doc-2016"="rjijgnngr283s18cn8l5s2ak6pdna0p7"; -"uplatex.source-2016"="wwmsbbcvzps1fwihgg67gpcsx4g6p82b"; -"uptex.doc-1.20"="yh3sqpmqh2np2rh2znjw7yi7nwjpqmzf"; -"uptex-base-2016"="1rnrl91k8j55vn11jb524ax006zsa0k9"; -"uptex-base.doc-2016"="f5xmqqmm6dpbl34449a6cypzj5dfz872"; -"uptex-fonts-2016"="rrblg7298fjx0i812c3ang0jyayr5673"; -"uptex-fonts.doc-2016"="9xplpb15g2a7mlgwl9nnf80jrkqn1fgv"; -"uptex-fonts.source-2016"="7fv1x7hb2wxq46dpk5iqq3ah996fbyms"; +"pxjahyper-0.3a"="3a9zl4137v9aj5rxbq7adw58yvnpy5cf"; +"pxjahyper.doc-0.3a"="5vp1y5bkkgmsnx9nb3008xwkjcn0c6m6"; +"pxrubrica-1.3a"="bkfyawj5m7c98fg5vzixpch3kjsxrpin"; +"pxrubrica.doc-1.3a"="gglfvvfwj2zvz1r6mwq1rxhppjj4b8p2"; +"pxrubrica.source-1.3a"="1c4bnhz069j2nq9zbngf3fliywf71q60"; +"pxufont-0.3"="9cvf0yzn10qsfzwymqgzjc6va01yxrvg"; +"pxufont.doc-0.3"="mfxsqffbf5fdipm4cfzmxk0c51kkncxk"; +"uplatex-2017"="q64l0jcg7j81xs1zm4zsmrw5i7zxkz0j"; +"uplatex.doc-2017"="3blys33r5npwd9zdkhyng96d1f797wc8"; +"uplatex.source-2017"="xmvm4ac425msrcsii3nafnk5ck0yyssi"; +"uptex.doc-1.20"="nm8z65s2mglz8j7b14ycyjfjcxqq67j6"; +"uptex-base-2017"="8w4dl8ga3rarn2zl6515i6xcx5x9qbng"; +"uptex-base.doc-2017"="ya7n5pgaxb556i3d2qw1qhgnd03sdwg5"; +"uptex-fonts-2017"="671gjfrrxvxsym1kcbmdqwng3p66vcsv"; +"uptex-fonts.doc-2017"="jyvva851nsqjwwqfkhsjlsa6xmzc4lyp"; +"uptex-fonts.source-2017"="7fv1x7hb2wxq46dpk5iqq3ah996fbyms"; "zxjafbfont-0.2"="gqmmwcbw81z91mwqf731jk0mgdfiw8d5"; "zxjafbfont.doc-0.2"="0901rpw6rd2wivh0fsqnna6gywc6j8hh"; -"zxjatype-0.6"="9qhfs4jzhh2hg62bbdgczns5p6lp4yxp"; -"zxjatype.doc-0.6"="dsbn56x5h53lz263hq1llbbb7s1v5cxq"; +"zxjatype-0.6b"="4l4hhr25q10l90846y1vqziv72k4a11w"; +"zxjatype.doc-0.6b"="sgbxv0j3f3jb0gw6rx3nq4vmfgpn3m7q"; "cjk-ko-1.8"="bzihr3wa6c0rp7jrj89483w2xlapj6jv"; "cjk-ko.doc-1.8"="avb0cwq3p97yj94gsfwj29bwdixv2lyg"; -"kotex-oblivoir-2.1.7"="b4awgfxn4990kjv0gjv8vgifik5pz48r"; -"kotex-oblivoir.doc-2.1.7"="3gi19z396y82hfyzl6p3kh247k23h4ng"; +"kotex-oblivoir-2.1.8"="wq598w1jbvbczmznn97basmrybz42zxq"; +"kotex-oblivoir.doc-2.1.8"="inqj292cqra8rxpa11vwkpjx7wcpx3zr"; "kotex-utf-2.1.2"="x3j8gcy8ylvgpiwyrwrgl8wjj9gdrp63"; "kotex-utf.doc-2.1.2"="r61iwnwwvwh1999l4ylczvz0d6l9ff1f"; "memoir-3.7f"="3jvlhgp9mk14zlsqwb9y5x1nh3xk6ydc"; @@ -2312,12 +2311,16 @@ "lshort-korean.doc-4.17"="1g5islw4v6x4s50zxb0zgc3nhk83yf06"; "nanumtype1-3.0"="b1wscjlknaslwhpaxxfi8w2drxg1m770"; "nanumtype1.doc-3.0"="4jpi6pmfq42sbcfzl403niskxg6qnxfp"; +"unfonts-core-2017"="ms70r9bpx59vj59mgrg9366idfzr17hf"; +"unfonts-core.doc-2017"="15lirjd8hw6kajqalrbjda9fzbgzs7c2"; +"unfonts-extra-2017"="ib9sxr60ylsw9vyvr3wxya8xhq6hv0ix"; +"unfonts-extra.doc-2017"="2r7sls3pa7a3fq9q74dlzhp7yjbwdsni"; "amsldoc-vn.doc-2.0"="09zv7q83wc6zg9an9b1x1nvsnqx8bpcr"; "aramaic-serto-1.0"="mcxkjm533zpz4srgqqbd1asax309lhmk"; "aramaic-serto.doc-1.0"="2717wqsb2bzap0cjgw8d1rsryjyil57n"; -"babel-bahasa-1.0l"="qrw3i2ywjbgyacpn10n7kdxrxiv2dr3c"; -"babel-bahasa.doc-1.0l"="rrvz1g8jjjjyzhkaz1kdj0zhl7z8wvvz"; -"babel-bahasa.source-1.0l"="667qxnss58f78gbmabgafbcjricc547h"; +"babel-azerbaijani-1.0a"="hyp5q2f1i53nwc2fpzrvg73sig4cidi3"; +"babel-azerbaijani.doc-1.0a"="hii173fm6g5kdiai6d26f3zfg1p5bay3"; +"babel-azerbaijani.source-1.0a"="x887igvkinyx05lnir925xva5snhmsvf"; "babel-esperanto-1.4t"="0zwr18503la5x4gw11ic8x2gbhb5ic06"; "babel-esperanto.doc-1.4t"="vyjxr4qb3w2nj8a0d51n9k0zrdy56brn"; "babel-esperanto.source-1.4t"="ngrcz6ixvk4mbpg41jgp38py5ynfqssw"; @@ -2326,9 +2329,15 @@ "babel-hebrew-2.3h"="4mbg393m14m3j2i5sxfznnr486jw83b0"; "babel-hebrew.doc-2.3h"="arlh4cs388rna2cj734yfi4vjrfli6bd"; "babel-hebrew.source-2.3h"="8g78490s5lnmgi3h4rxw30cprmqv5mkz"; +"babel-indonesian-1.0m"="q9v0zfb6xbw2q4wa0pa0bray3knhxpm4"; +"babel-indonesian.doc-1.0m"="b9f34f8r7nvdby8z00xw1z56kmd92p2m"; +"babel-indonesian.source-1.0m"="rdb6dd4h5qjsgzqwx71g0n1h41ldfh9n"; "babel-interlingua-1.6"="sq1l1svm80rfm09l1ys2ha7x0cyg4h3v"; "babel-interlingua.doc-1.6"="q0zmjgrk58m7ivyi952jr3l0hnicpbxa"; "babel-interlingua.source-1.6"="v04rpx7bwxjvdl8psjhc8w38krsv837c"; +"babel-malay-1.0m"="72z6yjhaxbkvnvs3x98bp3jrkkyk2ihv"; +"babel-malay.doc-1.0m"="8x81zjk3fmbnl5mq1dzxphhk6ap9sfq8"; +"babel-malay.source-1.0m"="npqm8jnnh4i4kjjsz228ccy6mzg1q5mc"; "babel-sorbian-lower_sorbian1.0g_upper1.0k"="7vc0b3cfj4j9b1wjim0h68lnr941yarq"; "babel-sorbian.doc-lower_sorbian1.0g_upper1.0k"="vvpq6ah1mapvcg8mbjm68layvcbhp05d"; "babel-sorbian.source-lower_sorbian1.0g_upper1.0k"="yi38218h67326i4swrj94ma5pjax5krc"; @@ -2338,114 +2347,161 @@ "babel-vietnamese-1.4"="pi8gc005y8hn42hyxrn7p23kbashsv1c"; "babel-vietnamese.doc-1.4"="5l7qyvppvihhdzcszaxskiscp8xm686h"; "babel-vietnamese.source-1.4"="y9wmbn3j1f614p6dfciwnvig3v5r9q39"; -"cjhebrew-0.1a"="yrqcf3w89y1iapkax8cmymbckaanim9q"; -"cjhebrew.doc-0.1a"="klgdcnc8fkxi7j8y5ckmm3dz08qb8pin"; -"ctib-2016"="gdfzyzhwfcwi275xdrvah86459bsfxx7"; -"ctib.doc-2016"="jy7r4mkpncfmy0djcxvpcvkwjaqxv7s5"; -"ctib.source-2016"="3pfn4qglvw3wjjw4f3jlk5vzq3ci4zj6"; -"hyphen-afrikaans-2016"="whfr6hv11bax9c0crb7fm29xs9m2qb0w"; -"hyphen-coptic-2016"="p47kp3hkkwz9ihxh3ijac8gx4maqbmlp"; -"hyphen-esperanto-2016"="7jmj4q99wjl0ia2s0wzkm0m5jwh3bzkh"; -"hyphen-georgian-2016"="2qsb2ivmvmj13pw8z4xa6kv51209nnfm"; -"hyphen-indonesian-2016"="nkrgjmp62s8wq32qbvfginx0fgzgn2m5"; -"hyphen-interlingua-2016"="7zichfacqkg5vrzb4ps6327p8lsxdjq0"; -"hyphen-thai-2016"="kfc8fbnx1cmg4s1qzl2k20n7llz1i4yj"; -"hyphen-turkmen-2016"="1mn76d4axhk2hz29qdla7f18kwf3y0kq"; -"hyphen-turkmen.source-2016"="c7md4qrdh7hms3vzkpcams5hwl8qy953"; +"bangtex-2017"="cn3ss5r73gr19dbjlrnvb7icfpbb2aig"; +"bangtex.doc-2017"="7dwz3jgliyn649ns4iqmgjnqn80bv3xr"; +"bengali-2017"="xv6b2ya4hn8bhhfwmi7sziq9qwmhx6qb"; +"bengali.doc-2017"="f6c5pyzrih551k2p50vqy9jfx4ar3svx"; +"bengali.source-2017"="s77yi86avqzhp5lin4dwhbavb41g4q0n"; +"burmese-2017"="gymkq1rr5pmwaaid3dpks3f8ngz3525f"; +"burmese.doc-2017"="yirjf8crgj2a89451jh8iv66qhdqdrr7"; +"burmese.source-2017"="ixz9y2ck9awijs6w9rz005nkvl613811"; +"cjhebrew-0.2a"="nkca25dwl8i1li6q63sv4w2n35z28bdn"; +"cjhebrew.doc-0.2a"="w8jqlvv6cm125d68dhfsar5y7xynac7d"; +"ctib-2017"="gdfzyzhwfcwi275xdrvah86459bsfxx7"; +"ctib.doc-2017"="jy7r4mkpncfmy0djcxvpcvkwjaqxv7s5"; +"ctib.source-2017"="3pfn4qglvw3wjjw4f3jlk5vzq3ci4zj6"; +"ebong-2017"="mhlr9r7i2zf3rm905m527hbnydppaiar"; +"ebong.doc-2017"="pqr96lyawpif4fzp0izw8j0506gnf06f"; +"ethiop-0.7"="fd4kynb70wkja5fxhi10n52mff3s2a8q"; +"ethiop.doc-0.7"="cabq6vprpklsmzi68af6nb4qiwbrwmzf"; +"ethiop.source-0.7"="yv6pwmbkvahpy2h4vnijnqag2rv09k5l"; +"ethiop-t1-2017"="f73j35aqlr29gmh9k00d3s0jzkmk6zq3"; +"ethiop-t1.doc-2017"="92ly98mz1iim1gfh4cm8hjwc17j9kjhl"; +"fc-1.4"="iyjlb5q55khnp515n1snhpnfrrmfn1pm"; +"fc.doc-1.4"="wd9bn967d6nzzvdrvim470l711v1jkg6"; +"hyphen-afrikaans-2017"="whfr6hv11bax9c0crb7fm29xs9m2qb0w"; +"hyphen-armenian-2017"="mdffnpk1ry6sw0xs8h5adzzz11dr7d8z"; +"hyphen-armenian.source-2017"="0b2gny5672fkb5sd8vb2g3fapx9pl7z2"; +"hyphen-coptic-2017"="p47kp3hkkwz9ihxh3ijac8gx4maqbmlp"; +"hyphen-esperanto-2017"="7jmj4q99wjl0ia2s0wzkm0m5jwh3bzkh"; +"hyphen-ethiopic-2017"="nixwv8azmh1p1av7alhrzbxqqihcgndy"; +"hyphen-ethiopic.source-2017"="dg6qij9y5la6kr6izwb2ap1mih84bcdd"; +"hyphen-georgian-2017"="2qsb2ivmvmj13pw8z4xa6kv51209nnfm"; +"hyphen-indic-2017"="s567k5d9h58s4a1203a5a8h34hwdxk8z"; +"hyphen-indonesian-2017"="nkrgjmp62s8wq32qbvfginx0fgzgn2m5"; +"hyphen-interlingua-2017"="7zichfacqkg5vrzb4ps6327p8lsxdjq0"; +"hyphen-sanskrit-2017"="smb3iyryyb5p0fcrb083q6cnzh362ps8"; +"hyphen-sanskrit.doc-2017"="a2pncv9fz35p3bbj6mll93vqcyagsmbq"; +"hyphen-thai-2017"="kfc8fbnx1cmg4s1qzl2k20n7llz1i4yj"; +"hyphen-turkmen-2017"="1mn76d4axhk2hz29qdla7f18kwf3y0kq"; +"hyphen-turkmen.source-2017"="c7md4qrdh7hms3vzkpcams5hwl8qy953"; +"latex-mr.doc-1.0"="vwb062hbn3371czg99plccbvxw1a7gjh"; +"latexbangla-0.2"="6ix7rfgj51z585jry3i1g68x4wvm4xxz"; +"latexbangla.doc-0.2"="iw79gb4sk4hys6xbc8j86lpzyji8h7r9"; "lshort-thai.doc-1.32"="iwmnm7z7b3r8km4i3afq8hz0f2vy9dl2"; "lshort-vietnamese.doc-4.00"="2y25jrim204g4q916rf1hhkavl7fi6vx"; "ntheorem-vn.doc-1.203"="ys9g749d9f2nbq55ckyrjrr4mg9yywni"; +"padauk-3.002"="dwdgm603clk71s9gcjx9ghzwlkh6k2gd"; +"padauk.doc-3.002"="zarib60py4ddx2axyrm695pkikxih70z"; +"sanskrit-2.2.1"="scnnwa1xsfnpv0w7xp8ry49ps6s5pw8w"; +"sanskrit.doc-2.2.1"="0ps1lrlzdhq7gaagjqb3m4yygpz4g7p0"; +"sanskrit.source-2.2.1"="dp3nk8wbjrvb3hg4xdxl8s8m1wfcwny5"; +"sanskrit-t1-2017"="lwnbgg4flg35ndf7p0iii468sf6avylv"; +"sanskrit-t1.doc-2017"="h7licx4ivjwnvbym7724rdj3vrcaak5i"; +"thaienum-0.2"="acsj56dxkcqi83yajkm4rjxm99p6r10a"; +"thaienum.doc-0.2"="55zcsq659l2wki581xvcdy3ssljgk9s5"; +"velthuis-2.17"="10lr5jgiy28w3diqwwj9qlmfrlhicg17"; +"velthuis.doc-2.17"="f3fwfja1qnbh6hbn93zs4y2f4pwwn7kl"; +"xetex-devanagari-0.5"="v4gi0agfvxz808s3mapzf2ylxhv5n8a7"; +"xetex-devanagari.doc-0.5"="b3kz558m6h9avjwalwpw1nnr68q47sjr"; "vntex-3.2"="vzdcn6z7knkzsj8gxwj8zda00dq6w8is"; "vntex.doc-3.2"="5ix8dldkd2qmmbwn731ii4ffng7d3fgr"; "vntex.source-3.2"="72m9wqbqrsam0b6a15lqq4yq5hbcx0kj"; +"wnri-2017"="z6010l0pydl50vy5jnrg5fh2xki5fi6a"; +"wnri.doc-2017"="clpx7kcx1hp0qy30v5nlfz10kd5hmqcl"; +"wnri-latex-1.0b"="y9n4dac8cbzm2gwhcfan32rbv3dyhr0s"; +"wnri-latex.doc-1.0b"="f1m11fnp49h90f3djiml0awlxqcnxkdp"; +"wnri-latex.source-1.0b"="zd4smslq18sp693fgay24m503v01v3bk"; "babel-polish-1.2l"="k73wcwg7ab64nwjyq9rb78pmgkapy4xq"; "babel-polish.doc-1.2l"="720j9r3c7y7yak2j3qbgx2baanwl6az5"; "babel-polish.source-1.2l"="65j5b50flchq2kw6wi8g3i4jz9n9h7w3"; +"bredzenie-1.0"="dhjq0ccgxxin5a6fmwb95275d1i11xkh"; +"bredzenie.doc-1.0"="br35cfyn2zq2qb44mss225ylw16sz0jq"; "cc-pl-1.02.2"="d0vdpawzrgwsxj9sff3y83mf1xrs891y"; "cc-pl.doc-1.02.2"="wqnvmgzzh65fhrgwbrmpa307qa7xbh21"; -"gustlib-2016"="x6dscxji10p04msr31f3vsaf6pfpzhsg"; -"gustlib.doc-2016"="07x28ysinfhv15jlkpyfsv7cjyzwbdg7"; -"gustprog.doc-2016"="v1mb66z2nc7vwhy2yg5rk699mvqkpqs3"; +"gustlib-2017"="x6dscxji10p04msr31f3vsaf6pfpzhsg"; +"gustlib.doc-2017"="07x28ysinfhv15jlkpyfsv7cjyzwbdg7"; +"gustprog.doc-2017"="v1mb66z2nc7vwhy2yg5rk699mvqkpqs3"; "hyphen-polish-3.0a"="pdmrgcp1gnms1yqnscrk977xzg2b2rpr"; -"lshort-polish.doc-2016"="7fr1g9j932xjam26nnf6b6zc47m1i9g8"; +"lshort-polish.doc-2017"="7fr1g9j932xjam26nnf6b6zc47m1i9g8"; "mex-1.05"="z7m8kmw19bg4yw3p99fvpvhhclkj5ff2"; "mex.doc-1.05"="qajd1x35x1mbkvs39hbxs3qd8df3hp5s"; "mex.source-1.05"="kf6k037zqvlad7sm8z4a2gkg2xlf01j3"; "pl-1.09"="glzasf47dgz69y9gkr4amiffpl7wwx8j"; "pl.doc-1.09"="1p5zh9jmllvddgsnnafm2vabqhwdqq3f"; -"mwcls-0.74"="i2g8cqdlkrkz6q8km8vb2l0hckx1qn6s"; -"mwcls.doc-0.74"="bd0kqb1b219dmp2nqfjm87ak0d92ys99"; -"mwcls.source-0.74"="affb5qi93zka4jz4ihy8mfn1qc8kbhbv"; -"polski-1.3.3"="i5daqxm5hdqbq7bmi8fdk1sz58vk6l5x"; -"polski.doc-1.3.3"="wqj47s7sdb26y570npr0byq70m7c72cb"; -"polski.source-1.3.3"="6n5clfvas1s0s7cmmik9rvjzd30nky0l"; -"przechlewski-book-2016"="qid42vb23l6fzc6dgmx3bflwz7z0mdb5"; -"przechlewski-book.doc-2016"="23zvnv9pcvl5n68js39l4hrcli608qck"; -"qpxqtx-2016"="wxccyd4si0x6338hwmwdaxmjj3brm7p8"; -"qpxqtx.doc-2016"="xvxsnjfajz7zfvgfih7v3mfca5b36qda"; +"utf8mex-2017"="d8314s7lhlafhspi1qf8hiqzx61n439a"; +"utf8mex.doc-2017"="svpkpbc0caxbynjnjjynng11fdg3dgid"; +"mwcls-0.75"="nldix3j60gjybkg60qdbi1wrdarqggqb"; +"mwcls.doc-0.75"="16cqcaliy99s6dqnb507hcncxbjlhgmq"; +"mwcls.source-0.75"="x6jn9m23ickiy79sk1w1jsgiqpk2jh9v"; +"polski-1.3.4"="j98gsw0v3vf0a9j8bfjbynmrv47fcd34"; +"polski.doc-1.3.4"="zldgln4yhr6qkmay2aqrlv0bbbwqdyyl"; +"polski.source-1.3.4"="a7ig2cy5jamdgk3dxigyz4qa0kjrd36z"; +"przechlewski-book-2017"="qid42vb23l6fzc6dgmx3bflwz7z0mdb5"; +"przechlewski-book.doc-2017"="23zvnv9pcvl5n68js39l4hrcli608qck"; +"qpxqtx-2017"="wxccyd4si0x6338hwmwdaxmjj3brm7p8"; +"qpxqtx.doc-2017"="xvxsnjfajz7zfvgfih7v3mfca5b36qda"; "tap-0.77"="mgr2m41yv0y4dcf4myk7020hkmqrd5z6"; "tap.doc-0.77"="mr27kjalpicyv8915p32yyya5imm3m8v"; -"tex-virtual-academy-pl.doc-2016"="rr38v1syb2b4ji3psf47pmwr562zv59n"; -"texlive-pl.doc-2016"="1i2g04arlkawj7807rrjnq03n4z37z8w"; -"utf8mex-2016"="d8314s7lhlafhspi1qf8hiqzx61n439a"; -"utf8mex.doc-2016"="svpkpbc0caxbynjnjjynng11fdg3dgid"; +"tex-virtual-academy-pl.doc-2017"="rr38v1syb2b4ji3psf47pmwr562zv59n"; +"texlive-pl.doc-2017"="83acfdx5lz84vqb1479jxp7gb3xnixxb"; "babel-portuges-1.2q"="n9im1w2dz7yfqqq4k8pfmqmxjg5mfl0s"; "babel-portuges.doc-1.2q"="d5r7vabmr3lhrfcrji8rayi6xx6q6hqy"; "babel-portuges.source-1.2q"="rgi4li2frm84fbdi0sfhqvmpijlx64lp"; -"beamer-tut-pt.doc-2016"="kxpy2m4hbwm3sfj7ix9x249df3dgmvfm"; -"cursolatex.doc-2016"="arfkwqkjw5kfv2rcfhkvxjq603wdsq3y"; +"beamer-tut-pt.doc-2017"="kxpy2m4hbwm3sfj7ix9x249df3dgmvfm"; +"cursolatex.doc-2017"="arfkwqkjw5kfv2rcfhkvxjq603wdsq3y"; "feupphdteses-4.0"="696my85w1ngcar81vacyj8nr7m4dn0wd"; "feupphdteses.doc-4.0"="9nm4793nyfp5v2rjd5297sbyw2b29bqi"; -"hyphen-portuguese-2016"="373150snca1vkvj58s0kdv6q044akcsq"; +"hyphen-portuguese-2017"="373150snca1vkvj58s0kdv6q044akcsq"; "latexcheat-ptbr.doc-1.13"="qzgl6v54k07i6lc3ps84s9mj11j1qqqf"; "lshort-portuguese.doc-5.01.0"="m3r2gbq4v09p9svs0mxsw3s3yc7has5y"; "ordinalpt-2.1"="ds49jf4pvghzwn5nqwjbzz6dhp0cdn80"; "ordinalpt.doc-2.1"="4hg5jx7bnx1j13s1mq8xscr3jfajl6by"; "ordinalpt.source-2.1"="cc2f6xias35ac0c0kxan2cvcmyjq7l6k"; -"xypic-tut-pt.doc-2016"="2rj58kib26w8jnfzpd9bsm0nf2ladv4i"; +"xypic-tut-pt.doc-2017"="2rj58kib26w8jnfzpd9bsm0nf2ladv4i"; "babel-catalan-2.2p"="18ngggp3v707j48vac5grpqw342jwg3f"; "babel-catalan.doc-2.2p"="19hc8i6d64n8dfk6hmgpgm03kg5r7wx0"; "babel-catalan.source-2.2p"="v2750fsyzjlc6iqk44s31idwybz2jvfz"; -"babel-galician-2016"="xczl3malfygp6w1fd3rpd26rifcgj3j8"; -"babel-galician.doc-2016"="i7r7rp46vmhmf18dgzsac2ay1pwanlxz"; -"babel-galician.source-2016"="ix6vzvf936s019948pz5bls7nfca9xng"; +"babel-galician-4.3c"="xczl3malfygp6w1fd3rpd26rifcgj3j8"; +"babel-galician.doc-4.3c"="i7r7rp46vmhmf18dgzsac2ay1pwanlxz"; +"babel-galician.source-4.3c"="ix6vzvf936s019948pz5bls7nfca9xng"; "babel-spanglish-0.3"="17nhdd8za144n05vhvd50kr6bss0swaw"; "babel-spanglish.doc-0.3"="sfjf3dfj841772k5ipvf0r4qr3zayhak"; "babel-spanish-5.0p"="lxsy4aq5mwizmif2r3i9h97mccim0ljv"; "babel-spanish.doc-5.0p"="2aa12l6ndp4r6rdv6v0z405y3hpsmgnx"; "babel-spanish.source-5.0p"="ad9wxx0qp6kp4r8ri1vwycgf2gpdj6xw"; "es-tex-faq.doc-1.97"="v9brqkql6xbb1zdk5m6xhff1dxm36nhf"; -"hyphen-catalan-2016"="0z92n1kivwrihxn1vi7hcm046drhw9c8"; -"hyphen-galician-2016"="8shj0dvmbcma4y9b8sj192x7za67ciig"; -"hyphen-galician.source-2016"="ivmw5irkn7vfp4k6ldn5jn9ra43cjlcs"; +"hyphen-catalan-2017"="0z92n1kivwrihxn1vi7hcm046drhw9c8"; +"hyphen-galician-2017"="8shj0dvmbcma4y9b8sj192x7za67ciig"; +"hyphen-galician.source-2017"="ivmw5irkn7vfp4k6ldn5jn9ra43cjlcs"; "hyphen-spanish-4.5"="b6d0bh9xrr1091idjs1dmjjicgsk97l3"; "hyphen-spanish.doc-4.5"="416kb8avd7nb048aia9rgbvjbh6bbh7k"; "hyphen-spanish.source-4.5"="lia19yzmwyz4fsbnrca8al43hfc46i55"; "l2tabu-spanish.doc-1.1"="rc7058j31za1cg1ik27b6gcgscir9bfk"; -"latex2e-help-texinfo-spanish.doc-2016"="pc6j632r0jvqdyi6k5rzwfid8642gn6j"; +"latex2e-help-texinfo-spanish.doc-2017"="zr9zrgsl255yyi1w2hkw9i8816inazzv"; "latexcheat-esmx.doc-2.00"="bzjjilpj8rmp1cc93bs32568dc8dvgic"; "lshort-spanish.doc-0.5"="3gmql5wpqh3h5mhr0pjcs6v0a5jqc1c8"; "spanish-mx-1.1a"="ipghkbmay6pmwisxrnpkrhnlrlgsr9zz"; "spanish-mx.doc-1.1a"="4qrhsw2wnpdmq7i3j30vfb04njyhldi3"; -"texlive-es.doc-2016"="dgp40lsr1ca5dl2651vn0d8amc3qn49g"; -"2up-2016"="qd90xqk7f4p9mgp53yid9rixhhs11ns3"; -"2up.doc-2016"="gv5blpi2xdbjdi1i2p9j6gz2qzr14d9p"; -"ESIEEcv-2016"="w5zhmx6kk19kwf98gdm7rlp7l3i9k93y"; -"ESIEEcv.doc-2016"="4ci8yn36m2fz6v6n7iqb071291rl23zw"; -"ESIEEcv.source-2016"="kvh03awwlhwd8wn69h32sdjxmcpa6lmn"; -"GS1-15"="hwnq8xailhxvp87b3fxmmmirn6qsbr55"; -"GS1.doc-15"="kqb4nf593qvba3bsq1f4l1jps7h7zryq"; -"GS1.source-15"="lvpahbw3vnj3b7bmn1wj7lrm6f7n0aqv"; +"texlive-es.doc-2017"="k3jl7b08fb3mrmz88211dpfsl7vr9if5"; +"2up-1.2"="qd90xqk7f4p9mgp53yid9rixhhs11ns3"; +"2up.doc-1.2"="gv5blpi2xdbjdi1i2p9j6gz2qzr14d9p"; +"ESIEEcv-2017"="w5zhmx6kk19kwf98gdm7rlp7l3i9k93y"; +"ESIEEcv.doc-2017"="4ci8yn36m2fz6v6n7iqb071291rl23zw"; +"ESIEEcv.source-2017"="kvh03awwlhwd8wn69h32sdjxmcpa6lmn"; +"GS1-22"="2fvvg7l5g84vhg88mzaa6x16p13pp34c"; +"GS1.doc-22"="bsdamqnalwikpldq94f035nh849vjb2h"; +"GS1.source-22"="gzg5ynawvwr24sl31f85q7ksinaks3a8"; "HA-prosper-4.21"="kbj26h7zvc9v5l330s2hp63l44vrn09r"; "HA-prosper.doc-4.21"="hpj2qljnhi7x2prcwnra1ycfzazhnqsz"; "HA-prosper.source-4.21"="wlzyr02pardayic4598mc0v6mks9dcx0"; -"Tabbing-2016"="1ffaxfww9l073hvjvgp4vkxzfdmmgb8l"; -"Tabbing.doc-2016"="gyhcdih64zw18s44f5s1h8ccr2ndd0qs"; -"Tabbing.source-2016"="pifazcagjavajck7h6a0kyvnxxk90k8y"; +"Tabbing-2017"="1ffaxfww9l073hvjvgp4vkxzfdmmgb8l"; +"Tabbing.doc-2017"="gyhcdih64zw18s44f5s1h8ccr2ndd0qs"; +"Tabbing.source-2017"="pifazcagjavajck7h6a0kyvnxxk90k8y"; "a0poster-1.22b"="dkwb9gdxv3jxnw07ji0ydmpqa0fgy6mh"; "a0poster.doc-1.22b"="bn6j9nsmcri2irby7njhbdlpgqqaic0x"; -"a4wide-2016"="lsss6h32r10x1v8k9wwdp7ind09y6x5h"; -"a4wide.doc-2016"="vb90v0v79l34fr86i7hzx787ndyq271w"; +"a4wide-2017"="lsss6h32r10x1v8k9wwdp7ind09y6x5h"; +"a4wide.doc-2017"="vb90v0v79l34fr86i7hzx787ndyq271w"; "a5comb-4"="sc874hfilkfjjv1aw8qnf36v5jkhd6s2"; "a5comb.doc-4"="gsp7dsbhk6r2q332apbqrx29mna85dhs"; "abraces-1.-"="54c3kj96d3symq8nbzrns0pf1200jm5z"; @@ -2453,19 +2509,25 @@ "abstract-1.2a"="qd0czw54z49h3mxnxlk6drblpbl47sln"; "abstract.doc-1.2a"="qd4dggpq9076j7cma12mkhy238ni4w3z"; "abstract.source-1.2a"="819fv5rryh634fmqic8fqagdfi9h04wj"; -"achemso-3.10d"="x1xl7siphk33vxz6gncid7vlksg9m2pg"; -"achemso.doc-3.10d"="8kmanl4zl7dd5i6k10rkp8hipmjrvm6z"; -"achemso.source-3.10d"="y5pqp3d6pbf02qima57l4r1vwj41n7w0"; -"acro-2.5b"="ns6hajvhik82vifv778b45w11yjnhqn5"; -"acro.doc-2.5b"="y000gsfns3bsvjba3wrqz8104ykxqq8n"; +"achemso-3.10i"="3lp4cfmiharmf6m9xagy75n1rs2i910k"; +"achemso.doc-3.10i"="61irkqrnn5vy2jycd1z1q524zk798m8d"; +"achemso.source-3.10i"="6qqkj8l96pp0w6ymvmxiphh0zw1ap7yk"; +"acro-2.7c"="mv0fczm4wq1pf3dfrg0zq4x8a08y0ay2"; +"acro.doc-2.7c"="9xvmh7zq4n4bl61jy4w2q20n946mh5sr"; "acronym-1.41"="2spcw1vwwm6mwpl2dvv7wybxvndbsqn5"; "acronym.doc-1.41"="izmrdd0rscib9xa10xm33vvh7bvgzdly"; "acronym.source-1.41"="1l7ca4pd0nx499pv45sv1092bilsxfkg"; "acroterm-0.1"="04m91cky6cj3jv546mdf6461bdg6sfkk"; "acroterm.doc-0.1"="jnxcd65y58xrqg0cfg7y0m8yslbj7xi8"; "acroterm.source-0.1"="w99kkypzq7c73rx4rv4m917c68vnan00"; -"actuarialangle-2016"="gdr626xy52l5i3svfgrhj95l092mxz9y"; -"actuarialangle.doc-2016"="mrycbdm2blp0b1j0bpg8542m5skr8m04"; +"actuarialangle-2.0"="ff4khzc793za2vl8ghg9k3jzh21npa4b"; +"actuarialangle.doc-2.0"="blrrabd60rlmly07kh83wwa88nkw7mb8"; +"actuarialangle.source-2.0"="naxi069bqfb3w7bx5g1zwj4iy5b8kq54"; +"actuarialsymbol-1.0a"="46rajcg49v84amgxarr8d24z1ilzgzjs"; +"actuarialsymbol.doc-1.0a"="7pzwnc70kgqh5lq6wni6lhyij6ydbzh8"; +"actuarialsymbol.source-1.0a"="39chg76j3ahyny2m16wq77y1rcs0jsxb"; +"addfont-1"="16jk4kypw619n5fy7j0hvfiydk5k3mbk"; +"addfont.doc-1"="r6jy27nla35rjdsbcqfb7ckc7hfszngi"; "addlines-0.2a"="2v5gfg9w6p4p6849lgipiql9x73d5a41"; "addlines.doc-0.2a"="wrd21fcqv7nd225xb85v13dgsbfk18lv"; "addlines.source-0.2a"="l5dv40igkq2wphl1g6ni1g7fii9qkp26"; @@ -2478,8 +2540,8 @@ "adrconv-1.3"="q8vpdifigy5vld3vq660afya6i8h4l0p"; "adrconv.doc-1.3"="l0k77x7p8bp00rzb3744p3nnwzy5d8rj"; "adrconv.source-1.3"="yg4dpghvmsjb7a7k6aiml5k5wi9ij2cq"; -"advdate-2016"="f0awsj80hyiv2vkjizidk3na8yvfm6i4"; -"advdate.doc-2016"="0yx83g0jz771kjqq6rf07wlmzs4h68x3"; +"advdate-2017"="f0awsj80hyiv2vkjizidk3na8yvfm6i4"; +"advdate.doc-2017"="0yx83g0jz771kjqq6rf07wlmzs4h68x3"; "akktex-0.3.2"="6mhzn5d98q6vmxp8vjbmb6i26x9zja3g"; "akktex.doc-0.3.2"="z43q786v20515sgsp4dh5lii0pfa620r"; "akletter-1.5i"="7i7x6692i5zicjsrp51cvx8sivm1arpw"; @@ -2498,21 +2560,21 @@ "amsaddr-1.1"="6sf35pmlda97q2dhi5h7cwan25gi9nij"; "amsaddr.doc-1.1"="m5wxpa9vd09pja40i6lzzrlw62ml5zvm"; "amsaddr.source-1.1"="b66925k432cw6rqwqapcg1h8gjgnvry7"; -"animate-2016"="d4pdlligf9j10ra0nxm95wfqz68795lf"; -"animate.doc-2016"="6rdf1vzjasqxj9dybl4ij147mhwgn60c"; -"animate.source-2016"="92f8s47abgbbpn8vc33ixcys430zai9a"; +"animate-2017"="d8q0vz6yx5k5lx9l51gqgcnyzfmwz82k"; +"animate.doc-2017"="lgz3pc2xypvbgs884aczvyyyk2msrbin"; +"animate.source-2017"="vixphgcmrxzw46hm0swy9k457hh1ly3n"; "anonchap-1.1a"="qpazykls2jy7nqpqkaqvyi35c2ajz0qg"; "anonchap.doc-1.1a"="3xy9r4p9f22fjdvznba1jjp09gbkvvlr"; "answers-2.16"="isadn9v17ma5krfq4hm304nrdc8kx7dd"; "answers.doc-2.16"="3ma0j6diq2zp7k547zp6ilbynsrkw59d"; "answers.source-2.16"="7w1nvr73ndj7c545xps8h969q4z58gji"; -"anyfontsize-2016"="z7d08jdfvq55ls4va5f5iyixxyp6xjv6"; -"anyfontsize.doc-2016"="fxvax04n8dj9haksiqx0jddi47mb8q1n"; +"anyfontsize-2017"="z7d08jdfvq55ls4va5f5iyixxyp6xjv6"; +"anyfontsize.doc-2017"="fxvax04n8dj9haksiqx0jddi47mb8q1n"; "appendix-1.2b"="vv6787vrvnmwm8mg85aq1bii0lgprzc3"; "appendix.doc-1.2b"="095s7b98s2n14xsf2ffv9v6fvsdvl6zz"; "appendix.source-1.2b"="5ivln5wysazp8nllz5k3z5vh9ivzwwl0"; -"appendixnumberbeamer-2016"="1gcs0vw348jli5pa4b8z2hfnhciis6pl"; -"appendixnumberbeamer.doc-2016"="is8nlzz3klxg3rjgixqxcxphlp109s23"; +"appendixnumberbeamer-2017"="1gcs0vw348jli5pa4b8z2hfnhciis6pl"; +"appendixnumberbeamer.doc-2017"="is8nlzz3klxg3rjgixqxcxphlp109s23"; "apptools-1.0"="v2ag8kbf87fm4rf66z1a3z93pfs1j6gj"; "apptools.doc-1.0"="a8mjxckcrk06xajadqf2124k5k0ra2qi"; "apptools.source-1.0"="q37a0dpqnw1vbqih6p7lbi70a1f58yl3"; @@ -2530,17 +2592,19 @@ "asciilist-2.2"="cx4yfvy3r2cr9kskf9drbcl919np05nl"; "asciilist.doc-2.2"="f8hnsjyks2f5qjnya4v6b23px0f304dn"; "asciilist.source-2.2"="10pkhmrfp0d4qw56x2nk296rn2j436gd"; -"assignment-2016"="f5a0sprx94bby245g2cfycrrazgp00k7"; -"assignment.doc-2016"="0d0cafwd56gqn5dacsq4fdgzz8jqks19"; +"assignment-2017"="f5a0sprx94bby245g2cfycrrazgp00k7"; +"assignment.doc-2017"="0d0cafwd56gqn5dacsq4fdgzz8jqks19"; "assoccnt-0.8"="6bikcn3hf37rs2wp84f9h8nf81z86hr6"; "assoccnt.doc-0.8"="xb17k2w0skjxh3cw3hag91m5cjxj1vz9"; -"attachfile-1.8"="a8qk19fzxsf3bqkrqjyqmwshb4jv5nc1"; -"attachfile.doc-1.8"="ld05y453xrmdk4pr8j97lcicgsiv8hy5"; -"attachfile.source-1.8"="c89y3jz9rrk56l5di8xcln8sfpx9syl3"; +"attachfile-1.9"="vmyp7ywfqli6yzs89419885jac9x0yql"; +"attachfile.doc-1.9"="f076ljz64r8ck1l9cz5g7xypm92jb9qs"; +"attachfile.source-1.9"="j93ivs0jy4n52a18gw0icmh0ffsnm1j4"; +"aurl-2017"="8nnjg9zwrc6p5qy2mq32jirxz29wpa0c"; +"aurl.doc-2017"="13g1jz1510lipg3v2m4zpcz2pzi04fyc"; "authoraftertitle-0.9"="6mqbsmy9gg6qkwgihzapa0xnlqyscz4z"; "authoraftertitle.doc-0.9"="64j4gkrz0i7bwah7s3dazi1nanw6dfby"; -"authorindex-2016"="khcqpf8rh3cqb9fk2wl35lvp1fs3k2nw"; -"authorindex.doc-2016"="vrlqni24vz4wixqr83pkin6j02vxgz5r"; +"authorindex-2017"="khcqpf8rh3cqb9fk2wl35lvp1fs3k2nw"; +"authorindex.doc-2017"="vrlqni24vz4wixqr83pkin6j02vxgz5r"; "autonum-0.3.11"="z0mz6nrw3s9661lc5s983bj7qpfg9ns3"; "autonum.doc-0.3.11"="ghxpr5ayzxq1w6v3wy0hqvkfy28n9slp"; "autonum.source-0.3.11"="5fm5vfmi11jqdgqklj6zmc90vw3vqiqp"; @@ -2560,8 +2624,8 @@ "basicarith-1.1"="81hlw6p432i5ln72shhg2k976as1w1l5"; "basicarith.doc-1.1"="3hskpplbm89xpzx8q0bajn7i3kxncig8"; "basicarith.source-1.1"="x4qnlbc6v2dfq23ijrjhk5rcfjc1c2a1"; -"bchart-0.1.2"="8qyn0h9n8hq85c5g8rzfjm9v0hd6i6k1"; -"bchart.doc-0.1.2"="f6v6qbrz79rvx67l6a062j4dznacp7yj"; +"bchart-0.1.3"="4xxv8n13igfgl0n89wmxncp8662fx941"; +"bchart.doc-0.1.3"="11b1xlxkxzayb2a96w1svhba4pkchanx"; "beamer2thesis-2.2"="64a0v9a7xr9yi4ffsbm98s058hkmq9wg"; "beamer2thesis.doc-2.2"="5ypn90w572jlw04xi4vzk7pxxsf7ciwy"; "beameraudience-0.1"="3zc39f4qsyqi4204k4a5n9pksf6gk3xl"; @@ -2576,13 +2640,16 @@ "beamersubframe-0.2"="m8capqp9nc8mbi9xdzkz89nnz41972v4"; "beamersubframe.doc-0.2"="y5m8y5zkbzi553hp8maav6g6a42iklfr"; "beamersubframe.source-0.2"="kw2rnly2zyqw1ap5g9gkv2xchpvbk7gr"; +"beamertheme-cuerna-2017"="vrgqfiwzbf1082zbj8pvn53dmx77qi4f"; +"beamertheme-cuerna.doc-2017"="jcxa5vs5g4nwgck7913jb2jnxccx2y3f"; +"beamertheme-cuerna.source-2017"="lrn8am3h8x2ic39ghpkdl9bxsp07pdf6"; "beamertheme-detlevcm-1.02"="25f0c66nnhq9r0qrqf186rwqvifzi4nj"; "beamertheme-detlevcm.doc-1.02"="5yh3kypxg8cjr8vqy04k1ad1agnlq047"; "beamertheme-epyt-1.0"="1g3593pcp0b4k9lacp4c0afs7jzffa9b"; "beamertheme-epyt.doc-1.0"="al12nh23v6l4lfa4616zzivldc5jfkjy"; -"beamertheme-metropolis-1.1"="fak1gdla6djdh3k7ijbqgjqgjgmcfq9i"; -"beamertheme-metropolis.doc-1.1"="lr7lvhflfiwpmqz14i12d42vy4jiaf7j"; -"beamertheme-metropolis.source-1.1"="fc4j5wz3bv0z71bb05xfhjavi4vvy78z"; +"beamertheme-metropolis-1.2"="g062nnxl4v5951xq2xa4smkdjq6v2xpk"; +"beamertheme-metropolis.doc-1.2"="xvapcphzmylh2s3551bglqw712q82bxn"; +"beamertheme-metropolis.source-1.2"="5gmm1q6xagbavzzxhc9750yb3bhxf3zv"; "beamertheme-phnompenh-1.0"="01nbk38jh4hxk8vykf37x6bhnb55ijdb"; "beamertheme-phnompenh.doc-1.0"="p0nj4cqg4vaaq6wlycicz0xbl7391lwp"; "beamertheme-upenn-bc-1.0"="i535al38gpn0j6mhixm5g6vnlj7gi957"; @@ -2590,27 +2657,29 @@ "beamerthemejltree-1.1"="iqjiwv4v9vp84a3cjjmv5gxygyclw5c5"; "beamerthemenirma-0.1"="jix18byykz4n2mqcipf60pskfjlj3ini"; "beamerthemenirma.doc-0.1"="llvppchvbd0zz9cl3lpswghs8hjm78rq"; -"beton-2016"="0psc07yssk92pgrf4c9zvyr4k3ibbz3j"; -"beton.doc-2016"="9jpvnkmri3w4m9ik5d4l7mnlfpwxacg5"; -"beton.source-2016"="znwrdd877gdwmsiaxc9v8pczdw21wrb8"; +"beton-2017"="0psc07yssk92pgrf4c9zvyr4k3ibbz3j"; +"beton.doc-2017"="9jpvnkmri3w4m9ik5d4l7mnlfpwxacg5"; +"beton.source-2017"="znwrdd877gdwmsiaxc9v8pczdw21wrb8"; "bewerbung-1.1"="kb947mnv03wjc8ja8k402inijnplk1vy"; "bewerbung.doc-1.1"="mv9vrqp8g689cvbwpm3xkczk98s1blas"; "bewerbung.source-1.1"="w8z7h0w0ld2dd88a0yhp6p6md8hn7kkh"; "bez123-1.1b"="9lx6fqcskk9lj28vcfhfnkmjb9dhlqdh"; "bez123.doc-1.1b"="s5s834dhxqlqc5i8dswvayhf62chrqbh"; "bez123.source-1.1b"="fsc7gqwcbpfjlhn0bljq7l0jd8g6zapd"; -"bezos-2016"="xfvg3ykycr5dkmi1xc6h66g0a9fiah5z"; -"bezos.doc-2016"="6g6lwlra53qn9jh13sy28gzjxn5gcyr4"; +"bezos-2017"="xfvg3ykycr5dkmi1xc6h66g0a9fiah5z"; +"bezos.doc-2017"="6g6lwlra53qn9jh13sy28gzjxn5gcyr4"; "bhcexam-0.4"="1px8zypnmrvi26ysrplj54pdz67ajcs5"; "bhcexam.doc-0.4"="ksq01g78a489prh8lrrs0nn9k5jqasvr"; "bhcexam.source-0.4"="ra3418l0mjj31jrkss9fysd4q1h3bdqn"; -"bibletext-0.1"="yf6bsiw9l4dxz6nqsq43xdycjcr2a1z1"; -"bibletext.doc-0.1"="c1lkjffk05478pm4swmb6a0y0v6jyhlc"; +"bibletext-0.1.2"="l1xjz1y65n8788jhskhb7z74fs8azjxr"; +"bibletext.doc-0.1.2"="z37aix7i7hm3rg581np1mi67dn5agl7x"; "bigfoot-2.1"="i4hdv09y0blcrbhk554ilzc70fv19242"; "bigfoot.doc-2.1"="ixi0hkjrzg740q3pkp9lwrq43ab1f006"; "bigfoot.source-2.1"="jp9h2p1j46ha7ksxvh3d6rmxr0832r1w"; -"bigints-2016"="6ig6fmxy6wj6k3yc4x9s7b18xbfxj4kp"; -"bigints.doc-2016"="jyxj3risms61j5aazx9hkxxfwbg6nyzr"; +"bigints-2017"="6ig6fmxy6wj6k3yc4x9s7b18xbfxj4kp"; +"bigints.doc-2017"="jyxj3risms61j5aazx9hkxxfwbg6nyzr"; +"biochemistry-colors-1.00"="fvz3nlqi6y12g5pcyh118l6vjbw5kz2i"; +"biochemistry-colors.doc-1.00"="r7n07xkk4ixxk9zhz3ffkg7kqsz0i8fc"; "bizcard-1.1"="l59w5wy3djx28g5yw2ywagi5am258bry"; "bizcard.doc-1.1"="yallp1mh43m9224sqhzg85ylymiib9v2"; "bizcard.source-1.1"="z70q003l3pmi9p0z0a99f2bz0lxkq2y9"; @@ -2619,19 +2688,19 @@ "blindtext.source-2.0"="dr68k54p44vgwp3rw9d1khc733k4apah"; "blkarray-0.07"="djcla33mmskp42qbf8qg053p34515x1a"; "blkarray.doc-0.07"="7iy0ssb4spk30f5janvknnhl91csvmyk"; -"block-2016"="b75bd0f6imd8svp869g4j3q2q02pilpp"; -"block.doc-2016"="gza7j45w5qixk19px05wr4q67m4lzhkl"; -"bnumexpr-1.2a"="asvhrmm3rb14s1mlzyfb86gigd68nc7h"; -"bnumexpr.doc-1.2a"="3x0bfnyy7wddwp3367npwg7nz1kxsh63"; -"bnumexpr.source-1.2a"="1ngbaxdcr4kk188a0fmpxzd0ss1ra2ib"; +"block-2017"="b75bd0f6imd8svp869g4j3q2q02pilpp"; +"block.doc-2017"="gza7j45w5qixk19px05wr4q67m4lzhkl"; +"bnumexpr-1.2b"="qqqk5ia11sdakf252mp1a0p3ran5qqjv"; +"bnumexpr.doc-1.2b"="p0pbpph2q811l9wjvsigvq7qbdw509nz"; +"bnumexpr.source-1.2b"="9xjfsjgr3c4r0r0mj9qf1qlx7a86akqv"; "boites-1.1"="nccwd0yxdm5cr6razvwlkrrb5wxxj1i2"; "boites.doc-1.1"="q3mcdfg2afqm3w1zhbcb1bxzwqgp4s3n"; "boites.source-1.1"="vcfgm806kvw3z466j5kimj5wzgaywv0f"; "bold-extra-0.1"="0kr4p0z1bfng2sindvkk7rkfzm863qmx"; "bold-extra.doc-0.1"="czal2y2szfldrzkn4h0aj6iwjk7gpifk"; -"bookcover-1.1.1"="p9qni52l0lb3w6698kcwjja6qlrmf6n6"; -"bookcover.doc-1.1.1"="jdbdndsing4jx8cni736zjvkfaq2y48k"; -"bookcover.source-1.1.1"="2dzi5qm13hk6qq5807yw16z0did780z2"; +"bookcover-2.1"="88b1fscwqb7plvmvfila162f2bvsy9vq"; +"bookcover.doc-2.1"="3lh8rjzkwm6fah42d5754pbfhjmwrffh"; +"bookcover.source-2.1"="flrj085kr19zpjh0mh8hdrjmkac696l3"; "bookest-1.1"="70j4zrqfn4cr0qg7dhdqainy3pxxilg0"; "bookest.doc-1.1"="3cbqgyzvm6zvzib6jhgdyy7mcw5p75nc"; "booklet-0.7b"="fkicb41vlz1m3spn6jf9g1dk28f22v7i"; @@ -2653,8 +2722,8 @@ "boxhandler.source-1.30"="0s647gs05wi22qcrv2zsb8x1713yhf1w"; "bracketkey-1.0"="4l5l8s1xcwhlkaq50spccp2z90lm161f"; "bracketkey.doc-1.0"="500h9kzvrkkqj22622hr4a78d6mz94jm"; -"braket-2016"="ck5gh00qn839wsxy2qili0184vswy0br"; -"braket.doc-2016"="mqckibrwr123hhda3fnbf8wrh1d16bxy"; +"braket-2017"="ck5gh00qn839wsxy2qili0184vswy0br"; +"braket.doc-2017"="mqckibrwr123hhda3fnbf8wrh1d16bxy"; "breakurl-1.40"="lsl2j1iflzhwwapb03s5hg137rynjjhl"; "breakurl.doc-1.40"="rjyrmhd32w912qg9wd4qxc9q46kg8qc3"; "breakurl.source-1.40"="lpxb827p465qc14c38rk14jrzag7jfq6"; @@ -2663,18 +2732,20 @@ "bullcntr.source-0.04"="6lw02qi8iyp3qph7yaycfm5p1q6l71r3"; "bussproofs-1.1"="v0s3q29bdab23xi07f123bq7gzc2i185"; "bussproofs.doc-1.1"="6cnd5akpxdcq2q82n7ph5lvmb94ql8sa"; -"bxdpx-beamer-0.2"="dhj9i0a8zba5193andgyjvpzli8pip70"; -"bxdpx-beamer.doc-0.2"="cixgk9xcfsgr4qvdmvald5wrwpf7sq2n"; -"bxdvidriver-0.2"="9cmf1k4nqkh8dcmx253n1knm9zsmwq2v"; -"bxdvidriver.doc-0.2"="2rclnlzywr7nzxabsga12icypvmzjqaf"; +"bxcalc-1.0"="zlcn1rji7mk5lpw3lbpa4nl64i8nayjh"; +"bxcalc.doc-1.0"="qj20a0nb9rpsrypcya98i4lfjxchxkfq"; +"bxdpx-beamer-0.3"="q07kpnmln2v70w83z91vsk53c0i63x02"; +"bxdpx-beamer.doc-0.3"="8ynjsgbyifkvz27qp8j4nrfk3pryphdf"; +"bxdvidriver-0.2a"="f6ndmagn10ax4hpmlia649f7c14hjkgx"; +"bxdvidriver.doc-0.2a"="lg3m3lw08iizdhdfjqkh91wk5ma43825"; "bxenclose-0.2"="h4cay0x5nq4xwqpaihbvyzhjxgsp5fwn"; "bxenclose.doc-0.2"="9i72bmx63c76m7gc7qavv228g1afrnq7"; -"bxnewfont-0.2"="7z96dnw72d4dc6qbbymnhg1hn5nmasx8"; -"bxnewfont.doc-0.2"="gkskylsckyi61fwg1lz3h4i0pxpdlfmd"; -"bxpapersize-0.2"="5ajl4kq3iqwhl5a8f1lwz171akps0arl"; -"bxpapersize.doc-0.2"="xh3sgbwvrr8g63lwyx4k2lf64s1srgii"; -"bxpdfver-0.2a"="mjkshqj1a5rxr416jdpgy1a710zk0lzx"; -"bxpdfver.doc-0.2a"="aig0rr30s7f5p750nb7wm52cn3pa35sr"; +"bxnewfont-0.2b"="42kvrm0ag8zrxavfijin59k9sg3akhhp"; +"bxnewfont.doc-0.2b"="wxkcv5hklkzxs3xsw28z0bknq0sjjhsy"; +"bxpapersize-0.3b"="41garkjgw98adpn761lrj849y4rzzi2x"; +"bxpapersize.doc-0.3b"="j6scsfx0fn9yd5illwnw41j8f17k18ba"; +"bxpdfver-0.4"="rcizp6hg0bir8rf3njqc66kjcm7c9nic"; +"bxpdfver.doc-0.4"="nj6cpbjw4paw12ggkxg28nm1wj076dlb"; "calcage-0.90"="4yzr1l7jhng80xs4n1vavaks3d8cjr49"; "calcage.doc-0.90"="b4vjy0d8rz4jhhw4vimfdfwhpqx7sgck"; "calcage.source-0.90"="x42rcz3r7lphziii9v8vgv0lm43ymj8z"; @@ -2683,26 +2754,26 @@ "calculator-2.0"="z44sdp5jlkqywi01c1x7ly2yvzkx1h9w"; "calculator.doc-2.0"="dwb0bhngsn0xk56gnil8wbaj5dv7v0yr"; "calculator.source-2.0"="3m4b364wkgfvxyc8y20rg8c7rh22rhyd"; -"calrsfs-2016"="cq6j9glbxrl31xwx7k5s8ayispn82vfx"; -"calrsfs.doc-2016"="avw2hw984yx1vsxayn96nzhgqcfpz90r"; -"cals-2.2"="6wlwfvx4yc3grkw6czi9qvjbjdrz82qq"; -"cals.doc-2.2"="4bf5bb1rgiiy7rbn6hhsmj5qqap4s7hr"; -"cals.source-2.2"="a6znwcv73yr8c2r24sz2d18vj563dnig"; -"calxxxx-yyyy-1.0i"="8jw4z44q97036yl05blsw3l7dav9xrk7"; -"calxxxx-yyyy.doc-1.0i"="mhgmrvpmsv28jzgw0xhf0paic8qwx315"; +"calrsfs-2017"="cq6j9glbxrl31xwx7k5s8ayispn82vfx"; +"calrsfs.doc-2017"="avw2hw984yx1vsxayn96nzhgqcfpz90r"; +"cals-2.4.2"="0xq2pylhs1gl542s86wm23nynnfzk188"; +"cals.doc-2.4.2"="yq4wig26r1cadd3kxg5bfraig4axvyvd"; +"cals.source-2.4.2"="fshbdf6ljfy0c7kdcvz5kyinysplcj86"; +"calxxxx-yyyy-20.17a"="rdjjkm8hyf5d386rynl3q8s2ln4z34g0"; +"calxxxx-yyyy.doc-20.17a"="6v19vf9p4gk7zp614bjgpcimk6vhwij2"; "cancel-2.2"="gq061h1xf31ivc5zz1wqk7c457m33amn"; "cancel.doc-2.2"="24zhq0iz9iqwm1lnyd6zgzc7dsg9b1gf"; "canoniclayout-0.4"="hk30976j3lql00w0rj481p8j6z5v69yk"; "canoniclayout.doc-0.4"="gyr8yvdm21p45qqdjin8abq3v0kbh1lw"; "canoniclayout.source-0.4"="0bqpq8mn7n7223ay0gfrq3dcpfzkxalc"; -"capt-of-2016"="qmph3ai6555l904xk4q6sy4jml5l6nqb"; -"capt-of.doc-2016"="bpa4ll7afaz43ysz8m7q8fs8klvv4h4k"; -"capt-of.source-2016"="9rjjpf1v8qg3v8j27rn8x3b495lddicd"; +"capt-of-2017"="qmph3ai6555l904xk4q6sy4jml5l6nqb"; +"capt-of.doc-2017"="bpa4ll7afaz43ysz8m7q8fs8klvv4h4k"; +"capt-of.source-2017"="9rjjpf1v8qg3v8j27rn8x3b495lddicd"; "captcont-2.0"="5s81zvby8iq2l0j4bkz99s56w0kvc5pf"; "captcont.doc-2.0"="ivp30a2jxrnp8zivmdm61nn0i25kiarz"; "captcont.source-2.0"="bgy7jzbckqnajp42hy4x31dvb01cjm7s"; -"captdef-2016"="gx42x6flbn7jdbrbqzsn8csgi07ij4k0"; -"captdef.doc-2016"="fykmdpzxx24x66iph3rrzj0sc755y4nh"; +"captdef-2017"="gx42x6flbn7jdbrbqzsn8csgi07ij4k0"; +"captdef.doc-2017"="fykmdpzxx24x66iph3rrzj0sc755y4nh"; "carbohydrates-0.1"="x4rj3x70sfcdgq8sd8yv2486khxip4wz"; "carbohydrates.doc-0.1"="lp5y1sx5s74px1x03366lpn676vhl6c9"; "cases-2.5"="jlc3flcfb7ckwr4320n9gxmv2y7l4d2f"; @@ -2722,9 +2793,9 @@ "ccaption-3.2c"="4l3kxgc46z9i4lrm479ghpv7d0077l07"; "ccaption.doc-3.2c"="qm6lh4nrdndp4vivy815ajpj9jj4w433"; "ccaption.source-3.2c"="fdfpz99x7z4avqx1q4nrydg3r4csq4fr"; -"cclicenses-2016"="scxyv1a4lh05mfgbs55rcg40vbfyvvij"; -"cclicenses.doc-2016"="17zr0mgalzfnpayvzym8hri1yfz8c6xa"; -"cclicenses.source-2016"="hgm5y1054596k129p6j4s86kv0m0ky76"; +"cclicenses-2017"="scxyv1a4lh05mfgbs55rcg40vbfyvvij"; +"cclicenses.doc-2017"="17zr0mgalzfnpayvzym8hri1yfz8c6xa"; +"cclicenses.source-2017"="hgm5y1054596k129p6j4s86kv0m0ky76"; "cd-1.4"="34nj75mgz2mzxjbmpik2kvqhmwdmbw71"; "cd.doc-1.4"="i7230mqkczs0b3nczmf3gkv8z0bx61mc"; "cd.source-1.4"="h5plih2dk6kk9klc7lwv5gpx88apljlj"; @@ -2734,8 +2805,8 @@ "cdpbundl-0.36"="qli68wj3jjv1p978in1qrg63qpvlldnq"; "cdpbundl.doc-0.36"="wsg0p030n7mcz1p993vzgmp6h5xfmayd"; "cdpbundl.source-0.36"="p2gp7qsmlczdhdank177dq5lnz1kgy0n"; -"cellspace-1.6"="z1fb1l66lni6drrvy1pyfksvpp424vjh"; -"cellspace.doc-1.6"="3qxa9imgb6ap4kvc97znik9vhzdwb15b"; +"cellspace-1.7"="0grnmj8yywvqmzvil5qdqqz86p0pxsch"; +"cellspace.doc-1.7"="00nzspr8m16s0wqs6q1v82gn40yj45jk"; "censor-3.21"="a5anc6g425g9f6x6ag4d824y659dlw16"; "censor.doc-3.21"="29ayn0qp9hhc1zx54xicn4k56xhkj6y9"; "changebar-3.5c"="syrijhn123hp8qhrbss4jkjfzzqyyxxk"; @@ -2746,8 +2817,8 @@ "changepage-1.0c"="s3dd0v3z0g8v74i6cnasyaa70wnqiimk"; "changepage.doc-1.0c"="g63jqnyrkc74dd9ksi0s7pbxq7s4dzwb"; "changepage.source-1.0c"="0ck3lyl2kzvm1182hmw88ni48paff7aq"; -"changes-2.0.4"="h3nxw2xdajy1xy8sssgpbg2ka8b9fwig"; -"changes.doc-2.0.4"="cv0ylrl6axc6s6c3swyckxxs8kyr39nb"; +"changes-2.0.4"="2v7wbkgk8n9pafgapjs6glqbx943s257"; +"changes.doc-2.0.4"="zgsp981wnjs758wwf15l8hlh5vrd7zx6"; "changes.source-2.0.4"="74ahc6k7qb1vyackh39xv57ak0pzn9z6"; "chappg-2.1b"="231kpsvxwdnmakq4mkca0nisqdl622n2"; "chappg.doc-2.1b"="nhh2f6k2z5gh449b91fmxnvh359n9adw"; @@ -2755,11 +2826,17 @@ "chapterfolder-2.0.1"="n1iyz86gz5mb7ixn2kd48i0rgj28d7sr"; "chapterfolder.doc-2.0.1"="cq3fgi89g5j3l8pjmgb9f76ly6ykdviz"; "chapterfolder.source-2.0.1"="v9hlnak7v7s4bi4942gc43hh03zy33d7"; -"chet-2.1"="5401gmabiw5jlcqrxyamzb9ravbsmgqp"; -"chet.doc-2.1"="d4rnap038has280b5cxv76rd42bf42l4"; +"cheatsheet-0.8"="dbp6g9c967pc45wn345qm95zns815kl0"; +"cheatsheet.doc-0.8"="s3h23qpv0l6hn9bqnrzyiqx2mv4bzxch"; +"cheatsheet.source-0.8"="4x8njfgq1scmiqnkx4xvgxinc133a4vf"; +"chet-2.2"="g654s58dhkxsnzbg59zydmncldn3qklv"; +"chet.doc-2.2"="4wc8nmj6lprpqhm5a067nsm00y56pzmi"; "chextras-1.01"="mc1ymd3wfbwash00ly9gxk6hcx9rl4lk"; "chextras.doc-1.01"="9rl2yhjmafyp430avjf0dmdmmgb45x01"; "chextras.source-1.01"="5a4dqp8jyaq0bi98q26mskbpmp1avb35"; +"childdoc-1.5"="qnvl5zskdh6rwkl516m60h0qxwgb85cp"; +"childdoc.doc-1.5"="703kk90sddx7xxyf672nrjkrjd1rnmxn"; +"childdoc.source-1.5"="bcrjz2zs84pv7lynj8v04p9zrc5w4c4x"; "chkfloat-0.1"="m48shpd6qvgscba8rz3dpkx0blzfiw13"; "chkfloat.doc-0.1"="1l3anr2pkpq0h4wpshscrxmcdj80q6i4"; "chletter-2.0"="9nvpbffnfn080w6pkf4xv18vwsvrc2z6"; @@ -2774,6 +2851,9 @@ "circ.source-1.1"="j3hksz3r2pa1y4m7kw2qwzm11j7a4za3"; "classics-0.1"="kpskmb202fj06y3glw5f7m625q6zp4c2"; "classics.doc-0.1"="ysdwq12pmmxanivxl1j5nxbfh1aw0vz2"; +"classpack-0.77"="dybfkvi6ykzw4s03xgz8r7n88xir9zzb"; +"classpack.doc-0.77"="390v2v6vabq679gr2yqvmyq26x6l6lz0"; +"classpack.source-0.77"="mr188ykwygc0gsznl43vlbx33wa2imyd"; "clefval-0"="291n2xdsripyiq6zskxqdca5gn3ajfj5"; "clefval.doc-0"="s9mvnhb1w1q61igbrvbn4fi4hannpx2v"; "clefval.source-0"="l73m1k6wksnfqwd1jiqjksvdpwwp9k1q"; @@ -2782,15 +2862,18 @@ "cleveref.source-0.19"="g0agqk7r1lli033sa33k5hp2xnsrwvm2"; "clipboard-0.2"="01iyxd2i6rv9vzv1r3j5gyrnancfbqbj"; "clipboard.doc-0.2"="iybnanqb5ykxdz9d108xqa46y48x6zp6"; -"clock-2016"="bcsbr112z4np0wszh3dwv9h5l8w11bvd"; -"clock.doc-2016"="prj65yh580yg74pckacsr432rki2nsl6"; +"clock-2017"="bcsbr112z4np0wszh3dwv9h5l8w11bvd"; +"clock.doc-2017"="prj65yh580yg74pckacsr432rki2nsl6"; +"cloze-1.2"="6aawammcpq8n2igbncbkip67ph5mapc8"; +"cloze.doc-1.2"="5lsz6hfblnzj9wjs7j43c07drsgv5mdc"; +"cloze.source-1.2"="x6gbbdxnvgfysjhv3xad83lfs9khg4f9"; "cmdstring-1.1"="mzw3hf7xhy01j9irvvlba90hb0065p1r"; "cmdstring.doc-1.1"="l2hjd47d6wmd07rnciadrbir01887nd0"; -"cmdtrack-2016"="1jw2c4hx9xmalis8lkz7lr4b38h6srlq"; -"cmdtrack.doc-2016"="0fniwn5zccpkypjn9v5hjl0baxscpc8a"; -"cmdtrack.source-2016"="hlqnd8ar2w2wyjr7rxi6qbi3mw2ppgsn"; -"cmsd-2016"="4b40ccv8788hg71xh6sv12gnzyy2q4rb"; -"cmsd.doc-2016"="j3bvhldqzjqf1snv9pbg7k39sbwl2ccj"; +"cmdtrack-2017"="1jw2c4hx9xmalis8lkz7lr4b38h6srlq"; +"cmdtrack.doc-2017"="0fniwn5zccpkypjn9v5hjl0baxscpc8a"; +"cmdtrack.source-2017"="hlqnd8ar2w2wyjr7rxi6qbi3mw2ppgsn"; +"cmsd-2017"="4b40ccv8788hg71xh6sv12gnzyy2q4rb"; +"cmsd.doc-2017"="j3bvhldqzjqf1snv9pbg7k39sbwl2ccj"; "cnltx-0.13"="i7agvf6p3zbmpp0yy54jcz30yk5wgndb"; "cnltx.doc-0.13"="bfzwcspv6kaizp2cngdbgps61w40a61l"; "cntformats-0.7"="v6xl1mkldlf6265h96m2q0bylifxhl33"; @@ -2799,9 +2882,9 @@ "cntperchap.doc-0.3"="y2jdwmpp6r1w17svqw9iww07pi3blbah"; "codedoc-0.3"="gva56ykkkr58q9gxkff6ng0wd5bk9by7"; "codedoc.doc-0.3"="8w9r3z61w026a0zqmbsilmf4q382bvd2"; -"codepage-2016"="y9xv0i4lq1nh9nav86b5j34rws8lln53"; -"codepage.doc-2016"="7rwl8dagypzj93xim0qj3gm56a24f8y5"; -"codepage.source-2016"="4955x5b5ddysnx8bksmwsqhj1jy83991"; +"codepage-2017"="y9xv0i4lq1nh9nav86b5j34rws8lln53"; +"codepage.doc-2017"="7rwl8dagypzj93xim0qj3gm56a24f8y5"; +"codepage.source-2017"="4955x5b5ddysnx8bksmwsqhj1jy83991"; "codesection-0.1"="mnsfhjy6j2ypxiwmwx85w2k2zyw928pi"; "codesection.doc-0.1"="s2kwd6brlwa42pvhpjasx84s87vmbz8j"; "codesection.source-0.1"="j94xngba5c8r55idfqgy7ra3imzkmg8x"; @@ -2811,25 +2894,25 @@ "collectbox-0.4b"="2kxzzkgkgcjw80ff9n2mjnnfpxaxcdhj"; "collectbox.doc-0.4b"="2xgqgni67w7q4ad0jqy4vr9wki08kn1g"; "collectbox.source-0.4b"="szy9gprjqnkx357dca60120lvaiyyy8f"; -"anysize-2016"="0phqi21d8qz3ifadzfzyfb04v10xc46n"; -"anysize.doc-2016"="4as0n5cw5g21j1wy094gdrbw8pzdm460"; -"beamer-3.36"="id37ddaxfy99hh4h2gb6jk84z9jnjg2i"; -"beamer.doc-3.36"="hm5ffj1pzaz4i6jz6nhl951b7yjfzwna"; +"anysize-2017"="0phqi21d8qz3ifadzfzyfb04v10xc46n"; +"anysize.doc-2017"="4as0n5cw5g21j1wy094gdrbw8pzdm460"; +"beamer-3.43"="1rr03jx5bdhqhasg6qm6qymaq6assdbs"; +"beamer.doc-3.43"="i8bd2mhvl6i2q3ksgwb63sb2jpab5b2l"; "pgf-3.0.1a"="2j88yrmw9ss4c39j1r7s5nfhpkf7x3vc"; "pgf.doc-3.0.1a"="4c2fgj2lxmhw85ad2hnc5bajzxjg6v6x"; "pgf.source-3.0.1a"="0fvi39isxzyyndb9x7awjv3qmc0bhb5g"; -"xkeyval-2.7a"="nznhb9srbfg7ifdi2mlkqbdcsq6329a4"; -"xkeyval.doc-2.7a"="k84lpc1h5d71qcb2k5rm5fnn04pv8czc"; -"xkeyval.source-2.7a"="9g5vvb4y71qryhdbjwjyxhh2w86cch0f"; +"ms-2017"="ffg55s4fwk1r5lfv94wjw4f7npbvjpi9"; +"ms.doc-2017"="980rqpzi9zf2dn8aa891k4538rpzlq2z"; +"ms.source-2017"="ybpn3z6c8gw2jlbj3161l1gm6xxy85g4"; "booktabs-1.618033"="5pj973c5lps8fzz4skmgik3892jii5vb"; "booktabs.doc-1.618033"="kv5d1vbz28n5ifi1xnd4213q3dp55qgh"; "booktabs.source-1.618033"="siz5pfb2skr927lz92dhhxirx44wsc8i"; -"breqn-0.98d"="yd3rkqy1lr94iyln19qa57y69cd17324"; -"breqn.doc-0.98d"="rjmnz7x2yd6v4b9jbcf28impyldahxcf"; -"breqn.source-0.98d"="ydx0xbxcsabk0in6z3y4r335cms9zk87"; -"caption-2016"="x087kmssmg4nhihw1bb847ynszd1zxyh"; -"caption.doc-2016"="ng1lsvkakl14jja0izyd20l41w7as4z2"; -"caption.source-2016"="3nsnn2kccyqk4nf7vm16j38qakv24pbr"; +"breqn-0.98e"="6qavw7nbx6wsm84qxfilj9ah76isisrn"; +"breqn.doc-0.98e"="5b6s35kmasnhrnyzmqg2d04k2448nipx"; +"breqn.source-0.98e"="gmqymf8lwcig4sb897ba3acwd4i316dj"; +"caption-2017"="x087kmssmg4nhihw1bb847ynszd1zxyh"; +"caption.doc-2017"="ng1lsvkakl14jja0izyd20l41w7as4z2"; +"caption.source-2017"="3nsnn2kccyqk4nf7vm16j38qakv24pbr"; "cite-5.5"="7vzh6m2dnlxwkiw62ifbyn9hx82jpgyj"; "cite.doc-5.5"="d20p75a21nvifkj1f61fd9ah5580n2bx"; "cmap-1.0h"="bky8rw1a9f00x6fzx611hgfcyf7d115f"; @@ -2859,73 +2942,92 @@ "fancyvrb-2.8"="p2lpk6f8lrwa8gv07j1l0m83sqkdrdx2"; "fancyvrb.doc-2.8"="1np0vw5dyrzz6a3d59jvrzbvvwi6ix6h"; "fancyvrb.source-2.8"="g38dv0ix1c8dg3ijahs20kcwzw1lzdf4"; +"filehook-0.5d"="95km0y68ldra3ha3c3j83zlchg7d6xn6"; +"filehook.doc-0.5d"="xvrasdz1m52dsjzn3wv5hy1pdwka3msk"; +"filehook.source-0.5d"="il5yprd7hw76wmbb6xmqz9njhkqjqkz6"; "float-1.3d"="dqksfsgqpc0vprkhfc6c9vfxlbrnn8sw"; "float.doc-1.3d"="88hpzqh1011kwvwwm5bppb2gx6c9qqrv"; "float.source-1.3d"="j1vp24g1lvwniahnd9vlw32c61cjswn9"; -"fontspec-2.5a"="2vi3kxivlcpj8b50m2ww3ras1p37ga75"; -"fontspec.doc-2.5a"="sajy2q2b06gfgj3kzxxwipjgskpmwbzy"; -"fontspec.source-2.5a"="4gq5r4qksp0dw70j2zwprrhi3sy5k3mf"; -"l3kernel-SVN_6512"="lm0yv8krbnpqahkhh709b8w23rw3ihma"; -"l3kernel.doc-SVN_6512"="vxs6yb5j84p9d54ywlbgxivq6hp4dpn8"; -"l3kernel.source-SVN_6512"="x7q0njz7nk7cwi1alfrxz3l332nyx6sl"; -"l3packages-SVN_6512"="saqbanzsyp410c4dm1sa6j9p19rzvi0r"; -"l3packages.doc-SVN_6512"="rdn7qkfq2p28rb38srhxipjvwmm9axmj"; -"l3packages.source-SVN_6512"="71ha7h8p9kbg205v12dhnx6bc0sa5mr1"; +"fontspec-2.6e"="x6b5ia4c6fd3g8i89yardh6qq123fzgn"; +"fontspec.doc-2.6e"="cb04igh8awrj1hxk6gw7jif5v51676mb"; +"fontspec.source-2.6e"="88zw6mh93p0l995l0vqjg75xzawk20pk"; +"iftex-0.2"="3amzn5jjz9l90w90rhrrq75shl1v731z"; +"iftex.doc-0.2"="n514jbc0x2jxsk39lhayr74xpzfgqvn1"; +"l3kernel-2017"="hr5j6c16a8w3vhsb9yfc7d0vgfh7qjpl"; +"l3kernel.doc-2017"="0mc8sd5b4rp8crd5wykb54zlx0p30h2w"; +"l3kernel.source-2017"="crqwys02pz1w51vaj0zs2qiypjrf9v31"; +"l3packages-2017"="3f0yl94ywspimn44zb9hpr4crwcjs59x"; +"l3packages.doc-2017"="89xxka7x0nmmqdndm3r2798rn6zai2c9"; +"l3packages.source-2017"="fbxnsnv6p5rc354pffbk4qxavfi0w1i8"; "xunicode-0.981"="ybvkdgz4sdl4nixzgz2rbmqfz7hwajv4"; "xunicode.doc-0.981"="lydvg50dcpp0lk3m9niwdyf1vra61mgf"; -"fp-2016"="5nb3zlqbvs9n2i59y5rw7b5v4ypa6dj4"; -"fp.doc-2016"="cx0qn4l16ir6k92rjjxjxy9n38agfxii"; +"fp-2017"="5nb3zlqbvs9n2i59y5rw7b5v4ypa6dj4"; +"fp.doc-2017"="cx0qn4l16ir6k92rjjxjxy9n38agfxii"; "index-4.1beta"="qbh9vs69mrp2czw492icb71wbx4nzshx"; "index.doc-4.1beta"="l3476by3qz0r0cn3lcbw006ay5p11naz"; "index.source-4.1beta"="0i38dyjh6278hxgkdzy0wvlcbn2w0k7n"; -"jknapltx-2016"="cvwv1bfgf5s8rnahghpy2pbb7kgwzqwp"; -"jknapltx.doc-2016"="cxdmxr63vm4sm8rv6bp9n3yyw5gqc7y3"; -"koma-script-3.20"="9rghxgb9iqrpmq1p4wcd75rxkw9wr318"; -"l3experimental-SVN_6495"="iwdg63yc5kn5v5j38xqcjd0s31vy6nss"; -"l3experimental.doc-SVN_6495"="xibw18dsdz7vkl9bq58i9bbmrvqhws27"; -"l3experimental.source-SVN_6495"="8g98p736z2zfsr6pa1p4lm6fb5cdama7"; +"jknapltx-2017"="cvwv1bfgf5s8rnahghpy2pbb7kgwzqwp"; +"jknapltx.doc-2017"="cxdmxr63vm4sm8rv6bp9n3yyw5gqc7y3"; +"koma-script-3.24"="sk70f26ssyy2jgl2hg38xczpabq3rf8y"; +"l3experimental-2017"="zx3p8f8zn925s3fqzlqcprljsnm423vh"; +"l3experimental.doc-2017"="r2mbcw8cbbl33zg507clbl7qcgv1dxaw"; +"l3experimental.source-2017"="6lnd3k35vd8hjx5d8z7ha23lj1ilvvi8"; +"latexbug-1.0d"="zfxinlwjxxz1rqb5ryfh87yfgd27g2ax"; +"latexbug.doc-1.0d"="cwsa9c4pp9q6w0kb003aqz72ydz3r5bn"; +"latexbug.source-1.0d"="lkf2ykr7yj8aw7g7322ivhr9a7qcv2d6"; "lineno-4.41"="kvbdigwxw4db752kssgdb8rlxhljkkpm"; "lineno.doc-4.41"="cfnil0v0isahd65d1sly2kr29w38h535"; "lineno.source-4.41"="w30n8z3rnrvzpfa1d1s7mn3rcj03s892"; "listings-1.6"="r7c966s9wlhjz29xgpfb4v17s07kwbsm"; "listings.doc-1.6"="xc3xnzdv0vxhw7zgpxi6yk52bbmk271y"; "listings.source-1.6"="l4a55gc3ilikmsfcc45x8faa78938303"; -"mathtools-1.18"="3dyinwg816qr0kip6bgyz4092qsw6a1d"; -"mathtools.doc-1.18"="gfsk3bcappsrqj4nxn57v7jgg9x2xyg5"; -"mathtools.source-1.18"="1amakm4cndfasnykdsnqh4rsrjgmis93"; +"lwarp-0.41"="hjv61q16h3cz8l789fbqajssv31bkcmk"; +"lwarp.doc-0.41"="h6qnbn2by8bdznq4zaiiygqm2n650d2w"; +"lwarp.source-0.41"="3zqnhsqblgas8dnr1jzliykj3mhm33l6"; +"mathspec-0.2b"="kwvx81d4nlxj7vbr2n5zvgnfvkasg4y0"; +"mathspec.doc-0.2b"="rqykkdkfahnnnphcns26p19z9mr2mlgh"; +"mathtools-1.19"="lkqf9wr9ipgqrg8isqz072xhhpxfjkjm"; +"mathtools.doc-1.19"="qggrhicv1gw317cjpfsz8i5qq684mpmx"; +"mathtools.source-1.19"="0jpdsw0yrcak32k0bmsiry958rm2fsvk"; "mdwtools-1.05.4"="fbp8vrgdzc2g4i27m9f4qcsr8yjlbzg3"; "mdwtools.doc-1.05.4"="jb5r95gmlqj1bx19gbkvcm372ina3bdy"; "mdwtools.source-1.05.4"="kcm853bwwv69vb5zcmikd1gmpcnhz9pw"; "metalogo-0.12"="hamja3bdw70llmwnabjq9vsdni1w77qv"; "metalogo.doc-0.12"="mi09m2hdx668xm2v9igsq25z504n4vrh"; "metalogo.source-0.12"="4xddwk98vl0xdff6j49jjanzvqbw6yzm"; -"microtype-2.6a"="f85ick2wisjl5vrp1jwkw3jbiq5jf360"; -"microtype.doc-2.6a"="qlqbr1m88wb79lr7rjs586rfgbp4m6wl"; -"microtype.source-2.6a"="s2xh2z3h3wxs9bdagjgl9a0x8m24h9nj"; -"ms-2016"="ffg55s4fwk1r5lfv94wjw4f7npbvjpi9"; -"ms.doc-2016"="980rqpzi9zf2dn8aa891k4538rpzlq2z"; -"ms.source-2016"="ybpn3z6c8gw2jlbj3161l1gm6xxy85g4"; +"microtype-2.7"="brkf8w0rci9bkmykx0lqmc020r641gkh"; +"microtype.doc-2.7"="ldbm8hm1rfjzgfzkqx9qjxl8p0ki10wl"; +"microtype.source-2.7"="5ipknc0bdbq5i51zbvs1pf072ddsxmqk"; "ntgclass-2.1a"="z5fz8hxig5gp5ii9780b8filsbk7qxyq"; "ntgclass.doc-2.1a"="900yw3bcc4mdycknaspf867wm8fc3g7b"; "ntgclass.source-2.1a"="rqd773gdvwmrz54igqz6qz54z4irajvg"; "parskip-2.0"="93zjzx0cifz9lzdsdlwy3z46psp6nfzn"; "parskip.doc-2.0"="v4ddahrdxf1qf7xsqvfqkzrzg3pj7zgg"; -"pdfpages-0.5f"="sxam7z4bmmi795vh4ymchgva2mrhqmqb"; -"pdfpages.doc-0.5f"="hi1d8chy8jgasnpdgk20iq0z39d5qj28"; -"pdfpages.source-0.5f"="pfs8i92djk128xz85y07mrvm53q7052j"; -"powerdot-1.5a"="8dwy2srd3g7gcahfcqrz9189r7wh1wyx"; -"powerdot.doc-1.5a"="1x73p0bsd8h2r4xa71w21gbyzg4zp6ga"; -"powerdot.source-1.5a"="1r81q1kv1x36y328d1ypaq0gi34y9jdw"; +"pdfpages-0.5k"="r58pxikda61jwmdly8fpd2nijwh5bzfd"; +"pdfpages.doc-0.5k"="hjl7akjx7wrjkm95bw9l2g8cgnzm4drn"; +"pdfpages.source-0.5k"="gdfjq7njbaiwsaxhjv5baqhvxa4599rn"; +"polyglossia-1.42.4"="csnxk84k28xvpajix45dyjhqrs054rxy"; +"polyglossia.doc-1.42.4"="62m2fgqmplp2z5pb4sv038i1f0ynxhmw"; +"polyglossia.source-1.42.4"="92wvkanrs6mq0kgd878c0my5fab6960f"; +"makecmds-2017"="anpaqglvl5rmcy8r2q0ap8m117nsx89q"; +"makecmds.doc-2017"="39zxaxxqlmps1wd4rjy42a1hk027n06v"; +"makecmds.source-2017"="j4g888p0hniq7p6b30q1fb4qfw3qp7i6"; +"xkeyval-2.7a"="nznhb9srbfg7ifdi2mlkqbdcsq6329a4"; +"xkeyval.doc-2.7a"="k84lpc1h5d71qcb2k5rm5fnn04pv8czc"; +"xkeyval.source-2.7a"="9g5vvb4y71qryhdbjwjyxhh2w86cch0f"; +"powerdot-1.5c"="dq53xc4c6n4qpxcqkdazwn6b8v8z94f7"; +"powerdot.doc-1.5c"="ph5p9y3knn1w1hkzb79kdxcwkg6fhrbs"; +"powerdot.source-1.5c"="245bf49s69vlxk1f1mlbdyfhx68icgpj"; "psfrag-3.04"="k8qyr0l3fsc4insyy1r6q596dq4gf23a"; "psfrag.doc-3.04"="ybb4r3w20w1pcjwzaw0srpkx5c19rqg7"; "psfrag.source-3.04"="xk135sb77fk6l9wz6fzifsjvchcqyj0f"; -"rcs-2016"="4lkd02hz1x9zkxnh247wmwy6n9pg4pyw"; -"rcs.doc-2016"="m1lw85b793n2nxywdi39fg438i6kif7x"; -"rcs.source-2016"="iw4nn20q54s2d4wdyby7n03ljcqrjmig"; +"rcs-2017"="4lkd02hz1x9zkxnh247wmwy6n9pg4pyw"; +"rcs.doc-2017"="m1lw85b793n2nxywdi39fg438i6kif7x"; +"rcs.source-2017"="iw4nn20q54s2d4wdyby7n03ljcqrjmig"; "sansmath-1.1"="yxyny4949h4hm4ajn673nzzw8wn8cba8"; "sansmath.doc-1.1"="b8vzdmm1l2x7cyc15xzhmwjkszlsp2j3"; -"section-2016"="69anwmylbk95jbgr8645abp07ygv9f9g"; -"section.doc-2016"="ri1gsrpfp94rp0dc90djj1kgpka2p5gl"; +"section-2017"="69anwmylbk95jbgr8645abp07ygv9f9g"; +"section.doc-2017"="ri1gsrpfp94rp0dc90djj1kgpka2p5gl"; "seminar-1.62"="z9nzymppz6hz3lxy0nliqvy5szq6jk4c"; "seminar.doc-1.62"="23fz6p4ybl42rmr1m3fllg7qn1zbmfki"; "sepnum-2.0"="x64bd0f3g1x0bcpdgd2lfspr13jyxvcf"; @@ -2935,16 +3037,25 @@ "subfig-1.3"="sbdadp9ya32w2h8f484zwpmpln2zi4l0"; "subfig.doc-1.3"="y5g4iadgvkfi144zk37fww79r0smsfk4"; "subfig.source-1.3"="3xn4yhi29m77001w2hy0s04svik5z5xx"; -"textcase-2016"="5a82axcc916n61755cafcqcz3vb7w27h"; -"textcase.doc-2016"="b8iq4xf229k6p8s0b38br9gncyqhrlxl"; -"textcase.source-2016"="xlgxjkf93zrwdhk44zmxazfqg1yw88pa"; +"textcase-2017"="5a82axcc916n61755cafcqcz3vb7w27h"; +"textcase.doc-2017"="b8iq4xf229k6p8s0b38br9gncyqhrlxl"; +"textcase.source-2017"="xlgxjkf93zrwdhk44zmxazfqg1yw88pa"; "thumbpdf-3.16"="h8ssy495zrgwx10wsb9bypapmhdnvn5k"; "thumbpdf.doc-3.16"="fqbyfy2ip2ayd0a0fwkg25jdjcyprkdv"; -"typehtml-2016"="rk5lpbaikavkp0shg38cdk5b209wx3kh"; -"typehtml.doc-2016"="292x26pw24azh4zdwpy6sh3f1ksk8r2x"; -"typehtml.source-2016"="96p79dyy553b4mc01ihk7qgr11396drn"; -"underscore-2016"="b7kwk1zddr5a19mcw3yxrp9pffc604x0"; -"underscore.doc-2016"="gwqnbwqn6vjizs1xqnmbv8fmcrs274fr"; +"typehtml-2017"="rk5lpbaikavkp0shg38cdk5b209wx3kh"; +"typehtml.doc-2017"="292x26pw24azh4zdwpy6sh3f1ksk8r2x"; +"typehtml.source-2017"="96p79dyy553b4mc01ihk7qgr11396drn"; +"ucharcat-0.03"="d445ic6gwl7d5d31s691vr63f4hn76dz"; +"ucharcat.doc-0.03"="ma6rz3djr9v3q5p8ffqyznjb91gjj5li"; +"ucharcat.source-0.03"="kh9cnzg1pn8c51bbph2amp5y1j85q38h"; +"underscore-2017"="b7kwk1zddr5a19mcw3yxrp9pffc604x0"; +"underscore.doc-2017"="gwqnbwqn6vjizs1xqnmbv8fmcrs274fr"; +"unicode-math-0.8h"="mjk6kkv3y1w8lf8cjc2rh38x1lz22ldm"; +"unicode-math.doc-0.8h"="k7p6qgb3nab20m9zxhcsd9wzxbv108ky"; +"unicode-math.source-0.8h"="k98hzk930s2wgf8y4qn2shgmh79s9j9r"; +"xltxtra-0.6"="gr3v05m1pm9j55smbfy71vfn3kg1kpz4"; +"xltxtra.doc-0.6"="0zsznrgvzqcfi0ypxkbk3vqslwyap7l9"; +"xltxtra.source-0.6"="cw6kmfdgyz9ds3gdjlgy2bh16i6fxip7"; "aobs-tikz-1.0"="klfbwfabfx6lv1pk6kz3vayabsnphvrh"; "aobs-tikz.doc-1.0"="qh43c30d1xpyl4rbazp4kj8p850rdxwb"; "aobs-tikz.source-1.0"="xgmck3vrplx5q6blkm6yg2njgkk4k5bz"; @@ -2960,6 +3071,12 @@ "autoarea.doc-0.3a"="zh69glasmj251qwrw6pjrshprd6x4hsh"; "bardiag-0.4a"="vh54valkzncvzlx8y58gzs3k5jq66s69"; "bardiag.doc-0.4a"="576s5nnqvq13rjnnn4l2d1g1rnd64vvn"; +"beamerswitch-1.2"="2gx2ar9z4xq6m9wc9231021ck3kbi23a"; +"beamerswitch.doc-1.2"="b23d4h32bchpzs623m6zpn4p54ap1ybr"; +"beamerswitch.source-1.2"="iwwiic62ha7ag7yyjsdhwzha7lmr9k3j"; +"binarytree-1.01"="xl1rqgn286y7hpv69bwja6c5rrbx29g9"; +"binarytree.doc-1.01"="7ihijqc33m3ydk77aw0qqqhf94yyrz21"; +"binarytree.source-1.01"="lk7v0gr502ck4z0d605z6mwkswqpmfyk"; "blochsphere-1.1"="8sagm09ymgd1b2ls78rzrcbn6k0m63rr"; "blochsphere.doc-1.1"="sj294bshvzlc77wi6mwv4pl0y73j311p"; "blochsphere.source-1.1"="4kr6ra2cp6fm7r6xfrln38v06iwxqzaf"; @@ -2982,13 +3099,15 @@ "bxeepic.doc-0.2"="qkfwmg27v6ygkp3d9d1l18zrpribbx3q"; "cachepic-1.0"="hr0pnmjxny590gzhqbwq9qiqd1vcpwrq"; "cachepic.doc-1.0"="myyjxkc21qrwmvx2nvbg2smvzfzi5f5l"; +"callouts-2017"="i91ky84hjizrxkhb5k6281iq3fkifrsg"; +"callouts.doc-2017"="k4rca9nia095sgskhv0kzp1qqw0ydf8l"; "celtic-1.1"="mr86xyd6md9n5b17a6wga40k8z98dq7b"; "celtic.doc-1.1"="3mwjjxnv079m8ginlv5my50jj1cmpjv0"; "celtic.source-1.1"="z25a01arypma6jfyj2f16n36hqyicffd"; -"chemfig-1.2d"="klsfh302iw9fzbl4w2hr155fgzld1jw9"; -"chemfig.doc-1.2d"="vrb240a4yi56v7whq245iw54kr5r5k0z"; -"circuitikz-0.6"="l82zv9h6q20gmy6yn2ldc9gxp0x9zm91"; -"circuitikz.doc-0.6"="89wa9mkxwiv2pxnh409cg4min00n3hcq"; +"chemfig-1.2e"="m8vww69bdg2crm2w4885x1qlyza948nc"; +"chemfig.doc-1.2e"="22p1snikfh9s9wwqnmzxzy24ay08sh69"; +"circuitikz-0.8.3"="krbwmn8nd6adhbjm4pg7rfxj9aff15cw"; +"circuitikz.doc-0.8.3"="sa8797nhxww4z85k37kmr5ipnyqa3k1s"; "combinedgraphics-0.2.2"="hr8cvhw9ng0nx1v0v34bx5yppzhw8r3a"; "combinedgraphics.doc-0.2.2"="2s219mqf373sb1rp3dwjd9kdasjl9fdg"; "combinedgraphics.source-0.2.2"="4q5n4m14613bv27dc7n3z1m8w2sfiv0q"; @@ -2998,30 +3117,37 @@ "curve2e-1.60"="gy48z045rdfrzda6vsy0ybwgaynvf78b"; "curve2e.doc-1.60"="8gsmvy2s3s1xk0qrmqnv3w7z0h3g0xwn"; "curve2e.source-1.60"="zjxzgxgi1p6lbq521dbg92xylk90kgpd"; -"curves-1.53"="5v3y0h5201ayjrnlwy6r3d1bv738k0l5"; -"curves.doc-1.53"="97v1zy8mydmmqqzlcmjv1b8l2aad74m3"; -"curves.source-1.53"="q7s2kbn6n75s0ddda5f5jfmiw470rb3h"; +"curves-1.55"="2cyy1kwxbvxpvxpvvsbh7nvh5q5l7n7b"; +"curves.doc-1.55"="jk4ma0hcrdg6lwy4l5238b9xzsb8lfrv"; +"curves.source-1.55"="q9l5hcsi0n14kkcim30yk6i6sxc5cmvw"; "dcpic-5.0.0"="vw8yp87w2arykklgfbi4sjpqq68nkxl4"; "dcpic.doc-5.0.0"="0shw5fqn8pmzs2s98yxa12jp6lf23c4b"; "diagmac2-2.1"="4q9fi0lsnriy4szlgdlg0w302q1gmbrs"; "diagmac2.doc-2.1"="dfp1br71r19b0pzjzln61wjdn30qy0n7"; -"doc-pictex.doc-2016"="770vj0w7dzrw6n4jf1dfds5ngk11cf6m"; +"doc-pictex.doc-2017"="770vj0w7dzrw6n4jf1dfds5ngk11cf6m"; "dot2texi-3.0"="igh08hai8lpcr0pn4lcfx5b6kgymw4sp"; "dot2texi.doc-3.0"="r038r86xd4csibgk9n3h76qc5ak1zpl5"; "dottex-0.6"="yvd132700sxd7hnngskg6w30r1cpx3m3"; "dottex.doc-0.6"="67dpg655j83k809rs0ybc3cxpy2lvvqb"; "dottex.source-0.6"="fz625gq3shyvx3wk5jk4hvr33wls038a"; -"dratex-2016"="ydbymdy490gw405n0gn3amd771knss83"; -"dratex.doc-2016"="7z5sxm5li3by76x7sw9hq83gl34f6gkr"; +"dratex-2017"="ydbymdy490gw405n0gn3amd771knss83"; +"dratex.doc-2017"="7z5sxm5li3by76x7sw9hq83gl34f6gkr"; "drs-1.1b"="h9fz09xdgwgnbif1vxa1k7rxj8v9ri5h"; "drs.doc-1.1b"="aq84i4xdklf4wcripj60cc9fd4w3zhhc"; "duotenzor-1.00"="fx9ljkzzp09x8iajbwjlrzcjxf382k9x"; "duotenzor.doc-1.00"="x6y62df7hjrp64r4w1qvdikqdg6ph8l2"; +"dynkin-diagrams-1.0"="fw1bx6nc0zlb5x2kypbh4gbb1i8jgwgc"; +"dynkin-diagrams.doc-1.0"="zvgsf8yw5l276jz2323i4qhmx84vgk46"; +"ecgdraw-0.1"="py3xjb8hz3mdsh42hnjww7i4ndxgkwnc"; +"ecgdraw.doc-0.1"="a9ggi8ivc4wcnqv9gd28lhdw56w4zg8a"; +"ecgdraw.source-0.1"="77vlnnhs178s19gaa4n7wa82lcvyp0s1"; "eepic-1.1e"="vdbwj455076cwr4fwmx0lmf00nzka9vs"; "eepic.doc-1.1e"="ngcq5bdryv79z4wazbzibf8fybc2mhb0"; "ellipse-1.0"="8whg820p9jrqn4nfb7lc3w8d1a2cyfvn"; "ellipse.doc-1.0"="i9njlr8m3jb9pcrwqsbcjbsb26993p8n"; "ellipse.source-1.0"="25xhi22s1cvkyzbjwchd50ixsx6awfk5"; +"endofproofwd-2017"="xn4xfhhr3k5cq53ab6rkjwvxqs877kq8"; +"endofproofwd.doc-2017"="q8zg1zy1909bsif59caj8rmmjj4g3v4i"; "epspdf-0.6.3"="hz6676iggzrqrgzdr612p75vzsjhxx8d"; "epspdf.doc-0.6.3"="6icfcsk9gq46lfhq975g6sq5r3g77812"; "epspdfconversion-0.61"="4dsfb50v8zqbx8nqlzlj712jiq9hchwz"; @@ -3039,19 +3165,22 @@ "flowchart-3.3"="63krabbf5sfqxf0rjb2h4mjksvb9vgcd"; "flowchart.doc-3.3"="697hizfchfd691kx07sl1y84p8l6196d"; "flowchart.source-3.3"="zgn96fhr4z67gpz85717hwwfvkfz2hlx"; -"forest-2.0.3"="vv8z97lzlqh30sv94a7bx42r8781mi6s"; -"forest.doc-2.0.3"="1sfmjnqkm1x3j0lfzalk40a3n3ibkg70"; -"forest.source-2.0.3"="3y5gjdvmfz6kk79ligfmzx93znchdqlg"; -"genealogytree-1.00"="jgrq9w6r2kqaa7fh7a7gbl64l9pg673m"; -"genealogytree.doc-1.00"="10rvn2bm8wkxzy21qjj21kpd9jhjfkxl"; -"getmap-1.8"="ghp3skiy0znf7vyhl59mfna7sgfc8fsz"; -"getmap.doc-1.8"="lvmiaxhc7ghwsxaygcabjsbx1dll8kzi"; +"forest-2.1.5"="zl86yn0am5c7v9c471ai0g4spp3lfc4k"; +"forest.doc-2.1.5"="9sfpasybcfbs0v2afcmhxwpcmdxjpv42"; +"forest.source-2.1.5"="n53yzm6p3nwbxrjj999yvcic58p4iv6z"; +"elocalloc-0.03"="mk2cs80z0gh4dx409y2n3h9cr8ls1la8"; +"elocalloc.doc-0.03"="0p4f0hwr11xvn57adggbbssn9iiynsyf"; +"elocalloc.source-0.03"="spa5lrwk7nikx08v1pgp0xrx4c2gbahk"; +"genealogytree-1.21"="vin4yvnqg5lfl514h2ahrpsrvrwn9ax5"; +"genealogytree.doc-1.21"="z89h194wmsj268j1zlqxnnk0ingbxdnc"; +"getmap-1.9"="y4m1lsy4h96s40i3xq266b9mm6y060rh"; +"getmap.doc-1.9"="giffmyvysflclgj4j4dap3xzihnkgddv"; "gincltex-0.3"="sqimpp1pb3c7mqcm4jnd40jlahpcnr30"; "gincltex.doc-0.3"="mpr0nv6ldvvc7wgq35qh34csxhxnknmf"; "gincltex.source-0.3"="s0dq3s33c04fqmzi9q9wp09vgfm7qh9h"; -"gnuplottex-0.9.1"="vwpajdwl4aidnz2jf0gqk6nqyp26vv72"; -"gnuplottex.doc-0.9.1"="2xaikygkmmp2mk71p5d615z6skyk8nl9"; -"gnuplottex.source-0.9.1"="l858zza52c4k3vzx4rq1m97gvi8nqdfy"; +"gnuplottex-0.9.2"="mbk6yk5147w2rx00503pxmhmldykggdy"; +"gnuplottex.doc-0.9.2"="i0450hl7wd09618hy9igkz3g80zzklwl"; +"gnuplottex.source-0.9.2"="dzmxjcpajp5ylmj1hqn6zqvl5b0c5vlz"; "gradientframe-0.2"="x80zlqzx72n55qpazclikrafwzny8ss5"; "gradientframe.doc-0.2"="pgy0vrx4nvys3wki3202r377nryd0r1h"; "gradientframe.source-0.2"="10dx55zpi0j7xzdkry3dh41ax873mmmk"; @@ -3060,39 +3189,53 @@ "graphviz-0.94"="gicmf9qslgbamr7qkac4y3x0wajkbhw1"; "graphviz.doc-0.94"="xxyyxpgr81jv00v48zv7vxkm9sa4hjsn"; "graphviz.source-0.94"="kqv26abzy2ff31a3f0aval7lskvk5nql"; +"gtrlib-largetrees-2017"="4chnakm8ava1r34m27p526zjda26671m"; +"gtrlib-largetrees.doc-2017"="yhvmg7p40bvwq04xpbwnb41k74xy9mwd"; +"gtrlib-largetrees.source-2017"="jlmhx0507vard05bp7b0np4q5fz1qqn9"; "harveyballs-1.1"="axddj0mvqck1gmg0b7s43q7gi9hm1327"; "harveyballs.doc-1.1"="rpsz7hqyyp9h5sa0hxmxnlrs6na0imbn"; -"here-2016"="3jh68lc8arqbg7kb8ixc87i12qlrnh23"; -"here.doc-2016"="445zak4q5zdlbhvkb8gvkg20wpmwjmgs"; +"here-2017"="3jh68lc8arqbg7kb8ixc87i12qlrnh23"; +"here.doc-2017"="445zak4q5zdlbhvkb8gvkg20wpmwjmgs"; "hf-tikz-0.3a"="hfdmzpnpak33573ldllk90rywqz3ngqi"; "hf-tikz.doc-0.3a"="dy6jw7rgbclhb6c94rm3c1bxz0gznqn4"; "hf-tikz.source-0.3a"="jn1iy5nysj2y94ar0s2491l97m1y2rw8"; -"hobby-1.7"="6js0d9ylxpxf8gk7h5zada74g8y8icf6"; -"hobby.doc-1.7"="k2w8xlnn5qdzj6804hw6ymcf4ayhhirx"; -"hobby.source-1.7"="mwa1aw4fbi7zpgmhzzwpicfq2kj29s6q"; -"hvfloat-1.1"="9zvp0b77wng7rqynhkb4nf7fr2g7kvpc"; -"hvfloat.doc-1.1"="yypnjczvr2ixa5q2h5rcwxjrmsvj20s5"; +"hobby-1.8"="kmk2l2ik0anclivgqk6alx1v44j6g8pk"; +"hobby.doc-1.8"="8bdi0hrpyxyczql8rhqfiqlrza5y2g56"; +"hobby.source-1.8"="99k7q3r58r1v7vqh3hv08qbb5s1r552p"; +"hvfloat-1.2a"="axb6597ialjyarbgg1vf40hp1rcmgkrw"; +"hvfloat.doc-1.2a"="lzg6ril60limzkk1g3dzzx1g8hs0vjc4"; +"istgame-1.0"="82zni4rq7gvblfvr3x0b74634ly161rd"; +"istgame.doc-1.0"="yiksd9zn2y8p0b6nciz4svg7mfb71bsa"; "knitting-2.0"="qam4lj8q2acrb4pl4yqapl2d49hjacvp"; "knitting.doc-2.0"="1kl1yx9iw11zig2pclzr7y3g290ma2bd"; -"knittingpattern-2016"="8xvccf07iwn71kfnj9f3pnni3imwd9kb"; -"knittingpattern.doc-2016"="bq96pr4hd9mg70qqfwjynhix7ljabbk8"; +"knittingpattern-2017"="8xvccf07iwn71kfnj9f3pnni3imwd9kb"; +"knittingpattern.doc-2017"="bq96pr4hd9mg70qqfwjynhix7ljabbk8"; +"ladder-2017"="wgw0drkb53daslzwsvg48dfznndrz6dp"; +"ladder.doc-2017"="32b2x9zydsp7b2zncs2lg6ldz5cs7gpa"; "lapdf-1.1"="g5x8axkiscl5796b82is201vcbdxvc3f"; "lapdf.doc-1.1"="3lpf17r6yqaa7ld8742cp8a7crafpc9x"; -"latex-make-2.2.2"="r8xdcw1z65l15vw8bwxhwmkwv3mrs543"; -"latex-make.doc-2.2.2"="gqpl5yl40hl8c5157yzvkpd09hfn9gmm"; -"latex-make.source-2.2.2"="f2g9xici8cnq8vmar0v91s2m2kalv5ah"; +"latex-make-2.2.3"="zgvj6k5mzlmkgcm2z8199w0j0w4yddxl"; +"latex-make.doc-2.2.3"="l2ydsv2j6spgs52x8malk9ar6mbvjnxq"; +"latex-make.source-2.2.3"="j5qmxv84a2qj8bbp2ral1ibppsacr0gx"; "lpic-0.8"="74wchk7ljfacnfqy6wn0j9ns5bqzhkv1"; "lpic.doc-0.8"="yqsjlvnfzgj180kssqhp1i11gq8d9c9q"; "lroundrect-1.0"="x8g1sz9w4xaj9da4y1xy58hrdblmdx4g"; "lroundrect.doc-1.0"="2pw71ykcm2w7ki2xx5fvhlfk5xgi410a"; "lroundrect.source-1.0"="4ad9gr28lqir9g0a15pa31wybbc9m935"; +"luamesh-0.51"="h9iynwv9kpydaizfmn51kfvinqnmlixq"; +"luamesh.doc-0.51"="jmg6frxjcmpn3s4wkv11s2kbpb8aaidh"; +"luasseq-2017"="k07ymsxywmasi0nkdd2ldk164lf36z9d"; +"luasseq.doc-2017"="vnqisa721w2nx11wxb3zsk070b3dzm1b"; +"luasseq.source-2017"="341ldjdwdvjin4rq8ica4f69hb5kbwr1"; +"maker-1.0"="88vzniwk6x9fqhp4y3g32a1cj6nb57g3"; +"maker.doc-1.0"="5w3rag10kbzp8whk0hjrl1ic7iqrna8f"; "makeshape-2.1"="y9d0868x2s8950zphcf6sdz3l7a1sw9s"; "makeshape.doc-2.1"="wdhhbk50rqxnm4iqd0gvnfzgy17knvqd"; "makeshape.source-2.1"="5ddzsj9xakk5hwhg54snvv7bp0vlmjd1"; "mathspic-1.13"="x4m5r6mv0y3cc4vx1qb6anrparbgdvlq"; "mathspic.doc-1.13"="qh2ycvh04kxfihxnri5fr5zxdkk04ppa"; -"miniplot-2016"="3myl55b3q359l0aillyxg7pisii3llpj"; -"miniplot.doc-2016"="hi57wciv475ix91zl4rh30lv5pffns1p"; +"miniplot-2017"="3myl55b3q359l0aillyxg7pisii3llpj"; +"miniplot.doc-2017"="hi57wciv475ix91zl4rh30lv5pffns1p"; "mkpic-1.02"="m0rzxyzpyjzial8vvd5nm2rny449ka5b"; "mkpic.doc-1.02"="m0v80hkyq699sbmdbv5ydp75ccdh5yd3"; "modiagram-0.2g"="g2syxjg96d46hkn75ym5p3pszq92kn9y"; @@ -3103,15 +3246,15 @@ "numericplots.doc-2.0.2"="9dlfmdqslpzhsf8zyfnsqy41qmcgzf1x"; "pb-diagram-5.0"="34vlhfdhm7glvpzprr99v7z7lc8rc8pd"; "pb-diagram.doc-5.0"="8a36mfpszgjyzddfmmz2qrg9fv03r9vh"; -"petri-nets-2016"="0yny9mc10syfx1a716sjw3768bf1a51z"; -"petri-nets.doc-2016"="3m0f4r65jhnq3la2qyp0xa7ra66iyahs"; +"petri-nets-2017"="0yny9mc10syfx1a716sjw3768bf1a51z"; +"petri-nets.doc-2017"="3m0f4r65jhnq3la2qyp0xa7ra66iyahs"; "pgf-blur-1.01"="zl2b6914nny60vlp1fppznbn5k6wq0lw"; "pgf-blur.doc-1.01"="h20qsk87c3x0p74jzlpg5wcsr7w6qmdc"; "pgf-blur.source-1.01"="aj17ly8zi3ql1k08n35h2kjj672rbvzd"; "pgf-soroban-1.1"="1l6ifq09crmg68d174y2ms66jjhgklql"; "pgf-soroban.doc-1.1"="ajlhmwd0fgmamsgnnzr3s15z6irx579s"; -"pgf-spectra-1.0"="b9vy6dvdvqlhsr58c5n5r6nhjqs9b8vx"; -"pgf-spectra.doc-1.0"="s50lidsjxrnpr46317dnji6va9qmiki3"; +"pgf-spectra-1.0"="w2w6z4fj2g5z77i72q7l5fzrz3hbrb0p"; +"pgf-spectra.doc-1.0"="d9v7k3fbf4hl2yz91q8n5sccn7bfq2v3"; "pgf-umlcd-0.2.1.1"="h2syv4fn0svppahm66gpwb4jnrl7jdl8"; "pgf-umlcd.doc-0.2.1.1"="yn8vn90qgh34r1i91cg7k5n81v47i6ni"; "pgf-umlsd-0.7"="f6lyf7ph9a6ayc082h8bd1hrwjx1jw2y"; @@ -3129,9 +3272,9 @@ "pgfopts.source-2.1a"="g9ya18k22lcd5f8aq3anl152d98h6b7z"; "pgfornament-0.21"="v3jz47bv6awc3fq6fq81ybvmsigm8wmq"; "pgfornament.doc-0.21"="amyhh0pq8p7x6f4ldyf2sgcqfs0qgm5a"; -"pgfplots-1.13"="i9pwdfcm73c58xsspszqv5qlri3avj54"; -"pgfplots.doc-1.13"="1l9cadkcp46777ay7s7ybf8ynk391q6q"; -"pgfplots.source-1.13"="f4p8xs7216r589pq2xil2bimm400xxih"; +"pgfplots-1.15"="jsinc1gbwvmkcavhwyy9lsfv60l75ahg"; +"pgfplots.doc-1.15"="ysv140i50dd6g6hz13d8rp6kqs8kb3wz"; +"pgfplots.source-1.15"="38vsghsgmhah17g5n7m1br8q3qzcx83h"; "picinpar-1.2a"="wvxa8vjglc2v1k8dcszj32wx5jgmsm3w"; "picinpar.doc-1.2a"="ix8d6091agdxivkq3pj0xv5afksr16xj"; "pict2e-0.3b"="rmhf7g2w9a3qv2a4il24y0905swisx5p"; @@ -3139,20 +3282,20 @@ "pict2e.source-0.3b"="rmx8qv2f1a170bcy1j2x1pjbq4r8js9l"; "pictex-1.1"="3wr03wxjs0nbpncsyzzz2flz5h383a30"; "pictex.doc-1.1"="d96f4qc758wqc5pifjspr2cfhkj3j44q"; -"pictex2-2016"="fmvr7pqdpq2lnigzzbshgwmrjf03kj6h"; +"pictex2-2017"="fmvr7pqdpq2lnigzzbshgwmrjf03kj6h"; "pinlabel-1.2"="5bshz2446a2c3mgc79b1znaw07n54cck"; "pinlabel.doc-1.2"="a23kw5gn0cwsg5fzldlq5a9rj03wg1la"; "pmgraph-1.0"="hp6991d3dq131lsjr5675igjkgnp1hr6"; "pmgraph.doc-1.0"="yi2b6kiybj2mivsjp7jw0zy895zj7731"; -"prerex-2016"="kzqmlwvyiz4gcqfl6jf7gafgxnbz7jf7"; -"prerex.doc-2016"="3drv28pc3vsfldz54gw76pa93diffz8g"; +"prerex-2017"="kzqmlwvyiz4gcqfl6jf7gafgxnbz7jf7"; +"prerex.doc-2017"="3drv28pc3vsfldz54gw76pa93diffz8g"; "productbox-1.1"="7l9nqp2nxybrl35q1slpz9jhn70las0b"; "productbox.doc-1.1"="j713za0sjbr7plb4xdis6zwvi7bg1n1q"; "productbox.source-1.1"="aqhyalz52l2nz9v46bi0jn21vqw68w6g"; "pxpgfmark-0.2"="sy9cs1y4gf9xr7jfiyp8zkr1r8di00hc"; "pxpgfmark.doc-0.2"="25vgpjc0zr0wjny4snksr3yzk908s2mq"; -"qcircuit-2.5.2"="650hi6ixd639rm1jf6sm0djk4721njgj"; -"qcircuit.doc-2.5.2"="kglha33r0ab76wh76i3w5f8arqrki571"; +"qcircuit-2.5.3"="xyi15872rsfq72625wgdwwibg93mfsq7"; +"qcircuit.doc-2.5.3"="4ylgaz0kdh1vl5zaccrbnn2arbc03bpy"; "qrcode-1.51"="x2mibdysf003dgl6i1zq3h68a1km3j2a"; "qrcode.doc-1.51"="y97sa2ha89kmhfj5kq55qk57sf6yf3h8"; "qrcode.source-1.51"="f4mxn89cz4f6wvnvxqfxdq411nnz4z44"; @@ -3171,41 +3314,56 @@ "sa-tikz.doc-0.7a"="27fh1xd288pwk62lngyy91f97rl4ag7h"; "schemabloc-1.5"="7pm30f9wazndg4cnxv31m616di90d0p4"; "schemabloc.doc-1.5"="2020d2ivq6qccq1s7fk161pmarznn6ss"; +"scratch-0.32"="m3dp6cr9lw6i8mj04vc601vdp156qy2j"; +"scratch.doc-0.32"="c1f4hn2kab4gif9mjdf5vpspzqn3lqnj"; +"scsnowman-1.2"="vjnd95wnbk0rmz52mhrc8k7b6n1aafzp"; +"scsnowman.doc-1.2"="mb37dwgcnlx77na0gqkfnvswkf6frhlm"; "setdeck-0.1"="jhxxygy339baxmfl252kjjyhw2zbhf8n"; "setdeck.doc-0.1"="0h0bv2ywm46jj8g1r26scn8r3pc0a2k5"; "signchart-1.01"="y2yc5dcfwbpicxf3w7kp6lxjgwxz4dsx"; "signchart.doc-1.01"="r2zsa7zazg4l0z4x18hwzkisqaympv1f"; "signchart.source-1.01"="81p9ykfplbsb51lnx3wb00zrsrmsd9qr"; -"smartdiagram-0.3"="s0yg41ckmjrch8akwy5n14hmv1x4x8z7"; -"smartdiagram.doc-0.3"="mqfb7n14whfmai3z2qw6ixjpd94snlk9"; -"smartdiagram.source-0.3"="lx2y6g34z0smm1ysn4pisdp8zhdmb81w"; +"smartdiagram-0.3b"="2ap0zqyxnbs2lkdgx70rrpm2b6d9gslr"; +"smartdiagram.doc-0.3b"="p0q92dnkzxz2i5zb8837353j4ainabxb"; +"smartdiagram.source-0.3b"="lqy3sqf14w7fxzrfim7mb1y7rmsbln1f"; "spath3-1.1"="gcf13xh7ibd3pn63wz9ffzf9bary3ipx"; "spath3.doc-1.1"="1dw393fzkzjh1yxxq7wb37wj60rfa3bi"; "spath3.source-1.1"="ss89g9nx5f6lq8xcn1zy0g1hc7yp6dbw"; -"swimgraf-2016"="x77prbkrnadhj57fbh68hqsmrbk2qsis"; -"swimgraf.doc-2016"="hfrhqz5pj6g0mdyp1fbbfbnasph11pwi"; -"texdraw-2016"="iwrv8alhsxxawklhgxbnsncn6plr9mfx"; -"texdraw.doc-2016"="awprn6s3sq5ighgqgbh2gzcbai1iwxd3"; +"spectralsequences-1.1.1"="i3ia4kd5nw46x3zjbxqrzd9q28a8q94n"; +"spectralsequences.doc-1.1.1"="4iingbxa3ym8mbs3a8y72kl58jbjnr26"; +"swimgraf-2017"="x77prbkrnadhj57fbh68hqsmrbk2qsis"; +"swimgraf.doc-2017"="hfrhqz5pj6g0mdyp1fbbfbnasph11pwi"; +"table-fct-1.1"="b7wz94n1h3wpq9mi40zdl3v4m9hi1wxk"; +"table-fct.doc-1.1"="1k2sa9bsygbw1ib85x7yqda1jbzbg05f"; +"texdraw-2017"="iwrv8alhsxxawklhgxbnsncn6plr9mfx"; +"texdraw.doc-2017"="awprn6s3sq5ighgqgbh2gzcbai1iwxd3"; "ticollege-1.0"="bznj0maq6a1b7m6p18dhq0fnssx06bwj"; "ticollege.doc-1.0"="7n7nyn8zrp9za6l355797gq96vxp2d78"; -"tikz-3dplot-2016"="kl827mar9jlbjpwxl90z3fml8i3zabb9"; -"tikz-3dplot.doc-2016"="y736rbqkbjg7nnly25d0jl72z9gyx17w"; +"tikz-3dplot-2017"="kl827mar9jlbjpwxl90z3fml8i3zabb9"; +"tikz-3dplot.doc-2017"="y736rbqkbjg7nnly25d0jl72z9gyx17w"; "tikz-bayesnet-0.1"="w9x9vf5hgmv18ljz0kx7rby1dig63539"; "tikz-bayesnet.doc-0.1"="g7dkg4gg6729jbscb7cf3fsay2dfqv42"; "tikz-cd-0.9e"="6mql3sca8l0r784yxgxllsl8asw065yl"; "tikz-cd.doc-0.9e"="6phhv8sdlz57n7yd9qhnnd19hdz1sffw"; -"tikz-dependency-1.1"="nadfysgh4sbcw74lhsjh7mqzj29jn0nn"; -"tikz-dependency.doc-1.1"="lh3n27zf5ycmsg0ri0hqgnyi147k64np"; +"tikz-dependency-1.2"="yqnd9843awmwy61pd310krnfhyf3867k"; +"tikz-dependency.doc-1.2"="n3rk72ln03anvylh5pc5gyajkvgm6cff"; "tikz-dimline-1.0"="q2wyvka6vafwaj58iawrrl3capkzvvfj"; "tikz-dimline.doc-1.0"="gbfqnslkm9piq4jmhcivpyb9y2cjra2j"; "tikz-feynman-1.1.0"="icrxa2hwmgnrah6x7br5sqsky8r47v38"; "tikz-feynman.doc-1.1.0"="afnpl0m1fkwp7cip0ia10z0lgq2vnpwj"; "tikz-inet-0.1"="mkhy91a9633a5hbqcckgppy43ri13wy0"; "tikz-inet.doc-0.1"="c62lz4nmz4cw48rjmfl3vn913smpxzcb"; +"tikz-kalender-0.4a"="0adll5wk22lvcnl5wgb2x37640xiccj4"; +"tikz-kalender.doc-0.4a"="3njydw7hzl4k15kw9pnqvm0a12ksydpb"; "tikz-opm-0.1.1"="5hgjh2kg1ynxp4vn8x47wfkcxz27ahra"; "tikz-opm.doc-0.1.1"="4jqackkzg26vkvrkwflljvxx6ikx1jbf"; -"tikz-palattice-2.21"="7dxxnmwkz77sf7rzhjd1mllsmfx0lh6k"; -"tikz-palattice.doc-2.21"="whx9afnnwnmpv5j1m95xg74zvh015sig"; +"tikz-optics-0.2.3"="lc3znr18mmhw9v5d7wc8s5hs83bm20bv"; +"tikz-optics.doc-0.2.3"="9fhp84w25nsi4hxq2rys1y6vc03f4nlf"; +"tikz-page-1.0"="zv2wzvv8xzs4s5cf5vs8w9ffsz8sq4rf"; +"tikz-page.doc-1.0"="vgszrg09v23lc7yj3j0h9hwnyvdhsck0"; +"tikz-page.source-1.0"="2x6hmyi5739qskj8wf1k1636kbzns9b7"; +"tikz-palattice-2.3"="l8q247mbkx3qyywwb6sif0if3jv5ykjk"; +"tikz-palattice.doc-2.3"="j7y3y3r0mgm8limkgfljmn3i8dcnj0m3"; "tikz-qtree-1.2"="vl2jq8b492p7dznrx63mi2zxcpax8a1l"; "tikz-qtree.doc-1.2"="01bkpz1f0pm7plpkh6a2kx3c93iwcfwa"; "tikz-timing-0.7d"="6706w7avmqfsl3xzgrc1zgyy9k1jpwh0"; @@ -3214,17 +3372,23 @@ "svn-prov-3.1862"="d5py1m0kjdzdx371fpvi66l80p92xp4i"; "svn-prov.doc-3.1862"="kz3zma1cmbi2kxvn560vzl71n0pj5bvj"; "svn-prov.source-3.1862"="xz3g6ljh9fk8vfla8c3asbzraqymnca4"; +"tikzcodeblocks-0.11"="4cph54mcb5ql7zi1nhgw63y3h730vf61"; +"tikzcodeblocks.doc-0.11"="s2hfma88407szpr8xw7ckg1anf66w6p6"; +"tikzducks-0.4"="60p76nxh3c3w7g3kl0wnvx9yhylzyxwv"; +"tikzducks.doc-0.4"="1g6y89ipw5kdp4xn7rzn2fly1vqw37hv"; "tikzinclude-1.0"="hh3h2srdlz39dv69wdwcrmjr1pps271a"; "tikzinclude.doc-1.0"="qdzw00zvqp206krl9ph782lvrmvjphm9"; "tikzinclude.source-1.0"="bznb6w85hk7nzsmnglz01qvi4mp64bqf"; -"tikzmark-1.2"="ffq4x7i6wgiady28p2bnishx88km4ai2"; -"tikzmark.doc-1.2"="x6qkvrmnw1f9q4w9x8zz0qynlsnm1002"; -"tikzmark.source-1.2"="654897q52sg509xsa0vf41r252vq6wba"; -"tikzorbital-2016"="0jand3q2rnj1l71kiqc5wx9br6iqa8h6"; -"tikzorbital.doc-2016"="8w7za38r9lqh6hjyrx51mhxljlwbr13d"; +"tikzmark-1.3"="zzc5vb7vh8p5q4l1p9hbfbvxiwyqxj3h"; +"tikzmark.doc-1.3"="q5z9wc07ldjcrvi2yq86rwl4nibg3s1b"; +"tikzmark.source-1.3"="gibic4bss01ih9dcwrn42cg782dn8d2z"; +"tikzorbital-2017"="0jand3q2rnj1l71kiqc5wx9br6iqa8h6"; +"tikzorbital.doc-2017"="8w7za38r9lqh6hjyrx51mhxljlwbr13d"; "tikzpagenodes-1.1"="bbppcjhxjza1vhld9n9kjdm5jf03by5f"; "tikzpagenodes.doc-1.1"="qds77qax9drbdmnw93lsg9lzkd7kjmnj"; "tikzpagenodes.source-1.1"="bm54xhdx003f6j5j2csj6272d6pqxbmd"; +"tikzpeople-0.4"="9cjdrp8gw59kkklf92fmpq8wlflaavxg"; +"tikzpeople.doc-0.4"="fpwfczmdq8qad1c637rcxjzqy2r6gi7f"; "tikzpfeile-1.0"="ay059ccg53rz4q39dy1cls80g1yi2mq2"; "tikzpfeile.doc-1.0"="f97bldn28br9f6dfr88b81w8g683xvgq"; "tikzpfeile.source-1.0"="hcsmvxfza3qg128nsj2n48v7fr12viqg"; @@ -3234,11 +3398,11 @@ "tikzscale-0.2.6"="7cc4pbv23n95rb1b80p1y7w8m55z59yl"; "tikzscale.doc-0.2.6"="qb6yk80pbipaq95cgasija63px2v836w"; "tikzscale.source-0.2.6"="2spzfhaff1wn11brhjcx881jmql261ad"; -"tikzsymbols-4.0"="2gzkcmcbmdmpgmdvvpn7h9cwppx3dndq"; -"tikzsymbols.doc-4.0"="dn674hd2g523jpzd78dpiaabhrjxl44r"; -"tikzsymbols.source-4.0"="69a49p2bz2dy10ks8p2lvawc1kqgzxa0"; -"timing-diagrams-2016"="89d8m3lh174y7p3xx2iqdkxnq71s7fzq"; -"timing-diagrams.doc-2016"="r8xz0yb362glmkcaadipa5v8jsf3w5py"; +"tikzsymbols-4.07"="zzm3935wc6d8017skzq0hfg0z35xr2zr"; +"tikzsymbols.doc-4.07"="z349ksc6qqadim9shryp16sz6f9d4ivy"; +"tikzsymbols.source-4.07"="3alj38g159gb83iabl7vm7y1vdmgfrm1"; +"timing-diagrams-2017"="89d8m3lh174y7p3xx2iqdkxnq71s7fzq"; +"timing-diagrams.doc-2017"="r8xz0yb362glmkcaadipa5v8jsf3w5py"; "tipfr-1.5"="dd5jgd6y7rzspj6shr5mbqcbbzyncv2b"; "tipfr.doc-1.5"="w5mslbn2d53wzdkaynxigaw4344psp9j"; "tkz-base-1.16"="q2wyxd4r38873irmj30lck29x2d504b6"; @@ -3261,23 +3425,23 @@ "tkz-orm.doc-0.1.4"="20ccyjaxz59v4yvbrz18ql5dz05nqxj8"; "tkz-tab-1.3c"="9nbbbpgvmr118ww6a70vdz7xzqzwdpg4"; "tkz-tab.doc-1.3c"="fz6yxgwm70plmff6ga99x5y31mrn0wk8"; -"tqft-2.0"="jnhsjp496fxakyqr5za6a81q0g5x4i19"; -"tqft.doc-2.0"="9bb0qa1qwpsdy8wx3r5cjhq9ryy6wg6c"; -"tqft.source-2.0"="2bjz4a1qadajnh25srakwvq4qb24rk96"; +"tqft-2.1"="jg1k2p45j027wivwykric03v8vgfgaaw"; +"tqft.doc-2.1"="0qc7pjywc0dwxkw750xsqb67f6cpzka2"; +"tqft.source-2.1"="2kasg0q4bb70r80kaxm5hykahynk7vbf"; "tsemlines-1.0"="qd021jr57lay3xa2hwms13x49y9f3q7v"; "tufte-latex-3.5.2"="fagszla48gaakgcvvynmhcmk8c2qvbf8"; "tufte-latex.doc-3.5.2"="nqqzq6qbgcq8w5ih3fns8wibvfdn5df0"; "ifmtarg-1.2a"="wx2341bljdqhc4844w5b3bjh6clq0km6"; "ifmtarg.doc-1.2a"="jhj0bgi9zb3j7cm5xp3cfkvq359yk2zx"; "ifmtarg.source-1.2a"="kzgc2yrn0pkmi2712sg93y2dm8m447h0"; -"paralist-2.5"="xhbh9fnqwfljdls86cd3k68djdavz9pz"; -"paralist.doc-2.5"="lhngm541a50s9ya2zjn933mpvj5h3wdx"; -"paralist.source-2.5"="7p1dppzf7dwgq8c42b912dscw4xjazbx"; +"paralist-2.7"="9x62lrvmw3pkvlrkhrcpm2mk90s23a1p"; +"paralist.doc-2.7"="8jww1j8k4rf6jfnal0dlqv4abcjyz5n5"; +"paralist.source-2.7"="vs1jw2rijrnym49vd3w1nxswq52lvf9g"; "placeins-2.2"="ac0ckzyrg9k2akv26dg4hck4q3w3z141"; "placeins.doc-2.2"="ab3faqlwqspnnrvigdsljl9ykqyi2gfm"; -"sauerj-2016"="9x0hghvh5wh6jljwpyf61c6pc4rl9jaa"; -"sauerj.doc-2016"="zk8dghf07j3ijvnr3zxw2bajqx49nbaj"; -"sauerj.source-2016"="j1bdzs9ky0ycfh00sdynswv2vfvx7nmh"; +"sauerj-2017"="9x0hghvh5wh6jljwpyf61c6pc4rl9jaa"; +"sauerj.doc-2017"="zk8dghf07j3ijvnr3zxw2bajqx49nbaj"; +"sauerj.source-2017"="j1bdzs9ky0ycfh00sdynswv2vfvx7nmh"; "xifthen-1.4.0"="4d6x7yb6hdr4xg2dn572gwpfnykppsph"; "xifthen.doc-1.4.0"="364kifdxmk5ak2flyqcfzjgv0dbsykax"; "venndiagram-1.1"="651nqgk2id3a7hxbb6j5rbcv75mhbsvg"; @@ -3289,15 +3453,15 @@ "xpicture.source-1.2a"="a0bq9s39fb1askk6bb5yy69bmv3ii59l"; "xypic-3.8.9"="rh7ahdwsnxzsk42imv3qqa0q2cb15ng1"; "xypic.doc-3.8.9"="9vnm1j6g180slvahaq3mgdlsjnnllhnh"; -"colordoc-2016"="sb31vsh0mzzd16vrf3gpvs9c50zcjbgx"; -"colordoc.doc-2016"="2sw71l3579qkh4z3hqirvv0y3d79sssh"; -"colordoc.source-2016"="3p7baf59n87p34sxwdm9lf761dmh8w0b"; +"colordoc-2017"="sb31vsh0mzzd16vrf3gpvs9c50zcjbgx"; +"colordoc.doc-2017"="2sw71l3579qkh4z3hqirvv0y3d79sssh"; +"colordoc.source-2017"="3p7baf59n87p34sxwdm9lf761dmh8w0b"; "colorinfo-0.3c"="x5wwpzhcm3ppfg6hh0dcr3rl7cjs23zn"; "colorinfo.doc-0.3c"="ppz8wrqzph8cq5dggikgi0gphmg0y1hj"; "coloring-0.2"="qdjj8va77wpin0pw6izv2lhjj0cm8zfd"; "coloring.doc-0.2"="v7z4bnnpghfi39b8jmzpwq496swhwndh"; -"colorspace-1.1.0"="5rr2hv10ryc9qpmrhxsfnchyc97kxsmw"; -"colorspace.doc-1.1.0"="1rdj2121h8jf1vrzksyzddg1bfvq4g2j"; +"colorspace-1.2.0"="33j69sadgpsmz3ji7163p9rx9bpvyxk8"; +"colorspace.doc-1.2.0"="mf7rdcflp40zwvqr249wyv87q90y8fxa"; "colortab-1.0"="4bqbx02c34g7271mg6y1gw1nyqmj6vwq"; "colortab.doc-1.0"="qm51gjkcfq5gjimr5pp3svfj1xaqshbd"; "colorwav-1.0"="ilrircjl70f9pv8g89d8dzjdsipjfbmj"; @@ -3318,12 +3482,12 @@ "commado-r0.11a"="7jd82pb66a5hapcrqk19bvnszkgs649j"; "commado.doc-r0.11a"="rg7zy4zsbmvan3vln93y2crrmc11c5dd"; "commado.source-r0.11a"="2z09138429p7bxlq4392bd8psznnsyib"; -"comment-3.7"="5l7ahv2fc7lvrq0fsa8wsll97d8pzbay"; -"comment.doc-3.7"="mkr6c5fxj75bjni2z7123271zizf87ga"; +"comment-3.8"="dalw0d3w4mg1i8pg530ji0c5nmyrjvcb"; +"comment.doc-3.8"="hsk8kvj5arq1xznsmv8p6iglrj5f95kh"; "concepts-0.0.5-r1"="n6f2szv53cszq0ybd93wcggz3jl0wf00"; "concepts.doc-0.0.5-r1"="xww0baz5rff17j0c56d1d0j1mh2zfpqs"; -"concprog-2016"="fy8virjhfw7d1y1l0vg6fgzmxkc4f7gb"; -"concprog.doc-2016"="sm3fl60ymv5z649frky6xck3hd9rr8yb"; +"concprog-2017"="fy8virjhfw7d1y1l0vg6fgzmxkc4f7gb"; +"concprog.doc-2017"="sm3fl60ymv5z649frky6xck3hd9rr8yb"; "constants-1.0"="p22vxmnw3a68jgrwxzvs90x1ads7vy08"; "constants.doc-1.0"="0d8avlpp7ra6jin7rq92vrpa6c97q5g4"; "constants.source-1.0"="44ajza7nr171n3nlbj0lqqq7bld53i1a"; @@ -3336,9 +3500,15 @@ "contracard-1.0.1"="chyj1368kccmjb8c4z8yzmp6d61zvwyh"; "contracard.doc-1.0.1"="b68rcwxrjq7azcsgp0x2f3ih4jnbs2w9"; "contracard.source-1.0.1"="4p3mia4dpg4qswibf5485dh32vn9pr9l"; +"conv-xkv-2017"="irm1jvqddc4a7jfl1qraxkii8gmmmh63"; +"conv-xkv.doc-2017"="vs1dc6np4zd01fkq95a0kqwm72h9snli"; +"conv-xkv.source-2017"="8gj6sqrsbxknfpvrfalflkrnhncjhbfz"; "cooking-0.9b"="sp0gxpgc190gn2wngw7nqzay88hykl4x"; "cooking.doc-0.9b"="15mncbdsswn8q6914ijlhzlg5ch6schl"; "cooking.source-0.9b"="n6pvjf2lx012s5y29qc5mjkiz8dinkjr"; +"cooking-units-1.10"="nl9w5zmg45vfssgf3gga25kbfmgkgdbf"; +"cooking-units.doc-1.10"="wkv0i54874wch2c84ix5cjr6bxh2a2yq"; +"cooking-units.source-1.10"="5k27wblnj2rcw6jrfcb1pfmzr838f24g"; "cool-1.35"="djbl4kj33wlqqnj6sl31f57viw5sacvf"; "cool.doc-1.35"="3l8iy5landcaybfhvb1inj773r55k7hw"; "cool.source-1.35"="hfd759pc6m30sxnmchmv59nl8xr3hwrm"; @@ -3379,31 +3549,38 @@ "cprotect.source-1.0e"="lzyx2nvma23d6ds8cl52zfxhsdjjshnc"; "crbox-0.1"="y7zkz2wszr0iv7y3bhcgcaddsw3d54hp"; "crbox.doc-0.1"="64zk4z35xzpxa2dmb4am67dnilqs8mqa"; -"crossreference-2016"="rghmvk4vfk0la5kygcm5wmnrrzxag6ff"; -"crossreference.doc-2016"="p589qj9h7vi563dgh5lp2l1gmpzfkyrm"; -"crossreference.source-2016"="pmqnkrcxkwjdsz7pfwmqpjgc2kykv9s6"; -"csquotes-5.1g"="k629ld2x8j7r6d67n6hcy42581xvgws5"; -"csquotes.doc-5.1g"="gkpdiqnrl930c7p14b0gx0x17pfmmcdg"; -"csvsimple-1.12"="wj7j3gmgvfmbdaqjjvnbzyk5ywafk47k"; -"csvsimple.doc-1.12"="ajy1nsy5icn88h2653zajxy2hpilc6a4"; +"crossreference-2017"="rghmvk4vfk0la5kygcm5wmnrrzxag6ff"; +"crossreference.doc-2017"="p589qj9h7vi563dgh5lp2l1gmpzfkyrm"; +"crossreference.source-2017"="pmqnkrcxkwjdsz7pfwmqpjgc2kykv9s6"; +"crossreftools-0.1"="5df8fv7lbqy1b1ai62irnkl140kszq6y"; +"crossreftools.doc-0.1"="id7awhann611jf1km4rz9micb4vf8q1z"; +"csquotes-5.2b"="1lf42h3g7pvyia09glwbqrfjlphz7ybq"; +"csquotes.doc-5.2b"="q6yhc0bvgnxf9q06w82svl2cw0v5qj6j"; +"css-colors-1.02"="5ybcj58dl55v53z40fvb3mgc8hl93z8x"; +"css-colors.doc-1.02"="kyz6mh1pkrjvz4za7x7sgmig7zrrxk8b"; +"csvsimple-1.20"="i6qsbbiqd7520p3nclaq59r99f0rwz6c"; +"csvsimple.doc-1.20"="lj0s0945ydzqqgqdzph3rbfv49kawwpj"; "cuisine-0.7"="nj3ryfmy997y6llg5b3l1lp84jw3vg54"; "cuisine.doc-0.7"="50wqmjcv6v117qxi0dkgyzs293y6jx1v"; "cuisine.source-0.7"="n6zv4r2yz1fcgswbshvyfzji7jga7m3r"; +"currency-0.1"="0zjamg4hcz845l1zlf5iyggkqa50d678"; +"currency.doc-0.1"="h25dvr7yv0z7z7yap10l9q8v6mn6zrpd"; +"currency.source-0.1"="160vxy8c7xs7q1w5gi0q6b6i0al19v3f"; "currfile-0.7c"="8zm55f76nvvsgyjj4fck1jzqxfgv389q"; "currfile.doc-0.7c"="y1cdz8qj6n4327smxxbp5fzmn7apg2cp"; "currfile.source-0.7c"="bfsbb72fld42c15qq3zddgr0agfigc14"; -"currvita-2016"="119xrbrr7d5i8xlvzf15azymj8znxy2r"; -"currvita.doc-2016"="fc8s69xdfiir0a8g7594l7y0m7b5qsiq"; -"currvita.source-2016"="2m1krjlgi5ihm32cfr3ayxmz324zpsxp"; +"currvita-2017"="119xrbrr7d5i8xlvzf15azymj8znxy2r"; +"currvita.doc-2017"="fc8s69xdfiir0a8g7594l7y0m7b5qsiq"; +"currvita.source-2017"="2m1krjlgi5ihm32cfr3ayxmz324zpsxp"; "cutwin-0.1"="q1c752nzdf2jw9agyb3aj6ishnk3yy7c"; "cutwin.doc-0.1"="pawz3k75s1nws5nd0ilhgvy3g5ndfwvp"; "cutwin.source-0.1"="c9aw3vjaxldf082z61m61d7p7rsaynfb"; -"cv-2016"="xpyr31xcphpydv1iyqaalwxfqhs99cg6"; -"cv.doc-2016"="f3xak6320ql3rmbj3fvjsgcsq4mp1vql"; +"cv-2017"="xpyr31xcphpydv1iyqaalwxfqhs99cg6"; +"cv.doc-2017"="f3xak6320ql3rmbj3fvjsgcsq4mp1vql"; "cv4tw-0.2"="zw6g6n1l4mcnjdbpfx36h1l7ix8gj6sv"; "cv4tw.doc-0.2"="49ghjsydw5i13nwglc69xmm1z0ypxlyd"; -"cweb-latex-2016"="w87x1irky7jm1ixvs8m2ig97pk07m19m"; -"cweb-latex.doc-2016"="r4xzcb98w8khj070k9q23ygmq84pxqd5"; +"cweb-latex-2017"="w87x1irky7jm1ixvs8m2ig97pk07m19m"; +"cweb-latex.doc-2017"="r4xzcb98w8khj070k9q23ygmq84pxqd5"; "cyber-2.1"="iqwcr7zqwva7spsayxm3rv5dgslfq8vm"; "cyber.doc-2.1"="ns6hxmg7ckw0yc7ni8lz1sngddbanqh3"; "cyber.source-2.1"="qpmn9vyb6czjr45zy3fi9xckr82rj1sy"; @@ -3418,12 +3595,11 @@ "dashrule.source-1.3"="94ga7n7xpk7wm3j37gp8innc0c0irdz5"; "dashundergaps-1.2"="23qw0dybqym299mk1ygxrdwybxgv25cx"; "dashundergaps.doc-1.2"="siig4cw48w28mwsgrz46b8vdm3h7y47w"; -"dataref-0.5"="ardscqh2lgwa5233bp1x54rqc43727pn"; -"dataref.doc-0.5"="qnw2yp14xjmwilsfdlhjjb386rz5w0vq"; -"dataref.source-0.5"="l8mhka36lgfw14ka6zyhay9xx4i6j953"; -"datatool-2.25"="i2wkzvfzhii2bhzzbk3rs2040mp1w8hz"; -"datatool.doc-2.25"="8yszf04pyp38yink7wwb7pi7ici7srrb"; -"datatool.source-2.25"="15jp1qcrx3qy71z8yj5m12ij41kbnffg"; +"dataref-0.6"="s46my6g3mkk7d5g7fm90xxpn2d1h4gmv"; +"dataref.doc-0.6"="ap8c1b9ljp1zg3wpzfbp827kwqcjdp0j"; +"datatool-2.27"="f9dzqdv88li2f5y3wprcm9d60c80afgf"; +"datatool.doc-2.27"="yf25vvlj04h3j2n4s7x2922m14v0w88d"; +"datatool.source-2.27"="rl1a7anf3mxym8gyx9ilqfdmsy8kaibw"; "dateiliste-0.6"="s50fmah2lasy1vfkgkybbaynspnh0wb6"; "dateiliste.doc-0.6"="frs8z7x6yf2l78g94dxx0w5nxchx7kdx"; "dateiliste.source-0.6"="idazlpxank1dw1mjym4vcdlq0970i5gy"; @@ -3433,9 +3609,9 @@ "datetime-2.60"="59y83sl151h396xz62kp975q9vplg195"; "datetime.doc-2.60"="dzj8ihkcdv1hcxxi5vrqbv8ga05mx6l1"; "datetime.source-2.60"="b5x1cfqxg3rlbmdzc1g18i76rk7m1323"; -"datetime2-1.5.1"="z111r6rlfp81vzgymb9zd8wzksc0rps6"; -"datetime2.doc-1.5.1"="13cvzyhf2y68gfg8f7ajcvj85pnd4pj1"; -"datetime2.source-1.5.1"="nwrid0592gjrpm3f5x0a7v2gmbb0a5pc"; +"datetime2-1.5.2"="w23wvi6kindclbzf278m1ja399mgcpn8"; +"datetime2.doc-1.5.2"="95bymv9fa86bmc5jy0w4b6ddhaqnk1xw"; +"datetime2.source-1.5.2"="kjwgivgvg6l24q4b9vaagywby7236smw"; "datetime2-bahasai-1.0"="57bvb4bqvpdmsysmyd0ijqjgf8yc7bkp"; "datetime2-bahasai.doc-1.0"="v1aj9cfq3cd4s9yggcgpx60mxz4vrfss"; "datetime2-bahasai.source-1.0"="a1wip71zywwd60fs0n6pxswpl4ngvyrk"; @@ -3478,15 +3654,15 @@ "datetime2-finnish-1.1"="mamcyx4qzrfb4iq35ijpmb6j4iplgmid"; "datetime2-finnish.doc-1.1"="bx6am316gbca5q28b7fb6cmvi9pc57rl"; "datetime2-finnish.source-1.1"="rc3svamr8y6bqz0gilpybl1vr50jdvy8"; -"datetime2-french-1.0"="p4ygxwd3m1q3s26vv7vj3azmfdb2b84k"; -"datetime2-french.doc-1.0"="fmhla6dh7cj57i8slsyv05r9dxxmkapc"; -"datetime2-french.source-1.0"="8kb571xs39kvhcp0w4dnilvdrx981v68"; +"datetime2-french-1.02"="0n2l9y4431i1092wkk8h2fkmk2pj1lmx"; +"datetime2-french.doc-1.02"="gc0pp2rnx16vgc4qq359ch6i61a8mbsm"; +"datetime2-french.source-1.02"="97fxzb9swgq0nwisql0fngik9c203pkc"; "datetime2-galician-1.0"="6gz4kbawl3wh2h4hlgldw46gj9pwk1yq"; "datetime2-galician.doc-1.0"="974n3d11jz2lv6xkycbxxgf5zwydnia8"; "datetime2-galician.source-1.0"="p3gc9hfjwrpgj9m0a531a4dq9w83ni5i"; -"datetime2-german-1.0"="hmvn8ggj4vh228vsk3d2k1vgzsdmxnfb"; -"datetime2-german.doc-1.0"="8cqvagixb6a493n2bghls21pskdhwb1m"; -"datetime2-german.source-1.0"="0bz7w3zs8fm1lqmbp0jqhiqd0nfcxvl1"; +"datetime2-german-2.0"="49mgp4mdzjgwra0800i9fwkqzyjijgqp"; +"datetime2-german.doc-2.0"="pnzfkn4ragg9cxdvcfp10bgxaaq2l5d1"; +"datetime2-german.source-2.0"="hb17hszkczg22qbkw6zqkb4qypdhq5vm"; "datetime2-greek-1.0"="28sfvp2vg971a2vj0sd15l03wxba80js"; "datetime2-greek.doc-1.0"="czifm6gl1y01a39lsmj5ldvr4xan5r7q"; "datetime2-greek.source-1.0"="1c6cf7zay1k3x42ax0axvfgihz5qvah4"; @@ -3523,9 +3699,9 @@ "datetime2-portuges-1.0"="lx6pd7j20xkkjjc64cfadxjgjy0lvb1z"; "datetime2-portuges.doc-1.0"="s67zadsfprmn6yvyyzf233sflhnaj10h"; "datetime2-portuges.source-1.0"="r6glrcz406kfgm00yy0y6sjw1jcw3bz2"; -"datetime2-romanian-1.0"="xq4rfscx66yyfifjsnfbcr4g0q664hyx"; -"datetime2-romanian.doc-1.0"="l6zza9x9fyz0mp53790091nzxnfqvacg"; -"datetime2-romanian.source-1.0"="0j8mrvq8xcwh3kzayvm6gj93gq5n88qn"; +"datetime2-romanian-1.01"="4cf2q7zs9wccx1cg2an0gfr3pgbfgvld"; +"datetime2-romanian.doc-1.01"="wzjqwrn0xrwhvz5yqdw1v9942h6f1s4b"; +"datetime2-romanian.source-1.01"="9apbkgyiy21r9lahbrffpnn3l1b6z7fg"; "datetime2-russian-1.0"="dakjxs08ikkmwmw1qwyb8a8p811g1vwh"; "datetime2-russian.doc-1.0"="dav2bsbdv9v5b59czrsv601njxysf51v"; "datetime2-russian.source-1.0"="vmfldg1sdbk8yb3p4fikd58fglvyg24g"; @@ -3553,9 +3729,9 @@ "datetime2-turkish-1.0"="lk7wm07qz96rfzi5g12hzcfwbdqnxmi7"; "datetime2-turkish.doc-1.0"="86yp3mb4x7sl9im3cvxvfykfljc0cd8j"; "datetime2-turkish.source-1.0"="4bzavnlmpy63vcfhjygjmhl4lf233m6x"; -"datetime2-ukrainian-1.0"="ilqpkm6x6270p8gbbiml1m1cl8q0vg8v"; -"datetime2-ukrainian.doc-1.0"="apycgr6nvdab8x0n1k1wfbj4am43aqz5"; -"datetime2-ukrainian.source-1.0"="xlzg1rxw2fkqb6y2c32b8ip9b3bpjzxr"; +"datetime2-ukrainian-1.2"="m4h61516qwlr61w87g0yd82zpwpngv6d"; +"datetime2-ukrainian.doc-1.2"="wkf35nvlc0bdmxl7hvh29lh8xdsfh5s5"; +"datetime2-ukrainian.source-1.2"="dv2jcr5cjnv8c81l5bpzgyllzsafhsr3"; "datetime2-usorbian-1.0"="i5kdakk028r0jrim2pc65gjj38501dzs"; "datetime2-usorbian.doc-1.0"="ab6bfr9w1ybl26abk2vac5baffgsx8ib"; "datetime2-usorbian.source-1.0"="p3xf2vlz24av6j4zihdig8jkf9xf328v"; @@ -3564,44 +3740,44 @@ "datetime2-welsh.source-1.0"="2a3pn8nifx6bc81zk45cg8p0vdnwhfw4"; "dblfloatfix-1.0a"="d1796nn206cs1jsas8kc05p0bfcb80rm"; "dblfloatfix.doc-1.0a"="2rgw8lakmgyv5abzbpcngs9g1lrfdps1"; -"decimal-2016"="a7xks9vjp0pa09i5dbwz78n28a8fg83d"; -"decimal.doc-2016"="ib5j82aqc5l2rkggx5s3i7h0vz81sw01"; -"decimal.source-2016"="znw0p5x4xyg8nbaa0840lw7i27bczkf8"; +"decimal-2017"="a7xks9vjp0pa09i5dbwz78n28a8fg83d"; +"decimal.doc-2017"="ib5j82aqc5l2rkggx5s3i7h0vz81sw01"; +"decimal.source-2017"="znw0p5x4xyg8nbaa0840lw7i27bczkf8"; "decorule-0.6"="pia1d0196sj7qkdyzximhpf0bidqv7pg"; "decorule.doc-0.6"="p42gqybrsy773lypbb1nrjcigycf1ilm"; "decorule.source-0.6"="q90xhppxnggj3gqx9vaf5qvc4aknfbx1"; -"delimtxt-2016"="akp06kcf04g4dx2ph7bs5cg4byld136r"; -"delimtxt.doc-2016"="ddxva98pp4ar0bxdlpbh6v2rxlai5d1n"; -"delimtxt.source-2016"="j788dpwxgryml7ny68nzab9c3dy0322z"; -"denisbdoc-0.3"="94wj14j0m71jzy0g88vppwbdv0d3falz"; -"denisbdoc.doc-0.3"="fiin4jdccszb0w2c2jf76mdvzccv8w84"; -"denisbdoc.source-0.3"="6gjbr9l4v9wnx38237hbid8adp14zj1k"; -"diagbox-2.1"="pq5arykiwz69xmgwhxbsx3736r495drx"; -"diagbox.doc-2.1"="l4ymyvrmc68gci8ywdfckhiyj0fbz4n8"; -"diagbox.source-2.1"="c0fx8lxqlqyqs62b8crlyn4s36wsgy5x"; +"delimtxt-2017"="akp06kcf04g4dx2ph7bs5cg4byld136r"; +"delimtxt.doc-2017"="ddxva98pp4ar0bxdlpbh6v2rxlai5d1n"; +"delimtxt.source-2017"="j788dpwxgryml7ny68nzab9c3dy0322z"; +"denisbdoc-0.7"="fxcj67mah72g8w5xmrwb10vm1hxmciix"; +"denisbdoc.doc-0.7"="k4qq3apgqk0xgxgmrmqpl039hwzb478p"; +"denisbdoc.source-0.7"="45fl1pbbkiwk3b5cwl9ylcs1vxpdz8m5"; +"diagbox-2.2"="mcmg51aism26pvqhs198yngx4sq7hpcs"; +"diagbox.doc-2.2"="p1vln62lkw76jldxxcgr0wkraidcd3fr"; +"diagbox.source-2.2"="a6m49qkh7w30xgg342dd4vs7kpcf8kkx"; "diagnose-0.2"="dbkvix4h3jhwq9pd2g9ydknc87z3zlr3"; "diagnose.doc-0.2"="0b0ajzf5gvv3901szcwnkb7938sgqqr9"; -"dialogl-2016"="qn4qmw5yrhvim6fdl2gff1vl0ca4dfs2"; -"dialogl.doc-2016"="bh2vp79kq5adw6smmn0kbkhgk27qqq71"; -"dialogl.source-2016"="zqjq4a7kp63s0m7aq57ragybmigrf05z"; -"dichokey-2016"="0gjqadln2d38gclhy9ggf3i8vcnf2bfm"; -"dichokey.doc-2016"="af0pz0ixx95k8abfhximgla5jjly9ddf"; -"dinbrief-2016"="49584j24lg6vxazw8rqbhzcf0c7anbqy"; -"dinbrief.doc-2016"="i1dwsv81v87ll6wipvd7idsg8vym61k6"; -"dinbrief.source-2016"="b3hcmv6mjq48yhjl7g32yv9s1p3d0hkw"; +"dialogl-2017"="qn4qmw5yrhvim6fdl2gff1vl0ca4dfs2"; +"dialogl.doc-2017"="bh2vp79kq5adw6smmn0kbkhgk27qqq71"; +"dialogl.source-2017"="zqjq4a7kp63s0m7aq57ragybmigrf05z"; +"dichokey-2017"="0gjqadln2d38gclhy9ggf3i8vcnf2bfm"; +"dichokey.doc-2017"="af0pz0ixx95k8abfhximgla5jjly9ddf"; +"dinbrief-2017"="49584j24lg6vxazw8rqbhzcf0c7anbqy"; +"dinbrief.doc-2017"="i1dwsv81v87ll6wipvd7idsg8vym61k6"; +"dinbrief.source-2017"="b3hcmv6mjq48yhjl7g32yv9s1p3d0hkw"; "directory-1.20"="7r6n8s393idf94madvzpfz70qvmy9n5z"; "directory.doc-1.20"="shvbxhb02d3lw1sn3ayvx5xs6qayxjkh"; "dirtytalk-1.0"="1a6r7pzqjy14f4f7vnlqgqdb6r0yfm1g"; "dirtytalk.doc-1.0"="h383wrcj7pxb3mnqnssb48qx0zzw61gx"; "dirtytalk.source-1.0"="dzvypzk6yrjli5zmr06xc2mqyajrvz1j"; -"dlfltxb-2016"="ms6423aqc91c34fmxw8l47d5kbk9yc6b"; -"dlfltxb.doc-2016"="kb0p5vzgr45gzbmwzc9mrk8hpg1z6x0h"; +"dlfltxb-2017"="ms6423aqc91c34fmxw8l47d5kbk9yc6b"; +"dlfltxb.doc-2017"="kb0p5vzgr45gzbmwzc9mrk8hpg1z6x0h"; "dnaseq-0.01"="719cl1bfw7c1psv115pmrn7bijd0kxsr"; "dnaseq.doc-0.01"="f8yw32bkw0chrk221qga668jpfnb3rk0"; "dnaseq.source-0.01"="7aw7332aklsigpg8fazvv7ips2a236x6"; -"doclicense-1.5.0"="3bzndybh09g1zw38cx3mxbcqlr4xzrlf"; -"doclicense.doc-1.5.0"="3hnwlqwxnkg217pck8fvkx7ji2b1fbai"; -"doclicense.source-1.5.0"="xp8hlr1qn9rd2617rn4vlrkn3d2dkhla"; +"doclicense-1.6.0"="a2c3a42sv4zc9yzrivg43r77dpyxbl5a"; +"doclicense.doc-1.6.0"="hr8z494n3sk5a4agjpxrz5yz26hgab3s"; +"doclicense.source-1.6.0"="g8qddkxdv1i8x2ghd80mzc8qz9pfbyy4"; "docmfp-1.2d"="5az4cgljj1gmc28z6kwy9g4h49gzkplf"; "docmfp.doc-1.2d"="rn7s95z09ijvddynz2dda2lpqidzbbnw"; "docmfp.source-1.2d"="c6swy2dkxzrprrl0zjbphcf15x6my5l2"; @@ -3614,8 +3790,8 @@ "documentation-0.1"="kji3s9vf00jpl198nm49dxfxw8yh3xkh"; "documentation.doc-0.1"="ir7a948d9yliinmb3y55vx8wa2zi4ada"; "documentation.source-0.1"="gjlkrc2a087589g9lrk9sh8g4q0l03vq"; -"doi-2016"="g36rm3hngqxngcvb0yiavp760ln0z88j"; -"doi.doc-2016"="bvpm72vndaq1rywjrpa9xv6x3pryqk69"; +"doi-2017"="g36rm3hngqxngcvb0yiavp760ln0z88j"; +"doi.doc-2017"="bvpm72vndaq1rywjrpa9xv6x3pryqk69"; "dotarrow-0.01a"="an0dsydrk9bfcahzi356nrfq9fw0i9fs"; "dotarrow.doc-0.01a"="ay137znk96s545wq4sligy3q832m4g91"; "dotarrow.source-0.01a"="g5krgdbp4bdfhk40s759qw2j6f7n6ss7"; @@ -3625,11 +3801,11 @@ "download-1.1"="mrhh5hmhypwk95rzjgzp59wjx1alvqf3"; "download.doc-1.1"="plal7xhskmrylmkpra45xmw0vf4sgd46"; "download.source-1.1"="r5lrlmp4ccxlmzm1h7l57d17cmgdsmww"; -"dox-2.2"="sarscfdpmls7raj764wwm5vx9kwb488k"; -"dox.doc-2.2"="dk16ylj8h5kjd2smgk3hj0imgmpnnq3g"; -"dox.source-2.2"="7vk9qx9cc223kdkds5lib4zi0hy15bx5"; -"dpfloat-2016"="lad2kjr2qljjmnrygdlhgqbhpj8cxqb2"; -"dpfloat.doc-2016"="j3mxi39ar6vsyz51w7dj3nsnrrcsqjpy"; +"dox-2.3"="rskgr7w7m2i5dvx6i401drk0rr3dn4x3"; +"dox.doc-2.3"="52i43v7jdl0zv7i2634674fi9mandnyd"; +"dox.source-2.3"="iw70hs3n9m7pdk2lj1ib4y93wai4vfp7"; +"dpfloat-2017"="lad2kjr2qljjmnrygdlhgqbhpj8cxqb2"; +"dpfloat.doc-2017"="j3mxi39ar6vsyz51w7dj3nsnrrcsqjpy"; "dprogress-0.1"="6bz0iy8fa34famjb67k3q1xhsca311k3"; "dprogress.doc-0.1"="9x4n68z2vp63dvhc4g30yar4z70xkxbb"; "dprogress.source-0.1"="g0d00q6x7wagml9hphd9b2ddg7zn887a"; @@ -3639,13 +3815,20 @@ "draftcopy-2.16"="jpi5kv4l4r74ahxh9m4nw338hlx9qjxc"; "draftcopy.doc-2.16"="x49fj5rzavabrdw8c8j05nnqxkdjlhpp"; "draftcopy.source-2.16"="b6319hjnccfx3xxfrxz1kmx9813aik0a"; +"draftfigure-0.2"="w154bzgm94wzqs4shyi3vir6vzfd7324"; +"draftfigure.doc-0.2"="n3cvgb3mn0a0asrk5wng4f5pnr36k337"; "draftwatermark-1.2"="r78p4n8jbzjvx8p7gx1fj7fp4h56x4xq"; "draftwatermark.doc-1.2"="6mzqbw0grmivgby8vqiqf04i9dnvvimb"; "draftwatermark.source-1.2"="6p47ci9wfjq7svn09df09p4jxwvyfzxa"; -"dtk-2.04"="r20ldgp64cd12i3zc7vzifhv8sq7nbpl"; -"dtk.doc-2.04"="qmgf0802ym26frnbk59i2l3fbrldhb9q"; +"dtk-2.07a"="ygp8d66wn5xna4hlb3r8x7ycp652xqmz"; +"dtk.doc-2.07a"="7f2zzwfwcb6x4a7yg79d12yf63k0n7ly"; +"dtxdescribe-0.10"="3hlr55zk9177am5aapn3x4a8g6bbwnma"; +"dtxdescribe.doc-0.10"="0zd70zz9n32r0aar3pq1rqwxs8k6cppp"; +"dtxdescribe.source-0.10"="mpkicmsgs6fvrhx832s15gxmd219wayp"; "dtxgallery.doc-1"="fsbqzc353dbd3705kp716446mghsnn19"; "dtxgallery.source-1"="74z8aaywbl3hhfk0lpw3mgw9sinxj01m"; +"ducksay-1.1"="0fncqd4i0kbm28iwkj5qh5l1bqg0321m"; +"ducksay.doc-1.1"="95nj3jxw0xa9svlfi2vhcaxdf9dggn5n"; "dvdcoll-1.1a"="x9xdlwqrbq8wflwbwkabwyi9bg8rakqz"; "dvdcoll.doc-1.1a"="m88326jypnn2i1bqgv458cyjdzdn320i"; "dynamicnumber-0.1.3"="p6s0hyavqqz8hsfca8ymfqd63ajpbgam"; @@ -3653,15 +3836,17 @@ "dynamicnumber.source-0.1.3"="1s5p8px5hk951cifga7as2cys5p9v9g8"; "dynblocks-0.2b"="svrn2iyvz97vsdz7zf2npfjjmj1hiiwd"; "dynblocks.doc-0.2b"="vbfwn0p5rpddhfbj5dzzg8y777i69s62"; -"ean13isbn-2016"="mc1jwh057knlvcn9rh4z55xf23cx3lnn"; -"ean13isbn.doc-2016"="bdnaafy3hkiz4prf7q3fkn00gsf1fw47"; +"ean13isbn-2017"="mc1jwh057knlvcn9rh4z55xf23cx3lnn"; +"ean13isbn.doc-2017"="bdnaafy3hkiz4prf7q3fkn00gsf1fw47"; "easy-0.99"="jb9dranvwd0ngzigpq8kla53wnd99fiz"; "easy.doc-0.99"="m4hx4j5snaiip3mzz1hnakcqjdmhmy4z"; -"easy-todo-2016"="303p58si7jhry6gzkiqjcdhkgdxdj8yn"; -"easy-todo.doc-2016"="19xs0lb6swakg1f9ci5gfmmfbddcirvp"; +"easy-todo-2017"="303p58si7jhry6gzkiqjcdhkgdxdj8yn"; +"easy-todo.doc-2017"="19xs0lb6swakg1f9ci5gfmmfbddcirvp"; "easyfig-1.2"="nscfzvqz3kn48c6gh7a2pqhkvwvmcvq7"; "easyfig.doc-1.2"="cavk4xr02m1bmwm6vpax122sv114vwar"; "easyfig.source-1.2"="g0an0lfgsq03q1lqrmkj2y2cdrq37d1q"; +"easyformat-1.4.0"="x6ad1pxvbj09q2kypdg6z5js8q11a7k4"; +"easyformat.doc-1.4.0"="1g0wbnrc4snik4hbzldn9c015ry80n50"; "easylist-1.3"="3mri8pvv7jc5lkqkmzh8h5a4x8agh702"; "easylist.doc-1.3"="7ak9lbazspcv1k8yi2j3shf106v4spjx"; "easyreview-1.0"="gc6ml3qw7j723r20jxc9lvrfm5ll2ljl"; @@ -3691,58 +3876,55 @@ "egplot-1.02a"="wjw51hmdhl76wqrgj9ylhyb656rfqmg9"; "egplot.doc-1.02a"="3ybfma3qjwnmd9djk0ckr22kvln7ksgi"; "egplot.source-1.02a"="lpd8c8hpz0vpln7hq4ck2xm896hhkjz5"; -"elements-0.2"="pw1nw1xk38m4ss5b2h5ivrzkk7ismnay"; -"elements.doc-0.2"="w236k77ysl5p2pcfsb78cs126jxcxc12"; -"ellipsis-2016"="cnpqy3kavs6v3r35x6hp9cny47lp47vq"; -"ellipsis.doc-2016"="pl4c26az5319bjkqmp0byyjh6m2ghxnf"; -"ellipsis.source-2016"="s1vmh5xsvqrwhd0c4qqk4qw9pgmm62ms"; +"elements-0.2b"="7mapcz0ap3scq57qx3qhqzs326hi61gc"; +"elements.doc-0.2b"="2i2x6fi5k661ssn5mr6yvimdzzmp8yd8"; +"ellipsis-2017"="cnpqy3kavs6v3r35x6hp9cny47lp47vq"; +"ellipsis.doc-2017"="pl4c26az5319bjkqmp0byyjh6m2ghxnf"; +"ellipsis.source-2017"="s1vmh5xsvqrwhd0c4qqk4qw9pgmm62ms"; "elmath-1.2"="pljnyyb5wp8n5f7g5wp2hb0f7aizxwyd"; "elmath.doc-1.2"="9rrybpg3pziqa42bkhblp14jjz6zgm2v"; "elmath.source-1.2"="fnw5k3ck3nbphv71xqlyq6yisgq04xjc"; -"elocalloc-0.02"="0gqrphs1lf308f8zjav7sq16wra0n0lm"; -"elocalloc.doc-0.02"="9ig5y0y22q918zb6agnzmjv8pg4nsr6f"; -"elocalloc.source-0.02"="0lrvflks8zdg6w35315dcq339y9cyrnz"; "elpres-0.3"="31sslizp2zcw6lvjjcv2hgplfsa5754w"; "elpres.doc-0.3"="xzdg5q7032sn14b31zva0fhvv1abrciw"; -"elzcards-1.20"="7lkq509yp7ibz55kwxfnkvgv1dqzxjna"; -"elzcards.doc-1.20"="nmgd7l3zn96nnci1fjq87hyaafgz9gi2"; -"elzcards.source-1.20"="22wk0f650vif0df4mgj5hif788f1q6hs"; +"elzcards-1.23"="p6nlzsxv09zr1g0pw4y4ldmlmvsi09wz"; +"elzcards.doc-1.23"="lmgv45bh0c4ka1a2yc4xkz08dxby4hfj"; +"elzcards.source-1.23"="y17rrin365qx9zrx5ja7k9bwws1ar92h"; "emarks-1.0"="98dkcqyxwjzmy7r7piap7kmf3di5xjqg"; "emarks.doc-1.0"="caipsh0fic83rak0dbdjfmgkvppj5ini"; "emarks.source-1.0"="06wmqv5p4nhaqhcb0i8byf6s600bq7in"; "embedall-1.0"="z335nw0mjz6g6gjn2xhifqa3ab9i20sc"; "embedall.doc-1.0"="xbw4wwbl2ri0mmikx2vfqz557pq8ilr8"; "embedall.source-1.0"="2xz175j1v7zvc3ndvgnwp5kvqpni6vs2"; -"embrac-0.6d"="fqf2gsgbklz1m6j5s307cmxh1p6vaczy"; -"embrac.doc-0.6d"="6q6pkj32qm9bs601n1qjgbdmyqxjh9rh"; +"embrac-0.7"="80kckrxa5bbw60nrx7c2smx26ldlb6l1"; +"embrac.doc-0.7"="d3kv5937wvw26jlz66wnf272iiidql0p"; "emptypage-1.2"="lbjvj1gf2jiy15yj86d6jxlhrk66zmrm"; "emptypage.doc-1.2"="07fnrxjidk9b42610wx6696cah8p1zdi"; "emptypage.source-1.2"="svha86185zhrvab827x8nbn02vlp027l"; -"emulateapj-2016"="2ywrmmrvlkygp6a86i56rn9bm6wzqqki"; -"emulateapj.doc-2016"="ij4q6ixvmmh8xwq7kgb0hzvhz5pcsy68"; +"emulateapj-2017"="2ywrmmrvlkygp6a86i56rn9bm6wzqqki"; +"emulateapj.doc-2017"="ij4q6ixvmmh8xwq7kgb0hzvhz5pcsy68"; "endfloat-2.5d"="87zgnqacq5g917650d693w51xr4hgynp"; "endfloat.doc-2.5d"="6qc2qfjv040p3w7s97qybv8r9p1z1lif"; "endfloat.source-2.5d"="b1643gmpfxdphf19gyv4jyx8pyh992nq"; -"endheads-1.5"="2apfqs44yphaiai8r7w2c0g1dg1lshrj"; -"endheads.doc-1.5"="czf5fxmpb02if7vhmqha1bf16dgqrn3a"; -"endheads.source-1.5"="sb33znhkg8y3rif9iak46ssc8p8hxgy8"; -"endnotes-2016"="mwf7b44kh21vis4mjglri12m2ji0fkyq"; -"endnotes.doc-2016"="ksik52m1c5n390015awpj4hszf621ih7"; +"endheads-1.6"="0gjn1xldvixl6lh9n2g9gyly9va84sp4"; +"endheads.doc-1.6"="y0phz9mfklcq56h6mwkx2jd535v94r72"; +"endheads.source-1.6"="x01kj0pd2b1ljs3457l1b7880vp8amdx"; +"endnotes-2017"="mwf7b44kh21vis4mjglri12m2ji0fkyq"; +"endnotes.doc-2017"="ksik52m1c5n390015awpj4hszf621ih7"; "engpron-2"="d0k5j6bdrzm418x90n8858cyw85i439m"; "engpron.doc-2"="4mhw0220r7x85dshmar87b3jydn2jxdd"; "engpron.source-2"="3rdxi48m3h33kn1z81md9izji6my7sdk"; "engrec-1.1"="8wc4zbqvp2lgs3qgvhks8fhy0gcafddy"; "engrec.doc-1.1"="3rvil27vakyv0c56wykmhb499a3xfbjk"; "engrec.source-1.1"="3rj7ij1f8rvyb80iaxx0fw8br06w8kgp"; -"enotez-0.8b"="0jzsqm3x2q3xg65m51xjp921kybfyijh"; -"enotez.doc-0.8b"="vclw4nnqf1bhl674rc3fn5kz02raka55"; +"enotez-0.9a"="saxj59f54nz8jpg1bcacx3izk6ijbbfy"; +"enotez.doc-0.9a"="f16i6ia9mvylja841x3s2z3nhwpvriaj"; "enumitem-3.5.2"="0rjr25bj1ymnpq332cvmmmscrwgjc0cr"; "enumitem.doc-3.5.2"="a4f9yp8sgbxgxvsg6mz3p71pshjm76h2"; "enumitem-zref-1.8"="hj60650qiwzxhdk9f9pix1wgvphgqxj4"; "enumitem-zref.doc-1.8"="nq73212kl36wimf8k4m37xzb5pr6qqdh"; "enumitem-zref.source-1.8"="3l875sm2v3c2frxhr17rv80q36n19a9h"; -"envbig-2016"="9jl4id16g9bmsqwwdbcdp2925m5c381k"; -"envbig.doc-2016"="5302z09wsidh1fvnfs5d7zf3fzd9z967"; +"envbig-2017"="9jl4id16g9bmsqwwdbcdp2925m5c381k"; +"envbig.doc-2017"="5302z09wsidh1fvnfs5d7zf3fzd9z967"; "environ-0.3"="abj66v6h73l8sj7rll1v0czlx99j5z8k"; "environ.doc-0.3"="rq5cywlfalfd6c2585ihs8mabnadp2n0"; "environ.source-0.3"="r3bq7ppaqwidvilrf1hyniqfk1fdh4d8"; @@ -3752,47 +3934,52 @@ "epigraph-1.5c"="6fjixgh32n7mlygm6dz3xdiv4bzd1p70"; "epigraph.doc-1.5c"="mmk8d73w2mkhya560hvdz56nvw8l5vz2"; "epigraph.source-1.5c"="6zj62nlmzvi5pagymipk9611glql8pnx"; -"epiolmec-2016"="hpmg6yy63c52078mqmp861418xi07rgk"; -"epiolmec.doc-2016"="vl11cbnw0avwvjf8ad01fziya1dzrbh8"; -"epiolmec.source-2016"="1b7as37h0ncqjvsypwc9wdzzjhs0sfhs"; -"eqell-2016"="24n6gsirzxiyv3avcm27hll6nwrybkk5"; -"eqell.doc-2016"="xwz1qv3l0345p2al1p02dc5k3f77k48h"; +"epiolmec-2017"="hpmg6yy63c52078mqmp861418xi07rgk"; +"epiolmec.doc-2017"="vl11cbnw0avwvjf8ad01fziya1dzrbh8"; +"epiolmec.source-2017"="1b7as37h0ncqjvsypwc9wdzzjhs0sfhs"; +"eqell-2017"="24n6gsirzxiyv3avcm27hll6nwrybkk5"; +"eqell.doc-2017"="xwz1qv3l0345p2al1p02dc5k3f77k48h"; "eqlist-2.1"="jajr72vgjddrwagibq1nmhf9lqqsk66n"; "eqlist.doc-2.1"="ln486bm8phd0pmdfa75rjy6p1bwqzgmd"; "eqlist.source-2.1"="r07gp9r0wb57knv1gy35kwkvksz9bxd2"; -"eqname-2016"="mjcyi6q46c5jd44m8m9wzx12lhqir4a2"; -"eqparbox-4.0"="ivnbcavqly35lry4z1ci2zh0dpp1hj6w"; -"eqparbox.doc-4.0"="65vzjs8liyh2r72p69jc2gkq7nbfj8b0"; -"eqparbox.source-4.0"="ra0zw9fgszsbgm2j5cv462acjh51lrlr"; +"eqnalign-1.0a"="lcg6zvxcnzmljvqfv6lh1majiywkwnyq"; +"eqnalign.doc-1.0a"="h21nzl5g0hqh3513gbipm4fr79i6pljk"; +"eqnalign.source-1.0a"="m8i3vxkn3ciab2p86shkzzzx2ckp9d7v"; +"eqname-2017"="mjcyi6q46c5jd44m8m9wzx12lhqir4a2"; +"eqparbox-4.1"="c3v8vdwcjfhn85751995viymlfgwpwr1"; +"eqparbox.doc-4.1"="9mn192afkzc3pzxp5xxsm7kxpaa3yis1"; +"eqparbox.source-4.1"="s206q1m2wkjsvjz23xlsx1yy603jjisa"; "errata-0.3"="kgx1zy8j3g12czpg8hhnjq6dwa3m8xqn"; "errata.doc-0.3"="518rdbnh3w5jsk4vlfp93cnag3kaiwmy"; "errata.source-0.3"="p27pa3b4plzwhxl8vpr7qigbnr8aqv11"; -"esami-2.0"="jfz4612avdmb7mfmsbi905g36mrj1vhn"; -"esami.doc-2.0"="g2xi15fasvxjz68r11nf2cdl2gii4y0c"; +"esami-2.3"="1n4hfcyppr4ll6abcd58mp2jf7sxxffk"; +"esami.doc-2.3"="v3zq82r6lpbqz87j3g47xkpf6dx95qvd"; "esdiff-1.2"="q26sgf5s4ans9qv984p9s04pginqby9z"; "esdiff.doc-1.2"="67vh3nycsw9h9vv7k25agixsmrdg0068"; "esdiff.source-1.2"="xy6y4za3k53myl7dxbjxm21rcskb1mqz"; "esint-1.1"="gl1f53zj32cqf3vy7rrhj1l5g5lb0vvq"; "esint.doc-1.1"="rnlcq3gjvqz0728pydxz3q5cpbgch5fy"; "esint.source-1.1"="sw4zxm0z19980pq7f9fxkf0b0v7yp9nf"; -"esint-type1-2016"="0fwcq5cpsqzajzlp2rc9ffmcwg5fb5ja"; -"esint-type1.doc-2016"="vmamlk0v1w4ffks6cp9f0gg09rkr37vf"; +"esint-type1-2017"="0fwcq5cpsqzajzlp2rc9ffmcwg5fb5ja"; +"esint-type1.doc-2017"="vmamlk0v1w4ffks6cp9f0gg09rkr37vf"; "etaremune-1.2"="1x3604jqbswjza4ryv49l2cs63iqcv3r"; "etaremune.doc-1.2"="6k8qah3w1ksn77is2i8kh1nilr6qgm34"; "etaremune.source-1.2"="5a4n5d9l39nb0v3affwx0sswnp6sv2yf"; "etextools-3.1415926"="w78v5hb43si3j8p38simfzscyh6lglsm"; "etextools.doc-3.1415926"="16fq8y3c226wsf57dkny9484440i61zv"; "etextools.source-3.1415926"="ch6lsyh0nlzkdrwzsxgf87srsb40x56k"; -"etoc-1.08g-doc"="wbk0i76lzwi6pq0hrmnzdn226rx7x97w"; -"etoc.doc-1.08g-doc"="114mbdv68dblfgxaib5slbdpjmfkvs26"; -"etoc.source-1.08g-doc"="4jhb84fa6fqw7dpw0msj1vhxyn11dcw5"; +"etoc-1.08k"="hrizhy1f1qwgvjqzyz5if3jhpylghsqn"; +"etoc.doc-1.08k"="dfrkivvgn1qlall6ifyjccp9hlad64ln"; +"etoc.source-1.08k"="gyvw34ykcyxv4g0n5ka3mgk94n0mnlmr"; "eukdate-1.04"="5lql99zq8izsri87dhqf28nnchrjkyhq"; "eukdate.doc-1.04"="f3xl3nllsr8299rjnxnhpksv7rz8pdq0"; "eukdate.source-1.04"="scjqaadvah0kf1rxj9r2nphvffk86cis"; -"europasscv-2016"="kr9aqmcnhwj0qly1xk71m3w5xgpwl5ly"; -"europasscv.doc-2016"="lvbagzd50mzsphpx6c15b60b0y6r01kn"; -"europecv-2016"="ak691rchlkdwj2zabcwawcb4lzn4fl69"; -"europecv.doc-2016"="l57k7bwvp5f27mcjvgl5s8yp4cjn4drg"; +"eulerpx-0.2.1"="1kvqcqfjh77lg1d1jzwj6mr2rchjpnyb"; +"eulerpx.doc-0.2.1"="8jybcgzjn8c3qyagdmaxmmy0fx89sj93"; +"europasscv-2017"="3vd0zhpnxd4q5kc6h9hdsl3valj3zd52"; +"europasscv.doc-2017"="gzbv96qaww0195n7xk2g0ivwyyqmi8z2"; +"europecv-2017"="ak691rchlkdwj2zabcwawcb4lzn4fl69"; +"europecv.doc-2017"="l57k7bwvp5f27mcjvgl5s8yp4cjn4drg"; "everyhook-1.2"="ndig4g0nsbqla2i2p1n6skjjxsr3qjhv"; "everyhook.doc-1.2"="690qpw68wri4cr4ahv1xfqibm3flc5mr"; "everyhook.source-1.2"="rvh60i8j1gbyal0pjpdgld9l5g20zilf"; @@ -3801,13 +3988,13 @@ "everypage.source-1.1"="v920b95jn03slad6q3w3fr97ricjvd3f"; "exam-2.5"="1wd664jv1minz25hlnanbvz4xxxncbbm"; "exam.doc-2.5"="gc9s8jdanrfrn03ac18n24zwrr9nc6b4"; -"exam-n-1.1"="1xx1p09wlf97pilglzmjxkzfl07mdrl7"; -"exam-n.doc-1.1"="pp9rszrsg6b31p9fbyrwrfsvd2hw7k4b"; -"exam-n.source-1.1"="0wsaw5y334hrl4rhmn7lkwnjq84xxiq9"; +"exam-n-1.1.4"="nhyripks5spkljgi7js9mva03lgam717"; +"exam-n.doc-1.1.4"="s5zg21xsdrxmyr4v4fj9gjp5gkcm27wj"; +"exam-n.source-1.1.4"="yfj6g9n8q1i7x9037cmvghzyhm4i28rl"; "examdesign-1.101"="58mxkjnnwz8z68lvxdc43gn14v6i9ysx"; "examdesign.doc-1.101"="vr8j3mhp28h6d9zvcg6akfx9sx756zh0"; "examdesign.source-1.101"="51c9vyfhwcp9vmhsrsvzd47q93ckw2f1"; -"example-2016"="rpbgsy66fj5nxcf2j2kg6mmkb46hq4ir"; +"example-2017"="rpbgsy66fj5nxcf2j2kg6mmkb46hq4ir"; "examplep-0.04"="jnd218glfcwkbz8qprkac3nykm86lhsx"; "examplep.doc-0.04"="lgm123fsn5wpdgbfx3kqm9h5q92qss83"; "exceltex-0.5.1"="2zx6110fa87f5f3fabp4a163ybxd8mpv"; @@ -3829,8 +4016,8 @@ "export-1.8"="c2cd44yhfphk0wnyaq0db2y5rfjmcvfv"; "export.doc-1.8"="ijjjprbcnjwwj5hf13b61165mx8xdqn5"; "export.source-1.8"="0wz3raz7mf5cqz0j0g977b7ghznxgxxs"; -"exsheets-0.21b"="k55k9sfb5vwp5cqlarycixch64b2bwqh"; -"exsheets.doc-0.21b"="54x1fvwqhis6nndkz5mgy78yls4hvf1d"; +"exsheets-0.21i"="msii7pvzxyz9ja3yk2jagiyha66v2idg"; +"exsheets.doc-0.21i"="nd45sx9nz98h2xr3ki1h4v5cnrqbh5s1"; "exsol-1.2"="cj4l4d5p8mbr97yqd58mf2c6ki72qgad"; "exsol.doc-1.2"="qx2gpla4idab9jkjzg45q16pviy6na6k"; "exsol.source-1.2"="sp93yxr1favjifgzh0q02d7p8xhv73lq"; @@ -3840,9 +4027,9 @@ "facsimile-1.0"="mhx5jbh4rwv10z6hd3b2w5haj02bjz0y"; "facsimile.doc-1.0"="pb8sj68gxph376h1ph6yb65ncyblxbdw"; "facsimile.source-1.0"="dvjli6r3pr4w74n9mnm2ix30jva6yysc"; -"factura-2.72"="g8xdm1mms88b5n3mpbcdnndcbs2d98cr"; -"factura.doc-2.72"="l8b9g71snayz4bxqpvqqggsfn0k1y299"; -"factura.source-2.72"="ci90im48a3w15020gfi591z261wdg5f7"; +"factura-3.02"="xg5lhnwbxwdd7fw1g3qswcvrdjsgn5nw"; +"factura.doc-3.02"="ji2bm35g0z5nkrzw6zrn6hp25qka085p"; +"factura.source-3.02"="k11wnng92gzvlpvyih38cdip0ysfrd8g"; "fancylabel-1.0"="0fli827i51c1hwda0m8wms728x7dfv0f"; "fancylabel.doc-1.0"="6mzwbsyl0vh65yv140j8sxnqa1g1iq66"; "fancylabel.source-1.0"="97mizj1kpg1plydnwvc76h33idx0knzf"; @@ -3854,20 +4041,26 @@ "fancypar.source-1.1"="nbdd6vssivv5lkpjwdyc5pqw6d64hzg9"; "fancyslides-1.0"="1rm0ay1lphh034nxw2ww5w4jkyz0a8vg"; "fancyslides.doc-1.0"="h8cl20k630ccmwjxvnkns9yqzv2gx6i6"; -"fancytabs-1.8"="rqc1m37k5zb49j3fm4z6vxn920hc4ic6"; -"fancytabs.doc-1.8"="51gxw2kppckclncsg9ci0alwiw1drmxa"; -"fancytabs.source-1.8"="apk6s2sdnhd01l9cy8d1v1fb6sgk5akk"; +"fancytabs-1.9"="198b3fl0x7n2mghw2f667pxr4dzsyq0h"; +"fancytabs.doc-1.9"="m0fyacjfsm4rc2shbar55bwi6nrf5f12"; +"fancytabs.source-1.9"="4a3il9l6rj6wkxd489q9vxdjihk9c79s"; "fancytooltips-1.8"="92mbrk8gn6np54fx90qzcgkps3v6k54y"; "fancytooltips.doc-1.8"="v90g2vxn8yqy9lvibqhldwm23cpvv53j"; "fancytooltips.source-1.8"="cgj7harpp7wxh1fvh1wfx3pc0c34nhd5"; "fcolumn-1.1.1"="3as7qnpb697lii964wfb6zq06g4cp3ai"; "fcolumn.doc-1.1.1"="4grdm663fznflgh8c0kydq4h6bq2sy96"; "fcolumn.source-1.1.1"="srfg8sq0spa6rwika7aq7ylqpl6yc8kx"; -"ffslides-2016"="v88vqphgndyc8bznnkpc17pcgc4f429f"; -"ffslides.doc-2016"="1378bj25gqxr8mhdwf99rw2q61kbakqd"; -"fibeamer-1.1.5"="bjx20x8wn01gyqfzha5lh0gz5sn3xbnc"; -"fibeamer.doc-1.1.5"="bg9ljpvx4a5qpfiln5pn820bshccz5qs"; -"fibeamer.source-1.1.5"="4f0a8q5fj0qs3n69zckmbijrx1ka600m"; +"fetchcls-1.0"="hjmchh00z9pl5bhdxdb491f4grb4hvri"; +"fetchcls.doc-1.0"="2p0k1bx3y1b9b8lw2j25ybcaz1gwyyfa"; +"fetchcls.source-1.0"="xzc8psnl98xfsj7hy37f1qgln8hx25pn"; +"ffslides-2017"="v88vqphgndyc8bznnkpc17pcgc4f429f"; +"ffslides.doc-2017"="1378bj25gqxr8mhdwf99rw2q61kbakqd"; +"fgruler-1.0"="z5k7w4nncv381nbznr8c7bwq0a9k9l5m"; +"fgruler.doc-1.0"="rm6g865195d2lm97v9pbaim7jrgsnjyz"; +"fgruler.source-1.0"="67chz0f0pjn70xrxzmw7jvzgskjl9vlv"; +"fibeamer-1.1.7"="39kjk30dpdvclh0zy23x12jiycik3xgn"; +"fibeamer.doc-1.1.7"="qcvd0xn9h1j3dgjdk4kdyh6iy0q0kvl9"; +"fibeamer.source-1.1.7"="kzw9lj7jxl4kp2qqk8lcvbjhsdl3qnrf"; "fifo-stack-1.0"="dfyb5qmw70jy72ass9iy0k89criyybwh"; "fifo-stack.doc-1.0"="a5qh0b6zcxnfplc2xf0dy4384rvb8ggf"; "fifo-stack.source-1.0"="67n2h94p29l1j6dar7s1q8gz1cxg1zxh"; @@ -3876,12 +4069,12 @@ "filecontents-1.3"="pzgagggdjhjas2g1ycgxz02dc0j4qmiw"; "filecontents.doc-1.3"="s8f46qfl2ldsx4pwyvxhy19znypx6d2m"; "filecontents.source-1.3"="ikva5nvcs6q3qi97rwq22ssac4km6z2a"; -"filedate-2016"="krqs9ry6gpmk5xi9a2ijkrd90y7v6q5h"; -"filedate.doc-2016"="dq7487rvj7vai1j80j9sgi7hsldg433m"; -"filedate.source-2016"="qq7zspqhd6zl4w5lyy9gxw927ph31sp4"; -"filehook-0.5d"="95km0y68ldra3ha3c3j83zlchg7d6xn6"; -"filehook.doc-0.5d"="xvrasdz1m52dsjzn3wv5hy1pdwka3msk"; -"filehook.source-0.5d"="il5yprd7hw76wmbb6xmqz9njhkqjqkz6"; +"filecontentsdef-1.2"="6cmzpvqjr5dcbd865aj4333n3ha5p2qy"; +"filecontentsdef.doc-1.2"="qqlpd7b3fyvj35rnikqilvxbn199wzlv"; +"filecontentsdef.source-1.2"="h94zcfjld2z8vblaw0ka1wisj5kx72wg"; +"filedate-2017"="krqs9ry6gpmk5xi9a2ijkrd90y7v6q5h"; +"filedate.doc-2017"="dq7487rvj7vai1j80j9sgi7hsldg433m"; +"filedate.source-2017"="qq7zspqhd6zl4w5lyy9gxw927ph31sp4"; "fileinfo-0.81a"="gbv2pynx74765fc966q0l4wpflxyi0cz"; "fileinfo.doc-0.81a"="5y2xniw8nwg8iw11g49w04xl9fp4zyv3"; "fileinfo.source-0.81a"="lgcw481ya8a6ag2gzd0g589sm3ndsqys"; @@ -3893,22 +4086,22 @@ "finstrut-0.5"="adqypjvkvnkydw403q2wab9xzpvavhzz"; "finstrut.doc-0.5"="lcyklm3jkz5nq6j956dv55n0nfyaprkx"; "finstrut.source-0.5"="54slgzkfps6q4z7x49a5jqpc1j3p98hw"; -"fithesis-0.3.40"="05paf4m6zascqz0rl2m8k58fcrw8a3sq"; -"fithesis.doc-0.3.40"="dhckxqchfbq26kapnx43rl59kllb1cz4"; -"fithesis.source-0.3.40"="d3c6qp2lafrfk87gi1al88gwp02fknpq"; +"fithesis-0.3.48"="hyqply4p95wliidnqi8zsjw01k53rrfc"; +"fithesis.doc-0.3.48"="z63mf067b8261i9x8g8h7zd7wadqapkm"; +"fithesis.source-0.3.48"="ix5hn6m2wngalalrr1k6qgplc30mrr61"; "fixcmex-1.0"="wbmzc4wl601mg09pam4bnykh1dcnnlkr"; "fixcmex.doc-1.0"="0fy46qvzvp2zlwjbpm6pmwhydssw29kz"; "fixcmex.source-1.0"="06g7vgpdih9iks8q11v1ag68nib40d40"; "fixfoot-0.3a"="ci2h09kyh2k0w0d8mbmcw57i4cqirz2i"; "fixfoot.doc-0.3a"="5510blbn341f70ic646ad9jay6sfiilq"; -"fixme-4.2"="3k9cmnqankby3yhm8naizsbyflr8x7bw"; -"fixme.doc-4.2"="3p6vawfx6q709wppm7sfw8vf2kbjmcic"; -"fixme.source-4.2"="25a78ycm5jiqr223pr0zp15shwhb9jcp"; +"fixme-4.4"="j60hw7cgyk6777s1j70gidbs24rnzwfa"; +"fixme.doc-4.4"="dn3zcsjng4hnx627x3c49589zzawndkx"; +"fixme.source-4.4"="d6csn850lb0vbwcvll3cryks1hzmr3n3"; "fixmetodonotes-0.2.2"="8bzda1486sb6l1miw9fwc4gag8l86pld"; "fixmetodonotes.doc-0.2.2"="kwvshr4l5r8zgjia62ac04bpc7cy5n8w"; "fixmetodonotes.source-0.2.2"="c3v82mnqbxnz0b2yy1g5l9yfxh1y41vd"; -"fjodor-2016"="c6ya1a7zfddfil9y5f30af7d0jm8ikij"; -"fjodor.doc-2016"="ba4cxg0czxij6lwkl9w1kzmrcli6s3jm"; +"fjodor-2017"="c6ya1a7zfddfil9y5f30af7d0jm8ikij"; +"fjodor.doc-2017"="ba4cxg0czxij6lwkl9w1kzmrcli6s3jm"; "flabels-1.0"="pphsynfbbj4vxl9g3rklfj0igp6pzliy"; "flabels.doc-1.0"="hpsnqln41r0ybmv2vjycd0zrxi6mwrcx"; "flabels.source-1.0"="2x4jjggfjxvqby3yv13k0y1cgcrd0jcq"; @@ -3936,12 +4129,12 @@ "flowfram-1.17"="lr7jldig88wv8gsvp8aphxsvc6sv4cax"; "flowfram.doc-1.17"="3f550irxijq1vdvyxs6fyhpj5w1lw4jq"; "flowfram.source-1.17"="66z844imyrl7bsi22vrff1f05dqlmr8p"; -"fmp-2016"="3m6zqb7jl5rn5zgy0dbys5r8y1sp20x5"; -"fmp.doc-2016"="3hvfiw6yizjkxnx5h7xlzfig11diglpm"; -"fmp.source-2016"="44cqcijnqc5235rjqsmkj4vhmrs9j7hq"; -"fmtcount-3.01"="wwzhnrff6bafab926bak2kmjdw24gch1"; -"fmtcount.doc-3.01"="3s327yavhhvlymfgn8pklb29i189g9p5"; -"fmtcount.source-3.01"="10hm159mz13kv0qyn09pmhjrwf6w0giv"; +"fmp-2017"="3m6zqb7jl5rn5zgy0dbys5r8y1sp20x5"; +"fmp.doc-2017"="3hvfiw6yizjkxnx5h7xlzfig11diglpm"; +"fmp.source-2017"="44cqcijnqc5235rjqsmkj4vhmrs9j7hq"; +"fmtcount-3.04"="4lvcyjykq614vk64spx9wnbn7d1pibib"; +"fmtcount.doc-3.04"="mw5dmmzgwn6fpwpx5kczswvkvv61cbkr"; +"fmtcount.source-3.04"="byavxhi7bdfg0f76k0j8cgsz5m5bymsq"; "fn2end-1.1"="qw34b3ki30fqs4dj4fkj6f46aygw0ylw"; "fn2end.doc-1.1"="anwhkba91c48wl5p1ch35iplw974sdiq"; "fnbreak-1.30"="aiwqr078mw2127lbphc0lhmh90m5ddgg"; @@ -3951,8 +4144,8 @@ "fncychap.doc-1.34"="rncjjlyrjy916hn3ka9yaydjq6pdvn09"; "fncylab-1.0"="i7qfcb82d8b71j6qjn0szpxchw0xa0yc"; "fncylab.doc-1.0"="95kh740jadwxy6xszs7ia6v99rc6aj94"; -"fnpara-2016"="bwgyxjk2k7p76mw5ahsf2b0nm464rvi6"; -"fnpara.doc-2016"="h92c0g634x7n1qcdv6vqp5pnw9ykba0y"; +"fnpara-2017"="bwgyxjk2k7p76mw5ahsf2b0nm464rvi6"; +"fnpara.doc-2017"="h92c0g634x7n1qcdv6vqp5pnw9ykba0y"; "fnpct-0.4e"="lci9d0d1amlpxgfbbf6h2fv5kxck0cdj"; "fnpct.doc-0.4e"="hknasw4n1gfz7vm6bb4yvzippj4g8dw3"; "fnumprint-1.1a"="vhhc4n3xvlkb2a31kjpkxbwrwc30r62y"; @@ -3964,23 +4157,26 @@ "fontaxes-1.0d"="aaqzfxbcd9fdggw8lmj6syc1ff00m43p"; "fontaxes.doc-1.0d"="q1qsz0gigyg3x462k337crqng7njvakk"; "fontaxes.source-1.0d"="6xacssljffql809gpbhl8qdrs944v6cs"; -"fonttable-1.6b"="acvcfsrj0p47b2l3yh133ysszfxqiifc"; -"fonttable.doc-1.6b"="18zb08a2j10qb0aa7iibw6d5hgv9db7a"; -"fonttable.source-1.6b"="jdxj267fxbp4zxisy13aaslsbnjy6vg5"; +"fonttable-1.6c"="bljjiigal2igv0y004hwa9i1yc9i4b3d"; +"fonttable.doc-1.6c"="jssz79rldva4rmrziamjqi1krl4yijan"; +"fonttable.source-1.6c"="h3g6s458yvqsrlf0h7d8046ngi10698y"; "footmisc-5.5b"="ha2palj23dq2c3j4fb1j5s6cjjzisilv"; "footmisc.doc-5.5b"="22bx6glng885275x22z99lwwhwd3g5xq"; "footmisc.source-5.5b"="ii8ra20y2k8fzklf2cld2z6hjv8i1fha"; +"footmisx-20161201"="5pcwf6k39ybd84nnhzpc4py1sn3bsch4"; +"footmisx.doc-20161201"="0qniys4b74hs2d420k0xafys1578l2wj"; +"footmisx.source-20161201"="m3510nfdmbc96v66r54ikzkfcfffrxfg"; "footnotebackref-1.0"="8c8gdjzn36nfxjmpn521548334gbn86h"; "footnotebackref.doc-1.0"="fzjm17j06la934js2q0sn92l5d8g5z1i"; -"footnotehyper-0.9e"="nmyaarw2v5859sgv231maygild3n9jdr"; -"footnotehyper.doc-0.9e"="8migqr2id4sn2khfxlzb258gfi1jcvgq"; -"footnotehyper.source-0.9e"="misy2fgafsfp2yazb50kixlkmg3ycbya"; +"footnotehyper-1.0"="8kkl6vvmibngqlw5xy1yki93f90mnmzc"; +"footnotehyper.doc-1.0"="wmy9hb67vazkj40kvjjbdda23i27v6x4"; +"footnotehyper.source-1.0"="f0kjvcyphqb6799vannpbxj0gq6m7zv2"; "footnoterange-1.0a"="akznm9pld182b9c2nyqwsjc1d8p88qk1"; "footnoterange.doc-1.0a"="sywjz9s41xpsmmclmy1jrgv08491s5sl"; "footnoterange.source-1.0a"="hcyjz5xm3vs6d2bdcbm5ns3wj9n5nzdg"; -"footnpag-2016"="ym18m0gmmk7800dd1c4vrar53q66hm7g"; -"footnpag.doc-2016"="8kar3xxxjlrsjascd28122y5rckyv5lf"; -"footnpag.source-2016"="51nmvyy96mjbr46ar058jb7jhpsqz17q"; +"footnpag-2017"="ym18m0gmmk7800dd1c4vrar53q66hm7g"; +"footnpag.doc-2017"="8kar3xxxjlrsjascd28122y5rckyv5lf"; +"footnpag.source-2017"="51nmvyy96mjbr46ar058jb7jhpsqz17q"; "forarray-1.01"="682slfwbrz58fhqj0c07lv1xwab861ks"; "forarray.doc-1.01"="i7v5q2pjc3sjmcv3mcpdi3sffm4qs4kb"; "forarray.source-1.01"="q23rvw19x2rk8nv6yhgg76jxfs30qfys"; @@ -3992,18 +4188,21 @@ "forloop.source-3.0"="9rq5r8x9wv473bw97hyh21ihqzxd1w18"; "formlett-2.3"="ccr4iqh9ii22b0xkdl0j2rhp6q6cisd6"; "formlett.doc-2.3"="cwpzl5rhracg51x0lvqxxkbz4id1plml"; +"forms16be-1.2"="fl2lvzfwg6k8y6p5g351hnc6yx3l3x2r"; +"forms16be.doc-1.2"="p6dhrh7fjr9whcjcnkhbr7b2a59bh69a"; +"forms16be.source-1.2"="64w9r9hgmdwk0mmm80p5b2d0mggvixl0"; "formular-1.0a"="1ccyslvhjbzqyqyk4m3zh761kw2v45xk"; "formular.doc-1.0a"="lap9j51p3dsh02ym644576gnzm3a845i"; "formular.source-1.0a"="v80wnhg3xsl24a6bbsj4xfn82cv7ajd8"; -"fragments-2016"="jjblkk9dj72nvr2gday7p509pnlpwy16"; -"fragments.doc-2016"="z8rmyhlpsv68qbnr6h3sy08gcy6shiac"; +"fragments-2017"="jjblkk9dj72nvr2gday7p509pnlpwy16"; +"fragments.doc-2017"="z8rmyhlpsv68qbnr6h3sy08gcy6shiac"; "frame-1.0"="9bdydjkb9dsdvryibfq2p1q071zhhpxb"; "frame.doc-1.0"="fnv3ssnby17l7zmbgkc1rf4b5hysw7a1"; "framed-0.96"="n9an7cs91wwfnkalc4j9ccd0p0dg485w"; "framed.doc-0.96"="bwmgdv9r6rffibrm0wabw95vqdkiryfh"; -"frankenstein-2016"="ldv1sc8j6nxhd9cd95jf934pyz6s8lxs"; -"frankenstein.doc-2016"="j03cxxv0hw0c1j4afrfprgc2ia6nc5c9"; -"frankenstein.source-2016"="zc3nzdkbjrfgv241wj4xxlq6042xv9nb"; +"frankenstein-2017"="ldv1sc8j6nxhd9cd95jf934pyz6s8lxs"; +"frankenstein.doc-2017"="j03cxxv0hw0c1j4afrfprgc2ia6nc5c9"; +"frankenstein.source-2017"="zc3nzdkbjrfgv241wj4xxlq6042xv9nb"; "frege-1.3"="vczq96wx0icl69c5xqcqmfsy2wdw1ncn"; "frege.doc-1.3"="h07nnplqxq2fyh6f0wh03jpism89ji0d"; "ftcap-1.4"="7srhgl4z3zpicxv7aakm970xy2yxnpns"; @@ -4022,19 +4221,22 @@ "fundus-calligra-1.2"="5jn0qbj8zgi1c0166c2vdwzs1a5i8qm1"; "fundus-calligra.doc-1.2"="dd87040kysj4av2sq7grslyjv0gx4rmd"; "fundus-calligra.source-1.2"="s4s97ga289ncgv0rpd90b8i7qh4n7jfj"; -"fundus-cyr-2016"="fjyzn069q34z3ypaj0qwjq3f5zjm7y8k"; +"fundus-cyr-2017"="fjyzn069q34z3ypaj0qwjq3f5zjm7y8k"; "fundus-sueterlin-1.2"="4xlq7i6k1pqmq8vc6aq8h50gs1f02l3d"; "fundus-sueterlin.doc-1.2"="i8q42q2rzmby64v4il8jkpk7azfcrrip"; "fundus-sueterlin.source-1.2"="rl5n5rh9akf41ls7m2gi5l9hqq6wv8j5"; -"fwlw-2016"="887p12xhlcgydw4pddr0npyvp4xr1azf"; -"fwlw.doc-2016"="2di5y3hhm865frn42j1sh87hflxlpc1n"; +"fvextra-1.3.1"="apbi2ar2ajfmjr1mfxygj4ai5v5inia3"; +"fvextra.doc-1.3.1"="xg4krzxkc2w6lysdimaj78n1b0jximsq"; +"fvextra.source-1.3.1"="g96f98xfk115phmd2ik4ygvz982va0n0"; +"fwlw-2017"="887p12xhlcgydw4pddr0npyvp4xr1azf"; +"fwlw.doc-2017"="2di5y3hhm865frn42j1sh87hflxlpc1n"; "g-brief-4.0.2"="gqak9cc04cklmsg6xlar9l0s81027wgm"; "g-brief.doc-4.0.2"="bdkjz2wyh4wpgs0wlp9knfbj48fnj9g4"; "g-brief.source-4.0.2"="7kl0a76ylpcn4dixxd5ch603h4m9y7c2"; -"gauss-2016"="rm0hzy2h1msxkfp2lxm2k881y4iaw773"; -"gauss.doc-2016"="1d71g6781ar41gk3rjjy48bbkdkxx4id"; -"gcard-2016"="vrmrds4xh35bqjq4qaqj8rrvfd7fdykm"; -"gcard.doc-2016"="lxpbgqbbcldhlpwjkj531yh2bm3l2n3v"; +"gauss-2017"="rm0hzy2h1msxkfp2lxm2k881y4iaw773"; +"gauss.doc-2017"="1d71g6781ar41gk3rjjy48bbkdkxx4id"; +"gcard-2017"="vrmrds4xh35bqjq4qaqj8rrvfd7fdykm"; +"gcard.doc-2017"="lxpbgqbbcldhlpwjkj531yh2bm3l2n3v"; "gcite-1.0.1"="z7ha969s3ry7g9ibv521f2d6vr9lcxx7"; "gcite.doc-1.0.1"="3bb2z8jbygadc7qzmjz024dqzphncy4f"; "gcite.source-1.0.1"="v3fbj2j823jh4gy1vrc4f74qsdbfqnpa"; @@ -4044,8 +4246,6 @@ "genmpage-0.3.1"="r91a3wqjc9w7l3dh98j429ja8ymvbb34"; "genmpage.doc-0.3.1"="midc310i26fannfywf0cl7kp014y9ax4"; "genmpage.source-0.3.1"="riqs209lh1jip1dypvdhzq05i7n1kh7h"; -"getargs-1.01"="z3a918vmyg4vgcv67jxajbgf7p0fr32a"; -"getargs.doc-1.01"="iz0b92ask54p31fqi53m89rmd4j64c54"; "getfiledate-1.2"="jxr6fwmy8lc03cqchndg1dps8vjjfqz8"; "getfiledate.doc-1.2"="k0r2fr1q7cq0x7lrbk38ik8bqdngsq71"; "getitems-1.0"="8qdph1kdihdkqyd8rkn4n2i3wd5kfq0g"; @@ -4054,6 +4254,9 @@ "ginpenc-1.0"="gy74qjz23cw3lbmb0nc205qfp1a0ggib"; "ginpenc.doc-1.0"="9iln48gnlcshrhkk3mbpgqk06sj4bl39"; "ginpenc.source-1.0"="dkkxzw412c81hrhwnmjw1jgvhz5rrjhk"; +"gitfile-info-0.3"="dhkr443nnylzz5pmb4zwbygg1rznv9vd"; +"gitfile-info.doc-0.3"="a912kp1s2icfr4fhzczdl729jniza5dj"; +"gitfile-info.source-0.3"="q2knkm9xl1i1b8v9cdhdiivviny4vjdn"; "gitinfo-1.0"="a7mcfsqzwi88fsrdbqkwh8p3rd7w51ri"; "gitinfo.doc-1.0"="5dh5bifav6w87hq29ph7ls65yxjhk7c3"; "gitinfo2-2.0.7"="dsxgwrlg9j367wxxisxm2wv595xny8x0"; @@ -4062,9 +4265,9 @@ "gitlog.doc-0.0.beta"="29ysf5jz8cvwanmhad4ka66jcwxn9a1i"; "gloss-1.5.2"="xacfn3b2z30pnj9lwh6mximrbsfvarfs"; "gloss.doc-1.5.2"="4qial5a0p7ip784xgpqgkl6cmabd9hlq"; -"glossaries-4.25"="gsq3ldpks0b3cnxwm4qzlda11srwjx1b"; -"glossaries.doc-4.25"="780by5hd6x3m6w4hjsmzhz911b9b8alj"; -"glossaries.source-4.25"="jxqzwydh2q0pkf2a8bmfi3d22j10sgb8"; +"glossaries-4.33"="7iqvkfvliq7p7y71184g1xn16yirv8m5"; +"glossaries.doc-4.33"="9hwa0l9x2naizr9vkii6pxyw3av8lb32"; +"glossaries.source-4.33"="2lya1m8yfyi9i0lar9kaylyvz34pximy"; "glossaries-danish-1.0"="hmaay0viwacnrz7bfz6xlpb03cmsphcc"; "glossaries-danish.doc-1.0"="mxgh9b6vc63llhmfildmhkhjxd1s9kbq"; "glossaries-danish.source-1.0"="s5ayfh10z40cpi9amn2d1wwpnby0qgaw"; @@ -4074,12 +4277,12 @@ "glossaries-english-1.0"="ydbz6ls58gnxf3wmay4157516ggzsc1f"; "glossaries-english.doc-1.0"="53w4fzz52hh9jyik6384limy6633l8aa"; "glossaries-english.source-1.0"="dpc58cbb3snzsjxkz0c82yksx6c60h6h"; -"glossaries-extra-1.06"="pv682rkwqr1wr6fz3r780jy9lwsfkfc7"; -"glossaries-extra.doc-1.06"="dy1a1v8kvv9iwwxwmmvnah4dz1z3fsil"; -"glossaries-extra.source-1.06"="0pbmkwxy3l109nl1wrdx0ryzjz3j17if"; -"glossaries-french-1.0"="zpv1yipxkckkda94bqd3sakhmfdxwgrn"; -"glossaries-french.doc-1.0"="zkqcgjr5kv8spw3cm4cg4y3pvcggk0sk"; -"glossaries-french.source-1.0"="sj6879n829bqjqmdasr09fj7wld7i8kf"; +"glossaries-extra-1.20"="k64kafr2qx21knrc1419p0np9p0wd17h"; +"glossaries-extra.doc-1.20"="w5jrsbhl8ccx5x78ga6ql2xrz4ffrn84"; +"glossaries-extra.source-1.20"="bgp0w68a1xh11ld4n6g6gakmzp2vzpvc"; +"glossaries-french-1.1"="zkndbp5cq242l196fc6s35yib6ay4mnf"; +"glossaries-french.doc-1.1"="0bj95z10psabgwi3gg65jbmjfjr5jn36"; +"glossaries-french.source-1.1"="87wiw0b01wpqikz8r7wfrkmq8lylviq6"; "glossaries-german-1.0"="dhfan1gzz50rlg7q2y9x5lg1dgl2cacr"; "glossaries-german.doc-1.0"="8kajajbjllgcz3h1q6nhs0jh25pv9xdm"; "glossaries-german.source-1.0"="254c5j11d1xigfcfn5s89bv2i6si8cfr"; @@ -4124,6 +4327,9 @@ "graphicxbox-1.0"="6grrmcmr2wlpx8dbj1k1nggs2b6z7qh4"; "graphicxbox.doc-1.0"="2blrwzsralqjrvlx6xjvyaqvsi764nmx"; "graphicxbox.source-1.0"="1vl41sp02d8byjrapj58v5pg6i2g989l"; +"grayhints-2017"="xsxznm4jw3shsb5xh39q3hqarbrrj9nm"; +"grayhints.doc-2017"="6bjldw8aiddlv1swvvvck43r1lz8f7ga"; +"grayhints.source-2017"="cc126l1zsjsq7vackhd9z4999pcdj2wp"; "grfpaste-0.2"="wi95wbrs7k37di2dkqnix5h21p84cb1c"; "grfpaste.doc-0.2"="7hn9vs80ksnpaa0aqdmbv7qzhrdxwr88"; "grid-1.0"="hf1jfkwc5j27mhxi2skf3wjwq2y1ca0w"; @@ -4137,10 +4343,15 @@ "guitlogo-0.9.2"="7lfy6i5pq8cg24n5rh2aizbrv5s2815i"; "guitlogo.doc-0.9.2"="lrfcbc5mfy6qfji2c36zqkrva983c42v"; "guitlogo.source-0.9.2"="q5bdflg33yc271228jknv297i0fzq227"; -"handout-1.2.1a"="57fb4wlfw04ix1w84zd6i6svajpymc7m"; -"handout.doc-1.2.1a"="7xjf0xn7lx87r59i7rws8lj4q5dpwl30"; -"hang-2.0"="hrs62z3zxnj3m8mfxhvcbada52sqqmkg"; -"hang.doc-2.0"="hj3kp7ska6yzf3rs5b5ad1gkyljj7pq0"; +"hackthefootline-2017"="rj8zjach75a6zj91h5ycwyrfc6yicck3"; +"hackthefootline.doc-2017"="gy4wzaq5rbgwl2iilaly87i39xhnpdh8"; +"halloweenmath-0.10a"="mr8nvi7ynzngvgxp0i74wjkxwp77i7p0"; +"halloweenmath.doc-0.10a"="xamcznycdz08kgvbph8pi64h2v9j9j25"; +"halloweenmath.source-0.10a"="hr249rdkmmkm1v7z4cf7ymdwrshz0by3"; +"handout-1.6.0"="jz5qp5n1dij11nyrgmb3x4rl41mnggyl"; +"handout.doc-1.6.0"="xsc8qd00v663bgbpfp4kwjd1ndc47q8y"; +"hang-2.1"="ncymr7c9lsbbxm6z2q3210k185bkkxq0"; +"hang.doc-2.1"="rqlq0rkbqj3vcfpm93m46w40b7llalvg"; "hanging-1.2b"="48vqvdis9l05842lr3wp64x14qacr9ag"; "hanging.doc-1.2b"="sicdi70h8j7nnw4p7bj4j3wj2bxzrwhx"; "hanging.source-1.2b"="hhzby1cywgn7vdcn0b50lhpq0lkxpf53"; @@ -4151,9 +4362,9 @@ "harnon-cv.doc-1.0"="a7012x0ckxnym7cpbj8m12ak993bz7nc"; "harpoon-1.0"="88cndn21h4fshiq6yvd8p68gwl2d2nd9"; "harpoon.doc-1.0"="z21q49fw0a7wwwr6chwdd73ypkwqz1x3"; -"hc-2016"="vibhz5h2dnzdkwrxgadrwy8crfaa505s"; -"hc.doc-2016"="mhva92gfr4jn40d4sdnh0331iy19a4vi"; -"hc.source-2016"="dfmq6gax4mfq8z074sm76b6k7385d2nc"; +"hc-2017"="vibhz5h2dnzdkwrxgadrwy8crfaa505s"; +"hc.doc-2017"="mhva92gfr4jn40d4sdnh0331iy19a4vi"; +"hc.source-2017"="dfmq6gax4mfq8z074sm76b6k7385d2nc"; "he-she-1.3"="6rnp8qmascvlz9p0hgacblpx8svapf65"; "he-she.doc-1.3"="xl7nf17g73pn4jc3z6nc6fknr11lsf3l"; "hhtensor-0.61"="vnl54f4l78n4x9pllg95fr5dm79qs0jg"; @@ -4181,10 +4392,10 @@ "hyper.source-4.2d"="v03bmxbg7hqjpl8vfp0l8z81mi2db2hz"; "hypernat-1.0b"="25v0a423yhy68vf125ys0n6p0qhvr088"; "hypernat.doc-1.0b"="0n4qzpmvhks66d0g9gnyizpl44jbh4pf"; -"hyperref-docsrc.doc-2016"="5gjpppdrqh8qb1srq609q3kskl9rqfps"; -"hyperxmp-2.9"="7m2axynp5m3rpi5m1p0kfdmssciabj0r"; -"hyperxmp.doc-2.9"="z1im7lylg2nrqcdhh7wc5s68bvd2b0db"; -"hyperxmp.source-2.9"="0cfl2jf1s75mlcip3hbnyva12z5adkl3"; +"hyperref-docsrc.doc-2017"="5gjpppdrqh8qb1srq609q3kskl9rqfps"; +"hyperxmp-3.3"="8c3ad7hga2dm8qjmqw63kmfb666gbkgi"; +"hyperxmp.doc-3.3"="3nyn2xf60j4gf18ynqmmkbiwrhir3abn"; +"hyperxmp.source-3.3"="y391x0mjslfq1jlh3pk0dmpbi69z5j94"; "hyphenat-2.3c"="wr2lhsafb13b0zira7190bx5s68fak45"; "hyphenat.doc-2.3c"="z1sj3r1ny1lgixr2fcmsglz55b23f5lm"; "hyphenat.source-2.3c"="x70g8xiz9ss4pw775lz82yncq0x7lxf1"; @@ -4204,9 +4415,9 @@ "ifoddpage-1.1"="6f52apknfsjpswzikk3nfi9by5iip7gy"; "ifoddpage.doc-1.1"="7l75021f0gk7nrpiq2axr88pbnzjq50g"; "ifoddpage.source-1.1"="njqd27ax6313q2w063xbmw3mnfiajx98"; -"ifplatform-0.4"="pkmxrr0vhz1843jscvhcwyasfkhyji34"; -"ifplatform.doc-0.4"="k22674ffphm97b161cqz6rlp092dyil7"; -"ifplatform.source-0.4"="mm8dakbck01jyl9s3qif8iby2l4bn4bv"; +"ifplatform-0.4a"="sfnfrx7iqg6kikiqd44yx8004l2mqkza"; +"ifplatform.doc-0.4a"="sab580hpgp0nw6gq5li9vvv3x5gxp50b"; +"ifplatform.source-0.4a"="nkwc32c56f1s585rr18r54ib1xa9hn4z"; "ifthenx-0.1a"="2ah86wn9m3zc1f7hf1yzwyv26xbay35s"; "ifthenx.doc-0.1a"="2zrlnl6s8fbs3ndyfi21bdqsfx7n6fc6"; "iitem-1.0"="k0gdz2py6spiqrj4djhwbys9vkar3p88"; @@ -4214,9 +4425,9 @@ "iitem.source-1.0"="8xp0919wakx5r9xd21mbm4qwvd0l66fv"; "image-gallery-1.0j"="3skl1kln38c9g31pa8sbx370kw4jp23r"; "image-gallery.doc-1.0j"="gq0ngnivnwh35m29qimn54l0gigv79fx"; -"imakeidx-1.3c"="4aq0zkakmwla14z2lhslvlh1ybg5pxiq"; -"imakeidx.doc-1.3c"="bmg31gagysvnak2yr4d874i47vybxn6a"; -"imakeidx.source-1.3c"="1gdmb4ylyhndp98h1qac5lc85yn3d632"; +"imakeidx-1.3e"="vgspaw7w4kjbm38vzdga08j12aaqf3ad"; +"imakeidx.doc-1.3e"="p39pl4z0xkr2029czqq9nkaxz3dwdypx"; +"imakeidx.source-1.3e"="cn51y6d129cc0kzw3yx3ybziwmxy9mbs"; "import-5.1"="7i3h4z647jmm3scb0nringfljzk9vv6z"; "import.doc-5.1"="0sl784aip6r53fdas8xyqhjz5vcs6xpd"; "incgraph-1.12"="n14gyn5g1am9dyfqvxyxrqsfxdkg39xv"; @@ -4230,16 +4441,19 @@ "inputtrc-0.3"="vmk80jzg9sllpw28csmhsyjd13amp567"; "inputtrc.doc-0.3"="dl0qs37bjj4aam7ijfdg64fpl135k7b4"; "inputtrc.source-0.3"="1nx2jv4m63gc83iy3qp46gxr3v6wyw6h"; -"interactiveworkbook-2016"="4a6mi66i2z1sjzxjddvwajpvxl6i2c6m"; -"interactiveworkbook.doc-2016"="ldph57php6irhdbj9w497xk31n5ggxbz"; +"interactiveworkbook-2017"="4a6mi66i2z1sjzxjddvwajpvxl6i2c6m"; +"interactiveworkbook.doc-2017"="ldph57php6irhdbj9w497xk31n5ggxbz"; "interfaces-3.1"="pja00rv19b492fv0d1afkj1cmmi09wm4"; "interfaces.doc-3.1"="bj6l95whavxkrsa5rb8791d2ib4n5gal"; "interfaces.source-3.1"="f7gxq1s477zab7wh212nyad94kcdacqn"; "inversepath-0.2"="8csfwygw95dd5wrawwj7hs4gmpxhdwd8"; "inversepath.doc-0.2"="b3z6dkfmk19n96dklslzszn7vfrnlcn4"; "inversepath.source-0.2"="zpg2i1sqr76xvi6jn5vrgxvs44dlfx9z"; -"invoice-2016"="b7p2ca533x96hjf2xwbmvrj68zmydbng"; -"invoice.doc-2016"="71f1080i0rsjkd99gig3gi185pxhjv31"; +"invoice-2017"="b7p2ca533x96hjf2xwbmvrj68zmydbng"; +"invoice.doc-2017"="71f1080i0rsjkd99gig3gi185pxhjv31"; +"invoice2-2017"="l3j1qa7jni4bn8v1jmm9k6rmh7pbscya"; +"invoice2.doc-2017"="32p0bf7x08qkvj3x0mabigzi6p3kznjs"; +"invoice2.source-2017"="2k6qabwlpw6kp6mvg02c5xh3xqgjv78y"; "iso-2.4"="p6yl8v4jyvzq5fh3qw31kgalhrv1qv22"; "iso.doc-2.4"="xs5sw6aw59hr3xlk187dhwkg223vycsl"; "iso.source-2.4"="vrgvl97kvsb6n82w4acm2wfjsqq00cxr"; @@ -4254,9 +4468,11 @@ "isodoc.source-1.09"="aql8cr8vpdh2sf6bq0qfac1vsnq17q8l"; "isonums-1.0"="50diljpihfk6390ak54ml6gxg6h3qarr"; "isonums.doc-1.0"="qbnvabarywnwbfaxqjr1afkic152hhsf"; -"isorot-2016"="pzs5xd3c9n1m3r4m5g82702s0slq0kl8"; -"isorot.doc-2016"="760dh5j78kcgn2zxp6jhghmzxhyplavx"; -"isorot.source-2016"="35mi9l5bcbqmrixngyvb7g780ns0vjg5"; +"isopt-0.01"="0gyj9ri30pid0xymfv457g9r0nycy6qm"; +"isopt.doc-0.01"="q8srwcqk4w0mblrqzpy70wbqqrds2k9c"; +"isorot-2017"="pzs5xd3c9n1m3r4m5g82702s0slq0kl8"; +"isorot.doc-2017"="760dh5j78kcgn2zxp6jhghmzxhyplavx"; +"isorot.source-2017"="35mi9l5bcbqmrixngyvb7g780ns0vjg5"; "isotope-0.3"="paqbsfz0w4sl82imkw2zqsdwg3nlzd9c"; "isotope.doc-0.3"="f5mylfd5fga3jy0fsdvw1z5kya7kcg6b"; "isotope.source-0.3"="sc8npgj5397qvqwvfrz2bq51xj5840l4"; @@ -4265,10 +4481,10 @@ "issuulinks.source-1.1"="hmn5nsszd3vf27863sbk647fgfh5gxmd"; "iwhdp-0.50"="j4m15vz6ky21yk2m95kjz1is1z91vxxy"; "iwhdp.doc-0.50"="wphgycl74db9mxr5gjc2m80rbzkcqk3l"; -"jlabels-2016"="fw5il0bzwm10lj1ly8fjic2hjiqxnr7d"; -"jlabels.doc-2016"="fndgg419y1rp47d5qifv0k304b5iymab"; -"jslectureplanner-1.2"="b8fs1np0liq53xxrai6fsrp9kf410hrl"; -"jslectureplanner.doc-1.2"="3lvyzw1jq465jmcxqmcwlg71g9k0rwxw"; +"jlabels-2017"="fw5il0bzwm10lj1ly8fjic2hjiqxnr7d"; +"jlabels.doc-2017"="fndgg419y1rp47d5qifv0k304b5iymab"; +"jslectureplanner-1.5"="axyi8j1yfabj1394v0skwrdmsvyqdbxc"; +"jslectureplanner.doc-1.5"="d4pia762mzbgiz5wng5vfz0xggy2j6wm"; "jumplines-0.2"="acxl8nhlznvcwq20n01b41kamc5xmqdr"; "jumplines.doc-0.2"="hjfl57a9hwdyf6lxl6ah0k7937r03jil"; "jvlisting-0.7"="fi23ykvl6kw34qri5nz2k4mvgjqgbbyl"; @@ -4283,6 +4499,9 @@ "keycommand-3.1415"="sq6188m8lc3wl201phjx2qh3vwxf2mrs"; "keycommand.doc-3.1415"="q9lkdcggi17v7gl8hibk2qn5dm6h07f8"; "keycommand.source-3.1415"="k1fa9w6r1n1qhz428ipwflj6d6m5ap7k"; +"keyfloat-0.15"="x377cdsrx9gh5j8m6xz23z0i81cngjx7"; +"keyfloat.doc-0.15"="v630qlmdxhwr78j1ws86xaacl4vga1z7"; +"keyfloat.source-0.15"="gm2zjglwbxw209nf5k83nn9f7mcp4h6a"; "keyreader-0.5b"="wk5kgrrx4c8682j6a01n57ab33ww2j23"; "keyreader.doc-0.5b"="fy37315azfr09wzl71wdby8ry1dd40yn"; "keystroke-1.6"="vi7r9aac2w8jggbxpk5593nsapasmm18"; @@ -4292,24 +4511,30 @@ "keyvaltable-0.2"="njidjg64cv333s0j2djaycy1jmhn5h6q"; "keyvaltable.doc-0.2"="bfym53arpfh1a0zfji1b3f0giwg1kxni"; "keyvaltable.source-0.2"="dlgbjs6pq852xk6jbz7dxwd7jkf91rgi"; -"kix-2016"="lzdrca007a0r5rsm8f14ljx6v8yyg8xz"; -"kix.doc-2016"="jallvk311vqcjc3wrkxqv03ckbc9k1gi"; +"kix-2017"="lzdrca007a0r5rsm8f14ljx6v8yyg8xz"; +"kix.doc-2017"="jallvk311vqcjc3wrkxqv03ckbc9k1gi"; +"knowledge-1.08"="q748xlninf9v7zlg0727zmq85rf9c03p"; +"knowledge.doc-1.08"="14zapkz2ipb64fjqq5bs52hy5m8mc4d9"; +"knowledge.source-1.08"="wd1d5qcdld28hsw7c485cyx3g0dm9zl2"; "koma-moderncvclassic-0.5"="s33qvgji09s9glq93mdxzs3smnzlamv5"; "koma-moderncvclassic.doc-0.5"="dvzcb032fmh5xs804d9mbx6q0afm25r0"; "koma-script-sfs-1.0"="s9dryf4f0zgcij3v5v93zppqs876p2nq"; "koma-script-sfs.doc-1.0"="dxm4lfz50b0635g2dg24lzp3fgnlvkgn"; -"komacv-1.0.1"="w5j3z9f4svkq7syzb28wyzbg97p8npmc"; -"komacv.doc-1.0.1"="97n0hz7ngvi51b7grl3z9csvkbycy4qr"; -"komacv.source-1.0.1"="63d26l3aghm16qg3166hks64y3p01kmc"; +"komacv-1.1.1"="983485nkvn4jqxsh8mf8lsrlq6dqk6km"; +"komacv.doc-1.1.1"="sqdh6zbs97agsxd051w4g1m2b09hgmhr"; +"komacv.source-1.1.1"="1k5z0bk4hk2g1w88pmd3wgpdxal60qwi"; +"komacv-rg-0.9"="cmvsjza25057y5aympbi6gd1y8xgky4z"; +"komacv-rg.doc-0.9"="qq0vd7iks9kvsgrsimrgk15xrayhspy7"; +"komacv-rg.source-0.9"="h8a7jfdbxh6m8qq8hp9i36vddgjmc01j"; "ktv-texdata-05.34"="fdwnms9v43cjsjypsnlq6rw1j3c6zz93"; "ktv-texdata.doc-05.34"="896wnbqpxncc640x8rsi6gia2wh5njxg"; "ktv-texdata.source-05.34"="7wq3pi1mm3r1g209vq31im4n4ib21zv2"; -"l3build-SVN_6608"="vhcdwk4cb866zrz1r4di4yq0cv7d3pcq"; -"l3build.doc-SVN_6608"="x7j6dgnyz8ym2bbbjpfy8z1a1m4b8hpb"; -"l3build.source-SVN_6608"="qrwaifx9878anbzdg7zas0fdjn6594zi"; -"labbook-2016"="x7i28cyfski7ssm9hv28zrlac3inky0c"; -"labbook.doc-2016"="5qs95wc8ms4162nwd7q4lvh7rc62s2h4"; -"labbook.source-2016"="rrybnds4laxyariqq5c2sh1zm9jzvk7f"; +"l3build-2017"="vfywhg6vl1y5l0iqhksg4hsmi5hpbyhd"; +"l3build.doc-2017"="bgbywnw1irw79l5yiaxpacn58088n3q5"; +"l3build.source-2017"="phmm3cf5182jxx799j5ha1rw57pcyns9"; +"labbook-2017"="x7i28cyfski7ssm9hv28zrlac3inky0c"; +"labbook.doc-2017"="5qs95wc8ms4162nwd7q4lvh7rc62s2h4"; +"labbook.source-2017"="rrybnds4laxyariqq5c2sh1zm9jzvk7f"; "labels-.13"="rxcv9zw5jal0kr4kw0vlswjc87clgh8p"; "labels.doc-.13"="70hfinn9fsd8r14bk23fmdc0px7n4x5w"; "labels.source-.13"="7hps59wlxkqqjm9432dg15ml63n44x3g"; @@ -4319,11 +4544,14 @@ "lastpage-1.2m"="i37ji3jp95j287rx34q4yajih7w1riy4"; "lastpage.doc-1.2m"="jc40pwdbysv03k1wx113f2q0j8xf54dr"; "lastpage.source-1.2m"="gika2qk64lahh4l6c6pn76r5l57rspf8"; -"latex-tds.doc-2016"="m38f5gncr9c56sg2cjs0mfgd57wik7pd"; -"latex-tds.source-2016"="xdigsidx76bs121jl0m42wavzf4y88qj"; +"latex-tds.doc-2017"="m38f5gncr9c56sg2cjs0mfgd57wik7pd"; +"latex-tds.source-2017"="xdigsidx76bs121jl0m42wavzf4y88qj"; "latexdemo-0.1"="qjb630j87mqsczjbhvjgr4a187rg6wzy"; "latexdemo.doc-0.1"="p14qs32q48w1f8fq0xmwz1maiijhw44z"; "latexdemo.source-0.1"="vldkpqrsdaa84s356w6nd5a0q0gv40ki"; +"latexgit-2017"="fymcvzwl1sl173r3jgf0298hxzrv66fa"; +"latexgit.doc-2017"="sxi90m4zcf03fym5d2mmyycd9p8f1k0l"; +"latexgit.source-2017"="jgvdi7lnqw37v9c4w7ybl5424sxkzgsf"; "layouts-2.6d"="j5bph4p5drbgidk6k74k72n6ckzin1qq"; "layouts.doc-2.6d"="4440l4n1kwphf99pkms09mk8ilbyd416"; "layouts.source-2.6d"="hay5rjr1crxj98zqj1qm841dkxx55azg"; @@ -4338,17 +4566,20 @@ "leading-0.3"="m10kyvg2pjysh33gajn8a8hisfc74ii1"; "leading.doc-0.3"="5bc58zdia3qp0742p1hwmxaw13qdgnxw"; "leading.source-0.3"="ks8sv07mg6n12g60aj3s33siha865chp"; -"leaflet-1.1a"="sm1xci8wbxyqy28av79zwcnscks9y62m"; -"leaflet.doc-1.1a"="pwgms9v3irkh34agmx075pbhv7irhan3"; -"leaflet.source-1.1a"="z7lrijyfv4ab4ccsy5z2bx2n9zm8z9pd"; -"leftidx-2016"="d2q1jibnbyjk72phsf6yj7nxj9l37fvh"; -"leftidx.doc-2016"="db75s45b0v3lqkw9dx09m7zs7zhmng7y"; -"leftidx.source-2016"="whmdclngd2dpahpsmz5s3rahk1bvf7sq"; +"leaflet-1.1b"="jaqjjxvh2wb6bg7c608cn6rg9d67pkv4"; +"leaflet.doc-1.1b"="5vgkqz1bw0qlxzz5fczsqf873dqsq50g"; +"leaflet.source-1.1b"="l8g4n75f5d85dj4mfwbrc19bh87jzr81"; +"leftidx-2017"="d2q1jibnbyjk72phsf6yj7nxj9l37fvh"; +"leftidx.doc-2017"="db75s45b0v3lqkw9dx09m7zs7zhmng7y"; +"leftidx.source-2017"="whmdclngd2dpahpsmz5s3rahk1bvf7sq"; +"leipzig-2.0"="vasv42gq76m6bqc0kd3rhdjqm3jfbgzw"; +"leipzig.doc-2.0"="mwiqrvnz9dpar8yxz632anah37795px4"; +"leipzig.source-2.0"="8d88fsk8faxw58zrp0any6ld256jiqda"; "lengthconvert-1.0a"="7rfvx4n625g3rwinbxci25b0xpxrb2sk"; "lengthconvert.doc-1.0a"="ngl9jfvcplmd9z7kwzfd90m45jp9lbpc"; "lengthconvert.source-1.0a"="r2lh184znd42l741g816y2ljrsrbncha"; -"lettre-2.353"="4r3qyl971gcbsn182a449ks0vsid70lc"; -"lettre.doc-2.353"="gff37hsnpqyn0dbwkf4bshhql8spfzzj"; +"lettre-3.000"="cji81arz9mmmd0n31k9zh7pacq0w7df5"; +"lettre.doc-3.000"="szid42pk7qyrimafvma6z62407npv9dj"; "lettrine-1.9"="fybjnmp9wr11h1nlxhli9fr4bin99hyj"; "lettrine.doc-1.9"="0v96hk3gljl5q200v59q1nh2vxv0mwbn"; "lettrine.source-1.9"="q7kny754pmrmh1p9jcig9ccycvsbc2cv"; @@ -4360,9 +4591,9 @@ "libgreek-1.0"="dsf5z1fq4y0agzyyv6yi0vjwl233d8d4"; "libgreek.doc-1.0"="g2bs55qw4b3caw4paxrnapy67n0ha9ri"; "libgreek.source-1.0"="1fzq025r679gwbakqw9av95ycxj5zlmp"; -"limap-2.1"="q2jidxbgxmdc8233bgpl96zp8130bhln"; -"limap.doc-2.1"="4yv0y00w76c35n3lmwcm1psx9r0r77wx"; -"limap.source-2.1"="7pkwwflnqbhamz030rp1f0vpmdxs6gck"; +"limap-2.2"="kv5hncahb5nmmvrk1rn9j6ikj5i0qvs3"; +"limap.doc-2.2"="531jnlrzb50nsqzbm0amybf98crl0l7f"; +"limap.source-2.2"="djbm84g3cwpypc44slyscyacm1wmpl7n"; "linegoal-2.9"="amvia15hibyyc6n80wx6lzsdg3rk8h4p"; "linegoal.doc-2.9"="inrrzzhlascib9kbyjxs4f34xkj6djcg"; "linegoal.source-2.9"="9207gnjmj07pywp2ikhjhnk6am2i2r1l"; @@ -4378,9 +4609,9 @@ "listlbls-1.03"="hmdaqr5466rlpkkrq78d4p5rfzm4fyxa"; "listlbls.doc-1.03"="gmdiwdbadf66b6cchmxv1swlngdw6y5g"; "listlbls.source-1.03"="8l3lzr022qmx9pw4jgp1n2fkacyl94vb"; -"listliketab-2016"="8d6nwla5nj3m47r2nw7pqhv5kpc9dlmf"; -"listliketab.doc-2016"="7j02b3ng311y78pw6k0q4zjya5gs7zhz"; -"listliketab.source-2016"="vk9ar9i94brrf3csjh9ncp2r5z48glwc"; +"listliketab-2017"="8d6nwla5nj3m47r2nw7pqhv5kpc9dlmf"; +"listliketab.doc-2017"="7j02b3ng311y78pw6k0q4zjya5gs7zhz"; +"listliketab.source-2017"="vk9ar9i94brrf3csjh9ncp2r5z48glwc"; "listofsymbols-0.2"="9xg173d0qs233kqf04vm7qdl7ajha3w2"; "listofsymbols.doc-0.2"="4vhmgkz6wrk2ad9bnzdv3sv3ii1np14p"; "listofsymbols.source-0.2"="4g49piirj1spdl9hg02n9m1c8b5ql1k5"; @@ -4392,14 +4623,14 @@ "locality-0.2"="mr4032njdjyscsy5p9xax5lw5kdbhnnq"; "locality.doc-0.2"="98r82nbryc9zf5xyhwfnbkgrcybf7fr5"; "locality.source-0.2"="4g29gqbn9n7kp36x0s44211p8bbmcfi6"; -"localloc-2016"="jjmgwbaj9v9503wkm5x3mr008f3llvls"; -"localloc.doc-2016"="jn8x4qwci949zci0bk1ldrkr192kasgb"; -"localloc.source-2016"="2hhfkp3qb0p6qphv2fq5cyigyrx41iah"; +"localloc-2017"="jjmgwbaj9v9503wkm5x3mr008f3llvls"; +"localloc.doc-2017"="jn8x4qwci949zci0bk1ldrkr192kasgb"; +"localloc.source-2017"="2hhfkp3qb0p6qphv2fq5cyigyrx41iah"; "logbox-1.0"="6hm79ady9adc3i3c4p0jzmx7fwavbzqj"; "logbox.doc-1.0"="mxpkm6s6x6zngdy8jgj801vhq3h7mlxr"; "logbox.source-1.0"="a1q1w9s8pj9aqshkyla8cc1p3g2z9w8z"; -"logical-markup-utils-2016"="zbnw20yl4fjaj4vfmqa5zp4146yq2a84"; -"logical-markup-utils.doc-2016"="gwklf7w5nqlxiwy7avg5nwx514l2ryaz"; +"logical-markup-utils-2017"="zbnw20yl4fjaj4vfmqa5zp4146yq2a84"; +"logical-markup-utils.doc-2017"="gwklf7w5nqlxiwy7avg5nwx514l2ryaz"; "logpap-0.6"="dhd61y6riva220cjnb193v9cjbjz33bi"; "logpap.doc-0.6"="pps9ipn239h1vw0d8p2jlzbkmcd12czb"; "logpap.source-0.6"="6y6gv7qgh503f3n8zrpqddyghkdvzngh"; @@ -4413,13 +4644,13 @@ "longnamefilelist.source-0.2"="3ph503yw35mliqir4k60hv3i8lah3q7v"; "loops-1.3"="0f0xz58wdvx6cvkynx3xmyxm08x823jh"; "loops.doc-1.3"="6v1ghg77l3nrab23by4cwqwr014jjwq6"; -"lsc-2016"="m875c3d6lpgh92sym2hav1n0lll6f7nz"; -"lsc.doc-2016"="ajdphikngmbihczhfyarwa94i9r3mg6p"; +"lsc-2017"="m875c3d6lpgh92sym2hav1n0lll6f7nz"; +"lsc.doc-2017"="ajdphikngmbihczhfyarwa94i9r3mg6p"; "lstaddons-0.1"="n797dx657x03zpkhb1fc2ygd0ppb023g"; "lstaddons.doc-0.1"="w57l66903jqsb827q96f05as16fr5wf2"; "lstaddons.source-0.1"="35c9b9n0qi3rjl2gg9dr158v21rh5cq6"; -"lt3graph-0.1.5"="fc8pd37dds11ck9846rp74lxhn7x55j6"; -"lt3graph.doc-0.1.5"="kf6s1vz7bk0whmk4d3zcnxn0ik6cy3r9"; +"lt3graph-0.1.8"="8zd4fc2v8hlirl758qqdgjqky7cpm7ns"; +"lt3graph.doc-0.1.8"="rzp0cvxdj0p0ixlxp1snrklxd7ybj1q8"; "ltablex-1.1"="a9hh7jiwaw9k0zkmb5yy7halay61g1x9"; "ltablex.doc-1.1"="40lyll74mnj18w4fn69a2gnan846v4s6"; "ltabptch-1.74d"="z6ikfwfzq7wsnnr6acv0fnqmvq37cbnn"; @@ -4436,14 +4667,19 @@ "ltxnew.source-1.3"="30hsnd2yrpqdqxczsza02v4rkqa4fiwa"; "ltxtools-0.0.1a"="xml1xbh8w9gqi8gim7wps9vmadhmrf3r"; "ltxtools.doc-0.0.1a"="hdmpfrkdycgs0qh3mcxgydcscilacfr0"; +"lua-check-hyphen-0.5"="j17ryb5mhflvjwqh3dda281zhr916bqg"; +"lua-check-hyphen.doc-0.5"="x7qjdjgf22aa3332izgii5cw287dx4l1"; +"luatodonotes-0.4"="pn42k5rx83hibk0aayaydb2z0zkfi1al"; +"luatodonotes.doc-0.4"="9615fx7r9nlvlld7jn47jlgb380jmrxf"; +"luatodonotes.source-0.4"="k8919986lx5jwq3qmwyjpg62qjjpa9gw"; "macroswap-1.1"="19xdcyrfd1z77ld3isdzxjhvsijifmk3"; "macroswap.doc-1.1"="dkpw0kw0a0d8cwp237xy5c1a9ab0s0p3"; "macroswap.source-1.1"="wirvpfkv8zjyqghlabclnvnmb4w8i2rh"; "magaz-0.4"="zd02izsnb56wz1wcfqfj6p9p7pycwd3g"; "magaz.doc-0.4"="cdylbzidxq2abda3np8ia16m3lbga9w3"; -"mailing-2016"="4v4vxr5i84yphwj7ff6s3vi0n2wx1jaj"; -"mailing.doc-2016"="fw87jd6gkc88g5a5z17gm7fw3nk6pana"; -"mailing.source-2016"="1zmcm4sg1p3vlgb76yf7gz0ds1958s6b"; +"mailing-2017"="4v4vxr5i84yphwj7ff6s3vi0n2wx1jaj"; +"mailing.doc-2017"="fw87jd6gkc88g5a5z17gm7fw3nk6pana"; +"mailing.source-2017"="1zmcm4sg1p3vlgb76yf7gz0ds1958s6b"; "mailmerge-1.0"="6zixn5f5rjq4fd65bbhkzwgijfhw262i"; "mailmerge.doc-1.0"="wpim80lnxbf01an1ds6ksasm2271f54w"; "mailmerge.source-1.0"="00r71m4cliyz9870yfxd5nl0b7b2px0r"; @@ -4458,50 +4694,52 @@ "makecell-0.1e"="073c9wfpc83jhcbkmjlkpfbpmy082xyv"; "makecell.doc-0.1e"="irl3sf564yjdnx538vbqbw6ji0x65m56"; "makecell.source-0.1e"="qaw6f6hmvj4125v30wr0drnlq0piim3k"; -"makecirc-2016"="m4xbci3109krv6agm0nhvry9kd7wjs43"; -"makecirc.doc-2016"="w7jd6g686b8iqqbmyipml4c1rjry4bax"; -"makecmds-2016"="anpaqglvl5rmcy8r2q0ap8m117nsx89q"; -"makecmds.doc-2016"="39zxaxxqlmps1wd4rjy42a1hk027n06v"; -"makecmds.source-2016"="j4g888p0hniq7p6b30q1fb4qfw3qp7i6"; +"makecirc-2017"="m4xbci3109krv6agm0nhvry9kd7wjs43"; +"makecirc.doc-2017"="w7jd6g686b8iqqbmyipml4c1rjry4bax"; "makedtx-0.94b"="dwmvyknjsjdn1rpcpqjppdz4zyy8njwv"; "makedtx.doc-0.94b"="apq3lgzk13kb85lj83awvcyhb85s6bs1"; "makedtx.source-0.94b"="rhrscyrsh7lli42k79d70bsvrkmcv2i8"; -"makeglos-2016"="6bgdfjbhxvfj2my954iinjp1xcxnyq4s"; -"makeglos.doc-2016"="g4w2560v1pxm38dj5dsb3irgijzh221g"; -"mandi-2.5.1"="w1yqdi2as62nn1fypkya2ahhb9l64d38"; -"mandi.doc-2.5.1"="w9qicfpcyaicpj7q75dwp0sm3x27snah"; -"mandi.source-2.5.1"="70pshn283sj2vr897q5rfzscppv54mhp"; -"manfnt-2016"="1nl2yh0i4qbxg0js1q4h566vbhh9szlr"; -"manfnt.source-2016"="3vzdqcfcmcmi75xgy4787fqacrsa12ay"; +"makeglos-2017"="6bgdfjbhxvfj2my954iinjp1xcxnyq4s"; +"makeglos.doc-2017"="g4w2560v1pxm38dj5dsb3irgijzh221g"; +"mandi-2.6.1"="z9hnxqk2dmw7sz6shzpbg0924vnbbki5"; +"mandi.doc-2.6.1"="v5d3s1wn545c2r41m7xsv0wmm6kgn8xj"; +"mandi.source-2.6.1"="ayclqx26nvd2dsn4s6lm66rjkqcivyhv"; +"manfnt-2017"="1nl2yh0i4qbxg0js1q4h566vbhh9szlr"; +"manfnt.source-2017"="3vzdqcfcmcmi75xgy4787fqacrsa12ay"; "manuscript-1.7"="h6a06qa8wdg942c9l85xk2drlc07k340"; "manuscript.doc-1.7"="9lfydjsxnci0b6nfdmayjigm8gfvbiaf"; "manuscript.source-1.7"="7s5sj7f198rxkggz1j96kk6fgr5s88ci"; +"marginfit-1.0"="xlrx1rqs7h1f8zd81f2anaxbbq6n9xjj"; +"marginfit.doc-1.0"="4xfmgy7g5dmaibvpa7arxmn2g6rckqx2"; +"marginfit.source-1.0"="b9ycabhzwzzapwjbq3f5idnh8fafyp9q"; "marginfix-1.1"="00sy5lr6gy3r8nvfqk6pry6rcipvkvpk"; "marginfix.doc-1.1"="hfaiqs9h55v4c896b6grnhj4xaqsawhz"; "marginfix.source-1.1"="18sbg2vngagcka14wdl3xsx9iwy08q2a"; -"marginnote-1.2"="m84bs36g3sg29ipy2hzrsd8vwc0fvfdg"; -"marginnote.doc-1.2"="0q6661pn5mzpwfqpsgxppbyvh7iafj3z"; -"marginnote.source-1.2"="ldjfpp720mcwlp384fybl6zwhwnjic29"; -"markdown-1.0.1"="p8z21cw0w9k1bkgp5dhb2j0mq1zis3b1"; -"markdown.doc-1.0.1"="5iqk2h0i4z2px1jv6nvdpk3n6kfcysng"; -"markdown.source-1.0.1"="3r8fikzzdmq1pl2z1mmdv687mqqf87pw"; -"mathalfa-1.08"="744z9qw8p82cjjsay8nr488fzan7ig8l"; -"mathalfa.doc-1.08"="xam9in9jqw9nqyp1dm4km1g1jfgbhf3d"; -"mathastext-1.3p"="k3209kii5srgvc5ysry46c82a45anygk"; -"mathastext.doc-1.3p"="lbkr3jd1kdb7rzcy12vpigkizyqmx1v4"; -"mathastext.source-1.3p"="j255y5qraqzz8bhzyxp7vw1vijz0f26c"; +"marginnote-1.2b"="r8d7dck9z0p84r10axspa1gyd6h2s568"; +"marginnote.doc-1.2b"="z4n6kq0laa78dmcran994f27ivr3rz37"; +"marginnote.source-1.2b"="jkygfzpscl24i584xhmvy1ywz38akql1"; +"markdown-2.5.4"="i0l8df39y3skij5cqfn3ci38w6hssvj8"; +"markdown.doc-2.5.4"="zkvj562cqw7rxmigkdkm8x4ah68sfjsx"; +"markdown.source-2.5.4"="a0g72s8h6p2mn3ssrcwy5xd5fd0rxgw7"; +"mathalfa-1.09"="gavlp7cyq78z61yk26bfjvnchsxvc4qz"; +"mathalfa.doc-1.09"="zj8fb67s0984arvnb294pqbhslr3kba7"; +"mathastext-1.3r"="z9wqlvgdhn85y452410lcn49sd4glrj8"; +"mathastext.doc-1.3r"="9yrm0hqhzmn1n53ixv4d35pr7dnp35hw"; +"mathastext.source-1.3r"="pah24ri9ygxvpajmbzmy60f8p0f36734"; "mathexam-1.00"="4rhl11na8mqzbl9l7wjk53fdhdpzbgih"; "mathexam.doc-1.00"="7bhcdnalaakml3rx50sgb0799b9883cp"; "mathexam.source-1.00"="mcs3csvr3ayvjijs6sh67mk0mrp5zawc"; -"maybemath-2016"="b7n8bgmz0vizghas19svaf1asi7633ck"; -"maybemath.doc-2016"="7scmh5q3xpjd6gdlq07kf59sn5bbflxc"; +"maybemath-2017"="b7n8bgmz0vizghas19svaf1asi7633ck"; +"maybemath.doc-2017"="7scmh5q3xpjd6gdlq07kf59sn5bbflxc"; "mbenotes-2"="7nxdmwq8pxxkxh07x26nhxr4fy1mymif"; "mbenotes.doc-2"="bswvjyq6cy2vbfc1x2cmjcnr2jlcv90g"; "mcaption-3.0"="bxgcc1lkr9p5ghd80mh2ixnc1g4g49f5"; "mcaption.doc-3.0"="mzbfyspjjjq3mhm2m06jmf9fic78i6bm"; "mcaption.source-3.0"="ix6v7ldrgqw2kyb8mxppiw47p1fsxj29"; -"mceinleger-2016"="n5kag86y4a1q3m4d2kgc1k4xbbchv1hk"; -"mceinleger.doc-2016"="g3ldzbnb7jl4ii7pvc518va6x8ahlrh1"; +"mceinleger-2017"="n5kag86y4a1q3m4d2kgc1k4xbbchv1hk"; +"mceinleger.doc-2017"="g3ldzbnb7jl4ii7pvc518va6x8ahlrh1"; +"mcexam-0.3"="dh2rbahqmyay6sbzpsyxy34q8nbpiz25"; +"mcexam.doc-0.3"="bmlagqh7fvxgdvf87kibna8xwp7fn9by"; "mcite-1.6"="q16a807pfbxbcqyw1s5f3vrj0yym2z86"; "mcite.doc-1.6"="6ak2czh685l6gxam0p0vdl8blq8z260r"; "mcite.source-1.6"="pjqx07klaqvpxxf8xqqgad92h8rgvkb5"; @@ -4510,11 +4748,11 @@ "mdframed-1.9b"="kc60c77k0qwqhdmpbk3r777k4q857jx1"; "mdframed.doc-1.9b"="pr5d7iqc4akn0arxjl7ynqsl6dlh64sy"; "mdframed.source-1.9b"="xnqih0l0zng5bmrjfrprr43k6l645kvi"; -"media9-0.69"="zmj4p0c1gazhq1xa7w04wk6ll8sb0ql8"; -"media9.doc-0.69"="p4x1a23rgznzif5ja55w0s5qaj9yaccg"; -"media9.source-0.69"="l0yj9nx15ql7mwg6p9s6jmx6qigs8axn"; -"medstarbeamer-2016"="vplzcqcrgag8dvin3yj0prlcm9gsb2yh"; -"medstarbeamer.doc-2016"="7i4skhq9pj4k3aswbzbpjqqgdj0s69gd"; +"media9-0.86"="r9jkjpcl2i1rpy6ycb6nasg5y3vm1iky"; +"media9.doc-0.86"="0c5ddqpa6xgdhcnpbsx2m8m7n93xs1gv"; +"media9.source-0.86"="n51dsxx8ql54dzgkwj56xgcfx504vwx3"; +"medstarbeamer-2017"="vplzcqcrgag8dvin3yj0prlcm9gsb2yh"; +"medstarbeamer.doc-2017"="7i4skhq9pj4k3aswbzbpjqqgdj0s69gd"; "meetingmins-1.6"="d5x8znpkqcghi9lv4gby2l97smw6kddb"; "meetingmins.doc-1.6"="mkxz4zi4a7rgq8sgwaqsc35n888gzs4g"; "meetingmins.source-1.6"="5xridwnlmxkws7h293a1pg373mcb3gwv"; @@ -4523,21 +4761,23 @@ "memory-1.2"="xbyqh88hgszrma77r32dzly4k928vwpd"; "memory.doc-1.2"="97n5y37w8k1b1dghkjmdny2lgc2b0z4b"; "memory.source-1.2"="xj785y1h8zncgikinri52ri4sp7av9cr"; +"mensa-tex-2017"="gmwrpnrip46f283zbz9f8sarzwg375hm"; +"mensa-tex.doc-2017"="f2f4p7ak03srwli0q0hkcsj2kkban2a8"; "menu-0.994"="601vvx1mrqc5l4ig4j65bq88yjzcc08g"; "menu.doc-0.994"="s9wj7viflx78y49dbs3scapk5vslf5xg"; "menu.source-0.994"="n1pq98wjrfr476cwy442c8l99n1k9f6s"; -"menukeys-1.4"="yn67zcp4xc52fd1zbj3fk3sf3pvdh8xk"; -"menukeys.doc-1.4"="i2gb8mix2bjgdarsaj286k8mhlrmy2sm"; -"menukeys.source-1.4"="gd8bdhzjj7bl7am1afcvd7b31cwmxply"; +"menukeys-1.5"="4paqhdrsa9n9vnlcih3lwbs7ig1cvpxb"; +"menukeys.doc-1.5"="vqip96fgdq26ypfs2xpp947qmjybxpxm"; +"menukeys.source-1.5"="g0i476r5ajhpj65sq4m3h92c236plbkw"; "method-2.0b"="6lpy1619i1m75cvsi9c2vzjxbcs9ia5a"; "method.doc-2.0b"="c54snw0hl1agj2fs4r3jqnk9gblxpvhp"; "method.source-2.0b"="y3rnwdcn8d1zs9s74nsza1zscmfbskq5"; "metre-1.0"="mf4m9vxkjfkwhv1fqjw051kfb5rz44ml"; "metre.doc-1.0"="bd500sp1di947i1rll56h80k0pm6312x"; "metre.source-1.0"="44qm1832z64vxp1kmj3fg5zyv1jvjpb7"; -"mfirstuc-2.02"="hx3fqpvs8xs2lnydy1sf9ymh2s24m117"; -"mfirstuc.doc-2.02"="5mnpdfm6aiaqn0xsc4nhqnvl3ggbslby"; -"mfirstuc.source-2.02"="nmjacx1jdmvjd5kx7c8y8wjvgxzmkygs"; +"mfirstuc-2.04"="klcinqy9923z00iwd0ral3ra5xmjkwip"; +"mfirstuc.doc-2.04"="cs96z0na4pivz87g7ypmm8wxbmifhfsw"; +"mfirstuc.source-2.04"="l5n6bj9sq1djacdfpvsnqm82i57g3135"; "mftinc-1.0a"="ckn9lv76yrkzpbi965rl9zvgcqg8alzg"; "mftinc.doc-1.0a"="2qb409wrm8pf6nj53fbf16pwjrp7h3n2"; "mftinc.source-1.0a"="s4kaysarmk404dx4pf1xlanckix06jgg"; @@ -4546,6 +4786,9 @@ "minibox-0.2a"="4fhpgzi7wc6jh7n8rf2n9s0cpvljwwc9"; "minibox.doc-0.2a"="sviimirqdwfgk14my3w0zr2qycccckf4"; "minibox.source-0.2a"="q704gpig53qmnbsvy9kcwl6nm161nak7"; +"minidocument-1.0"="q06hnvnkj19habs189lgsx35srq63g3b"; +"minidocument.doc-1.0"="lccwy6b0j7z28w8zp9gsvassa240xc1p"; +"minidocument.source-1.0"="ksir0ia0gyc7qzr4pfjxzx2hcnzpc0b0"; "minifp-0.96"="28njw4zhz6fagd3wwk7ybah5c6nx4lrc"; "minifp.doc-0.96"="xci52b9lqvfx748z6y3a5f6spwqnc9qz"; "minifp.source-0.96"="y3lmhlpkdcrix3kk3kv7rpqmnb9hlz56"; @@ -4556,14 +4799,14 @@ "minitoc.doc-61"="72fq9vz023k96h5y6zza4b8g3hn24ldv"; "minorrevision-1.1"="svc8nrmpcahd95mzyggc6vmpfhmd9917"; "minorrevision.doc-1.1"="x12xlc4ja8ksnd9rpnic0c0hymj1sdwn"; -"minted-2.2.1"="lpvskaqcvylmg38i3r045dzqvwv5vd0v"; -"minted.doc-2.2.1"="z1f49s2aqnq1l62h84vsmzzf442fzck2"; -"minted.source-2.2.1"="x2v1ws1b73hcs5yabqmgjd6xdyzjid9s"; -"minutes-1.8d"="90bxwibh5hi4hnj1p44m7xkfcq1rlb1x"; -"minutes.doc-1.8d"="rqkkjsv6sk7ap3fchshbw9f61j8m13h6"; -"minutes.source-1.8d"="rnzlqp3j3fxxxz8jcx10438dckxpvapp"; -"mla-paper-2016"="7rh7dh7mzybc5wzzbibh1lc10kyc99p8"; -"mla-paper.doc-2016"="3csgrsb6bh3sbqdzfx6y84i7ph8lwnhc"; +"minted-2.5"="4d3kkhjjlhqb1nmp43wwsrw3z0mv94xy"; +"minted.doc-2.5"="pf8yy80fj73nibdnljhlisc18cs1x1cw"; +"minted.source-2.5"="wl128ack6c90ij18fmvf27hnxm6y9gf6"; +"minutes-1.8f"="c864pfgi1a853n93jddnndgsp325sr1i"; +"minutes.doc-1.8f"="z3z8rxzrkwz7k6756b654v6wclx4f6rb"; +"minutes.source-1.8f"="w4skq6nprvgxhvqrf4xa2afccr1hsz6g"; +"mla-paper-2017"="7rh7dh7mzybc5wzzbibh1lc10kyc99p8"; +"mla-paper.doc-2017"="3csgrsb6bh3sbqdzfx6y84i7ph8lwnhc"; "mlist-0.6a"="5yh180f4d4dsrfzin6cjmshad8w7fi6g"; "mlist.doc-0.6a"="wqscsdlyx7zqyq1g5hcfcp0cs5w5dxxc"; "mlist.source-0.6a"="hlnmvms7n3csa2v0ixwz82wp2dlc7jy1"; @@ -4583,6 +4826,8 @@ "modroman-1"="yvhwr314ymch4fhvr9zq8l1rsp3jfinn"; "modroman.doc-1"="2is4g9r40gr23cy469q2vk2kjj2jbkm6"; "modroman.source-1"="1kddwifbglz7hlhxndcrr28dfgd0bdy5"; +"modular-2017"="gp555cnfp2izjp81bg1l1aij466vcfxr"; +"modular.doc-2017"="5yxpl169qqnh3p4zhwx6glnagv6a210y"; "monofill-0.2"="jnv36mj3w2vihnq2f17pbm1yzrz2176w"; "monofill.doc-0.2"="gr0mhc8f2w3dnd9r6flqvq5yyb388h4p"; "monofill.source-0.2"="gmdpp4qn9x5bxk24afqs4xg7vzvaqkp4"; @@ -4603,35 +4848,38 @@ "moreverb-2.3a"="w1rxv8g11dkpi1zyfq7xblgjjwi2dkw6"; "moreverb.doc-2.3a"="70m0wiik9lqc2r4pi4nrdmm0rsx9d8cp"; "moreverb.source-2.3a"="zxqcx8a12s33gklfq4zv3mci70nimpir"; -"morewrites-0.2e"="i49b0jja8hpj21bh9pra7b6xjppm3nbl"; -"morewrites.doc-0.2e"="df80xh903dnsmmyi69l6cdays4rnj4ls"; -"morewrites.source-0.2e"="05is6dgsqcr1h6jx6fajabq781las4aa"; -"movie15-2016"="c2vppl6yv82s4n3kqjfp75qby2rwfxkv"; -"movie15.doc-2016"="1kn8iwx5x1gc978p0gjj2rwy4ablkdvg"; +"morewrites-2017"="syd5dn9pl0r77n0f60s8zga15p6s6dkw"; +"morewrites.doc-2017"="lv965nz8shz7lwmgcdfdgbb8v1lq42i9"; +"morewrites.source-2017"="y9y5isj1m8x3q5ljd4njbgav3lcy2mh3"; +"movie15-2017"="c2vppl6yv82s4n3kqjfp75qby2rwfxkv"; +"movie15.doc-2017"="1kn8iwx5x1gc978p0gjj2rwy4ablkdvg"; "mparhack-1.4"="5sq75r9p6laimfxiz9kl1j5cgplkzin7"; "mparhack.doc-1.4"="6i835nghib094n03i095dc0p7zq30znm"; "mparhack.source-1.4"="07xwzd4pvppkb7ywwzdrip3yk41d5wl0"; +"mpostinl-1.12"="4j85f7xd35ylinp50p1ghlhhs0xlwskj"; +"mpostinl.doc-1.12"="32xaghhcvg0mdr2lzghjmscnfxgxbgl6"; +"mpostinl.source-1.12"="xdbrhh33r1f56583lj1vb6cxprzbxxs4"; "msc-1.16"="fa7ja4f7a2qpc08q656711qdxlgsjqdq"; "msc.doc-1.16"="b6mcb2izb71p267zcfhj3l0x7rc2sihf"; "msg-0.40"="mi7ihvy6gmkfdi2m57125cq9c446q5d7"; "msg.doc-0.40"="q4fq11pxgvj9d37jpf5j1kigr740zmlp"; "msg.source-0.40"="bnclkshd9vm1ma3kwwskk5qq7s0n7lz8"; -"mslapa-2016"="xmci0mddxivrp23hxp50wnlyvl9kir04"; -"mslapa.doc-2016"="dpvra8ngic2ydqxs8y59zd0jffy2q4ai"; +"mslapa-2017"="xmci0mddxivrp23hxp50wnlyvl9kir04"; +"mslapa.doc-2017"="dpvra8ngic2ydqxs8y59zd0jffy2q4ai"; "mtgreek-1.1+"="afbh9ydcsnf1k0c714ypmqrf0qjcas6a"; "mtgreek.doc-1.1+"="pq9303jyrj7nq8rwgi5d7njbc2x3jn58"; "mtgreek.source-1.1+"="6whrwjvzz5jrhirhgr7kymc3jczn2zmf"; -"multenum-2016"="f1d7s8hafvsk4dic8ss1cqdjqvn8dlih"; -"multenum.doc-2016"="w65nsjanh13fxbkwhiinwzyhq0ra2m54"; +"multenum-2017"="f1d7s8hafvsk4dic8ss1cqdjqvn8dlih"; +"multenum.doc-2017"="w65nsjanh13fxbkwhiinwzyhq0ra2m54"; "multiaudience-1.03"="dcqxnkwsqd6vyk9wnwmac5b832dzb4ns"; "multiaudience.doc-1.03"="8z6mbzi6yyv5cmp6pn2fsg5vlagyrlwn"; "multiaudience.source-1.03"="5v4r06mydnjvq7hksjgdqd17m47b0g1z"; "multibbl-1.1"="7nvyshlsgfcmlxc0gdn8b353sc6g3qw2"; "multibbl.doc-1.1"="isxh2fz1yaz86acvpcv8k1hmwnazck6m"; "multibbl.source-1.1"="z6wbxacy1rzz1l7wx6ppi8dsbipvc5s0"; -"multicap-2016"="9ja1cljsr31lw6rjvph8gi154z8bpl8j"; -"multicap.doc-2016"="z17yw0id2vdhckvirlrq3npkdpxk5hrf"; -"multicap.source-2016"="yv4rw5hjfj5fj0xyh2p3glmz0887x105"; +"multicap-2017"="9ja1cljsr31lw6rjvph8gi154z8bpl8j"; +"multicap.doc-2017"="z17yw0id2vdhckvirlrq3npkdpxk5hrf"; +"multicap.source-2017"="yv4rw5hjfj5fj0xyh2p3glmz0887x105"; "multidef-1.10"="5wsklk9lvznmwisl7jyhiai2zz8iizhb"; "multidef.doc-1.10"="sq7a72nhiyd5384dx9y6k1c72gl8ia2n"; "multidef.source-1.10"="hx6fbjirp5gmpn9bglp0hcmmhdjn1rsb"; @@ -4641,8 +4889,12 @@ "multiexpand-1.4"="lzkfpp7kk7hnhpkxx9wfvpmkq6jqd7i0"; "multiexpand.doc-1.4"="arl7nqy5ng6jdhjswwahjfsdzk9j7467"; "multiexpand.source-1.4"="wrp3xlwpv3fxl24fkd5zycvpjn6nf0x0"; -"multirow-1.6"="yawlvmvk70adgz7s7m32h8aprfgp81vi"; -"multirow.doc-1.6"="44hqljzw34vkgghrghii229qk0nfp7s0"; +"multilang-0.9"="2zi01a8mbsngarlk4ry5dflyzwz66wkr"; +"multilang.doc-0.9"="8vmjg13chfm72c6314majamh66qccpiq"; +"multilang.source-0.9"="xis5mdr5i3k25sgng4kkswls32w4vdbp"; +"multirow-2.2"="vm7a3136bbpmipq7mlzlh0wyxn6v9yq1"; +"multirow.doc-2.2"="8wyfrf16ygxv2cy76ll1v82bhrbwn899"; +"multirow.source-2.2"="dkjn4myc4pf552hds2g4b86jd5v0sixh"; "mversion-1.0.1"="7vpmmb88cjk92m2a2hz10cijkxf44bmy"; "mversion.doc-1.0.1"="a2fx7phvl0i1nyhb5h0w6ld1n9kvcgcv"; "mversion.source-1.0.1"="zhbd3j6kxsdyznx9haqqh4vk7b8nrl09"; @@ -4658,18 +4910,18 @@ "nag-0.7"="zvdfnz7z0rgwmf5vpj3dg7l0p8xwaxl0"; "nag.doc-0.7"="r9gmc719q62qdim96mzw2sm98vwxsdip"; "nag.source-0.7"="rybplddhj3wzplms9knly5b4fpkny05d"; -"nameauth-2.5"="riacyimp8f602nljh83pynslb0rlz7l7"; -"nameauth.doc-2.5"="6r8cwamcmjin0wayyirzj38p18i4d13s"; -"nameauth.source-2.5"="g5hvra9spaj7mxlzn25si7402cwxvia8"; -"namespc-2016"="6f7x6ldx008l8w5ziahgwl42hb5bws4k"; -"namespc.doc-2016"="6aqpn007i8s488j4qi8xhbx9zsyvafbs"; -"namespc.source-2016"="s5ws2rny22j23bqy5cn2mz23qn91ssfj"; +"nameauth-3.2"="8mchkgj0v2f3qcvrya80vbx2c55gwjcq"; +"nameauth.doc-3.2"="hq4wywajcb2h28zy4alj8di8ap12c3r0"; +"nameauth.source-3.2"="g1p0ddh1x8g4w2qwc5kvj3p92g8s3js6"; +"namespc-2017"="6f7x6ldx008l8w5ziahgwl42hb5bws4k"; +"namespc.doc-2017"="6aqpn007i8s488j4qi8xhbx9zsyvafbs"; +"namespc.source-2017"="s5ws2rny22j23bqy5cn2mz23qn91ssfj"; "ncclatex-1.5"="vyc62gppwksnghphh3fch8ac3wji38qv"; "ncclatex.doc-1.5"="i5klzg6hjqk8gq73g7ck9za6arh58rwx"; "needspace-1.3d"="n3bhzw4qj1q1pml8yw40q3p8nzncygia"; "needspace.doc-1.3d"="p8ahld3my116ynhgip3xfgxd58n4w36v"; "needspace.source-1.3d"="2i7mdcxrdh8p54l31qqcfsdbrwjfiw87"; -"nestquot-2016"="f9rwiwxi2xksi75wfwmsq9gmrj78scg4"; +"nestquot-2017"="f9rwiwxi2xksi75wfwmsq9gmrj78scg4"; "newcommand.doc-2.0"="cdy7kzxpazx56gc6a0s62nx1bq3x1kz3"; "newenviron-1.0"="s27wb3f7q3qk5lv6ficrjs6kkxqal7hi"; "newenviron.doc-1.0"="j20cd7xar8jxbx17dv9sqpsrck6cydd9"; @@ -4692,8 +4944,8 @@ "newverbs.doc-1.3a"="884wh81zgssy9r9f2h70kank1kdv82mx"; "newverbs.source-1.3a"="d2fvf7fsx5xj7rfmi8wl0g902drq59gd"; "nextpage-1.1a"="b7b41bpr8zk2z6m5il51q9vxb3c8h67j"; -"nfssext-cfr-2016"="6d5df6w6qfyscs0j3900l2sfvdi75vyh"; -"nfssext-cfr.doc-2016"="4ni4zs22x94rcz5x7080nm3vspk5bgwr"; +"nfssext-cfr-2017"="isp9rw94ck4a9ckl4b5hd8ma3cmlkdwd"; +"nfssext-cfr.doc-2017"="si6j8b4314s0gbnjxwymqbzcajclqn2w"; "nicefilelist-0.7a"="crqgn906x51nq1d3z0s15f9kl29lbg3b"; "nicefilelist.doc-0.7a"="a77wbb5ajkj4ab3dy1zzs3hchac77cwh"; "nicefilelist.source-0.7a"="ng7drfgz7w69za7hmfzm4cv0m2awdx7l"; @@ -4703,8 +4955,8 @@ "nicetext-r0.67"="i3lvy4awa0igc272xv8mn7n4dfaxm9iq"; "nicetext.doc-r0.67"="iacnv3pa0a676wy34s3s261ypjpcl9gd"; "nicetext.source-r0.67"="6d0mm3ghwivk44g63875mpq6pafbll8b"; -"nlctdoc-1.04"="59mlxqz2iiyjz4s92g556xdxvgi2xp3y"; -"nlctdoc.doc-1.04"="149d267jg9xzhicdn6jm94hi2vn4km27"; +"nlctdoc-1.06"="2k3r9a400asfix3n8j3f7lgghr57imrb"; +"nlctdoc.doc-1.06"="3axalhgmiz8f9rikjwbkhckw0hshnpyk"; "noconflict-1.0"="df9gs1xx7gymaadn2ji4dzir36z6r897"; "noconflict.doc-1.0"="irvdqh1iyghgs73l3lv2jnrs2gj9jxcd"; "noindentafter-0.2.2"="w1kg4gv0dpfak1s7xshs04ariccpnx0q"; @@ -4726,16 +4978,21 @@ "nonumonpart-1"="a121f2i1n005xp51qn642vx30ij74zgs"; "nonumonpart.doc-1"="wcbvd9c2cv5ydbma4xxb6g2b2bihi0lh"; "nonumonpart.source-1"="j2jy48jw8hgcs830h187s9rg85kd3rfa"; -"nopageno-2016"="59l05x89jv7q4mm7k73i06rmv467iimz"; -"nopageno.doc-2016"="bn5vq6kzp69p03pfjx9s34ckf4h3q6iq"; +"nopageno-2017"="59l05x89jv7q4mm7k73i06rmv467iimz"; +"nopageno.doc-2017"="bn5vq6kzp69p03pfjx9s34ckf4h3q6iq"; "normalcolor-r11"="jfpqlz85fphm063mb51q9q2s61fcbnmh"; "normalcolor.doc-r11"="vz9557sxw9c6l8m66aaagcv39x1vkfzz"; "normalcolor.source-r11"="vs4y1p0zarr6nppqadcdcp03lc6nd2zd"; "notes-1.0.1"="w3rp5aas5n6sks7d5j7b27s11zi4lx3v"; "notes.doc-1.0.1"="hn20w72lj73didm46kkay056msa4cr8h"; "notes.source-1.0.1"="23qrfsbbmyds189kcnq09jbmd23mi50f"; -"notoccite-2016"="ifpkassfd9j5926gsnq00954clc52sbv"; -"notoccite.doc-2016"="5ggqh1mvc03xgyipc6c49ssmlaywh83f"; +"notespages-0.8.1"="3cx726w1pbmdiammpbzp0rmcahhza7p8"; +"notespages.doc-0.8.1"="rql7rmn1c85r1rb2jpmwd2h29m7b4gmx"; +"notespages.source-0.8.1"="sskq21wj4vhqyq8xzhrbsh7p8c701r7x"; +"notestex-1.0"="innwzn87vplj094lxw9w48ck6s5hmb5v"; +"notestex.doc-1.0"="p4lyxlar4125y9x3pb6sd5ysdn7w3vqr"; +"notoccite-2017"="ifpkassfd9j5926gsnq00954clc52sbv"; +"notoccite.doc-2017"="5ggqh1mvc03xgyipc6c49ssmlaywh83f"; "nowidow-1.0"="hf3wjpkn1j2yksdl8mryssv6cxqjn3si"; "nowidow.doc-1.0"="w1an9iayppa59h2iprjr515w8g72qkg5"; "nowidow.source-1.0"="b6i3ypchipa228x0s6i66vrvf7zc3hgc"; @@ -4746,49 +5003,54 @@ "ntheorem.source-1.33"="fc0wyfgjnckzqrd7lf3a4n6yvbhwaal8"; "numberedblock-1.10"="x1wlbk0d8xbl0b3mx0bxgymc9jd3vv5y"; "numberedblock.doc-1.10"="866z5if0xryr7mmi70any7p9l93f0d38"; -"numname-2016"="7gl7dp9c1wj7phv8ys39kxnarifbqfd2"; -"numname.doc-2016"="pfp7zzapdvlfbs9jd5vc2x977nxs3yfw"; +"numname-2017"="7gl7dp9c1wj7phv8ys39kxnarifbqfd2"; +"numname.doc-2017"="pfp7zzapdvlfbs9jd5vc2x977nxs3yfw"; "numprint-1.39"="7fd6ja6vw3c7yg824y30xrqrmrk3qkwx"; "numprint.doc-1.39"="bbfg2cyh8cykgl3zk9c53wk3q3vbb8pn"; "numprint.source-1.39"="cr7xjw77r8h4bcjihxc68iraxd760gh2"; +"numspell-1.2"="xv0c8dxm8yncknrmarqy0nhjcqdaq8fv"; +"numspell.doc-1.2"="b6sfqk9wnbrg0l3p0hwff0nkskw13rcl"; "ocg-p-0.4"="lxy3nprj8j37b2c7aylxzgm17221wscx"; "ocg-p.doc-0.4"="qg16xjfjp36s3jxm1m75ln2nrl1rlama"; "ocgx-0.5"="28p11v602hf9w9q1vynbf8fyhivbawl5"; "ocgx.doc-0.5"="6vx8iiz0zfipwj45xrk1gv9cvifv4y1r"; "ocgx.source-0.5"="5bm25s1rgsky2qc14nrgg6v3n0ywwcb6"; -"ocgx2-0.17"="sswq6h6ql12xr12l6zpxzka65dwqypfl"; -"ocgx2.doc-0.17"="hh4l7pvq1cz9cqi4yarwzzcxaj9l347p"; -"ocr-latex-2016"="7mi6izsnwk6dksgmscyn45w72n1bgk2h"; -"ocr-latex.doc-2016"="9cz06542a64k4ns92qgkx1hzm5sd275w"; +"ocgx2-0.32"="pcqh887g5sy739gj6avbbwjpdah4rwdd"; +"ocgx2.doc-0.32"="74a11fhyck8r2g11qh9iin2iiqhnmdbx"; +"ocr-latex-2017"="7mi6izsnwk6dksgmscyn45w72n1bgk2h"; +"ocr-latex.doc-2017"="9cz06542a64k4ns92qgkx1hzm5sd275w"; "octavo-1.2"="fpv1fcrym9gplxjs0zsrrv4iziizqzxy"; "octavo.doc-1.2"="wcd4cj4ihgmm1d0i36l66bf8dpw5cm58"; "octavo.source-1.2"="30dsp7266fzc2l2kn98pqwwv6sdb75hr"; "oldstyle-0.2"="3910vncyk04awikr4g0afgyfqa6dqxa3"; "oldstyle.doc-0.2"="picdnpvv6c53j0mg8gn3l89c4ydph9s8"; "oldstyle.source-0.2"="dwsgqd631bncikps4m9fvr7l7y428w5b"; -"onlyamsmath-0.10"="ydyfk2nr3qb06mx0f3pzg7y6j3a05r1w"; -"onlyamsmath.doc-0.10"="4nh71jjl96lwsgija5hhik4hs2aqcw48"; -"onlyamsmath.source-0.10"="064glmd39fyawby4r53rnjj8lbfw9h7k"; +"onlyamsmath-0.20"="z12vjq71xjihl30fwfhqqm4wimb1dkwr"; +"onlyamsmath.doc-0.20"="h2whk4751icqb332z3h346vcjqrbgjiq"; +"onlyamsmath.source-0.20"="w3yqdsdbhx5m6briw33a0mh8jhyx25kr"; "opcit-1.1"="59ykfp525lby8p0y5y1b5wk8ab9dvznz"; "opcit.doc-1.1"="h74vnsw6lf4iaca46r07x0i05rhrq4m8"; "opcit.source-1.1"="xsw3nb19li1hxnfpr4xhkb2s8qg3ap1w"; -"optidef-1.0"="b4prxv5l2jfb4a2lnp4h8pjxnhq1r6xz"; -"optidef.doc-1.0"="qzy4bp90vhzvwm4wcn6wv2czvzs25lw1"; +"optidef-2.5"="6qgvz673i7fb8dlm2cb4hmwv873n1qm5"; +"optidef.doc-2.5"="v4yw67ilsr3bws90x69gzhcib60wildz"; "optional-2.2b"="akjbm6gzli451ll82zbrwhpcajdn1b15"; "optional.doc-2.2b"="jg81vzayz3a2pvlxhvyrx8j3w1sw65xg"; "options-1.0"="5xy1cf8yq8awm7bspjj23nywhbs7ww67"; "options.doc-1.0"="gy13y93wl0im19p5jc011fjnr49afgsp"; -"outline-2016"="m192v07lmcfzq3zbv87cbckz8jwanbha"; -"outline.doc-2016"="wcm9psb6ap1a5xy16fp91bwpxkhqxmh1"; +"outline-2017"="m192v07lmcfzq3zbv87cbckz8jwanbha"; +"outline.doc-2017"="wcm9psb6ap1a5xy16fp91bwpxkhqxmh1"; "outliner-0.94"="24bsa0d5zxz2i50i4bz0b3zsc5v7hp8d"; "outliner.doc-0.94"="qgvvmjxq75fq907z1ya4vkir6iq7sbmq"; "outlines-1.1"="0yh26641p29qj71w6zsx1z6hsr663q1k"; "outlines.doc-1.1"="zg8b8617kq2vbf6inn2ms6x4a27j8yf5"; -"overpic-0.53"="pjgza37bcyj3fvka800jmikglm7i5dkd"; -"overpic.doc-0.53"="yg8rhb1nk68y31rjg80mf58l1w6g4pm4"; -"pagecolor-1.0h"="ba7q8fk5218ysfhqcdjzb2gknxv78qgd"; -"pagecolor.doc-1.0h"="x5cja14lpk8wx1772l7v7dl315zks6xl"; -"pagecolor.source-1.0h"="27dpjid0dqhbcwhqjfskql55k9gz0ii7"; +"overlays-2.7"="c20i0vbinrixlzhjj8aq01vmih5g978j"; +"overlays.doc-2.7"="938796xcyh4yd1nvfd3d341nx4l2ik0p"; +"overpic-1.0"="gpa3ldn6rh31llvwzj1xg3gfzm18xwzk"; +"overpic.doc-1.0"="z00m8pacqjjx7kkfharhxs20k5c5czcy"; +"overpic.source-1.0"="55c5329ladpygp3748lh5vw9h91v3k3r"; +"pagecolor-1.0i"="sllb6vybrngchz5k569b7pl3w13h6qfn"; +"pagecolor.doc-1.0i"="gm3l4g745mp6910pfv5201k63v44yr83"; +"pagecolor.source-1.0i"="ycqzawzck2jisybmxs7yfrr8v2h3vhy0"; "pagecont-1.0"="8n68c03h2ckbvv11jj3cdv771ih60s4c"; "pagecont.doc-1.0"="xkbrxr2gk65wgg5zf4cklsyzlgb03fz3"; "pagecont.source-1.0"="74vmzb28in78lnkb7gjb8pg626vff0za"; @@ -4803,9 +5065,9 @@ "paper-1.0l"="wxk3akaqvdbc0q5whlwd2jpw0nvccwmn"; "paper.doc-1.0l"="pppdcafd1gw0y9d5j91b2smzdssvvwyi"; "paper.source-1.0l"="g5np7r4ncm9pyzpqm3f0h60cihmfbfsf"; -"papercdcase-2016"="dncf3im483zf3ix2ycp8d07bdpdqnfqd"; -"papercdcase.doc-2016"="cv4gkmg3rljv2j0pb0xjw6xzbqdii5cj"; -"papercdcase.source-2016"="qlbxx0dxb9vj7939sr3pl8cam98bc619"; +"papercdcase-2017"="dncf3im483zf3ix2ycp8d07bdpdqnfqd"; +"papercdcase.doc-2017"="cv4gkmg3rljv2j0pb0xjw6xzbqdii5cj"; +"papercdcase.source-2017"="qlbxx0dxb9vj7939sr3pl8cam98bc619"; "papermas-1.0h"="xrl9ldvps0ffrygpgj501bvi4yb6cz2w"; "papermas.doc-1.0h"="1p87yvwnn29mi2n2q4z1jsxfnq8gd73p"; "papermas.source-1.0h"="6i3yx6ygswgf7yp1c0grv7gr6qc77r1l"; @@ -4815,23 +5077,23 @@ "paracol-1.32"="b06zg992m7hnsnws885cai5ls7kkln0l"; "paracol.doc-1.32"="wyj8zk1gnj2hzng6ghzcyynkxa8va5gg"; "paracol.source-1.32"="vdmvyxhwlzhv6a3d5gwlhq8ig15gwi79"; -"parades-2016"="bkr92ffb7s3zzl845jjkj1777517dwk1"; -"parades.doc-2016"="sfmlhp1idjhvy6cldh2v2k5bl5lp7s58"; +"parades-2017"="bkr92ffb7s3zzl845jjkj1777517dwk1"; +"parades.doc-2017"="sfmlhp1idjhvy6cldh2v2k5bl5lp7s58"; "paresse-4.1"="mjz05a7z528h2j2svmk4d8ycc6zfzbh0"; "paresse.doc-4.1"="yahsg4ij3mnck53fl3mgcywibmnq7nhw"; "paresse.source-4.1"="ydzd3zya07nc2kpvq3w1bjg5nbq4l37z"; -"parnotes-1"="adhqdgj7jbh602slsnip7cw7n5jniw4g"; -"parnotes.doc-1"="15qy2y9c531zaibdgniqz73sp93gicsc"; +"parnotes-3"="fhk85w9ldd4x7l9d2vma4jkrgiaybydg"; +"parnotes.doc-3"="61w2ijkfwd2ww81h39m8wydl957g8hxy"; "parselines-1.4"="krgfsp0vcnpgwgw70aw8iwbi9r9fnwsm"; "parselines.doc-1.4"="ahspn4rw6wdwlk9sgd8f2jajb2cbm33n"; "parselines.source-1.4"="n652xalrpp0s7yy0dvcdz24khybsm1cw"; -"pas-cours-1.09d"="wyhgyv5iphi3y6r4gy7spn4pvj04c8cf"; -"pas-cours.doc-1.09d"="dbjz7w5q67mnwzzh775m3l5hfh6gmx7z"; +"pas-cours-1.6"="2dkbzp14iv265qbbpa5i9s4ir54ihf9c"; +"pas-cours.doc-1.6"="s7d7lps8aay695www7xh7sxpscg26dfd"; "pas-cv-2.01"="zdvf8flk3kjln11sn5rs3cb265q8fgzv"; "pas-cv.doc-2.01"="am16i8cjhh2jadlhqsmfx8vb2jyrj8fn"; "pas-tableur-2.01"="ggwlvzkwdv3qhljir7c8v8fwivi9h7lp"; "pas-tableur.doc-2.01"="942prkpjhj4zpvdg2d2k27ibvchw2mbz"; -"patch.source-2016"="6k92ah4ka1ljyxwgg9n91m5aj6nwvnq8"; +"patch.source-2017"="6k92ah4ka1ljyxwgg9n91m5aj6nwvnq8"; "patchcmd-1.05"="asi7jsa5gwd1i2k0arh2p24wprnqfb2h"; "patchcmd.doc-1.05"="8nxwjfkxc3nbj39wfvqm8bkxm4qs1y66"; "patchcmd.source-1.05"="bpb3vc5kdmhiwh0s6sjvxjshvmgr7hrs"; @@ -4841,9 +5103,9 @@ "pawpict-1.0"="spbcprlcpyxh9yd98rfd8vy7ydxyk552"; "pawpict.doc-1.0"="wrpl43c4g89pgnrpcjky42h1ckhc4dgr"; "pawpict.source-1.0"="qfmjx2x9vrlm3zq8msph0c30py1n2x96"; -"pax-0.1k"="iqmsy6p191p8bn2bs642zclq3q42n89p"; -"pax.doc-0.1k"="cjppdms9xlc6hsj0mk324ndpjqg2px93"; -"pax.source-0.1k"="harabcx553nchhf8hh9m3wqwic4l80fc"; +"pax-0.1l"="iqmsy6p191p8bn2bs642zclq3q42n89p"; +"pax.doc-0.1l"="cjppdms9xlc6hsj0mk324ndpjqg2px93"; +"pax.source-0.1l"="harabcx553nchhf8hh9m3wqwic4l80fc"; "pbox-1.2"="9y4p69w5nskv8j5i8a2pxmhswxz8nc50"; "pbox.doc-1.2"="hjv8mqhlfa9ggqypr7nwzzf03rgm7cry"; "pbox.source-1.2"="pk6hx6w8szi4dbb7irkr0wy3xwjjdpxg"; @@ -4862,34 +5124,59 @@ "pdfmarginpar.doc-0.92"="0kc0dgfq3mmnwy3xs79gjmxkkmmfl5l4"; "pdfpagediff-1.4"="3nj0fki5pqm0i50fzacdvnnzhhf2b5a5"; "pdfpagediff.doc-1.4"="8h093sqzw62ivh2csz6fhkbbkdg1na2h"; +"pdfreview-1.1"="vbvpls5iy7q63snxkmn2ry1j8k1wmmhl"; +"pdfreview.doc-1.1"="8zpxlnz72x0x7wg5canh27y4qcq11l1p"; "pdfscreen-1.5"="5lwdmn4lxkq9hgn6fmr4rc2gdk3ms583"; "pdfscreen.doc-1.5"="bcg3kviqc0jr3s5h5xa3in5g1hj46zkv"; -"pdfslide-2016"="78wynlp5vyc14zn93gwy73yyykk0yh0i"; -"pdfslide.doc-2016"="j8krgspjlvn4ja9dww3mc0g3zg7qhlmb"; -"pdfsync-2016"="xqg7my569gq36snly1kpii240byrpx7s"; -"pdfsync.doc-2016"="y6am07gh7iwgmgkwq7sg9z704waxgqai"; -"pdfwin-2016"="yfdlssqwsa253r0qzvy5xbgbgwpmmxpm"; -"pdfwin.doc-2016"="7k1kqy2rpr93q4nvdvwcrspqjbzz1h4i"; -"pdfx-1.5.8"="hl8z1q94kablzkk0r2lrma2yx6b2vb7z"; -"pdfx.doc-1.5.8"="d7s43v0c56cw6nimbydgph3idpw12k77"; -"pdfx.source-1.5.8"="r34z1zp89d8bckxicc79waiai7kri3ar"; +"pdfslide-2017"="78wynlp5vyc14zn93gwy73yyykk0yh0i"; +"pdfslide.doc-2017"="j8krgspjlvn4ja9dww3mc0g3zg7qhlmb"; +"pdfsync-2017"="xqg7my569gq36snly1kpii240byrpx7s"; +"pdfsync.doc-2017"="y6am07gh7iwgmgkwq7sg9z704waxgqai"; +"pdfwin-2017"="yfdlssqwsa253r0qzvy5xbgbgwpmmxpm"; +"pdfwin.doc-2017"="7k1kqy2rpr93q4nvdvwcrspqjbzz1h4i"; +"pdfx-1.5.84"="3v3sjs8q7lq3vpl0pkax47nhs5pak7im"; +"pdfx.doc-1.5.84"="fi7wnhab781dn6prnr9a2fh0m5qpq56y"; +"pdfx.source-1.5.84"="zrw1pz18hh5msx2q3w15k7p5l4jdjwc1"; "pecha-0.1"="8bir75jmi5y33ids3wixm0sr7zjd66zq"; "pecha.doc-0.1"="lhdivjzja3syzm6ksfcckx4a9q3pp8ph"; "perltex-2.1"="2f79yiqssyigfci17gazdnvcms6kid3y"; "perltex.doc-2.1"="hn1salkk7b3f371y3l3nby3lzih2pb7j"; "perltex.source-2.1"="wfz5j1yi8qls7n7jfkip9s215s6jvvgz"; -"permute-2016"="anxvxdpnmr31a50r7anwj21vci3dxvg0"; -"permute.doc-2016"="rz1569972rz72laqrxnkphxr3bdx1pxl"; -"permute.source-2016"="va01wn3pv0j0cxqmgh8cjricj4m2vjxv"; +"permute-2017"="anxvxdpnmr31a50r7anwj21vci3dxvg0"; +"permute.doc-2017"="rz1569972rz72laqrxnkphxr3bdx1pxl"; +"permute.source-2017"="va01wn3pv0j0cxqmgh8cjricj4m2vjxv"; "petiteannonce-1.0001"="xv2yjs519vz0inbcy7m2a201ysjl3gwj"; "petiteannonce.doc-1.0001"="9xvfy2ivdmlamj4fr1q5i1mfh6diys8s"; +"phffullpagefigure-1.0"="hp51s42ycsary7n2qngls1bm6j6mi5ab"; +"phffullpagefigure.doc-1.0"="wvbhkw4axm3bkx3jyi32iy0g3bbbfc6w"; +"phffullpagefigure.source-1.0"="z0wwcy1cjs0kv9lwxdl7waidccaa9w2x"; +"phfnote-1.0"="77if36imrvp4g43h3vfd6j9qzsd7gv3c"; +"phfnote.doc-1.0"="i0vc3q353aa2f1xjhmddlq273x9jngp9"; +"phfnote.source-1.0"="0c893r2vi32kp5cx0ncwa23zryyy6j3m"; +"phfparen-1.0"="jj8lpyhs4h7li0dmc70xhf2h17vgqrwm"; +"phfparen.doc-1.0"="73rcrl7hp843q2fjgis48raf9hh4yaqg"; +"phfparen.source-1.0"="zqdkqbjn75g379gsw0jvlzbyz5qpr1xp"; +"phfqit-2.0"="yln8ifsblmbsp34na3jfi2j5z9az00y1"; +"phfqit.doc-2.0"="ll95cj7p15xx79q024p6xdf3wsjzlamv"; +"phfqit.source-2.0"="xqiygbddiwvl3l1x9xdqcd6zqdbc4xj3"; +"phfquotetext-1.0"="52h9qw8xvldzr7smwbg7njr8acxf4hp3"; +"phfquotetext.doc-1.0"="gk5008b5k8qbi3q2i7bjk57ipwz0vyhg"; +"phfquotetext.source-1.0"="wl18lww4jvg1k8361ra2jqc5z3drs4vf"; +"phfsvnwatermark-1.0"="11rqnm8ag7p0iv2bziy89w66j9cjv4vk"; +"phfsvnwatermark.doc-1.0"="rd3y1kns876788nmbkm7r95wml31yvg8"; +"phfsvnwatermark.source-1.0"="666y9zym40h351a9fbnwy24aangwswkd"; +"phfthm-1.0"="a1g65ldp21rjb5nk19ygpijbs0xfriqq"; +"phfthm.doc-1.0"="ad1m16cjb9kyi6jk6jnvgxcm2ci8pxqg"; +"phfthm.source-1.0"="lbd9qwdv67spq7v1dy78012a874wg9mv"; "philex-1.3"="766zmr2yzy48mmdakjhvvy56ck2g5zhf"; "philex.doc-1.3"="r94769rncbhw6cdvzwm0s9fhwa57z7xx"; -"photo-2016"="d2rv82rm7jyd2fvgzs545kz32nb7fn6l"; -"photo.doc-2016"="1gn03gddjcbfmidsn9snhbr9nsmlbsmq"; -"photo.source-2016"="70n1vi9qla3kl592hgay45af9m078l58"; -"piff-2016"="xz2idyqgwg5y7r9ac0bykvfx533rd29p"; -"piff.doc-2016"="xwlsyrk4mczbchklsx5x8ip08zc5jk6a"; +"phonenumbers-2.0"="ica7srldmdwi7knlazvxx0apigs5yha5"; +"phonenumbers.doc-2.0"="pbz2d1ia699qy8gadmn57fknalxy22wv"; +"photo-2017"="d2rv82rm7jyd2fvgzs545kz32nb7fn6l"; +"photo.doc-2017"="1gn03gddjcbfmidsn9snhbr9nsmlbsmq"; +"photo.source-2017"="70n1vi9qla3kl592hgay45af9m078l58"; +"piff-2017"="xz2idyqgwg5y7r9ac0bykvfx533rd29p"; +"piff.doc-2017"="xwlsyrk4mczbchklsx5x8ip08zc5jk6a"; "pkgloader-0.5.0"="0gd1w7ks997mcs2306l2hqwj0qqvsq7p"; "pkgloader.doc-0.5.0"="kwq2lhl3zsihnkb2ii4h50slvalpvwyr"; "plantslabels-1.0"="yi1s2470aj75chj1f5mi9961w9if1mpd"; @@ -4899,17 +5186,17 @@ "plweb-3.0"="9d5dh5afrcjlcx279s7hkrsi0xja0fg0"; "plweb.doc-3.0"="519cpfwspp2kxprill50lqhzimdi26jc"; "plweb.source-3.0"="2ikq5nka9npdkr8gqkj8lyi1hqmxihzr"; -"polynom-0.17"="iy5nig2y416z7mdkbilg2z5s78h4wmmn"; -"polynom.doc-0.17"="94zib375nwmxllj2arl9j5ywkq130x92"; -"polynom.source-0.17"="2m6ymgi8vnyc6h33wwkxz13c9dd1v2r5"; +"polynom-0.19"="lhl6cw071xb7ivyzhdylq48ja6dqq377"; +"polynom.doc-0.19"="6sj89ph1gnbd0xa2f8sp457ip6v8sadb"; +"polynom.source-0.19"="9z3hzyf19ksy521v28p47h1dxh3c9n67"; "polynomial-1.0"="k11f7cmzycx5q6ww5vnrxfp7xf3238r1"; "polynomial.doc-1.0"="ffr0i9z96w9ahr8k1jx8klk1kddd1zm0"; "polynomial.source-1.0"="m844kmijznga9r259cm2h977w4zdmi3d"; "polytable-0.8.2"="qzfi66r74yb3cvgd5aicyflm4b25f6li"; "polytable.doc-0.8.2"="36frl3y5hmlbh3cz9s17qnl4rjda1l5w"; "polytable.source-0.8.2"="768zbijzmx54yrz1j8qvg8an6xis2hmc"; -"postcards-2016"="zvcijbngj8m505fcx22y1hs7y5jmn1kc"; -"postcards.doc-2016"="d1v423a7xl8pi8nqqzbr9y5ag8d2pkkj"; +"postcards-2017"="zvcijbngj8m505fcx22y1hs7y5jmn1kc"; +"postcards.doc-2017"="d1v423a7xl8pi8nqqzbr9y5ag8d2pkkj"; "poster-mac-1.1"="vjpg0bc2f1qv0hr0kcxasymrchpwzn05"; "poster-mac.doc-1.1"="8m0bk06l7y5bps6hn3xd40s6yb0m8c19"; "ppr-prv-0.13c"="8znyclbgzli74aiciayqn88dp4p7mvsl"; @@ -4924,41 +5211,43 @@ "prettyref-3.0"="a75q522ix098qzsnhxg9w12kwp62xgk2"; "prettyref.doc-3.0"="vlnivj6n4wc0cf9l53352ph04wijswv7"; "prettyref.source-3.0"="wm5367872id8pf7v2k6wbbqvbh5ysrv0"; -"preview-11.89"="jivswxy2iaf93r88biwd6mjz1r1gq5vl"; -"preview.doc-11.89"="2yci4yv3dpr36y0l1xf4f7ncabz7zsmw"; -"preview.source-11.89"="mppw5yr54vw3hamra27my666igakjr8x"; +"preview-11.91"="hw31xlmv5xplpnz3gjcmdf4vbmhvy87a"; +"preview.doc-11.91"="zmkw5whmxh98mrc705lcmqw7wj6k5h04"; +"preview.source-11.91"="67s0y9mv40fs0dgvm6zlkfs4ivhh9vrm"; "printlen-1.1a"="fg8vfmr64nm31r8hycy81iqvqf6l9rim"; "printlen.doc-1.1a"="95icr7kk7bkg56m6sy8g24if35pfhhwv"; -"probsoln-3.04"="nvsbwpnd5ljhb8qwk3951iw5f2d856kp"; -"probsoln.doc-3.04"="ff6ak1p5kh9hkfwwv7y9n6ajg18322aq"; -"probsoln.source-3.04"="jrv0ylpzni2izinvghqj4rypy05fz7px"; -"program-3.3.12"="5xp68xplac6hvnrdw0b20i89zsy7j7c6"; -"program.doc-3.3.12"="j9h3i71my7qd4y9h52pkhvmh5m3v34mp"; +"probsoln-3.05"="qxvjb9csxhrh20qfk4xh264q4pvb5ghl"; +"probsoln.doc-3.05"="n81pf053v27m4xj6cjnjmd8r0sb8lv5k"; +"probsoln.source-3.05"="k8gwixn5ssp97d05ml01k8f9z6ijspq5"; +"program-3.3.14"="fxq3hls6cibrc92g1dyavcr8s2qjxsr8"; +"program.doc-3.3.14"="qvhjjfq3msq1i9h5jf2nx54cp87b3bl8"; "progress-1.10"="zf7iqvmc357pfg7phrc9gggwyb8rb0hw"; "progress.doc-1.10"="2pylrgmyscf4p6ndba4jf87vfglxydrd"; "progressbar-1.0b-4"="6zvflmdsm1vxkm3sjgmxpvl6jsw6vy82"; "progressbar.doc-1.0b-4"="ahkr6nf44xv8czg4ffpx2qbxzwn7b24f"; -"proofread-1.01"="r0h4d2rdsl3gs80xqrhpwchd690qbnnf"; -"proofread.doc-1.01"="qvirpkaybc5zg4d14mqr50c1whwmhhqk"; -"proofread.source-1.01"="whsivyb61vndsal4xx15mjygg5lrw8q4"; +"proofread-1.02"="nd7fkidqjjpnr5f96yckpa078ahk7sr0"; +"proofread.doc-1.02"="nyygbyzxsc65bvqdas81sc1ljg0hwjbl"; +"proofread.source-1.02"="h8gqk9c90l9znwdhypjcvxdj7z8sqi4x"; "properties-0.2"="is4zxlnpayim96h9vifb3wazi4hcl018"; "properties.doc-0.2"="pdpdn0rbg28dq9qgry9w9j2wvzrl9sxx"; "prosper-1.0h"="kwjg42wqipj8w4rmilmrpsl5spr8hzmp"; "prosper.doc-1.0h"="9bfspx1labf3y4hhy7a7sv8ccfmqw4mx"; -"protex-1.5"="nabzysx9gppk6m03f1gk87z7cwp1f4fb"; -"protex.doc-1.5"="ywr6kwqqz2h19qmw31g6alsvyc0dbi24"; +"protex-2017"="ajf4lsibbzcr2ynvfpx2n4pnazfkng2k"; +"protex.doc-2017"="j9v7mdk5dnlhdrj5sl3afbvgqgpk0bbq"; "protocol-1.13"="2mpbqs6r1sl8x79dbkzgg0vh0xxs89pi"; "protocol.doc-1.13"="fzvldl69vw5kxljg5jm4qwcar1k2zg8q"; "protocol.source-1.13"="x52qwan5dahs53bdm8dm450h2ljr7lsp"; "psfragx-1.1"="pb5q4bhhn2zxm0vni6xwcyxq76wj85l1"; "psfragx.doc-1.1"="bfx58if7s6z0sb5faslismic7jbx4ycf"; "psfragx.source-1.1"="6ikq1jhicgf6109gdnd3ldng0ycy920w"; -"pst-pdf-1.1v"="q4srqj933xa6098b16ddri1jca815qbq"; -"pst-pdf.doc-1.1v"="m633qsngfi85z8g0fx2g1a1d483g0c8p"; -"pst-pdf.source-1.1v"="8hky06dvsz3anc6cc5j4chkagq95r7q8"; -"pstool-1.5c"="ibnvkjd1831fki2xp0kx3n0a9n9jpnsl"; -"pstool.doc-1.5c"="ax73a4jbcszfflfn0cyhwaywkchhm8a7"; -"pstool.source-1.5c"="0xgqpm7aq8s16kiv83mkipx0vhlp0jhm"; +"pst-pdf-1.2d"="av5rd425773zxnzlwdk4x5sf8wp9w7in"; +"pst-pdf.doc-1.2d"="k2zssqg4qf151a5iiw2nvk8lyrlh7md7"; +"pst-pdf.source-1.2d"="1lswqfmczya2gdhxi28czpznic888yf5"; +"pstool-1.5d"="lllzrjpvihfpvvc512wgbblgd01c2akz"; +"pstool.doc-1.5d"="wzpiz133xxvdvahrm6pnfxdlj4j70rz6"; +"pstool.source-1.5d"="0mwfdfn0w1jpx523b2mdnjiyilckraax"; +"pstring-2017"="whkbcsicbqlvz1pwjfypnvwwbbwqpwfr"; +"pstring.doc-2017"="gf1pmfhczjrkjgpawxbk6zqrwindadnr"; "pxgreeks-1.0"="hdqmxzcwyd5llq80fakhjvx8whjxs8mr"; "pxgreeks.doc-1.0"="hdm2s76j6vya85lid9lrkzhaj6bkvlda"; "pxgreeks.source-1.0"="1i5jmxhyphz2mdhl742ydrzam336ix5w"; @@ -4967,12 +5256,14 @@ "qcm-2.1"="d9xas7ra5n0hzkc22s6ky3qr752i1i2k"; "qcm.doc-2.1"="ljb5bhy71jscf6hdw6xmxxyy3jyfa8py"; "qcm.source-2.1"="zywcw16m4hk75ialbg92bx98snk64hpf"; -"qstest-2016"="girz5x7dqmr96mqyviwld4i06s1h4ldd"; -"qstest.doc-2016"="0w3r2f745k9kj4ig8yrq1w1l1dhdblcs"; -"qstest.source-2016"="z067nizm6rcjm6yz1141pxa7gm5yyfs1"; -"qsymbols-2016"="w1c7ni9qmy255nyg3hb0yf94p1b924n7"; -"qsymbols.doc-2016"="pfhp65iz5ybxccd7yjxg2rww0j9z2xhf"; -"qsymbols.source-2016"="mk7daalfvk3wyyhnlvbhb5144g6qm8xs"; +"qstest-2017"="girz5x7dqmr96mqyviwld4i06s1h4ldd"; +"qstest.doc-2017"="0w3r2f745k9kj4ig8yrq1w1l1dhdblcs"; +"qstest.source-2017"="z067nizm6rcjm6yz1141pxa7gm5yyfs1"; +"qsymbols-2017"="w1c7ni9qmy255nyg3hb0yf94p1b924n7"; +"qsymbols.doc-2017"="pfhp65iz5ybxccd7yjxg2rww0j9z2xhf"; +"qsymbols.source-2017"="mk7daalfvk3wyyhnlvbhb5144g6qm8xs"; +"quicktype-0.1"="40znnh6yxbhx1i7gsr0icvy5avhm68nk"; +"quicktype.doc-0.1"="ljcdha8k0ngr0ymwqbqbblgyslybvcgp"; "quotchap-1.1"="0w1mp53lag54byxcb4jmkxmyd015jkpa"; "quotchap.doc-1.1"="mp5shidfjdswgg1nwp918ijn6fnf0l31"; "quotchap.source-1.1"="9wdm00jz0za5w1v1cv6k3nbi555mviab"; @@ -4982,11 +5273,11 @@ "quotmark-1.0"="8inn8x79cps7g1iw3pfmc7lyky20vyxx"; "quotmark.doc-1.0"="nkjdi0xl5yvvscs63kjdy7pk3dcvgvxs"; "quotmark.source-1.0"="nhinvh37dw0n8wk1gvpqnp5l3fmaq3v5"; -"ran_toks-1.0e"="apsnqr722xmvb71kagccph79j45d35v5"; -"ran_toks.doc-1.0e"="b4sn1fcr6xdx0n7q99hm1aqcsc3wzcka"; -"ran_toks.source-1.0e"="41ml4p6as4h6gl4552m2avyg41rwcg3b"; -"randtext-2016"="bnb1sk549kzmljwjyb9gc45xr2ndckcz"; -"randtext.doc-2016"="9mpim50akqiqp54x6kpz8w4wdv9d12dp"; +"ran_toks-1.1"="075bz1afn45n2klczxlj38jzl27ihxk2"; +"ran_toks.doc-1.1"="av9qzf5q7524xncg54dqiq5skgvqxdbk"; +"ran_toks.source-1.1"="qzsgi73xl8kkccb4rmv8hmhq3l83c8gq"; +"randtext-2017"="bnb1sk549kzmljwjyb9gc45xr2ndckcz"; +"randtext.doc-2017"="9mpim50akqiqp54x6kpz8w4wdv9d12dp"; "rccol-1.2c"="31w19kr365k8wkvkx91qqcw46fnl0sbk"; "rccol.doc-1.2c"="80zx3h1b0wjw8qgv81kb4la3zd9hh9m6"; "rccol.source-1.2c"="sqkkyhka856h4iirnvy4s8bdqlailgxa"; @@ -4996,24 +5287,24 @@ "rcsinfo-1.11"="y7cymhiac6wvahhzkmsrkchrp2i5i9fn"; "rcsinfo.doc-1.11"="v6wc6q5xv5rwbcgcvfrlkbk8lw3h4qz0"; "rcsinfo.source-1.11"="86ss0sk5rzss6m4b5n96dwfd0vjh2acs"; -"readarray-1.2"="7pdq7rqds7kc6d4597k41hfm6gnm6lcs"; -"readarray.doc-1.2"="wwhdarzc69d5bgayfdcxrz4iam7mgg82"; +"readarray-2.0"="6f0daia3lp0ipi8swprpgl1pzh44hwc9"; +"readarray.doc-2.0"="bgfhvri7xh8kq5y1qykhzhjrv0vcss2m"; "realboxes-0.2"="frdrijzjm4yi20fddhxb6gp314qg6bsx"; "realboxes.doc-0.2"="95b3g7v3hnns9n8l1gv69a9b1jnl4za0"; "realboxes.source-0.2"="2sj5y6k08cwcp8fs0ay7z7ik02is7vly"; "recipe-0.9"="ya2zz3axlaax8f7qkz3rwkfwl6kc7hqw"; "recipe.doc-0.9"="nrgg002rpx1gw16yx9pl4xfiyjg2lk16"; -"recipebook-2016"="z2m105warknssz9d0b5f0fg13mdjrwqv"; -"recipebook.doc-2016"="1w359b6rbd8cfvfa3z140hzsk7515m9m"; +"recipebook-2017"="z2m105warknssz9d0b5f0fg13mdjrwqv"; +"recipebook.doc-2017"="1w359b6rbd8cfvfa3z140hzsk7515m9m"; "recipecard-2.0"="ywrn03f3hy5hyzszpghn9rnjkj9a3kqr"; "recipecard.doc-2.0"="1g67mikrdxmhpn4xgpnlriapp4als1wx"; "recipecard.source-2.0"="7g35xa8kbcsrxxmp9xxk3rgvas158m9h"; -"rectopma-2016"="j8pxsc46j0m799x9srd74d7q4jjxjdwv"; -"rectopma.doc-2016"="7h3v5rpkvxcmv1nj0wzxpgn4whs1gk4b"; +"rectopma-2017"="j8pxsc46j0m799x9srd74d7q4jjxjdwv"; +"rectopma.doc-2017"="7h3v5rpkvxcmv1nj0wzxpgn4whs1gk4b"; "refcheck-1.9.1"="llb529mc4gj9wf4zzs7jz9p2qgngwxy6"; "refcheck.doc-1.9.1"="hvcfjpx9g9wiaqr70vmrpkgqy4i7xikg"; -"refenums-1.1.1"="8zxc6yyp3c597ydikw4zc36ri5xhlpid"; -"refenums.doc-1.1.1"="gnsi301rb4zxvcjf6cln28j1qmhp5i8i"; +"refenums-1.1.2"="8zxc6yyp3c597ydikw4zc36ri5xhlpid"; +"refenums.doc-1.1.2"="jqqqwvr0bd163njgkfgz2aj1jlgmlnxk"; "reflectgraphics-0.2c"="bbpagcn17kwhp9jzp3r6kp23qbr3gqs0"; "reflectgraphics.doc-0.2c"="klwad1c3lbcf9dga240cipdhf8vm4q0h"; "reflectgraphics.source-0.2c"="1pwn5m9mclwsmwalal0bcfvi5sq1jh37"; @@ -5035,9 +5326,9 @@ "regstats-1.0h"="zkxc3cbq3fr5rpwv3lw3znrs9sn1ajmc"; "regstats.doc-1.0h"="5ddawlcn7rqzs7i7mjjj8zi3q60qpal9"; "regstats.source-1.0h"="kafv0h7yl5qhzgq4j4ay54cm9lqgd1w3"; -"relenc-2016"="0ksy9dhzxf7dh2sgnais817krjdrnyip"; -"relenc.doc-2016"="w2s26knmf0pfnbvxbj3f2xmcvjf8mgkl"; -"relenc.source-2016"="vhwmn0hxlv5njl4v2ljz5z4kbi5n4a8g"; +"relenc-2017"="0ksy9dhzxf7dh2sgnais817krjdrnyip"; +"relenc.doc-2017"="w2s26knmf0pfnbvxbj3f2xmcvjf8mgkl"; +"relenc.source-2017"="vhwmn0hxlv5njl4v2ljz5z4kbi5n4a8g"; "relsize-4.1"="l9n0cv3vjwqlhxw58bnj4gh1qr0mbkh9"; "relsize.doc-4.1"="bmv72xvd2n40rclz0a5cw128a4m1khl2"; "repeatindex-0.01"="6zzlr3miqb7p0q3h1kyaly6ykzwjlq0k"; @@ -5048,23 +5339,23 @@ "rjlparshap-1.0"="584zbnkzrqjydg9hz42ayl9r806sd4cw"; "rjlparshap.doc-1.0"="g4bkg84j236faakga1kl593bjw1p9wq6"; "rjlparshap.source-1.0"="gys3kddji7j89c63a2kzz7z8xjdakpg5"; -"rlepsf-2016"="zvgnjwbrznazfy89cwbk9injrg0hk19b"; -"rlepsf.doc-2016"="q4jpki613c0b9kx9bxzqw3v7m5ggj4w9"; +"rlepsf-2017"="zvgnjwbrznazfy89cwbk9injrg0hk19b"; +"rlepsf.doc-2017"="q4jpki613c0b9kx9bxzqw3v7m5ggj4w9"; "rmpage-0.92"="iqvgmj8ygy8mcqffj9wl5xr3l4g19w7f"; "rmpage.doc-0.92"="nzm10y262ql87jqmlvbx8s5izflz8nk7"; "robustcommand-0.1"="pclwgpigb6jf5myrirrgb35jdsrc1r54"; "robustcommand.doc-0.1"="8236m9s2klnlvii7733r9vkr28ma0758"; "robustcommand.source-0.1"="a6wczmjbnvfqfqg0cxbnq7srr71w3l6c"; -"robustindex-2016"="l4xnmarby12fyxsg6wik044hqgh1a9sa"; -"robustindex.doc-2016"="xl6sr4f0j3a7inc615lb8jvxpbpnsndv"; +"robustindex-2017"="fk6hwg4fs0d99a69x5r94qs51xkagc30"; +"robustindex.doc-2017"="6j89lmrllkbnpx2i5c0k14bq7498mc2a"; "romanbar-1.0f"="77m3d5fv4abc2xx6nx5cvzpkshnbkmr8"; "romanbar.doc-1.0f"="7ha3ybbzivbkc7fllhfjv1mlvq20k6i0"; "romanbar.source-1.0f"="3jn06jd260yipslvs8xjflwd49pzrcqb"; "romanbarpagenumber-1.0"="x8gs1z6nn976praar888l74avfd1ha6q"; "romanbarpagenumber.doc-1.0"="cyfpy1g5g14jlxl83a7ngcl631297a58"; "romanbarpagenumber.source-1.0"="qs1ia3flkqsd1psbha7bfms1anfg336v"; -"romanneg-2016"="7w6wmvkyzy4jzs8akhaswqjpv1lh9lxz"; -"romanneg.doc-2016"="m7rc0j7xbkly1zh63lrym8pzgp1g3ivh"; +"romanneg-2017"="7w6wmvkyzy4jzs8akhaswqjpv1lh9lxz"; +"romanneg.doc-2017"="m7rc0j7xbkly1zh63lrym8pzgp1g3ivh"; "romannum-1.0b"="8l5hrx8svnn1pv9qd3c7y6gxy25fr5r8"; "romannum.doc-1.0b"="1wlc0m18vg6vl8sgxvj4i3ca4kyfl9c0"; "romannum.source-1.0b"="h9rkrds6v7b0pvgap090ja271k5jnc7h"; @@ -5075,8 +5366,8 @@ "rotpages.doc-3.0"="fh2a3xcl4f5mq95d2ibsgmml6pq95cd1"; "roundbox-0.2"="g1k35s2jqgfm0ih16zf59w470kzv450f"; "roundbox.doc-0.2"="97dr0pg7689mm504pld75cmnd3vq61rb"; -"rterface-2016"="l7szd2dbrky3idmzkx724b1ks8d9crwm"; -"rterface.doc-2016"="3hkrf5qycaq84dawxyv5a829bv8vz0qg"; +"rterface-2017"="l7szd2dbrky3idmzkx724b1ks8d9crwm"; +"rterface.doc-2017"="3hkrf5qycaq84dawxyv5a829bv8vz0qg"; "rtkinenc-1.0"="bgvb6v03sbayxss84awkaa98i1hza4rm"; "rtkinenc.doc-1.0"="ggkmbwp3kxa1zs4c5f7v3r5lk5v8pdjr"; "rtkinenc.source-1.0"="iavp7gzq742v267gf3hjq8vwi1ywqfbj"; @@ -5100,10 +5391,10 @@ "scalebar-1.0"="107wyhbx5wzliqmncsqlaykg7qw5ldwa"; "scalebar.doc-1.0"="a4krk1zpi2yiyri88r96363l5k5kcjf5"; "scalebar.source-1.0"="5f555kz7b0rbxh4vsmqa8hfqlv7790cf"; -"scalerel-1.7"="9lj25lw1p1x4lgw80jp46c03z7g2pdn0"; -"scalerel.doc-1.7"="1c8kka7zwlh3risn5kln27ch2d7hwhnk"; -"scanpages-1.04"="zgcj5yqrvr8wn4lgsys5r1lda1yv7vb5"; -"scanpages.doc-1.04"="jvavhy8f0zi9p3nyyjmbyhk743a4mqi2"; +"scalerel-1.8"="bnzdi8d0mf0ppkvwypxvb6wl2lyw4mpq"; +"scalerel.doc-1.8"="bpamgzs7nr8gfam69mad8qmgjs6hy909"; +"scanpages-1.05a"="vl8kzqsj7dlc21h9148c4cgbrwg92k2w"; +"scanpages.doc-1.05a"="8rc3sz2jw47xz3rz25dfw7g3gssndz7b"; "scrlttr2copy-0.1d"="jw87bnb7phfp7nmvp4gvbi6nhfwifqph"; "scrlttr2copy.doc-0.1d"="6pfnhhnjm97ap2zbi5bjj011wqbr2yg4"; "sdrt-1.0"="2pcbwfywj14n08187899xjdhrjr3zzlr"; @@ -5115,43 +5406,48 @@ "sectsty-2.0.2"="7677w338qg7wxalski08070328f4yjcc"; "sectsty.doc-2.0.2"="plwwncg7vkhqrkkh2b1a6wpp57h6x64q"; "sectsty.source-2.0.2"="r3z90f7w1nw4hpn61fcrn8iy5m1867jk"; -"seealso-1.1"="qrm517pv0z8rz1z125l4p4xrq1cs64mv"; -"seealso.doc-1.1"="zghj9bw3g8zf9x4h54lw1vjv6b1arvm1"; -"seealso.source-1.1"="625jnli7knayilbcp0np907aqpdfyk33"; +"seealso-1.2"="2ndffdja6sdc1zgi9ayhfgcfa4ihrqjs"; +"seealso.doc-1.2"="95n5alxkf7brg6dcad5jz0mfnn7w42fy"; +"seealso.source-1.2"="511kb0ka070b9q0973c1khain6yslqmq"; "selectp-1.0"="fp7iiqkb6xqw55v28rs80in6p47li70c"; "selectp.doc-1.0"="wy83q63fdm33il8rvia43y1kq51rkc07"; "semantic-2.0"="ky4ggvzl5171nda0329151c9vbaxs7gp"; "semantic.doc-2.0"="b1hyb592d0xx35p5dqppyfgykg37xx4s"; "semantic.source-2.0"="4fwjw0axn8d3ychsqmmdy6x73ckciv9p"; +"semantic-markup-2017"="h10qljl8ja159j74fvavwni1d7vkw8ag"; +"semantic-markup.doc-2017"="6p97lyrs0dsr3sf3ckk3jv5gkc5m1jcm"; "semioneside-0.41"="62v5zs95qqi1i0xpm2jmhcx9pa24jymn"; "semioneside.doc-0.41"="2z2azzz07gj105jrarifhx3ldjc9v09a"; "semioneside.source-0.41"="31d1fggm0km56jv6qr5yjv7da6y0ifsv"; "semproc-0.1"="gsf23afimbq3nhqka6vdbxjdasqc9f5j"; "semproc.doc-0.1"="iki2yxxxmq90xn2bbvxv942rl3lbfi0c"; "semproc.source-0.1"="rdzjw86dk757ddhwzw3z163zjigjnd9b"; -"sepfootnotes-0.3b"="rff9mxr6cwgznnzdizrjvi53bplfyw8g"; -"sepfootnotes.doc-0.3b"="9h41iw40si4cyxqghlawhfp0nfdagxwp"; +"sepfootnotes-0.3c"="chdd6rfn5v91c7sc3anf8rq1w7i49g47"; +"sepfootnotes.doc-0.3c"="h9k1nlwdgxynifqcllbplw29hhakzsfx"; "seqsplit-0.1"="zc3fmzgnaxlx4jvbmqr4g22xqqr46qm5"; "seqsplit.doc-0.1"="ans9jwdygk6j84fiwxjwr4z07rsswsw4"; "seqsplit.source-0.1"="syxc6bkp4i55zvrs8sxg8ncq5gmq74xh"; -"sf298-1.2"="4db1p9hn36bphh3rk2cl6sccvb4wbwz7"; -"sf298.doc-1.2"="xmwhqhn7shdyn4sn77fc3c50q7am3422"; -"sf298.source-1.2"="ab028wsqd7yibla663q3d1d0iziqi1kd"; +"sesstime-1.0"="37va0gf21j43zwcjy66635ascb0753g1"; +"sesstime.doc-1.0"="k3d05bkkzcv88dx9bdl2qa6y4nxpfk29"; +"sesstime.source-1.0"="6f9z1h82kcv9wj8b0lbhfj54j0q2cw33"; +"sf298-1.3"="nvb0bxh78nzvjk3x4d69mmcdbhfxnm03"; +"sf298.doc-1.3"="hdnvzghnkkgy79q6r2b9qqx9gda162mc"; +"sf298.source-1.3"="ixwa6c8c44ph14b5a0rz0js00jac9kpv"; "sffms-2.0"="jaarxw1lmdgsac04fzdggq0pkaqp0y8f"; "sffms.doc-2.0"="kqfjz0yn615f068v6349lgdp72gw2wkk"; "sffms.source-2.0"="h5sazi91347l3qdkn6ghw6ywyp5ddryh"; "sfmath-0.8"="mkmjhc5jg8ylbjdzx3yal2r3spxv3npz"; -"shadethm-2016"="6d2vr8xkis6ah0032nrbpbh3rs29xh2r"; -"shadethm.doc-2016"="ddw9pngafxfcx4cl0fh4dmnaqcfqnyfn"; -"shadow-2016"="xifs7y18wdkg1kj656swlvx7cpswmgma"; -"shadow.doc-2016"="ppc90h7d8qm8382lp2vzn5piy0mb7d4x"; +"shadethm-2017"="6d2vr8xkis6ah0032nrbpbh3rs29xh2r"; +"shadethm.doc-2017"="ddw9pngafxfcx4cl0fh4dmnaqcfqnyfn"; +"shadow-2017"="xifs7y18wdkg1kj656swlvx7cpswmgma"; +"shadow.doc-2017"="ppc90h7d8qm8382lp2vzn5piy0mb7d4x"; "shadowtext-0.3"="m2qsn137ij2l4lq4h0s5mpw1vvic0k4l"; "shadowtext.doc-0.3"="894a2s4awyxc0vc7d94fp0dfahjq4021"; "shapepar-2.2"="hps8xx8z0vviywd61vhkh8l758c0gndd"; "shapepar.doc-2.2"="6i0vwmvrphkjrqphk7vmxphhcvj89f0n"; -"shdoc-2.1"="1jvjqbc9zilg5k6vrhhz7x17p219rc5c"; -"shdoc.doc-2.1"="rdwms0pw74k1i6p1ll5m9dmrlbpryrcp"; -"shdoc.source-2.1"="d5rb46jw9w70pcgi0b0vgj81a9xwb232"; +"shdoc-2.1b"="grva4fsbp32pq2x7g4wb415y5cmf4cnx"; +"shdoc.doc-2.1b"="ba16nzmjm53zjq81w2zb6npd21wjfg31"; +"shdoc.source-2.1b"="mqn7081yqr3l1yhv3cxxrq6jwnd2h6sq"; "shipunov-1.1"="1k15najivxdmqvb3a6lm4wky5mi31a2r"; "shipunov.doc-1.1"="x0hc94hmncixvhicnja1kpd6y3gqg59w"; "shorttoc-1.3"="win5ajcivg0ipf38dx85vhhmfjfl1scq"; @@ -5165,9 +5461,11 @@ "showcharinbox.source-0.1"="v0mn2l95n4mhmxglwrqzwcs9h31hb99j"; "showdim-1.2"="8pk9x9rwpa46lxxxcrdrj8qvifs30x19"; "showdim.doc-1.2"="g9zbjc1awcan45gik1czyz2ggnygzzpy"; -"showexpl-0.3l"="v9383ryd8k5a8sif6np3844pfqkhwsgf"; -"showexpl.doc-0.3l"="83jbcrang4b3r7qm5bnsf4hjzmqql1j2"; -"showexpl.source-0.3l"="x2y902cyl1bc50jkq9bnhp4qsiw831sh"; +"showexpl-0.3o"="d6w2jrriv8w2vplqpgdi67wyl6wfaf7g"; +"showexpl.doc-0.3o"="v8jfqrzrsjxfvxw26qfw7ifj6n56q1cm"; +"showexpl.source-0.3o"="fir737kinjxq1w6igrsncks7bj2asxy6"; +"showhyphens-0.5c"="fcmfcmzkv9k6k2d6l2brhwwvffzz3bcd"; +"showhyphens.doc-0.5c"="451qz6c2k3mvnr488s138m8wmgsf1zvs"; "showlabels-1.8"="qpsrz097whnqv7phnrpff1j4spc0ccrx"; "showlabels.doc-1.8"="7pi69s9qfv69piak041lxa0vy3swg91b"; "showlabels.source-1.8"="raf4jncf7q4i31g7pswqriafllv6rw3c"; @@ -5192,21 +5490,21 @@ "skb-0.52"="4abwsdqy977aj45v4frjhf5p4kqi08aa"; "skb.doc-0.52"="hgwacvlqab84b3nv6rnmd79irl1ilzkn"; "skb.source-0.52"="v3b3ggy38vp9z5b9n802dg0xi22yjpwz"; -"skdoc-1.4a"="2z0djnn6j4ki23ns0z48g5z9ds6hra8j"; -"skdoc.doc-1.4a"="cy1x88m6g1mhqj86sfcfg9yx316ly49k"; -"skdoc.source-1.4a"="14zdwj0g1rc7phl9rvvq62fl610ix5a1"; +"skdoc-1.5"="6f6ripc6ka0yz9zjjjc7d30f43ii6i8d"; +"skdoc.doc-1.5"="27ks1fh7hmfyk49yg5xjw4688df5rcwl"; +"skdoc.source-1.5"="7xp965lqrh9zxf1pdqk8bzjakl3msxkq"; "skeycommand-0.4"="w3sqnw1xyx8l1qb9h7j8jg8z3f6xsnvi"; "skeycommand.doc-0.4"="y8kcbdpydw0an53vfw75nvs8f5rhp5f9"; "skeyval-1.3"="r39dajvb7hh6437jbq3gly44i22im66z"; "skeyval.doc-1.3"="g9gr3bwzslymzx3a5kja4n4s1n0ns5lm"; -"skrapport-0.12e"="zvy4ls3xmpkygfx4vkk49kwvc33ms2zp"; -"skrapport.doc-0.12e"="aaaf30yc35w0nbr2q7l7w176675wvlqk"; -"skrapport.source-0.12e"="zw6bbwchc9h5jkb8b0mrrhbpw0ngs2ma"; +"skrapport-0.12h"="i1vk1q4342k1vsxw251ky6gf7lmp8bcq"; +"skrapport.doc-0.12h"="r5rhlrl332zv18ssymapb95cfmlbgl2z"; +"skrapport.source-0.12h"="6dmc35ld656ikjiy38lm4w59yhb6f22q"; "slantsc-2.11"="mnqakna7b6f0pygw4c66jmxy2r2srpyq"; "slantsc.doc-2.11"="p4z9p7p33xchy1vqjqpiyw38is5irja2"; "slantsc.source-2.11"="8c2vrhsrgfpqb47wxik1inq8xpa5r50g"; -"smalltableof-2016"="a0sx95bj2ampjw3b7g4p56ji7fqwmdiq"; -"smalltableof.doc-2016"="1qrbnkki1in5kv142d0qzl3rxmrclm69"; +"smalltableof-2017"="a0sx95bj2ampjw3b7g4p56ji7fqwmdiq"; +"smalltableof.doc-2017"="1qrbnkki1in5kv142d0qzl3rxmrclm69"; "smartref-1.9"="7pvgdpjcdvdxbkb1ag4dal46c1hg4d53"; "smartref.doc-1.9"="hj0c7i3climwjy64h98ddab5skczf3mh"; "smartunits-1.2"="z3kj39xpdk8pa7bzqdjd6g6qlhwx2vhx"; @@ -5219,10 +5517,12 @@ "soul-2.4"="161jbj81y5m8rclwl6z8pwpbpc0axy56"; "soul.doc-2.4"="lssr7w6ry8p02mzmwyx7a2zzss2vmbkb"; "soul.source-2.4"="9w0g3y2pqkzsbg8jdr1vkmn4wlrx1b2i"; -"sparklines-1.6"="25bs0ffif63k1hyaikx3ncy9z48czp2p"; -"sparklines.doc-1.6"="c41pw93y8iy7yx0bc7bdjdyc0zhvx0bx"; -"sphack-2016"="gdrva3zalq63d7j737247ja9a22abdxq"; -"sphack.doc-2016"="3rzyc3sxq2bnlx5pw5xz1kb2gb36brgy"; +"spark-otf-0.04"="ffinni2ipxnxx47dzwpd2flvqfibqzhk"; +"spark-otf.doc-0.04"="i4jmg2h3nj27y585znj2mmdfgj231hh3"; +"sparklines-1.7"="swn54z70rhmbk917dpl37mfr3sx21525"; +"sparklines.doc-1.7"="mjpd57symvhnv6jjzynalmpqy3l4szfa"; +"sphack-2017"="gdrva3zalq63d7j737247ja9a22abdxq"; +"sphack.doc-2017"="3rzyc3sxq2bnlx5pw5xz1kb2gb36brgy"; "splitindex-1.2c"="72wrcsz1vmka4qal90la093asf12hs6j"; "splitindex.doc-1.2c"="gf9j1mi46ih0xanr4lzl43gpfjpjws14"; "splitindex.source-1.2c"="1y60d6s6ws70dgjhn239h4x8c77hjmdz"; @@ -5236,20 +5536,20 @@ "spverbatim-1.0"="cpn7cc2f4ila3xfq8yrr5456y2p5navw"; "spverbatim.doc-1.0"="bnw2p20z8ga1zynk3v8khpgfgbjb5jpx"; "spverbatim.source-1.0"="ivjx22khzgn0xgzbkb5y8q36i9wh3n49"; -"srbook-mem-2016"="30fmldc7ygh6c4a64z9cb5qcr1z400vs"; -"srbook-mem.doc-2016"="mfn2i8vs1h646gn5fcs3zh7lrn6gj2si"; +"srbook-mem-2017"="30fmldc7ygh6c4a64z9cb5qcr1z400vs"; +"srbook-mem.doc-2017"="mfn2i8vs1h646gn5fcs3zh7lrn6gj2si"; "srcltx-1.6"="pamgi7alvxixzd4dy68p502ifdlnz7fa"; "srcltx.doc-1.6"="1lja1az3vfzxkf2d7pl4cyxbliqml0hc"; "srcltx.source-1.6"="wk74304mhb77p653l52gmhc990ic0dfh"; "sseq-2.01"="rypda83sq8zgcnd6fmip2nw85dpqkb2h"; "sseq.doc-2.01"="2zw94ka78zap6914m7r3xc9slzjr0vig"; "sseq.source-2.01"="1fw0mc1crac3fps3s62rskzhn946zffb"; -"sslides-2016"="5j8zx3q4f3cm4c78q4vn8cbvp33frz1q"; -"sslides.doc-2016"="xsh6d0caydlgs3kfc0zgw4m79j1vkrxs"; +"sslides-2017"="5j8zx3q4f3cm4c78q4vn8cbvp33frz1q"; +"sslides.doc-2017"="xsh6d0caydlgs3kfc0zgw4m79j1vkrxs"; "stack-1.00"="p32bbliciimyyfpizvi0cdrw7nzkmlx6"; "stack.source-1.00"="x3hkdwa9hip4zp8paipd8yjjz10pysn6"; -"stackengine-3.24"="y7yrqnqakzkn5by4xa4ihijcqg1cmm6x"; -"stackengine.doc-3.24"="9f1c8n0krxp1p3jc0w5kyx5vw320104d"; +"stackengine-4.01"="nivan4carz07sqpiymvlkjxswkqa9mjd"; +"stackengine.doc-4.01"="1xfhqhhl578sbpgp0s3d2nhddv85dlwl"; "standalone-1.2"="fvknw62iws8v57ibh3518l13n8v6wdyp"; "standalone.doc-1.2"="5cvw78c6pajp17knfv1dn9y7znarmvzx"; "standalone.source-1.2"="017d64zzqwvbf2q32656115qsmsn1icp"; @@ -5262,9 +5562,9 @@ "stdpage-0.6"="1vx4hlfyz6s89qxqk8kssq2z4j4bv7x4"; "stdpage.doc-0.6"="qqh8y677jzbamylbm9jyx679sykp21ar"; "stdpage.source-0.6"="asizav9m4vbfcrgl6c2qhnzsvl4ngmzv"; -"stex-2016"="rnkv33n0w6nhfz91qls1a7nb2xjc7i6w"; -"stex.doc-2016"="l7fpwhdxi3q4qgbsi3wb303hifwz96kl"; -"stex.source-2016"="vcvwm90hc222rm3b2z2iryfz869fzaf7"; +"stex-2017"="rnkv33n0w6nhfz91qls1a7nb2xjc7i6w"; +"stex.doc-2017"="l7fpwhdxi3q4qgbsi3wb303hifwz96kl"; +"stex.source-2017"="vcvwm90hc222rm3b2z2iryfz869fzaf7"; "storebox-1.3a"="kc1a9kwyd31s1376b16hidk21cz2q2zv"; "storebox.doc-1.3a"="qhjcw6fzxlkzpgnk0ra7l6fqp10byiv6"; "storebox.source-1.3a"="6zzmya7fcjajy73i8iys9584bldh18z2"; @@ -5273,11 +5573,13 @@ "stringstrings-1.23"="3jyx0rjn2y5s3i7mdwgmbfygfqmph5v9"; "stringstrings.doc-1.23"="iwlccyqlbypigdzw8dmpfif08wq8nv2g"; "stringstrings.source-1.23"="lfm6lqdy2r3lazymqcca7padzmcvb0a6"; -"sttools-1.8"="pwbr1qlk309abm3m86ixdkinj9gyxl4r"; -"sttools.doc-1.8"="bgqj77jq95pf13yp5jcxipgdcxamg35v"; -"sttools.source-1.8"="20s5nzb743ki80vh6if55nl7kiyxsjvm"; +"sttools-2.0"="hhzhgswnm5a26ivlaskdzmma472vsl11"; +"sttools.doc-2.0"="rdvrvdri5g9pb2pm6m95sibp73a73d9w"; +"sttools.source-2.0"="95j75a9qmcpqi8b8fm2hagdmw3fzcn50"; "stubs-0.1.1"="5ia769ndpi4pcrbg6cljdbpxsx353qlj"; "stubs.doc-0.1.1"="apc0wxqj03fhbab6nwwh5rvzc6i9la8y"; +"studenthandouts-1.0"="3gss3z8gv8fyyj3qygmwmbp1jxs7k7dn"; +"studenthandouts.doc-1.0"="qjih5qdi7861v2mafv4bga62i0lmss3z"; "subdepth-0.1"="p59zl1bmd52xsf51l1qf4ij5j7qj9f8w"; "subdepth.doc-0.1"="973874d1ri46l5ixgzrlqxf09lxbhq3x"; "subdepth.source-0.1"="sdij1y3j4dy8y19pb4aw2azb48i5rssi"; @@ -5305,9 +5607,9 @@ "supertabular-4.1a"="51mc5fbbk13mmpya5n8lrx5yyk4k1167"; "supertabular.doc-4.1a"="jmm0dxfps5p36r6ds1fpx00spx10rrv5"; "supertabular.source-4.1a"="0wa3rcn787hn4707zbdm0jdfflp0dyf7"; -"svg-1.0"="p4v70j4n7z1awmq9xz5rb7cl3adll7qf"; -"svg.doc-1.0"="y13aisc5gvx1b42n634ndahzya0xc5fh"; -"svg.source-1.0"="aasj52d2yl5i53pzznyz6jifyypzfa1d"; +"svg-2.00b"="v4ifzawiyk7r2xpgk6ykg63k53kbzq23"; +"svg.doc-2.00b"="13knr2lyrfzbac6w8nrkrvjf48q4qv56"; +"svg.source-2.00b"="7bg9hr061s1ndndxrrlkra3inv6yc5v8"; "svgcolor-1.0"="ld3wccj2cxdhv0xyz7qmxcvr6saab2s2"; "svgcolor.doc-1.0"="nj7w6bihmr8hmvcykya9nkxlkhmlcw6r"; "svn-43"="hv7xk90h5qb4ilx7f4a6zybijnhba9ic"; @@ -5319,8 +5621,8 @@ "svninfo-0.7.4"="761kpr460h6nfczsf1vakdj9r947in1s"; "svninfo.doc-0.7.4"="qlhr7rj98m7g55kgrms1jjw3wp3k7z4v"; "svninfo.source-0.7.4"="xsf1rs0ar8ris0dh8qbslxwx5i0ci6ck"; -"syntax-2016"="1bvja2hjsw8p68202f84sbzcrs0f7d27"; -"syntax.doc-2016"="pkf7w0xwcnl7cm74z99bb32v4ycn4wmr"; +"syntax-2017"="1bvja2hjsw8p68202f84sbzcrs0f7d27"; +"syntax.doc-2017"="pkf7w0xwcnl7cm74z99bb32v4ycn4wmr"; "syntrace-1.1"="02njfsdqh7ssnjcsnpmzi3iwxz2yfj9f"; "syntrace.doc-1.1"="v5q7643l6spib4kf6mma67pl7xm8aaqc"; "syntrace.source-1.1"="qqmfivdpilm8qp26v7kf3lcvfp582jv0"; @@ -5330,24 +5632,24 @@ "tabfigures-1.1"="spwphj1m563rip8gq09fb97mz85yqwiw"; "tabfigures.doc-1.1"="l68l551i2skm8yns6r2f1ji0kgxhx56a"; "tabfigures.source-1.1"="6r4li6abzpgpv008xhy0x3lyywpy2w5d"; -"tableaux-2016"="b4zz5qhahr3kxwi68l2hh92w3v29gdry"; -"tableaux.doc-2016"="g4v3wbms4yw4wmzkm6v9aj3l46l4fcxy"; +"tableaux-2017"="b4zz5qhahr3kxwi68l2hh92w3v29gdry"; +"tableaux.doc-2017"="g4v3wbms4yw4wmzkm6v9aj3l46l4fcxy"; "tablefootnote-1.1c"="axmzyplpbyfmhfx7jsijk3aaqcyc7c9k"; "tablefootnote.doc-1.1c"="z65aphzdy953r1r3a5lzpvizmhs638g7"; "tablefootnote.source-1.1c"="a1qbk028v26pld26654hsl3j3fc90js3"; "tableof-1.4a"="p1z06zg544y0rkgbf32brizn4mlzwcc0"; "tableof.doc-1.4a"="gcxvm0qp1wkr13l7770cdhb73za4dq67"; "tableof.source-1.4a"="kxwaxxm6596mv3vpbzwav1kb7g6irvfl"; -"tablestyles-2016"="91l6ysgskdcijj4zh756956i9s4cmlhp"; -"tablestyles.doc-2016"="8j8dyc0fxj53xi6jq8vabn7hzrd8krsf"; -"tablestyles.source-2016"="5kdg1v2s60j7cmrr0w0q2qv58jznkxk4"; +"tablestyles-2017"="91l6ysgskdcijj4zh756956i9s4cmlhp"; +"tablestyles.doc-2017"="8j8dyc0fxj53xi6jq8vabn7hzrd8krsf"; +"tablestyles.source-2017"="5kdg1v2s60j7cmrr0w0q2qv58jznkxk4"; "tablists-0.0e"="5f0qad58xlf65y5204jsg3ajlrmgga3y"; "tablists.doc-0.0e"="2p6b5b3b693cicbsid4zfr4lqvyiw0z0"; "tablists.source-0.0e"="jwabyps9hwly3s2xx4l0vs3xwkhg0a33"; "tabls-3.5"="gdkxv2mfqga5w7pmc8dszx9csma95imb"; "tabls.doc-3.5"="dg078n18gai6glbgwh0p45560s4zjs4y"; -"tabstackengine-1.10"="cvf8b9jnlcbwa89k82l5km7hqw022wxl"; -"tabstackengine.doc-1.10"="i69wd9zz9347sddpl82nm2f26s3r286s"; +"tabstackengine-2.01"="hwa615sc1wak2gc1397v7f0nadmgy924"; +"tabstackengine.doc-2.01"="jn0a7whrqs5hdkc94ahn6hykrkkzy4k2"; "tabto-ltx-1.3"="cgxvfk7sdxxpczv7x1jw5460lwg7bak6"; "tabto-ltx.doc-1.3"="irjpmicaxpxw947w4p3520g18cg27nmn"; "tabu-2.8"="mpb7wm2l1apzi7hygr6v0nywm77z1k9b"; @@ -5364,22 +5666,22 @@ "tabulary-0.10"="4lnwhfr4bnawqgc5hvmp9m5gi6dmw679"; "tabulary.doc-0.10"="439yc9m6b5na2i8kg8axqgx2pwhlv2aa"; "tabulary.source-0.10"="x6a4q2rfm6z97ylwh2skqcpjlf7kap5s"; -"tagging-2016"="hai0v2rkgjvzxg7f35blqchqpvax05h4"; -"tagging.doc-2016"="nkfw3b02dgag42a8zan5dvlj0dlkzb0k"; -"tagpair-1.0"="sp25yhzr4864qlvrkhpbg4fmb6li6ysz"; -"tagpair.doc-1.0"="2zcacbsp2kvfbim1rdiampyjvdlwxlvq"; +"tagging-2017"="hai0v2rkgjvzxg7f35blqchqpvax05h4"; +"tagging.doc-2017"="nkfw3b02dgag42a8zan5dvlj0dlkzb0k"; +"tagpair-1.1"="cw696a7ccw159f38sa6av7f2cr2w5mcl"; +"tagpair.doc-1.1"="n06xlqq579by3hq5rwsmh0l6x1damdrs"; "talk-1.1"="w3vffx02kp18gxkk2khsnhcpzhd6kvjq"; "talk.doc-1.1"="1hcv41gh3rcxncfqv75w92a2hdnb55nq"; "talk.source-1.1"="mvqbaz1vwya42g0idhhp948dxmb5z0q8"; "tamefloats-0.42"="biipxghplzwd03drjpiisijhdzr4i04i"; "tamefloats.doc-0.42"="mnmrchq7k8n04dx35r1plzxcw46hx4cj"; -"tasks-0.11a"="j06mhlvndc4pik32kzg4r267cdlxw8v2"; -"tasks.doc-0.11a"="6ng9523apz6aaxd9vl6v5lpyw3y9fm2k"; +"tasks-0.12"="a58wppbccpfxnmsc5g04qvpf0zyv06gk"; +"tasks.doc-0.12"="pqz2is810r3nypqn63w74xi8fg8vp2ap"; "tcldoc-2.40"="r9i94qmf78q9j3adkzfly43riv2bzdmr"; "tcldoc.doc-2.40"="fh6a7m41gxn4988pwr90ph25gg26ky40"; "tcldoc.source-2.40"="p007ccff6w6d3nlpsp3q476vg9m4rjq9"; -"tcolorbox-3.93"="n1723bwhxgyfnf8rd8pyq2y2jifdcq0z"; -"tcolorbox.doc-3.93"="mhq507zmwqdxy537ivyl6szkzji342yr"; +"tcolorbox-4.11"="8bg92bf23dfwbka9y6h524kk72z7igng"; +"tcolorbox.doc-4.11"="b8nlmrqhnlxn5cdcz47hvd3dslb6mjin"; "tdclock-2.5"="dzb2gj8y1dv7qm5mn7xfgzdq9aydqjk8"; "tdclock.doc-2.5"="sgdpiwcnkifms1lx7xicl3xj194lfhbg"; "technics-1.0"="cav50vxgp01465wa07bmza4blgsv49wh"; @@ -5387,9 +5689,9 @@ "ted-1.06"="2rd9qzrp0i0yk9qzz4g2zsjafswd6m91"; "ted.doc-1.06"="02zyzvjncgpgm4iy2nxkx209l8dhgkm2"; "ted.source-1.06"="isk5yz52jxsdqq8vzcvr99xjcg5sy7pz"; -"templatetools-2016"="byxkf3ad6nbxsjvmqda6iv4qxwh9r66z"; -"templatetools.doc-2016"="yv7q44lxn02yn1fawm3rkcdia11hq99s"; -"templatetools.source-2016"="4cvfpn19a3cqhx9sx2jin35ycakq4wi8"; +"templatetools-2017"="byxkf3ad6nbxsjvmqda6iv4qxwh9r66z"; +"templatetools.doc-2017"="yv7q44lxn02yn1fawm3rkcdia11hq99s"; +"templatetools.source-2017"="4cvfpn19a3cqhx9sx2jin35ycakq4wi8"; "termcal-1.8"="brb1gf3h9zaa07s0ppbvgjiava0yh9k9"; "termcal.doc-1.8"="3k8kgf7fy8b24n2jbx79a55awzs54far"; "termcal.source-1.8"="k680hlhzp03wfxnxld82sgsnaggfw38g"; @@ -5399,9 +5701,12 @@ "testhyphens-0.7"="xn9idcggd15gxl0iaphmlafpwq8ywilj"; "testhyphens.doc-0.7"="fpkvgpd63hz8zyra7l22rgb9cr4yiz3a"; "testhyphens.source-0.7"="fg7vps18xgf21gknlbcdikxn1yswafx1"; -"tex-label-2016"="wc2rqwp08adm869xmk7a6wkyzhfkbv6n"; -"tex-label.doc-2016"="lf9ff6q6n9rqng6akvbds9f1c6xiq5m4"; -"tex-label.source-2016"="vg5180hyadc0bl0hci4wzx90fvpxa2h9"; +"testidx-1.1"="2xv4ikmbq3d7njx8bd658hfmbn3y98i9"; +"testidx.doc-1.1"="6xdn43y612rixkk7v6f44c47znvrp3d0"; +"testidx.source-1.1"="3pnn4igzpbkgc7n1zgiq67wm0yf4f7l9"; +"tex-label-2017"="wc2rqwp08adm869xmk7a6wkyzhfkbv6n"; +"tex-label.doc-2017"="lf9ff6q6n9rqng6akvbds9f1c6xiq5m4"; +"tex-label.source-2017"="vg5180hyadc0bl0hci4wzx90fvpxa2h9"; "texlogos-1.3.1"="la6b3lzn1c4gw025npmz5xdm5rnq9n0c"; "texmate-2"="0i38p40p8maw2v0lypaph7fad88dar56"; "texmate.doc-2"="vaq40vr5526ic3fjdb2n1fr1q9s58wkv"; @@ -5418,9 +5723,6 @@ "textfit-5"="cik0z02pjb3a4xsbrfqjzva9m8cyab91"; "textfit.doc-5"="qzr9w01bk6ia7hv5r21m2nbfz2hldc4q"; "textfit.source-5"="g7ij0x5yghxq9jfr5vxq7vf5h8py3jx0"; -"textgreek-0.7"="m1b05a740x322la70k6ib44sk6cky167"; -"textgreek.doc-0.7"="vah190cds1677yv86nfcyriccln296yd"; -"textgreek.source-0.7"="cqc5zj4ck54rayydvml5m3n4hfnykglx"; "textmerg-2.01"="k9zrf9l5a75pzf1c30fxx48kly07m2rj"; "textmerg.doc-2.01"="bjgcbyn95fi8kpq91kkhhxbarw5dn526"; "textmerg.source-2.01"="4kws4jyfmh7w7z258clr3dd4x7k98iqj"; @@ -5430,8 +5732,8 @@ "texvc-1.0"="lkgr114w7d6z1896nirs06zfc052bs85"; "texvc.doc-1.0"="pn3lkc74xgzv837apqy731g291z7pi89"; "texvc.source-1.0"="z41sxdr45l3l8r15bxmj1zxybhmjbvfx"; -"theoremref-2016"="1md9iqkfgbhg6v64sgm94lp66x085rwr"; -"theoremref.doc-2016"="846wd88w325ganigw2g9rvhcs9is6ziv"; +"theoremref-2017"="1md9iqkfgbhg6v64sgm94lp66x085rwr"; +"theoremref.doc-2017"="846wd88w325ganigw2g9rvhcs9is6ziv"; "thinsp-0.2"="flil5f3fr9ghxa0bffvqy7wackrg7q27"; "thinsp.doc-0.2"="pk93sirkywa7hmqggnapklyz0bqy04c2"; "thmtools-66"="qy4wdqkznn7cg4jpvqi4mjbnqmb2258z"; @@ -5440,8 +5742,8 @@ "threadcol-1.0"="jwbi62xbc0cmzv65spvx1i6dijg34w6n"; "threadcol.doc-1.0"="j6v3gi6c2cnhs8z5pm0j1cwg7ayi4hxj"; "threadcol.source-1.0"="0irgk3ajakrjf1bgbfd71qvpy35fklmb"; -"threeparttable-2016"="1fmr9sbssycx23ql343hvvk4k0n90bgj"; -"threeparttable.doc-2016"="4y119m8549dk5kv4sbhh614nijlv0vx5"; +"threeparttable-2017"="1fmr9sbssycx23ql343hvvk4k0n90bgj"; +"threeparttable.doc-2017"="4y119m8549dk5kv4sbhh614nijlv0vx5"; "threeparttablex-0.3"="7slkq5cfxlah9ckr408l1wqxxc9x5hkh"; "threeparttablex.doc-0.3"="46r8874q74dgja9ivs4i3wcg35lwlv0b"; "thumb-1.0"="knz4ixhqam9i803vpaq6qmghx6n7h9hq"; @@ -5452,13 +5754,13 @@ "thumbs.source-1.0q"="pqgs9730gibbg66f9cspb9qlkqraic52"; "thumby-0.1"="15knwd9cgdmai53kdckgwap67qz0fmn5"; "thumby.doc-0.1"="6k49q0bwkajwd7wf5wkr0028a7c6p4h7"; -"ticket-0.4b"="8kjvrsfw83xvn979c2l6cmqr6k3xb9f5"; -"ticket.doc-0.4b"="8zzfsx53m2xvrsbzrip0990vygxw756f"; +"ticket-0.4d"="skfs956s0lzbxac4ydds9ynam475zk1y"; +"ticket.doc-0.4d"="c6d6arnzv37pczxs39h99s1isldk36fi"; "titlecaps-1.2"="lf0q66qrj3kw5hs90fbhr93dz7ik1gx8"; "titlecaps.doc-1.2"="qb1mj8p7srqz37f77wqs1igfcpl8wsg8"; -"titlefoot-2016"="1ggjs95rzvlmznqb8s67f7f3cjid5ynb"; -"titlepic-1.1"="9q4li6pm0n289xhxr5vv7cll3rvhzdm1"; -"titlepic.doc-1.1"="5d0g9p5skl85zl3bqwg5j2qnbi4fx0jm"; +"titlefoot-2017"="1ggjs95rzvlmznqb8s67f7f3cjid5ynb"; +"titlepic-1.2"="psapnhni7mhwd94s2qmki4hdlpbq3dbs"; +"titlepic.doc-1.2"="c363symm32mhjg8cxw9j4xsmyhdl58kg"; "titleref-3.1"="1ai0w05ipy1dlxm0n78jzvpdgp42j19j"; "titleref.doc-3.1"="6rgspvqn51kiw9gpp9bc59jxlyk654f6"; "titlesec-2.10.2"="25z9zccw5pikdak7045kw5651iz82vb8"; @@ -5469,33 +5771,36 @@ "tocbibind-1.5k"="f5kf8lxqhg6hn7qjnxxmrwphi11ndgk6"; "tocbibind.doc-1.5k"="v5vwh1sm8bzqky6lbabvk6j3gjp8bxx6"; "tocbibind.source-1.5k"="xq2f0iby2zafyghn0a9pjbvv1hw6z6fb"; -"tocloft-2.3f"="1fb42533y52mahpc3j3wkr2c7rva2myf"; -"tocloft.doc-2.3f"="188rgk0vm0rd62ddwvch3r9wazkqw7db"; -"tocloft.source-2.3f"="5d8c06hasaq2bxc1wmdmkalw52k353yf"; +"tocdata-0.12"="f8vsai2s3zp099254lq768j2dxrzciqi"; +"tocdata.doc-0.12"="726bz84j6ayvwjbrp7h1pwxf46b2p0j4"; +"tocdata.source-0.12"="36nc5nkl2jradqj6y7y6gsqfv1zmkfpl"; +"tocloft-2.3i"="yjmv81gig4vic5qsvg5mlnzgksspjgyj"; +"tocloft.doc-2.3i"="nh0fvc66rrd9ckyxv9gyackd180kikni"; +"tocloft.source-2.3i"="3mcnwnx824kls2j5ln3b80hcvdk8ch51"; "tocvsec2-1.3a"="xwl43cb8m7y9vf9bbkc1lb198mh0yg9k"; "tocvsec2.doc-1.3a"="pqvg5ky3w445h7i4hf1v1mcq5mpl3znm"; "tocvsec2.source-1.3a"="8q0df51x5bbj1xphln6skb4cjdicfynm"; "todo-2.142"="2ydakqj3py3dsviz4npq41s593blhag2"; "todo.doc-2.142"="hs7ghig9yh4xhyr1y6n570vkiwmimv8r"; "todo.source-2.142"="3gwsvfv1rhr1c6jb1xdgm9ycws6q8m2r"; -"todonotes-1.0.4"="2807793b23h7diy3fs736v6za5axmxx1"; -"todonotes.doc-1.0.4"="f0xh0hyjp600g835hrjki6rfl59kmdk8"; -"todonotes.source-1.0.4"="i9d9ryrq35qwqh2f4rkpvrs4d0d1fcd1"; +"todonotes-1.0.5"="08hfb7f1hsnq45grgbqrf6698vzvn2vy"; +"todonotes.doc-1.0.5"="gc86l5v2pllax8xpc2v3wf0dpn46192k"; +"todonotes.source-1.0.5"="r44l10yglwsjhwv9yl9xh0gbxvrmj0g4"; "tokenizer-1.1.0"="k1ixh9ndc7r9cna3q86cccz4ibja32cs"; "tokenizer.doc-1.1.0"="yvz9x41xdnf5449k2ixpbwrpgyhwpr5y"; "toolbox-5.1"="czvh3swrgna1q4bf7dvbi6vqvaaja1z4"; "toolbox.doc-5.1"="xl7w44azdaxsr34cz9fpy63pzfgz1pm6"; "toolbox.source-5.1"="72cwzx2fbbqb0q7n8s2r8rwckfrfc8vj"; -"topfloat-2016"="a6wpasrna61fbpcb35m1gighj3xshfrp"; -"topfloat.doc-2016"="1gqq1kwkhj4s99vrqc3hys2pzr691k0d"; +"topfloat-2017"="a6wpasrna61fbpcb35m1gighj3xshfrp"; +"topfloat.doc-2017"="1gqq1kwkhj4s99vrqc3hys2pzr691k0d"; "totcount-1.2"="mjp1wrksnwg89cj9si72fj1zjyrw9szn"; "totcount.doc-1.2"="q1j4ja1xiqc4aahh7d02cnm8pvb356r6"; "totcount.source-1.2"="g56d6lcx4g79iqg8af4nazv3lf3973ic"; "totpages-2.00"="5lxvigm3prx6djwih6imgxf27d57sw2f"; "totpages.doc-2.00"="9kxxf13pfksp7whw0rkx554qn9dbbbhj"; "totpages.source-2.00"="y4d9lbpab1xlfdd69q2558c5d0ka5mrj"; -"translations-1.4a"="6nwhc34hgsviaf6h677fmvknrxr5jr4y"; -"translations.doc-1.4a"="gmiqssij8f73vy1gn0504nj1552c82z3"; +"translations-1.7a"="lf9q67l2kyl24hbhr3ir66rq078dydrj"; +"translations.doc-1.7a"="adqaxzgjhsjn0hcryjgbib4f1n6yii0f"; "trfsigns-1.01"="5q6ajydw6n8k0b6rfflyp0bh973n4lqa"; "trfsigns.doc-1.01"="bapnr3mrhxw22p78cg2y7gjbwfqirg7f"; "trfsigns.source-1.01"="mmk5v5g9xidmfki3jnik1m7rmwcp0xf8"; @@ -5515,23 +5820,25 @@ "tucv.source-1.0"="85rsysj0whl6f07njaxigyk14ij204gc"; "turnthepage-1.3a"="kiaa5nrr0q0zdgbl22349ilfl23hlzvl"; "turnthepage.doc-1.3a"="akqb1g5iyf9f7shvsm0v5wqzi43w8974"; -"twoinone-2016"="mg0zc3lsfzqfcj9w6qgqiynjkqki9h92"; -"twoinone.doc-2016"="8shpm77vq1ir8f18ix6ddz80jn0qg0ni"; +"twoinone-2017"="mg0zc3lsfzqfcj9w6qgqiynjkqki9h92"; +"twoinone.doc-2017"="8shpm77vq1ir8f18ix6ddz80jn0qg0ni"; "twoup-1.3"="9zz59lr969ia2fr0kawfiibwfvjz8803"; "twoup.doc-1.3"="scznf4yfaq02nd7yq3fkjxn2cnzhd0s8"; "twoup.source-1.3"="rksz35jmn56sd5s5m3fmsp7a33rgk0c0"; "txgreeks-1.0"="6g3vnp9prv91yjr054dshpgdl2f62w2x"; "txgreeks.doc-1.0"="rvca7hs2rrssy46nd855knh10jkav8s0"; "txgreeks.source-1.0"="aifnmmsvmda0vs6xvw2xrl3dyvr6sxkn"; -"type1cm-2016"="fnxv8a4anvnhl4a2hm1fx45hpdns24mh"; -"type1cm.doc-2016"="fly8yjqm52klwal3cpiw5c3c8pmy75n1"; -"type1cm.source-2016"="735jsqhiaa26wlbbwq764rl18s3j1s7v"; +"type1cm-2017"="fnxv8a4anvnhl4a2hm1fx45hpdns24mh"; +"type1cm.doc-2017"="fly8yjqm52klwal3cpiw5c3c8pmy75n1"; +"type1cm.source-2017"="735jsqhiaa26wlbbwq764rl18s3j1s7v"; "typed-checklist-1.4"="cpp5vq1jjm6j10cs8kd0pgm4zfjc9c6k"; "typed-checklist.doc-1.4"="pl26829sbpz8dp1yj6rqac7hdzrkahw4"; "typed-checklist.source-1.4"="jr53p2li6f3a00kfikz9fr20bphcr0ha"; "typeface-0.1"="cfgy9wb6gcjvx6ki1paf42l8qwsh7glc"; "typeface.doc-0.1"="60y2dvas00811spzl8bjwjzm6hz1plvj"; "typeface.source-0.1"="v0i8v4sgr0df953cfp39d20shiyk69c5"; +"typoaid-0.4.7"="ab2akk0hicpkgis255a91bqzn67awvba"; +"typoaid.doc-0.4.7"="ab6c2n162jl25cmynkks5z0978ki0myn"; "typogrid-0.21"="av412ig7qlf5bq7rdwvsg4ik5rsx94dm"; "typogrid.doc-0.21"="assax9xx3pfnb27qal4q5g2wgxa87mwn"; "typogrid.source-0.21"="nqrxi01vw8mia4pswp68yvj1rxnya86v"; @@ -5541,9 +5848,9 @@ "ucs.doc-2.2"="z3jxd58nlj0lkch4gc3jg4nwc2aqgzwr"; "uebungsblatt-1.5.0"="9z0cwx5jfib1mfyq49bq2yl0yfacwg89"; "uebungsblatt.doc-1.5.0"="vps5ya9a8z6hv7lynd0fwizwxdxyb52j"; -"umoline-2016"="2vm0z3pykwnz31pyxxpmgdl3bbpzxi0x"; -"umoline.doc-2016"="i3rs7g3iqdqnkhicadrnfr981fwkmw8x"; -"umoline.source-2016"="rsd9s0gqx20dvf6sk91gwzlsx4mq6299"; +"umoline-2017"="2vm0z3pykwnz31pyxxpmgdl3bbpzxi0x"; +"umoline.doc-2017"="i3rs7g3iqdqnkhicadrnfr981fwkmw8x"; +"umoline.source-2017"="rsd9s0gqx20dvf6sk91gwzlsx4mq6299"; "underlin-1.01"="vp1wvsy871d28x0z1rw4pgxw9abkr8yg"; "underlin.doc-1.01"="8cbapdd7sbqfxs6s2fx6pv0d8x6b0sjs"; "underlin.source-1.01"="52j0xlhajihpgw5mp5zgpnsaiqkyfr62"; @@ -5558,8 +5865,8 @@ "unravel-0.2"="2wy3mzx9jfxaijrh25kyjz8l4r6fzphz"; "unravel.doc-0.2"="jd6afyhcdzb94m1w2i189vx0iddga5l2"; "unravel.source-0.2"="8fgbilfhn21yz1syl8spbvd0z38zw2hr"; -"upmethodology-2016"="wyyk5vr68dqq0yqmvggyxpk1ibqsifi7"; -"upmethodology.doc-2016"="jz8hinz4ax0jv72dvaslqd2inxw8pq9x"; +"upmethodology-20170808"="hy4n7lrw9k9lqmmassjyyald8ylfg945"; +"upmethodology.doc-20170808"="5r34ab8bm4nrsg712pypbj0l7bc4wcc8"; "upquote-1.3"="3pr0j9wkyd8fzk026qk6vzsv5hlyccy7"; "upquote.doc-1.3"="ilclzgj5m6nxhnz4398f5nwypf4jp2gh"; "upquote.source-1.3"="4j1q8nck1g1cg4paz65l2zpvyimkf31r"; @@ -5569,13 +5876,17 @@ "ushort-2.2"="p1yyh90qr3whijp18yjv9d6aqxp519k3"; "ushort.doc-2.2"="p7n00vh408fnmq7j619v8dnj08fw5x18"; "ushort.source-2.2"="jhn6sxdjyff94x69jhax021qfx39dca7"; -"uwmslide-2016"="zf5gky1nzsjd1jp5kq843in2prllnk36"; -"uwmslide.doc-2016"="m67bshz8bpzw4vcsj1klgh8sz3mnbx8n"; +"uspace-0.04"="mc9j21cj64djdxspryc0knx00xm2krvm"; +"uspace.doc-0.04"="72420339xc9l7a1xaz1pdkn7clkdrm7w"; +"uwmslide-2017"="zf5gky1nzsjd1jp5kq843in2prllnk36"; +"uwmslide.doc-2017"="m67bshz8bpzw4vcsj1klgh8sz3mnbx8n"; +"variablelm-1.1.1"="5r1z1sf1qa6j9l8z0hmbnmh5qr9xk33i"; +"variablelm.doc-1.1.1"="qqiyl1ckcn4z8fy6qphns8k80gwgydfz"; "varindex-2.3"="isp8j60q76fms3g4nlgf6d6da6f2y0xg"; "varindex.doc-2.3"="k6f0ji2kbz2slr8cbsbyifb4j19wpx0s"; "varindex.source-2.3"="g260r972d5dicmhzdch9kp77fxxakpqd"; -"varsfromjobname-0.5"="ic15rggbpqq2cd130rhwkqrvhw45zv7g"; -"varsfromjobname.doc-0.5"="vxifbbi9x12cc08hfcvmwrx38j8c9y4a"; +"varsfromjobname-1.0"="hy3mbsrrdd55ky6ilrmqfgc5dsx3kdl8"; +"varsfromjobname.doc-1.0"="inwn7n9dn0lym3nfh2szc3vfszhns7vn"; "varwidth-0.92"="z2p07dqsj6pmdk6wm7snd0bih1s1q2dr"; "varwidth.doc-0.92"="i4p58c787avqjqn5qqlcd19k8chxpp96"; "vdmlisting-1.0"="8kkhifiignvk7ilb9ka1b0bssgc7vv1v"; @@ -5618,6 +5929,8 @@ "vwcol-0.2"="hff0d1za1i8jqaa5bd7r94g4zvsxrmcf"; "vwcol.doc-0.2"="68p9iv66i4mx5l8s90ivl3w1pdmx9fim"; "vwcol.source-0.2"="x7qa2d5f1hxxbiabgym4g1n1n0g92x1w"; +"wallcalendar-1.3.1"="9ydbcsxj9n0nmrkr4drlbqwarpsa3lsq"; +"wallcalendar.doc-1.3.1"="cpsswrvazx036hyj0b2mfakfhziplm70"; "wallpaper-1.10"="hj7n1ajpapmwk51fnrhxawmgq6k9cxdv"; "wallpaper.doc-1.10"="751a0gq1m6px853zvyvbxv8migdm1pkb"; "warning-0.01"="a4agj71acw6kc20ikk8in8m27fcq7rld"; @@ -5625,16 +5938,16 @@ "warpcol-1.0c"="91kcbm5m59ym7kfjbhzdq20p9rhi7ci4"; "warpcol.doc-1.0c"="q72m3zkgkm7fxfq1453jsmqidgacb2bh"; "warpcol.source-1.0c"="lmr3rlbqz9q7j05glz4s8fyfrlm6ah43"; -"was-2016"="gw9043kq2ai4mkbcca20x5f10wnv8czz"; -"was.doc-2016"="y83pwhhkxlh92cr9b0hmps0izg2cjhmg"; -"was.source-2016"="cwqcmdh86sm58073zm929dxibw3flc02"; -"widetable-1.1"="0n206v1cghwwqan8izxx7m0spmk0vq52"; -"widetable.doc-1.1"="63ws9pvz6md8wjz0kvck8hbajazdrg89"; -"widetable.source-1.1"="3280bgr049jrra7vb1iy33i8pq2n0qk1"; -"williams-2016"="9xzcvf4nblyp6vl0vhnwi6lbbmp4lagm"; -"williams.doc-2016"="0fr8h1zsj1h1cf3qpjvdkg3yz4fcjdsk"; -"withargs-0.1.0"="a9d7w5ai4x1ap54hhb7ndx4k77cifa6k"; -"withargs.doc-0.1.0"="w3bdf6qbqvidpq7nhmjm7n0jlzsvjksy"; +"was-2017"="gw9043kq2ai4mkbcca20x5f10wnv8czz"; +"was.doc-2017"="y83pwhhkxlh92cr9b0hmps0izg2cjhmg"; +"was.source-2017"="cwqcmdh86sm58073zm929dxibw3flc02"; +"widetable-1.4"="1hbr1fdq4ssp796zm1j21lqqlv599jml"; +"widetable.doc-1.4"="5pxhchaigkbjblkp62p8i0kg27c2bhv7"; +"widetable.source-1.4"="3c54f8shs2ndrrqdxw6xp4bmy0isbv9g"; +"williams-2017"="9xzcvf4nblyp6vl0vhnwi6lbbmp4lagm"; +"williams.doc-2017"="0fr8h1zsj1h1cf3qpjvdkg3yz4fcjdsk"; +"withargs-0.2.0"="ahb75dczlyy8shzql034xqjq72ll0yvx"; +"withargs.doc-0.2.0"="6sr29bzbhwzcf77pjzhqb21fsp0541dj"; "wordcount-1.7"="839mnm7jbjmcsqidl0ddmsqgvwaxv1wa"; "wordcount.doc-1.7"="hsddvb5521vmj65yns8f9d69nnwhh6iq"; "wordlike-1.2b"="l4ma5j7ga4b3r6f627vf1vwcb872n3jr"; @@ -5642,32 +5955,39 @@ "wordlike.source-1.2b"="3zrpdarw3brnc5w1c5bgvxj37qlpc9cd"; "wrapfig-3.6"="0r2wm95j00mxbiqgyk2d5vsb4l013zdw"; "wrapfig.doc-3.6"="bb3z98p5kkhh2cw6qm0as75xv914l84d"; +"wtref-0.3.2"="427q1xixm8dz8wfh9z2bny6brs3s9i3j"; +"wtref.doc-0.3.2"="s02aiynd81ksydrfxlksamrdfkhhhfqn"; "xargs-1.1"="s6g70azr1g9mg42k7lgii1ngmyjad657"; "xargs.doc-1.1"="d8y9n347qlv5ybr4ahfqf51yb4g9wjzy"; "xargs.source-1.1"="zvlns27k99jmi1iy7nyc03kyyy8kaycs"; -"xassoccnt-0.9"="8vl4zg4d7kbvyw2d6zv14z641d09hrnw"; -"xassoccnt.doc-0.9"="gzmqyk4ykbdzdi7hdrv8hmsrpdgjmxz9"; -"xcntperchap-0.2"="xfr7rhdjafbnk7cvm7mkh9s1xvvxg1vx"; -"xcntperchap.doc-0.2"="x8pd9g74401ncjh0kxlclmkz4llbxsjw"; -"xcolor-solarized-0.3"="chbj9bjwfsm7pdjf72p3b82nfmn9ghcf"; -"xcolor-solarized.doc-0.3"="a8xwwf92kmz5y4aqpr5lgsdi9w20rn10"; -"xcolor-solarized.source-0.3"="aqd0xw3956pmvsjpz515i8ghhhq960r0"; +"xassoccnt-1.5"="gm7gxwzywrp5fx7y7n0ai3x8q0r33c2v"; +"xassoccnt.doc-1.5"="hxy66pflw755lgs6kfam4gvyv4c5vfal"; +"xcntperchap-0.4"="0iywxgavwp9jrrfb5rx6b9yzqxgzjbwb"; +"xcntperchap.doc-0.4"="526lndnvgdfy2rgsr9i46z4sx0dgssh1"; +"xcolor-material-0.1"="08zazp49lpmm92ang9i2q34kvx7v4rli"; +"xcolor-material.doc-0.1"="r646x6g0hwsi91hrxzz6b8l6nbbh3gig"; +"xcolor-material.source-0.1"="98z6j5l2iw9j1pyxmglm6b0gjdjyb2l8"; +"xcolor-solarized-0.4"="zwng9y8319hj7khamri46ppb0bcybpwz"; +"xcolor-solarized.doc-0.4"="c83zvv123bjwr6z10dgfih1k6b9wk4k8"; +"xcolor-solarized.source-0.4"="5p141gbzdasinppirw4wyb0mm9875bcw"; "xcomment-1.3"="qnmk0vpj33sszbi3hfndscjwcmg1gf5h"; "xcomment.doc-1.3"="m5a8wm984ff59mg0jsf4f402zbjqf0b8"; "xdoc-prot2.5"="awz55rah1196cknc1qsy0dc8ra91dvjn"; "xdoc.doc-prot2.5"="zx0nabzias47jm6270rmw9wqr117mb75"; "xdoc.source-prot2.5"="51sid2ab4iwhybxhkwf5wwxflabqy4v9"; -"xellipsis-1.0"="x7kbgr1jynxw7rbf4i7z41b7rghmf9gd"; -"xellipsis.doc-1.0"="2h5f30la1irs0lyshdlpbwmx1rm5ksrz"; -"xellipsis.source-1.0"="4i5w6w2shpkm1d5qdvyqzpym1qw9xxbd"; +"xellipsis-1.2"="rj1gs7pjl8prl5hgzja22wzrp4phxbmh"; +"xellipsis.doc-1.2"="mx9dzws449rkvdfmxn0688m8f1vvg2z9"; +"xellipsis.source-1.2"="8m51f0mrpm5fnzakijm38vxswzda3f3v"; "xfor-1.05"="x2bs3y606v8f42ds7xp2kmllq0vmrnms"; "xfor.doc-1.05"="lbgdf0qia743jdvlxqf7vm4w1pc77kar"; "xfor.source-1.05"="pafv6fqj0nd5xm0wgmwavkmg97rw7dnm"; "xhfill-1.01"="6c09h61nlwbviwc1vfvmr4jhbrw2fs24"; "xhfill.doc-1.01"="cw2rx4v66138fsh1vwxhq9smyai1xlr4"; -"xint-1.2g"="xdkk8ph0ad50qakl9dk31vlapdsg6aj2"; -"xint.doc-1.2g"="36pjbxhqxl9m84624vbdmg8mlahz13ih"; -"xint.source-1.2g"="4zwsacxjknhwdr4md0pvg2n2brvhi876"; +"xint-1.2o"="ra5aac7dhj04x57msq70dxjvz95y34sd"; +"xint.doc-1.2o"="j5r7k4mmpirl0l5jpariz5bl5vxkihdn"; +"xint.source-1.2o"="iw48mmji3k70riqn11n3vfz7vlnp71x4"; +"xltabular-0.03"="vna4kl7alw7mj4cnja5nf86mfybk4m43"; +"xltabular.doc-0.03"="6db58n1fnqgsh54r1y7l4wcd6z0db31m"; "xmpincl-2.2"="wjg1lw656zbn3h41pxqzwwag9mgrk3h6"; "xmpincl.doc-2.2"="dczhfj7g5h3gf3vg7wncvccn1q3xavqp"; "xmpincl.source-2.2"="0pfma5c8agil5jamikja0qh5fnyd9wn0"; @@ -5686,9 +6006,11 @@ "xpunctuate-1.0"="n3mxrha0440l5ngic93idrqw2agmisah"; "xpunctuate.doc-1.0"="lrvqrndq151vfz34ycvjnh3sw77v58lz"; "xpunctuate.source-1.0"="cmmzrijia2ir3mrhcq4s531la5kx18fj"; -"xsavebox-0.2"="c0690467bp22qlwzkya4kfjgpi96avfv"; -"xsavebox.doc-0.2"="c47bayjg6qzzsn2zxckzx9x9bz93jbs4"; -"xsavebox.source-0.2"="hwld00rv1xk8wz66hhbi0klbqfsr6hm8"; +"xsavebox-0.7"="9xw5rn16kqwkb7gh47rxi4k6nvw4zssm"; +"xsavebox.doc-0.7"="0jqg2f31dibmxl8w6dl6jicb863wf62i"; +"xsavebox.source-0.7"="qzzx5fhwkd0kl7c6rw8gi3bxiqm7skgb"; +"xsim-0.10"="hj9jfx2qq5qqyr1kzzc2hg0d0bl4wrza"; +"xsim.doc-0.10"="pv4dn3j7ky28myxy7q58kn0ing8zgdlg"; "xstring-1.7c"="yykas5nwn259cnpaxjgijvv1z0s1xd25"; "xstring.doc-1.7c"="xawlbcagd4a1sd0ndzm12d8h80fm5zy8"; "xtab-2.3f"="zqrxzgk3pn3kw19jm28bvg0lch9lc7sm"; @@ -5698,56 +6020,59 @@ "xwatermark.doc-1.5.2d"="1ixadba47dckfx4r1hhzfd8q1wivygpj"; "xytree-1.5"="2kq4h083zj1zi2zvrhsnqz5wjyl0dkxf"; "xytree.doc-1.5"="05af0l0bbcbr5gav843zs69p917cx3xy"; -"yafoot-2016"="nb46q5csnys171p4y07ifbp4il4g6qn7"; -"yafoot.doc-2016"="6866y5zf5dhvk90kw03s7xi0kdwrs10l"; -"yafoot.source-2016"="mm2a4gpd3llkfz3ifvi96jvz8xl82az7"; +"yafoot-2017"="nb46q5csnys171p4y07ifbp4il4g6qn7"; +"yafoot.doc-2017"="6866y5zf5dhvk90kw03s7xi0kdwrs10l"; +"yafoot.source-2017"="mm2a4gpd3llkfz3ifvi96jvz8xl82az7"; "yagusylo-1.2"="rbhp05f6y6zw687pdw1mbjvaf99v7qy3"; "yagusylo.doc-1.2"="av3jf7zqa6rprfip5lm173xj2f1rffb4"; "yagusylo.source-1.2"="6z69ljv1xpv2cn81l63d8xrbwrk8am5m"; -"ycbook-2016"="dclc10yla2licc92m1pnqyxf5b1943v2"; -"ycbook.doc-2016"="kv4xx8rb41ixg85akxzslqynkr7r4alk"; +"yaletter-1.1"="br7r3x3n8h5nlfy36csx8a5ji3cf12wl"; +"yaletter.doc-1.1"="x5mhsm4pxjc2klcnwqyrz10gbq4kzw0x"; +"yaletter.source-1.1"="c1la5n24hxfi3paxwxd8m7lxpd083k0h"; +"ycbook-2017"="040lf3a7r9b33qmwngkr7r1q2cjfab4l"; +"ycbook.doc-2017"="8nq8qpzh43pnvqfrlihkimz7w6n9kph3"; "ydoc-0.6alpha"="4di93jv5wpv4bdng1ibkf0ma6m0bknz9"; "ydoc.doc-0.6alpha"="80hq2xznj76kgj0zb6zv6li578kc3r2i"; "ydoc.source-0.6alpha"="39128wyw2py0j8f334r7drff849ad2sv"; -"yplan-2016"="rm8ln7pvl6i672107i8hxic85s994g6g"; -"yplan.doc-2016"="0h0wa59ackd645spdqk9vqy0gzzp8f8y"; -"zed-csp-2016"="ggjqzwn3zi9x8ziddkh7xizgw80qqlrv"; -"zed-csp.doc-2016"="5p8s701yk431qyngw010qws6b9shx588"; +"yplan-2017"="rm8ln7pvl6i672107i8hxic85s994g6g"; +"yplan.doc-2017"="0h0wa59ackd645spdqk9vqy0gzzp8f8y"; +"zebra-goodies-0.1.0"="dr3dldrinlcvkrfp4bxwm8i9vbifvmlj"; +"zebra-goodies.doc-0.1.0"="gklc8j9w99rj38zrb472aa54plac099z"; +"zed-csp-2017"="ggjqzwn3zi9x8ziddkh7xizgw80qqlrv"; +"zed-csp.doc-2017"="5p8s701yk431qyngw010qws6b9shx588"; "ziffer-2.1"="jv9y39n2mj1csaixb3pdfp0qggc16b04"; "ziffer.doc-2.1"="3ys31swbmm03zmnlvfm155aii3nrd2sm"; -"zwgetfdate-2016"="ibagqadgb3nbq8y72lzhrbamv5xcipk1"; -"zwgetfdate.doc-2016"="idw9limrda31c7h0xd3j6v23xqbd2nn3"; +"zwgetfdate-2017"="ibagqadgb3nbq8y72lzhrbamv5xcipk1"; +"zwgetfdate.doc-2017"="idw9limrda31c7h0xd3j6v23xqbd2nn3"; "zwpagelayout-1.4d"="6wskn5h4bxigry3bjdf90ibdfrkinln3"; "zwpagelayout.doc-1.4d"="rr3q6ypq18rkaa77ikr0j2sd80pp322j"; -"checkcites-1.0i"="rxrn60krdqm7r1cw8jiqqvdbkbdc7gdf"; -"checkcites.doc-1.0i"="cqdxzcc6kkp5dbxk3j0xapb17y6206ch"; -"chickenize-0.2.3"="88fk20yd7a2z87m14hq9iafxlh0in10c"; -"chickenize.doc-0.2.3"="pilc6v0amdhyn3s0r2ff7khx71m93fch"; -"chickenize.source-0.2.3"="spkn5l6y1z2h3rzhph7s1d2k1kjwgvma"; -"cloze-1.1"="f37g67603xg4lxxq2bjf8l46hfhpjax1"; -"cloze.doc-1.1"="06dbczv4d5gd5py53vwzqpdb8g3dm3xy"; -"cloze.source-1.1"="q9s5fgksr5dppfzy72j4mxbjh3yjg75z"; +"checkcites-2.0"="sl7bgm1kvqvl8q5ykbkxpin78pn6ivb3"; +"checkcites.doc-2.0"="5k7dlp98z1dr1vlir72f0r78vmaxl4ps"; +"chickenize-0.2.5"="bh3kdbw0yvz28izgmxxw3psmirwmfcd5"; +"chickenize.doc-0.2.5"="hqyyggfs1is65gfl4ck1mki9wgm6238v"; +"chickenize.source-0.2.5"="xhybj8jxyv1fghx7955dcgfcl9kjgbkw"; +"combofont-0.2"="3fkzcqjwxkciacvpvncnvzknf6mrrgh6"; +"combofont.doc-0.2"="c49bkqad9gw6lghaqkl4jp53501wfcgc"; +"cstypo-0.03"="4iqsrwnw7pnzhzzspr686pf6y4img6zp"; +"cstypo.doc-0.03"="3s9dsniw0yz2j7iffbsycsgrycfbjlg9"; "ctablestack-1.0"="cavlzn944q3fhha3i4kf8bgvm2y5zpdh"; "ctablestack.doc-1.0"="g2d4fq9nl422i3i0skmlrydx6d3ks8cq"; "ctablestack.source-1.0"="bqrksg21vxxki14v7sadnh35070f2vdy"; "enigma-0.1"="1d9g45cwjgz5imk677zrza79fhwvz3cz"; "enigma.doc-0.1"="57pmvf7xx9hp23jxaj4sfam0526y652q"; +"fontloader-luaotfload-1.0"="vg98ak3japxis0z4cawqch4ibpiz772d"; +"fontloader-luaotfload.doc-1.0"="116ayy7677jgdyxikhpi540c6hxapx8l"; "interpreter-1.2"="pk1rbxzpaf3gida3dcshcgl5c12rgxzi"; "interpreter.doc-1.2"="p249plg4a7qmq65rm84qfs5xvjwywnw4"; -"lua-check-hyphen-0.4"="ahcs7ljiyy5c74x94dlhs29d3yz834d3"; -"lua-check-hyphen.doc-0.4"="rmb8fxdp2pnb9ffzbm8cdj424b7mpxq7"; "lua-visual-debug-0.5"="a728vzfhwg0bq8jhnznyxl59gaf9dfwk"; "lua-visual-debug.doc-0.5"="nsaxcsri49qpjj878k6l4yva2k5vf6m0"; "lua2dox-0.2"="f8nhx5l1x2vqsrnh0amwa4nrf77b6zjl"; "lua2dox.doc-0.2"="af422a39m2llgqkjghlhh9ix120jdrbi"; -"luabibentry-0.1a"="lm4x9gqyj8ha0cjwmmy7h4yffnd8wymx"; -"luabibentry.doc-0.1a"="psn62xnv0l494i67jzsc0sbij0r2kcvb"; -"luabibentry.source-0.1a"="9l96kjwd1kwkj7rjcrlq3vcyiylbawrl"; -"luabidi-0.2"="8af0f67k7hj72wsfrxxdxzl1p39byasy"; -"luabidi.doc-0.2"="9fdkj79aasj5vskrqqnr7c9zdy8vb8c7"; "luacode-1.2a"="8ckzckz94cdkygfjyh2dfldhr1pwa8dl"; "luacode.doc-1.2a"="2xzk8133632231pnn3v0afb003xhl33f"; "luacode.source-1.2a"="dw3p52gn6g103qkp5v8vmgxpj2b4cwb7"; +"luahyphenrules-1.0"="lpkklcbarmvfm4y9d5zgm9is55y66f56"; +"luahyphenrules.doc-1.0"="ch7vc8skad88crgb1blh85ig9sn97l3f"; "luaindex-0.1b"="hlzsr82cp5vs41bvnp22f8jc3kkwyk4y"; "luaindex.doc-0.1b"="k1nz25w1nrxbfcg8g9lrb4gm22i3m7ih"; "luaindex.source-0.1b"="7pg6v1phdz96x5nmwsnf5bd976s2magv"; @@ -5755,60 +6080,77 @@ "luainputenc.doc-0.973"="jyiy6f96v5nvrr4lp765vpvhrl96j67q"; "luainputenc.source-0.973"="5v1n89k8wg4g43fnx0wz53gdxp7cvgji"; "luaintro.doc-0.03"="gcz5ihcqinbpnqza158xsgw65h17lgi5"; -"lualatex-doc.doc-2016"="9vq4qxdsf4gfskrqpb45wj9m0jdkcykh"; -"lualatex-doc.source-2016"="jnrcirfvz7w28pcq3cvwb8g8khd3gzh2"; -"lualatex-math-1.6"="gqg4agy90mdyhrj20bpszk4fl4g7pjhp"; -"lualatex-math.doc-1.6"="xrvlm16l02f5s4cjl7rjwdsgkds5d8gc"; -"lualatex-math.source-1.6"="xan32mk86mc0lx4q94s140vnl29xyxiw"; -"lualibs-2.4"="mazy6j4bfync048nj6fhgzi99mcr6ra1"; -"lualibs.doc-2.4"="zixcbl3i6p5y0h46plkcjv48inc841gz"; -"lualibs.source-2.4"="6cfcjm2vr1py41r2nxj24mb8xixj464l"; -"luamplib-2.11.3"="wnvnfhjlyhgyw1073nb140smf46xgdvh"; -"luamplib.doc-2.11.3"="x1ircfrj5g5v53q3n3vkzh46r54hb4b8"; -"luamplib.source-2.11.3"="mwc4n65b65fw5pmm5wgms2hbwk6zhhzv"; -"luaotfload-2.7-fix-3"="bcqcf9ahlpw8866l3xnhbi8pw52g9a4y"; -"luaotfload.doc-2.7-fix-3"="a6ayw6rx6pzqpyay1v35pylw0ganim17"; -"luaotfload.source-2.7-fix-3"="xx93qbrhazh729f26vlfp1x7kqbs4yyi"; -"luasseq-2016"="k07ymsxywmasi0nkdd2ldk164lf36z9d"; -"luasseq.doc-2016"="vnqisa721w2nx11wxb3zsk070b3dzm1b"; -"luasseq.source-2016"="341ldjdwdvjin4rq8ica4f69hb5kbwr1"; -"luatex-def-0.01e"="i7z5yl17iwjxa8k2si4xhixb6m96paak"; -"luatex-def.doc-0.01e"="lp4il3gbgyw7nk3g70pd2asfiwans3qr"; -"luatex85-1.4"="ka3px4aiyi8gq487i085s31y9l95jzp1"; -"luatex85.doc-1.4"="ac2agmy9dkavln2vnd63fmavv7xnkdrw"; -"luatex85.source-1.4"="wpm4dw7j6fikz3dqa4zk3r5avg4isxr8"; +"lualatex-doc.doc-2017"="9vq4qxdsf4gfskrqpb45wj9m0jdkcykh"; +"lualatex-doc.source-2017"="jnrcirfvz7w28pcq3cvwb8g8khd3gzh2"; +"lualatex-math-1.7"="psliwjmyjf7rf1zxqfinpw6xjcijj906"; +"lualatex-math.doc-1.7"="i3a93gp6s6k1qlchh9wjlzxjnsfa8qm6"; +"lualatex-math.source-1.7"="bxf60i66c2dalirywzyq6qr9vw4gv8kd"; +"lualibs-2.5"="p975fbb74h2gbkwsqd2gqpmn7knklrry"; +"lualibs.doc-2.5"="jkfd05nmmm2p8bdqf1dz1kbsc77428c2"; +"lualibs.source-2.5"="bf55j3qmny5m91vm2fp7vqzx06kdf3q1"; +"luamplib-2.12.1"="00bqg0gxzpjrpc7bvnbvv1p5lp8v0yv0"; +"luamplib.doc-2.12.1"="l0nayjkmvn25fpchyhpbgldrksvnhsjb"; +"luamplib.source-2.12.1"="a46xp5q12wxc5z2hinfdw9bssawhalrr"; +"luaotfload-2.8-fix-2"="sp53ks2p5pbppdsanrgi0zdz4jdm1197"; +"luaotfload.doc-2.8-fix-2"="w4zkf61hmhp3xlhf392hgk6kxhzynw9k"; +"luaotfload.source-2.8-fix-2"="hx4zfc8xwya9qvg69jgl2dv2ab31sjy2"; +"luapackageloader-0.1"="rc85q0c3lyjd3c4mhjjbqlcywycwxcgj"; +"luapackageloader.doc-0.1"="dkccp3n7nwkwv9scga2xa1aqqplsird6"; "luatexbase-1.3"="hjzprkfxz8i905ffdzfad0myg2ym4vg4"; "luatexbase.doc-1.3"="3rnbzrql8m9ss0pk1yydy4v9acrk3qq0"; "luatexbase.source-1.3"="v5x5csbgplvah43m8lbjky2nmfk2s3fp"; -"luatexko-1.15"="jkv5a7jdf2ycbvbsj81qb795g6n2cmix"; -"luatexko.doc-1.15"="65mfbszrqmv4pi43m2j2dy695h38s5qp"; +"luatexko-1.18"="wl697fsrkhayxa4gip5kjm8wnpjm28mv"; +"luatexko.doc-1.18"="d6vpnzhw0m9yhlard38nadgd122sjnqy"; "luatextra-1.0.1"="xb3dbgfnm7ww87n60ydpilkwqczj77lz"; "luatextra.doc-1.0.1"="4pfnnxaynvw166pp1ivb5pjp061n2bvi"; "luatextra.source-1.0.1"="3ajlrmqc27xyxlkn4vbprh6zzlqpf0xd"; -"luatodonotes-0.3"="9vz674h0z93rilb57pmajmbk4dgy03a7"; -"luatodonotes.doc-0.3"="mdy7s35l59gid17igbsb5q9ds4xg8ysg"; -"luatodonotes.source-0.3"="0f79l8dh5g7bgg9qish58qgvxb6hr55k"; "luaxml-0.0.2"="gyfx3h4rp9jhbwrxria8dxwdr5shrdqa"; "luaxml.doc-0.0.2"="8dzsl4mj3ld9n6bmyzahwkj25dyq04fs"; +"nodetree-1.2"="7x6x6xjd3aqhvz1nchhxckfhzjllfr21"; +"nodetree.doc-1.2"="jnpfcdpwafza66wmlvgv4jkmisfc9k46"; +"nodetree.source-1.2"="877wmvyrnhma4v3qdlq4r1pbk1bldlv0"; "odsfile-0.6"="1h0vzwknsi9w3vpk008mdk87l3c33ffl"; "odsfile.doc-0.6"="4wvljjvknahcyfnwkpnpbmzg26zaa9bp"; -"placeat-0.1"="mmg5ndbp21rdsiyy4sj42bbyrmy6riz6"; -"placeat.doc-0.1"="vq7q60h7z7ni3kkxwxwq2463iywy9r9q"; -"placeat.source-0.1"="q357ifkppqwkamvg2f8ywmvmhhc6lwy5"; +"placeat-0.1d1"="rkzxsay49qp6qpiy3wpd6r3byzrm4hgy"; +"placeat.doc-0.1d1"="x954mm7qhyffqbh9hrgrxa5khh5h70p3"; +"placeat.source-0.1d1"="l19sqs0ipd1pgpl6kzggfizxvc1cb1p3"; "selnolig-0.302"="gw2nwscxyg2p83bs90nnbg47wddkh0i1"; "selnolig.doc-0.302"="d73jxs6xck7m5y95hx6nfls1572za6qh"; -"showhyphens-0.5c"="fcmfcmzkv9k6k2d6l2brhwwvffzz3bcd"; -"showhyphens.doc-0.5c"="451qz6c2k3mvnr488s138m8wmgsf1zvs"; "spelling-0.41"="kajpixvypcfl8ivqqnscfcd1fb1vv78x"; "spelling.doc-0.41"="r0sqb4qz4n2w8n0092qik847f3dziq0a"; -"ucharcat-0.03"="d445ic6gwl7d5d31s691vr63f4hn76dz"; -"ucharcat.doc-0.03"="ma6rz3djr9v3q5p8ffqyznjb91gjj5li"; -"ucharcat.source-0.03"="kh9cnzg1pn8c51bbph2amp5y1j85q38h"; "12many-0.3"="kzixh8p9qmbz0hxczir6pixx8k6zc1an"; "12many.doc-0.3"="v5qw194xha1w7mr6x3zcwp9a0gpi4w4n"; "12many.source-0.3"="wqc3q5hqwg09g0sz7l5va9xazvmqbbrv"; +"SIstyle-2.3a"="35jza92m3n8nhfnqxpi4yx5xi90hf5mb"; +"SIstyle.doc-2.3a"="7y6y0ks7aa4yvqcw4jzh7rrrajm5lyfz"; +"SIstyle.source-2.3a"="i5kmfn2pan7a6bvl7saij0wbfq7xsx8g"; +"SIunits-1.36"="jpghwsag31g9f2lnzdzmfg1rg1vjxihs"; +"SIunits.doc-1.36"="1qalyh0q4lvlxxmwykaq3bp3sw76sscg"; +"SIunits.source-1.36"="6v2lr8gjm3f2kyqh7pc06ay5iswbi7p2"; +"alg-2017"="2z4gi58401dsjwivwji0b169ihz3assx"; +"alg.doc-2017"="43bcrdwkqnx6rharxz9l106cxycm408z"; +"alg.source-2017"="yq6bvw0bwwqq8c367ml9p9cbimqhkr1v"; +"algobox-1.2a"="ykmx4b4yz0vbbzw5pkabkq23da5ab2nj"; +"algobox.doc-1.2a"="slrgkjc160aasdqly9n72inxxs20p7dw"; +"algobox.source-1.2a"="1jk7jr14qb3sx1vffwazmvdhmnxswpjv"; +"algorithm2e-5.2"="w36nldd3zkmg3v74jzg22kwkw0vhja5b"; +"algorithm2e.doc-5.2"="b2g0vk8jb1yqqi9fnkvxizpdhlaqjn04"; +"algorithmicx-2017"="8hvwf9c6b51yc623g8ivxqzwd10c1j7s"; +"algorithmicx.doc-2017"="1xcga5bk7fgqq2dad5mzv2v2x0m6hqrd"; +"algorithms-0.1"="s07h59vabig8jdk2d7r98hdnxpyq52sm"; +"algorithms.doc-0.1"="vwq0lnznxpwi4zpp4hjaljdfc3c2h6yw"; +"algorithms.source-0.1"="cskf3mpv2rk435przyidljaijx46fiy9"; "amstex-2.2"="lpqwc8f3c8iv9691yxqs6r00dkjp9mh2"; -"amstex.doc-2.2"="6kx1w9mz2120b44w011lc11r3difiwab"; +"amstex.doc-2.2"="xagb7dirsg6c0hwpcm99sy1b3p7vklcb"; +"apxproof-1.0.5"="n6vfgg21i1ln96a8ma1flmi3slnprfrp"; +"apxproof.doc-1.0.5"="l40pnh0x9hwavdbfl5q6zq4z15frscaz"; +"apxproof.source-1.0.5"="ka30dkm7rgbhws3igknx7mq6xzp16svy"; +"autobreak-0.3"="61yyi2p6gf0sjydn5kr8h8qvpxgmvbin"; +"autobreak.doc-0.3"="lzi2q6g0mrv5l8kb3b9yg0ykiiwimyfv"; +"autobreak.source-0.3"="62cm1l24gp51a8jnag36y8gm1bwya7la"; +"axodraw2-2.1.0b"="s60pc7wafn9ybkk0576i8daxm8ywchb9"; +"axodraw2.doc-2.1.0b"="s14v3s2ffrxlq0czh1f26fzr0pp8f9nm"; +"axodraw2.source-2.1.0b"="mm0maisc29q0kspj0jsm5i26k5h8n0ly"; "backnaur-1.1"="f74p150lbyc7bpvfg0cksv6g3and4qm2"; "backnaur.doc-1.1"="4kd67srbm2bxwrjj3rdd8k56g108bj5p"; "backnaur.source-1.1"="25zm2sxfdijfvbbcckim8glqfgidrc60"; @@ -5817,45 +6159,119 @@ "binomexp-1.0"="5jlh0g22c7b1i94n2qicn0j6k4zmami9"; "binomexp.doc-1.0"="vh653aqsqkvcsmrvzhw1h4sqvirxg3yv"; "binomexp.source-1.0"="jairxsdavf3ll4160dlbc39hriyyyrdr"; -"boldtensors-2016"="ivpsy3mgqghbw4qv325j9rc6nwwmh9ya"; -"boldtensors.doc-2016"="nbg1ilwbjn61g6g93bnqhfm5xgrgqzgk"; -"bosisio-2016"="dinsh8vlzgch7mvajkqmikbpgmzryqld"; -"bosisio.doc-2016"="asd7h31zda58mwykhc4jfp5nwv21y7b2"; -"bosisio.source-2016"="m2y96hhgypgcsli8v19w6jn7y39d23vy"; +"biocon-2017"="d5164k5f9rh092j3yd5vysfzcp6qbvc7"; +"biocon.doc-2017"="w3c6g9qr6s5pm76jq7v0fk4fs90p5d20"; +"bitpattern-2017"="s1gn3l5lfz24xgg768032s318gzx96zy"; +"bitpattern.doc-2017"="8nq9nd4qsrixnnw32saxp6272d26w040"; +"bitpattern.source-2017"="1xa4jib8aihzccs6lrijw5x0cvhlrkcl"; +"bohr-1.0"="5r65jri672mlqzhd26dmys54sj19c8kz"; +"bohr.doc-1.0"="8gsrm5xrxfqqgpljlyizlcdz4lw3xk9h"; +"boldtensors-2017"="ivpsy3mgqghbw4qv325j9rc6nwwmh9ya"; +"boldtensors.doc-2017"="nbg1ilwbjn61g6g93bnqhfm5xgrgqzgk"; +"bosisio-2017"="dinsh8vlzgch7mvajkqmikbpgmzryqld"; +"bosisio.doc-2017"="asd7h31zda58mwykhc4jfp5nwv21y7b2"; +"bosisio.source-2017"="m2y96hhgypgcsli8v19w6jn7y39d23vy"; +"bpchem-1.1"="c1qr5s3jp7zg06sis026ll5b38axvni2"; +"bpchem.doc-1.1"="54qyy00y03jbbhg00az5as1bc5h9i2fr"; +"bpchem.source-1.1"="r4bya1mqkjjnmzc14jlbv676ls312ynl"; "bropd-1.2"="zhrvx29z8y1gs88y8lx7wvi0dlhamkmq"; "bropd.doc-1.2"="1k5254jbhikwqrx5wv61qmznkhp41mqw"; "bropd.source-1.2"="8hny5cxa57186p4brdriyp3hrmmqr9ww"; +"bytefield-2.4"="whxn5qk2z4pia4hpafbzggp6q6zai2c0"; +"bytefield.doc-2.4"="ixgwy7pi37anjp4nmm765hc6hh484gxz"; +"bytefield.source-2.4"="mmnbxv3g3c6i858xs5dazi1nkfvrxsjs"; "calculation-1.0"="sss6l897zlki1lidr2s5vp60rv1jfm0f"; "calculation.doc-1.0"="zwcix1a11s0s1hh7ccy28gbdxylz1n3k"; "calculation.source-1.0"="asdip95ln7gna99vk7hjiq8n1hfcqg1x"; "ccfonts-1.1"="11ghrz5bz02nw40srb3ih2v3r6pmsvq5"; "ccfonts.doc-1.1"="vz7iqli9bwplwd20xvpdkpswc7r5zvlc"; "ccfonts.source-1.1"="iylfqg59y0yadrzjb1xcb6nbw7rkjfr0"; +"chemarrow-0.9"="mb0i68z92909632g3xd1m3ahvmg0nj72"; +"chemarrow.doc-0.9"="h7g7ldb9837ngsxbmxm2c902bk0k2wdg"; +"chemarrow.source-0.9"="05g345ir5pvd4wik23yykarizwp0l506"; +"chemcompounds-2017"="7m2snwdxnachamq617zap92fsgdqhay3"; +"chemcompounds.doc-2017"="imzf21bm33j290wmy96hx88ahf5zgbff"; +"chemcompounds.source-2017"="nwcxbn1ivdiswdqyr319y93l76527amj"; +"chemcono-1.3"="kppxwgnwc7f62n7bwi2gnb6zndxv4bag"; +"chemcono.doc-1.3"="r527psyb3zf91x0xd6ywiv429b0rmicp"; +"chemexec-1.0"="szl9xw9iiql9yi7la6hwcwx8frhdxkck"; +"chemexec.doc-1.0"="q7rkw9ny7g93m4xm5jvs17v8x4nwb2p1"; +"chemformula-4.15e"="pikmiqhp7658vggw4pdpip304s00jlf2"; +"chemformula.doc-4.15e"="vfw8hi8y9ysbp0ssaqiiphnlgyrjz5l5"; +"chemgreek-1.1"="6yfyrii5xkc1nz5bniqn134rqa2cdv6a"; +"chemgreek.doc-1.1"="x15bq2wwjyplpwpbj8hpz21zhzwjwryk"; +"chemmacros-5.8b"="8993jvwy5blsph2dckvh7g8y6154m33q"; +"chemmacros.doc-5.8b"="hqc6pskqgwdg9c9m83dapqgzz3nbfc05"; +"chemnum-1.2"="nk857am82h2zfh8f5l81sm3xrrg0vawm"; +"chemnum.doc-1.2"="awwrxj67jwai17nvgpgl2lx10n8wm741"; +"chemschemex-1.1"="2gf0m3crv8xyj0vgw3hkwwp1wkmrqdrc"; +"chemschemex.doc-1.1"="k0ggp3lgv2fnq369q0j26jrni2blcvnh"; +"chemschemex.source-1.1"="z9w3cyfnzg70i3ddmskkr1k9dpcyq3pi"; +"chemstyle-2.0m"="lzbqwhh58y559q5lbxnbbz21rfxp1rcn"; +"chemstyle.doc-2.0m"="zv454b37y12fspkcphm6qs0yy7x7768s"; +"chemstyle.source-2.0m"="v52wrccz5gh3pswpfilm4qs48bplws5s"; +"clrscode-1.7"="6w0y1xknbskhhahx05688943y4pqr22s"; +"clrscode.doc-1.7"="m1syqr9a0x2546s5qpslia4ic5zmf961"; +"clrscode3e-2017"="0fz3frh68k47pdn3way6fbpiagyillgk"; +"clrscode3e.doc-2017"="91b116aqyihwlizzw1apmvd8kaaia407"; "commath-0.3"="qgkl9s5w0dadgirg3aqg0si0zm8swxss"; "commath.doc-0.3"="ririan3s31h8cwcamjlwglbj4fyvc8b9"; -"concmath-2016"="7qqfg14ka9d6j0ccb3bswg0jhzg8gvjv"; -"concmath.doc-2016"="rw4q8bbj0jyv9fs9vvxv9iksi39mrjm3"; -"concmath.source-2016"="h0akd4lxynf1anylxfv0dibvpkkgb0f0"; -"concrete-2016"="8076kds0h67rl93yygsicgp8hpk6cfz0"; -"concrete.doc-2016"="xddpal4gfl1km582kqvn79q925mixskv"; +"complexity-0.81a"="id7q2in24z1r6mi47jdh98r7d9gkxdxh"; +"complexity.doc-0.81a"="jppdvfvs5wy2vbkzvizzirgrhf9k6sy5"; +"computational-complexity-2.25f"="hs6ja0ghmdhvkm2m5zk4bsyhr0z0z8b0"; +"computational-complexity.doc-2.25f"="nr5kmmq6nd2ppdyy3pygb2fj6ilz9gfr"; +"computational-complexity.source-2.25f"="br0rz33ycmvpsn5fdhvcjlpffhssnw08"; +"concmath-2017"="7qqfg14ka9d6j0ccb3bswg0jhzg8gvjv"; +"concmath.doc-2017"="rw4q8bbj0jyv9fs9vvxv9iksi39mrjm3"; +"concmath.source-2017"="h0akd4lxynf1anylxfv0dibvpkkgb0f0"; +"concrete-2017"="8076kds0h67rl93yygsicgp8hpk6cfz0"; +"concrete.doc-2017"="xddpal4gfl1km582kqvn79q925mixskv"; "conteq-0.1.1"="r5vmidbf2afm771ijgph43qc66safd3r"; "conteq.doc-0.1.1"="6ki2nz31r0b86kd2p9w9a5ph8g5dnj8f"; "conteq.source-0.1.1"="6sd4m9i6zv68gr0b8r80r477qcj6cbpx"; +"correctmathalign-1.1"="vip10w09k4kq9a67pfp73r64mk75095h"; +"correctmathalign.doc-1.1"="51qjv6v507ahi1jhxd9sp406bd93vkdz"; +"cryptocode-0.1"="a8n95hv90vi0bx2azmdxlvhvq5jx3384"; +"cryptocode.doc-0.1"="fz2j47nnxvzn5hymz7r66cq43pw859dv"; "delim-1.0"="q2f4p0f8bg1nwim31i272i5rpnjibxks"; "delim.doc-1.0"="5k874svcycyk4y5qalbs4h0x4zkviwc4"; "delim.source-1.0"="bglajqs1gdzhpjayh5d4afw7h09wln22"; "delimseasy-2.0"="nv8vysx58m3cgljms4fzrbpqms5wsb7h"; "delimseasy.doc-2.0"="jgsz6apzs5flbf717bmfgc9p07mfn16p"; -"drawmatrix-1.1.0"="ivzkwwrmf4bmwhzkihjlj7khh5ym85jl"; -"drawmatrix.doc-1.1.0"="1z6nq8mn0hzfrrrwzys9rqc654k47faf"; -"drawmatrix.source-1.1.0"="k1jwxviy7kwkbdd0mkhf3gyn9rmjspxd"; -"ebproof-1.1"="h3p8ykq18z6cdczl7vi38dzmjdr9mgrv"; -"ebproof.doc-1.1"="a40l66j6pm0hm70ly0hz9ckf79x47ibl"; +"delimset-1.0"="l99w5l073yxpq2jrx2lms4q0b129i5kh"; +"delimset.doc-1.0"="bvmwg2l20ah65jpbzavfpadzmk5zfn9x"; +"delimset.source-1.0"="4sj70zg5lbi42flfyfq3nbvf9s4bj6j3"; +"diffcoeff-1.0"="pz1h8lxq1j5js0gcgl27aghy5kz59mbg"; +"diffcoeff.doc-1.0"="nfp3a4dv00fp6xcgvc735zlsg792p5l4"; +"digiconfigs-0.5"="r2ph2xkdaslj50qk54n7a1xx37n8pq19"; +"digiconfigs.doc-0.5"="vignfzc0zrhrx0jgybwmfcgyfcgaqhim"; +"dijkstra-0.11"="25p95xl60c29w1b8z1ggvys4fs3szv9q"; +"dijkstra.doc-0.11"="xn84bb3zgv8jk4slwrr314680l5xybmb"; +"drawmatrix-1.5.0"="pl0mscrd3i4h9m8zq947ajh45apms3fj"; +"drawmatrix.doc-1.5.0"="qxljjk2vh5cc7l9xxn6kicknw2csdk4p"; +"drawmatrix.source-1.5.0"="89lglkdc257iwip9aiwnshzqwhvcqz5b"; +"drawstack-2017"="kdcvc0kd9lm3zxd2zszwriab31p26wrv"; +"drawstack.doc-2017"="plmy162h6z23pzimj4i5wjpih0m21z3p"; +"dyntree-1.0"="820wp3d1dcdm5vxihmk93wqc8qw4rqf4"; +"dyntree.doc-1.0"="j334vdgmzrhlv3x0ihzpa9j2rbbd9xhz"; +"dyntree.source-1.0"="ha5c29s0f6j3r5f3b2v7v7bgxaks28b2"; +"ebproof-2.0"="5ic2h08ff6km04b5j7ya8grg66q00a9j"; +"ebproof.doc-2.0"="3hc5hiis4cssjh2l5a89df29yhjg3h69"; "econometrics-1.0"="4b5wmgy2zn8mflr9zdfhyc0pcw707h9j"; "econometrics.doc-1.0"="5rm8ml9qmmq9nnyx9b5x7cfm54qdmqpz"; +"eltex-2.0"="n3kq7kl8i0b1k89i94i4k30qcy31lhfz"; +"eltex.doc-2.0"="pnvsk55d11vh82nn0a77lskyma1mqmpw"; +"emf-1"="l7l1rzphl87qvgldxpdal5pjvlxx834f"; +"emf.doc-1"="sbp51vc20b7m91r43ck9f4czblqa6gfy"; +"endiagram-0.1d"="lvncrih9fmmsd6571dklnq2vzh7jdxv5"; +"endiagram.doc-0.1d"="7nqf9zgjslck0853xy6r6i938k9pd76z"; +"engtlc-3.2"="dc257zhqmzl7yymbv9prpiam1mvznhnm"; +"engtlc.doc-3.2"="d6mmmsi3kr2dlz2g6iwynabjlw1jyp46"; "eqnarray-1.3"="iprdk3kp9cbmi01r29rmnjrfzifhiw5m"; "eqnarray.doc-1.3"="v7l4q95sjrh3kd92xgbqazd7dgq8kaq4"; "eqnarray.source-1.3"="bwkjz77mw47z33bwbgsx81wbw9i4n2n5"; +"eqnnumwarn-1.0"="vz6kiciv5zhrh16ddisfrik5y9g2qr8h"; +"eqnnumwarn.doc-1.0"="py5m5187p7i643k6wgsm7zyznh6awp4s"; "extarrows-1.0b"="6fa3hrvqa3qf7wqahhb7k168sz6pzmqd"; "extarrows.doc-1.0b"="dxnpkgk5iirpmzhznidklfk0xy1y5l3v"; "extpfeil-0.4"="0yaa2siwn8yvcsd1xy6q3shswdzfzq8j"; @@ -5864,9 +6280,41 @@ "faktor-0.1b"="bjbmkxvqgl81pnq0v7hm0a1ija9vwgyi"; "faktor.doc-0.1b"="mf571k3a23bdizhirzmkr1xwvm5y3fxw"; "faktor.source-0.1b"="l1lqrdj9dr1waq7dymzij0m1vvhzvw7b"; +"fnspe-1.2a"="firv6p5c69ljcf2bw8bqpjd6jjsgy8fq"; +"fnspe.doc-1.2a"="kq29lk89jw7wi84h5dgwvpi5vwqj69c2"; +"fouridx-2.00"="lxj3924da4bfn7605g2akgd3ccynizqc"; +"fouridx.doc-2.00"="ic4hkzvwc05qm91h90cx645gpskcm8f4"; +"fouridx.source-2.00"="zgb2xfg0wl5ld4b5v8rn72mxmfy3qy38"; +"functan-2017"="68wga1s4yiamylxfjma76hirgk867yym"; +"functan.doc-2017"="h6jwmv7wp2a8whhi34r62xvi1qll0vb7"; +"functan.source-2017"="rk42vz9n59n31xx5my1ahlnxmagzap7a"; +"galois-1.5"="b8khw120ihwg30l5wiyrpigb0n76j4pg"; +"galois.doc-1.5"="pl6jyfxfim7igp5lhhsdghiz6awrsf42"; +"galois.source-1.5"="pf7dxm40jcipslw88sqascls74wnvhyn"; +"gastex-2.8"="7ncqqh3yaip7f6fpv1cs57wlsw4krkzk"; +"gastex.doc-2.8"="y3ybpis1prha863r0486c1wr24wfy0y8"; +"gene-logic-1.4"="w7b16bvypbh9l3kiwbgha3dyh4dlqpq4"; +"gene-logic.doc-1.4"="nzraabszgvj8b0j503f7h892grbqjjrp"; +"ghsystem-4.8"="1ka9bn3qfxa1cq1f486n4gn596315gd2"; +"ghsystem.doc-4.8"="75554yiry6a6riz7m9mwpbzq801a0bl4"; +"gotoh-1.1"="lmsc2xb42i0w7ysmq1b7v69798xz6061"; +"gotoh.doc-1.1"="2nh9cbc9jvlwxlg3rhayjx63xyjcq0c9"; +"gotoh.source-1.1"="mbdzb4047z6wzr4gam5dfs5199hq02c6"; "grundgesetze-1.02"="cd0rxykb2favdbw1f945aalhy0shxcih"; "grundgesetze.doc-1.02"="7h4rhzzj2jak20jrgv9nnjri35iiyvdb"; "grundgesetze.source-1.02"="dqxmkagx54l3zhsqm2iixizzqmcwqabv"; +"gu-2017"="4m173j1ac2aiji1xjpxccd5bnasv68hd"; +"gu.doc-2017"="vkm8qnzqcdqh4xv4axh9sfy65bx2jji2"; +"hep-1.0"="f70qsf585a6rw0lzizd5ps7lcv2qqsl9"; +"hep.doc-1.0"="aqaxn42inmw854cm1qps4fkcijc11fm8"; +"hepnames-2.0"="3f4dycnxwd41da8gh67gs89xcb3l7zl7"; +"hepnames.doc-2.0"="99jvklmwjkmrlmr9jfgdax0j9ikr7b60"; +"hepparticles-2.0"="m5541j0ip82ygflxc174k8xzr2kx4fh1"; +"hepparticles.doc-2.0"="34viq0myldrs90f8y0dflrjxhimnzkq7"; +"hepthesis-1.5.1"="bnv8xza456594jqklx62qyac9zjn0j7h"; +"hepthesis.doc-1.5.1"="69r2xn0d0badii9gynlk0w2zyfwpbmn5"; +"hepunits-1.1.1"="a3yzdj6ykcd4522cknwng48wbig08kg0"; +"hepunits.doc-1.1.1"="x8d9hwb5z12ng0ndny3b9vgja741bg9z"; "interval-0.3"="kvyvv28dqv49nxdspbhayc8bbvigs6n3"; "interval.doc-0.3"="iq5iw643gmd90xmzq9mkmkzf4ws2yxqn"; "ionumbers-0.3.3"="rcar5imwp2v1vbkx3vxbq4zika5q8psm"; @@ -5874,106 +6322,206 @@ "ionumbers.source-0.3.3"="vd55vb8qai0kfy0mijzwzgdr52sa5a6v"; "isomath-0.6.1"="s9cgjw007kx4vcz5f8b51hbiqjmi68w7"; "isomath.doc-0.6.1"="nhpi08b738hs457jqv7139b44z35xy5j"; -"logicproof-2016"="24sbq01252ij7ldzb8achg4m73fakhas"; -"logicproof.doc-2016"="ldn1c2fdmnikc8fzklp5vzwkx73d91jc"; -"logicproof.source-2016"="745pxgmypzv7a1vf8gjm6r28khxk0s3k"; -"lpform-2016"="ga25ijvkw3cvzkag08jj7w8pv8d8mdj2"; -"lpform.doc-2016"="2pq3d2fni3nc4paaijygb6k5plky9wx5"; +"karnaugh-2017"="8s95y2qxd4i5g5q1x0a7h8iwsci6dls2"; +"karnaugh.doc-2017"="85z4avy6yfziaqd7b4w077ys394a3y4z"; +"karnaugh-map-1.1"="mryi5vdfqia142b35n97pwzvh267y6bh"; +"karnaugh-map.doc-1.1"="3zmcy9jclc8q01d3jz642w6j96ksrpx7"; +"karnaugh-map.source-1.1"="8zpvpcrxb35311nynqsxdpz4iqjai964"; +"karnaughmap-2.0"="52mx0flzri3z9y5fc1rgg665z2rpk01n"; +"karnaughmap.doc-2.0"="8m2xi7580kgrxq9v5dkcfcxhn757i7zm"; +"karnaughmap.source-2.0"="47f879r3821kwn8pwpyhh5874adx6f3i"; +"logicproof-2017"="24sbq01252ij7ldzb8achg4m73fakhas"; +"logicproof.doc-2017"="ldn1c2fdmnikc8fzklp5vzwkx73d91jc"; +"logicproof.source-2017"="745pxgmypzv7a1vf8gjm6r28khxk0s3k"; +"longdivision-1.0"="12d362pdsx3kjb0rbkv1qhnh0gkpp3xz"; +"longdivision.doc-1.0"="qlha7k5qp6rwhcz4c97kv0zighjy2jrl"; +"lpform-2017"="ga25ijvkw3cvzkag08jj7w8pv8d8mdj2"; +"lpform.doc-2017"="2pq3d2fni3nc4paaijygb6k5plky9wx5"; "lplfitch-0.9"="wxiv9ihwv4jdmr4ij0kvggbbnhbkh19c"; "lplfitch.doc-0.9"="lzz01n3w8zq7p9bn7lpb6rp6zkgmmxjs"; "lplfitch.source-0.9"="4lxhwsf7366gs7dkq9qk4pyphjv13ya7"; +"lstbayes-2017"="xd7mf65l1snrwrbbsb7m8357qkanb8yl"; +"lstbayes.doc-2017"="iv7g0mjayd51ymjk2q6azz1pl7nk5405"; +"lstbayes.source-2017"="mwqmkyrba64wp0wwfpx4wbbmii2qxsfj"; "mathcomp-0.1f"="rjxadz6409wc6g4ffb2jw40rw52rpwml"; "mathcomp.doc-0.1f"="098xybrmriwyh7dl5vsxxxy4v7nf4bdj"; "mathcomp.source-0.1f"="m3y8gisljqfy405d7cffqkda0mlz8rkc"; "mathpartir-1.3.2"="ka1crqmcwlidnxb6n91dlfnf16hir45r"; "mathpartir.doc-1.3.2"="0qn7ym4gl6m9g7vvx0mjnwyq2fjvy9cj"; "mathpartir.source-1.3.2"="vx38w09k1cfrprj4yr0vy1gkwkssw6yw"; +"mathpunctspace-1.0"="siyih51vi4k361ai1yf8iy7nkx92ajf1"; +"mathpunctspace.doc-1.0"="xrl18mb7kzlsk38mzbsfkjzm44xiabsa"; +"matlab-prettifier-0.3"="j5p21f3rgbx8hyf7rdjbpn845mw8fgih"; +"matlab-prettifier.doc-0.3"="zssm3k92kxa3mjja3r4sq2574f7byspr"; +"matlab-prettifier.source-0.3"="nkp80iyfa519dkk8gh7pk7fxbj4yn1lj"; "mattens-1.3"="v9rf7qmiardpzq3zzqzz0p3qnh4lp1ck"; "mattens.doc-1.3"="dnnzxlvc6vrfy4rrm4vw5w0g85fr886d"; "mattens.source-1.3"="dw4c26cwsg1hz3wvldlyi8q4f60h3szk"; +"mgltex-4.2"="99vi0f32fla2hmsabmf0d2d3c93kay29"; +"mgltex.doc-4.2"="m4m59xlcjgnd6pbsjsa36da37b61ydlx"; +"mgltex.source-4.2"="k3yw9bfjgkqha34712n3mplxsaqg6j79"; +"mhchem-2017"="75471cjk6hl3kql7ayvr2a0amrd362r3"; +"mhchem.doc-2017"="q2qy0yy4n3y0zak2psqkv4bbk6ajjgyf"; "mhequ-1.7"="a6dc7zsnfim8vbrwy8jzbhqhphwzh29j"; "mhequ.doc-1.7"="im348hlavjvbkg67akz24kcx6hxa8w2h"; +"miller-1.2"="vgpbb05dlbyp2phs7cpwrl9l8v7yczdb"; +"miller.doc-1.2"="fj6s0x2rzvldwm2lrmjx0f3hy9l4ih51"; +"miller.source-1.2"="9n5iljgqg52bzz39i2ailg3wjgfvgvx3"; "multiobjective-1.0"="g6fgsq3fzl30yd4hrw2l6v73ldm957gz"; "multiobjective.doc-1.0"="187syyaknws2i7i84xxzsnl9mj22z731"; "multiobjective.source-1.0"="qhsg6vg0djg5h279gbs2lbally9vbrj6"; +"mychemistry-1.99b"="8swklvjnvwzm43kg3q8ydiczfl8l75xy"; +"mychemistry.doc-1.99b"="immlivqi6jjsf5g4mkkr1nls63hb5nqm"; "natded-0.1"="q4nx9b58zsmfmpap3h2qs8pr28vap5v0"; "natded.doc-0.1"="bkhf1ldr1hzsyc06bcp7rld2dbf7p4rk"; -"nath-2016"="7x3cdih5q3i8dg25h6737vaphmrdxvbp"; -"nath.doc-2016"="ilxg3pmmz0pf1xp6i3g5rfwgvrjprzbg"; -"ot-tableau-2016"="9y08p6rvv32qh59z9d878g7rz22vhdbj"; -"ot-tableau.doc-2016"="gzadfy5k3kdw7zs1v8758mzpf0m1hgxf"; -"oubraces-2016"="sm7cbapl8cv51d41dgc46gjckv3icx3z"; -"oubraces.doc-2016"="yfvkv4vgc6ycvsd2sixyph039nm4gzvl"; -"perfectcut-2.0"="z5c7ybrfpbr9fjzqfdlfwp1341ylyb8k"; -"perfectcut.doc-2.0"="g5fvzw7j5i7dk97sz4nwy3k2dfzfblac"; -"prftree-1.4"="simwcfiskplzg4nwnyi3cmzgr0if9pn4"; -"prftree.doc-1.4"="mb0hcq6sdiri2dzb2dmlwl2b71jvcm2h"; -"proba-2016"="k6j2r5kacbcl25i7zwb71a2mlyn17dap"; -"proba.doc-2016"="a30lrji3wrd9rb8aa7hzflch7cwlybdq"; -"proba.source-2016"="7grfmfi6hwyqzhi0aynjq9cl65yqh5id"; -"prooftrees-0.4"="lgj82mdszx2i5h1d12fwhqc0w9q1fhaj"; -"prooftrees.doc-0.4"="d58varz8azz0rsyd5m6qwhsq02mjfj8h"; -"rec-thy-1.3"="skvj92b4haykljj11v6b3h1lhvdlsi24"; -"rec-thy.doc-1.3"="z6c8q8h8p8zfah0r7d3l94l0zcic2ggr"; +"nath-2017"="7x3cdih5q3i8dg25h6737vaphmrdxvbp"; +"nath.doc-2017"="ilxg3pmmz0pf1xp6i3g5rfwgvrjprzbg"; +"nuc-0.1"="4mmxcaippf5kwp6sgcwbcf55m4j415ma"; +"nuc.doc-0.1"="b0pkc17fxlgygmfvr84gq1gf58w95a30"; +"nucleardata-1.01d"="4va73nqf813pn4nwssq5l99bm8ridnym"; +"nucleardata.doc-1.01d"="4pf1yr25bs77xpffs1c7amainawiabwq"; +"nucleardata.source-1.01d"="z7amavcl11izgahvxf67r72wh0ib661a"; +"objectz-2017"="jxzqzh7y1nihr8m7jrsnbw7jh187031h"; +"objectz.doc-2017"="d8rk9nql7l67xn6hyvwg4x3xxkpb407i"; +"objectz.source-2017"="62cr53ff66gqjf6y2i01gr70bblhn18z"; +"oplotsymbl-1.4"="xzbszdakjgy7svbksd8w1csc7akwbg8p"; +"oplotsymbl.doc-1.4"="g6zpsvgp1kar3i9rmig6g7y60a5mmk0g"; +"ot-tableau-2017"="mdvqwhal8vq8bqxqi73p4fyc6qpaskkn"; +"ot-tableau.doc-2017"="gcfni2sp25f6qswns4bfl585gfi36vy8"; +"oubraces-2017"="sm7cbapl8cv51d41dgc46gjckv3icx3z"; +"oubraces.doc-2017"="yfvkv4vgc6ycvsd2sixyph039nm4gzvl"; +"perfectcut-2.2"="6hp6k3kq4y44ky1n7xvxp9zs41v0154i"; +"perfectcut.doc-2.2"="ijp8qchgj2vj0ivcvjhi11ckv1iqxq02"; +"physics-1.3"="y7b93d3qrc6674j33cy58v5c6fhlg3dy"; +"physics.doc-1.3"="ksf5jd2gfrq4dj2p1x2iwpgik5vb4pl6"; +"prftree-1.5"="90ydfx91y6rdn1sl1i4sxhf0z3gigm5m"; +"prftree.doc-1.5"="ssg7xvni36l7c69mcvf1ly55zxid9c1s"; +"proba-2017"="k6j2r5kacbcl25i7zwb71a2mlyn17dap"; +"proba.doc-2017"="a30lrji3wrd9rb8aa7hzflch7cwlybdq"; +"proba.source-2017"="7grfmfi6hwyqzhi0aynjq9cl65yqh5id"; +"prooftrees-0.6"="f2p9ln64cc1wqimqa47w3hzgpdw054xr"; +"prooftrees.doc-0.6"="0g5fbbd7fh9inwmgq3c6cbk8ws4y19bw"; +"pseudocode-2017"="bmn68g4pm7wga21yf97mrnmwc588gn6h"; +"pseudocode.doc-2017"="1hm6d3af5zjrpvx9h5ihd6qqyg2384xl"; +"pygmentex-0.8"="bnyslpaj6qfdmak1k1bjyrk0jvflvg1l"; +"pygmentex.doc-0.8"="crqmqfjxlpwibbb9s7sp9qkafnk38f8c"; +"pythonhighlight-2017"="wyvy6ms2blns0nffsf2lzjs4gwivgh97"; +"pythonhighlight.doc-2017"="9g7wy34pzzhdwsaa4rvn41iblnynvxz4"; +"rec-thy-2.1"="w4qc3li9xj805104zqhgvzrl6a2pnyn5"; +"rec-thy.doc-2.1"="p0sdvhna21gf66srbfyblp4nd150d15j"; +"revquantum-0.11"="ciws2fb27v2jkmvacgxx5f5rjypxwhxj"; +"revquantum.doc-0.11"="3yx0fd96b5sxmf0950wy2yfswfn5k5j2"; +"revquantum.source-0.11"="a3lxg56ihykvv3wy0az60hbd3n721grf"; "ribbonproofs-1.0"="7r52zy2n48hichyvyxnhvzcn10v6bm3l"; "ribbonproofs.doc-1.0"="15wcmvid4xbflmy4lv1njbnvbz5svk41"; "rmathbr-1.0.3"="fv88qckj67imsc8a7v0y9pgzqdlzcbmz"; "rmathbr.doc-1.0.3"="giw002mrgbyjbm5mfsxy2aan7mgiqmv6"; "rmathbr.source-1.0.3"="iq3id8a5cyskh3adf20nxwfwjxbb32ib"; +"sasnrdisplay-0.93"="qjpcpxjkpv4phwd4x6g42072343pn9jk"; +"sasnrdisplay.doc-0.93"="a9kmvwgbh2ih7vwah1my0gs2dhdzmz6w"; +"sciposter-1.18"="mi8zk7ik6q8rvncwp5m0ch6mfysil8fh"; +"sciposter.doc-1.18"="wan5jxr0084sid3zv4cdhr5kmdv1rjh6"; +"sclang-prettifier-0.1"="594wn96i6q9wgshyqmy7211c2x4j1fih"; +"sclang-prettifier.doc-0.1"="zy33dy1dq1lh9zzqvxh3zwqv53yw2xn6"; +"sclang-prettifier.source-0.1"="0k4nc1bkrw4l66wr47pd6dgigdgs5i0s"; +"scratchx-1.1"="fwylqfph2bpwqd8rl4jq8hi682cd1cw0"; +"scratchx.doc-1.1"="w1x4cg20frqfs889sk91xd5j822ja27x"; "sesamanuel-0.6"="zivl33hp7zrzz0996fs4822xsbd5pb0g"; "sesamanuel.doc-0.6"="h4dlbjwcrjk13lnvqxxjmm94pk083zv4"; "sesamanuel.source-0.6"="fjp5657m4v2qzf4bxzrms7v42ghl861m"; +"sfg-0.91"="5j8965gkq0p9s9ryvy8ym22qz206igqh"; +"sfg.doc-0.91"="ydamww1x4qxpg5bsrcacmfwkkv9c876p"; "shuffle-1.0"="zg1rq9yihzpl9l7xjlc7djqfg2s3mn2a"; "shuffle.doc-1.0"="dqra8x226wdqh5baz25qqg905r3xbcld"; "shuffle.source-1.0"="3r5607h5jsaibvmyvwm1v1scm0yrbfrm"; -"skmath-0.4"="yvpp627ncyb8zapx37023l6syqz8z2ac"; -"skmath.doc-0.4"="zpisnvvfv5xq9vy10msh90a1q6iyas5j"; -"skmath.source-0.4"="ajca6xx6yk8449fypz0y2gbvnwkbvr5a"; +"simpler-wick-1.0.0"="pmjzl9cnwrzxhjiwbrjxfd66lamrhvj3"; +"simpler-wick.doc-1.0.0"="pg2id6jpail1iiz92xdr1bvi2725lj8z"; +"simplewick-1.2a"="hfv61gj0g68m17iiimvp1zqzi7ri2z67"; +"simplewick.doc-1.2a"="kxfipc2w97479is7sdd9fmahrbwfk2l7"; +"simplewick.source-1.2a"="48db2ywp9dg6nd5xbclw2w85id3mf97r"; +"siunitx-2.7j"="105jmfdfm9nks053lc92wz5cbbfk1n05"; +"siunitx.doc-2.7j"="s8x3rnvz95jvgwy7mfp5ajizlnw0i5kv"; +"siunitx.source-2.7j"="d0iwcakc0kb0a80091sfbz6s7qg8lw17"; +"skmath-0.4b"="5ci5mzndbip008nmsjbcc5fq692mf9y1"; +"skmath.doc-0.4b"="gach5kwqg8k1khf43jbdbiybdz0fvnka"; +"skmath.source-0.4b"="ch2aknzr0lr1zav15zss8sv7j99afsf4"; +"spalign-2017"="if8r1d1xwq1as1147m3ixkxgyni8yb9q"; +"spalign.doc-2017"="s49kpxsa940l85yc6wzmb71i789874qw"; +"spalign.source-2017"="ahwv44vd19kn8vzbx7ya6275ysnp3q25"; +"stanli-3.0"="6ws3b75qs69jhag24aki76ndgryb9f9s"; +"stanli.doc-3.0"="iygalq6h7fdik4cfjyv5i62mid9gdr1k"; "statex-1.6"="h8y1sw298ilqajy8vmi00yl9wpklf5fa"; "statex.doc-1.6"="ksf4vra9673l5ycl8np7l55rxpj1xazg"; "statex2-2.1"="a7h5agdmh5xw1646faxxwd1n1ajci53h"; "statex2.doc-2.1"="cpiw77bl9p7y9vd6dwg4lnlk2n8lmmcj"; +"steinmetz-1.0"="v8vskhmyjdhc7yi21b9i11j4lfzmhypm"; +"steinmetz.doc-1.0"="5y0xh86b75lm16kjjl4cjs7vvylr6wn3"; +"steinmetz.source-1.0"="m31y5wd20vck85yj3zps711zi6bpcdym"; +"struktex-2.2b-6"="2vzrvkq0a6arxnzfsflmsdchabb6lv7s"; +"struktex.doc-2.2b-6"="hmd72jghr12m3kig5m3xpw4qzl9slbw7"; +"struktex.source-2.2b-6"="cyx3ndhnrjgipcwv36h2vbiqdjdvpq9r"; +"substances-0.2a"="wwjn0lkspnwgla7j46j2iwlvdrsvdyzs"; +"substances.doc-0.2a"="apg59a7fh980vddnfzjspsyq1jfnvsn7"; "subsupscripts-1.0"="1nyf4q1szg0q649jmqlzd5p8j9h1fjkh"; "subsupscripts.doc-1.0"="9yhhgbj7i83v21flfr3gkr35vkdxpx6m"; -"susy-2016"="xiv8s7m8lahyc17qdp7vhdnriqcz2gzl"; -"susy.doc-2016"="51apv9rzw9q1aa390a7p6w0d4y5amkms"; +"susy-2017"="xiv8s7m8lahyc17qdp7vhdnriqcz2gzl"; +"susy.doc-2017"="51apv9rzw9q1aa390a7p6w0d4y5amkms"; "syllogism-1.2"="gx6hjs32rq3d1sk28cs8ng8m2i1xwgrf"; "syllogism.doc-1.2"="m6nv4hcwmh5qa7m411vwm8c6s1xbdbx4"; -"sympytexpackage-2016"="x7b456c7l5nkwaf19g29rpc4m6qz27h2"; -"sympytexpackage.doc-2016"="klh09byy7h38j068d9qrgyhawcfjknji"; -"sympytexpackage.source-2016"="lzsz5ly9rnzph5nxnaqbf9nf5abm302c"; +"sympytexpackage-2017"="x7b456c7l5nkwaf19g29rpc4m6qz27h2"; +"sympytexpackage.doc-2017"="klh09byy7h38j068d9qrgyhawcfjknji"; +"sympytexpackage.source-2017"="lzsz5ly9rnzph5nxnaqbf9nf5abm302c"; "synproof-1.0"="bv32jflr6n3jdm93xxpbvhz1lrhc3i9v"; "synproof.doc-1.0"="i74i5km7n20hglq2icb62xcc2pl1fawc"; +"t-angles-2017"="an3w3nw07gc6hyzfjk4bd0j4swj8qr4p"; +"t-angles.doc-2017"="68ylwxvywabhyfqzlb7d642cmhdj3g2j"; "tablor-4.07-g"="fs9vl9gi63j8bqgiv06dbhbgs2vl1c8r"; "tablor.doc-4.07-g"="k3d87x83igkq78j1yvav6b08y818qgz9"; "tensor-2.1"="4gzhhxr2w1bbwb0yf799siazn5d6538j"; "tensor.doc-2.1"="j4hxlj9f804ffrdp8pf06mj79yb8j6qy"; "tensor.source-2.1"="89fmh96xlj21pm07c80q9cgiaj2a3c3r"; -"tex-ewd-2016"="725h0x4azacxb6pi7bnrvb5gb2b6rb8l"; -"tex-ewd.doc-2016"="npk74dnjx7jy9392pz0m4fzxcxqqsqq5"; -"thmbox-2016"="5b8zyq68dw8c7cylg28k9bmx261k8d5p"; -"thmbox.doc-2016"="rpd99zkmrb85kgldsyi2iwr70q9n8y35"; -"thmbox.source-2016"="hnjviz4vyw78mg6lbcdyv88qajhjdh6w"; +"tex-ewd-2017"="725h0x4azacxb6pi7bnrvb5gb2b6rb8l"; +"tex-ewd.doc-2017"="npk74dnjx7jy9392pz0m4fzxcxqqsqq5"; +"textgreek-0.7"="m1b05a740x322la70k6ib44sk6cky167"; +"textgreek.doc-0.7"="vah190cds1677yv86nfcyriccln296yd"; +"textgreek.source-0.7"="cqc5zj4ck54rayydvml5m3n4hfnykglx"; +"textopo-1.5"="rvcbhsz8win1g08s6az11ji6ryd9b1fl"; +"textopo.doc-1.5"="3f9w8nbyyjismgdxb5daijc88hfp8m8k"; +"textopo.source-1.5"="4h2x01rkf91dha2yxqpdfgv5qsmz34sx"; +"thmbox-2017"="5b8zyq68dw8c7cylg28k9bmx261k8d5p"; +"thmbox.doc-2017"="rpd99zkmrb85kgldsyi2iwr70q9n8y35"; +"thmbox.source-2017"="hnjviz4vyw78mg6lbcdyv88qajhjdh6w"; "turnstile-1.0"="c4nm39zwakha4bk75092371db2n0nx4m"; "turnstile.doc-1.0"="w2hv466gzdsc7vp0al5xk7bwa83szvr2"; "turnstile.source-1.0"="8p5g2w1pcaxhg2a54rq2h23zd7cbj60h"; -"unicode-math-0.8c"="xxr0b27pvifq3gdhia0fdbs2vbf8b8s0"; -"unicode-math.doc-0.8c"="qj2r3xzlsyf6ipaxaj61nwd1bn26rvhw"; -"unicode-math.source-0.8c"="4lbc78vjh6216iypsz8cd9wwr7alnwnb"; -"venn-2016"="vxgbc1jmchjsq3aq1wklgla50p1smqnz"; -"venn.doc-2016"="3z1kgbyilhajm6przv2a1rbdl55fzhqj"; +"ulqda-1.1"="llh5ji3r34m637hzb9qi4z0d6hap8fcy"; +"ulqda.doc-1.1"="w5anmbpapkg5r1bi0gvh1wqrqjivgmz1"; +"ulqda.source-1.1"="pl71x58ifcpllalxfw1snj2r464qvx3w"; +"unitsdef-0.2"="j5dhzwnaizymvvj0cvvn8hcjgpiaw3xj"; +"unitsdef.doc-0.2"="m3n8c9wpk9m0il8yn3ip4kwvlbyzfndw"; +"unitsdef.source-0.2"="rpwd7p723jsqcmcl28kkfg3fg9dmyfxa"; +"venn-2017"="vxgbc1jmchjsq3aq1wklgla50p1smqnz"; +"venn.doc-2017"="3z1kgbyilhajm6przv2a1rbdl55fzhqj"; +"witharrows-1.0"="1rbidc43dmr9d2qcwmprqd9a9j8d2808"; +"witharrows.doc-1.0"="gry0afqjx118fqcbzpbkbrah8p516air"; +"xymtex-5.06"="lh5pr87m1xhyaj74pmwc8vx3an7gppxw"; +"xymtex.doc-5.06"="bbknma6166kqvxhj3523p85lq7qn1ydc"; +"xymtex.source-5.06"="is60w9mjif26y9s3vv8c0v26z16m97g3"; "yhmath-1.1"="y84a1hal7inlrjy85za1lfcx95chas9h"; "yhmath.doc-1.1"="z1kf09r30ij5ghz89bjfikc42f1lq1w5"; "yhmath.source-1.1"="sx9dhb0nkm4wpyx48l3vp3j92n0knapf"; +"youngtab-1.1"="jknzzzxpa549x22gcar9aq433zwidbm4"; +"youngtab.doc-1.1"="1vrl9pqjlxs1izrw4a5d922v9ll8rv3h"; +"youngtab.source-1.1"="dbcchlqr498s741q1990aal2gm39bljz"; "ytableau-1.3"="37wsbj7an7fvsrh4w5kvjiibhq0abn9j"; "ytableau.doc-1.3"="wbgandbbk6zgms4jz2ird33kyg9yg19b"; "ytableau.source-1.3"="2rblxwykvkrljn1xqz7zw9dz1wyib686"; "automata-0.3"="7v2smy8hlz3yyqwcw11mjgh35z81n22w"; "automata.doc-0.3"="49q82z2aa5xqgz3wsgcyix4a9hqfh5q6"; -"bbcard-2016"="b26d8663qv8x23sp8q04c8jzdw49f2i5"; -"bbcard.doc-2016"="99jqw22g1xcqdn4q5f408gvlzwnl7wbm"; -"blockdraw_mp-2016"="al2d83amvpz7z19a14zxn4ib8ayc7b9y"; -"blockdraw_mp.doc-2016"="n0a85bchn27q09771kx4idy7hic8iq42"; +"bbcard-2017"="b26d8663qv8x23sp8q04c8jzdw49f2i5"; +"bbcard.doc-2017"="99jqw22g1xcqdn4q5f408gvlzwnl7wbm"; +"blockdraw_mp-2017"="al2d83amvpz7z19a14zxn4ib8ayc7b9y"; +"blockdraw_mp.doc-2017"="n0a85bchn27q09771kx4idy7hic8iq42"; "bpolynomial-0.5"="rwijp2lyphgyixi6l1d4j9vrwchr2m8k"; "bpolynomial.doc-0.5"="1561z658ar885xsbg15psi82qjzc4zbn"; "cmarrows-0.9"="03hcqmzx16n3y4vvh8aj6vrvpn6minmk"; @@ -5982,9 +6530,9 @@ "drv.doc-0.97"="3sw31jvb9l0n124h9kq9byzmy3ay1wxd"; "dviincl-1.00"="gf980a6jm4ar28h7464qx1nayjqvi1xx"; "dviincl.doc-1.00"="sxmj8rcvwj2q4g3c8ha9a84avsn4w1aq"; -"emp-2016"="brxc803kbnrd6qa1jfag6qxgb7f5j39g"; -"emp.doc-2016"="x8lkwbk13jq48h8ml7a0fzlyn4m8qlxl"; -"emp.source-2016"="ir1ng5an1jbffb2pd5rv412dcfzv84r1"; +"emp-2017"="brxc803kbnrd6qa1jfag6qxgb7f5j39g"; +"emp.doc-2017"="x8lkwbk13jq48h8ml7a0fzlyn4m8qlxl"; +"emp.source-2017"="ir1ng5an1jbffb2pd5rv412dcfzv84r1"; "epsincl-0.2"="srznlzss5ag3br4pmwny7aqq7gjmqv98"; "epsincl.doc-0.2"="993m24spzl4jymn69sczm7a8d1ix0zcc"; "expressg-1.5"="yd8jja79lbjibls84q1r2iqls9hgfp3d"; @@ -6000,15 +6548,15 @@ "feynmp-auto-1.1"="ps9nijgd6kcnsgvg3gq9gn53mf42xdwk"; "feynmp-auto.doc-1.1"="a1i2ay1mvkpdicyzmcapvpv3fkz6pk3c"; "feynmp-auto.source-1.1"="2iirzys42l2k5fmpjxxsn31wpfzv02d8"; -"garrigues-2016"="b6kfrr0zhmbnb1rh93wy5pxq31kspbmf"; -"garrigues.doc-2016"="zk53ay759rgd40fmf7byqpqmibw7rrza"; +"garrigues-2017"="b6kfrr0zhmbnb1rh93wy5pxq31kspbmf"; +"garrigues.doc-2017"="zk53ay759rgd40fmf7byqpqmibw7rrza"; "gmp-1.0"="pzdcapvcjvbn48n6jnl1hs9mbycrccyx"; "gmp.doc-1.0"="6ir5fj3s209rk3k9r2wbsz46kij8kw9q"; "gmp.source-1.0"="an64d733yq3h8fy347lppy46yklczrsg"; "latexmp-1.2.1"="x2plwjlw7cdim8lxh530zf5v2zjsfaxb"; "latexmp.doc-1.2.1"="d9q1zwyad9p1nkk08mq4lard5rv291rf"; -"mcf2graph-3.94"="9p3mgypg7j3zk4zd57nc9dplarqk90ds"; -"mcf2graph.doc-3.94"="zlyfdfzdiildl453al425z8qf3wzjj12"; +"mcf2graph-4.28"="la6r9cfqz8ynxlff3przfghrhlwyz4kx"; +"mcf2graph.doc-4.28"="l8yl5f4dqy5ikhn9jhasq188ywfgnd9z"; "metago-0.9"="4gzbngrpwjbfq5d7jcfavhsmvfwnb77z"; "metago.doc-0.9"="nn86x3g4dv9y5mbr83r8camfxg0xkv1g"; "metaobj-0.93"="83hf8awwak3msfmran6q2ylgcs6720lb"; @@ -6027,20 +6575,22 @@ "mp3d.doc-1.34"="gkjwsbz7sgdj5k6vzvswb4k4yb8xkhld"; "mparrows-0.1"="d1v4j0hrr4cxm42vwlclvccp1wmvbbyh"; "mparrows.doc-0.1"="jcf975s8ianx9dmiqa9lvv9ywj62rmap"; -"mpattern-2016"="9ym77kwd2kgw46lck4vbfrbbiwps8g6x"; -"mpattern.doc-2016"="vknyl0b4d4sx2c6l7qhwr4rdmx0ncpja"; +"mpattern-2017"="9ym77kwd2kgw46lck4vbfrbbiwps8g6x"; +"mpattern.doc-2017"="vknyl0b4d4sx2c6l7qhwr4rdmx0ncpja"; "mpcolornames-0.20"="j7qagfiggfwjqapdrh1z23n0paj54bgc"; "mpcolornames.doc-0.20"="jd5ai6f2ask0pbhrw46bdw8cfsrfpmps"; "mpcolornames.source-0.20"="1f0wy1lrg0733vnq5mjwcgdi5rnprbis"; "mpgraphics-0.3"="jad28la9l7z0jwiml56x849d8zwgsh3r"; "mpgraphics.doc-0.3"="51y5shq3bamhqhpm2hbdki09b9xil2dr"; "mpgraphics.source-0.3"="2gb71444b968ap0wvw461xskcgxgy519"; +"mptrees-17.06"="lqn20z9inh6qylgljn9k6z398b0vicws"; +"mptrees.doc-17.06"="50ggxw3jc63clpnz0fnxv2p2h4cgwjhl"; "piechartmp-0.3.0"="k15blq7m78skmi2q46gnazh4qhpfhggs"; "piechartmp.doc-0.3.0"="xcn16bgnyi4h8pqaisjivmywg234shgm"; -"repere-13.12"="d1xkkzp1i3qy721cap74dsvbg4g6rb5l"; -"repere.doc-13.12"="4d0fxi9nbp4jcsfynq027x9vkzqrdw0s"; -"roex-2016"="3dp1ank88mbkx9zd4gl8v6nxa7hjvck6"; -"roex.source-2016"="fbyyci2hg9bvdbxxv09q9h37q98gzzxb"; +"repere-17.05"="s6x73lk5rf2a7bxyqjkdbpx53crh1r0b"; +"repere.doc-17.05"="ql1jl0kykyy7wlqpff6sxpg1ipfd0l3q"; +"roex-2017"="3dp1ank88mbkx9zd4gl8v6nxa7hjvck6"; +"roex.source-2017"="fbyyci2hg9bvdbxxv09q9h37q98gzzxb"; "roundrect-2.2"="zihpsds4r0v44h4bbmmpjgx28y3knqc8"; "roundrect.doc-2.2"="g6kih4vjqjg4v4qxlxkkxgwhqv0x0pdx"; "roundrect.source-2.2"="rdydd5cwvnbzjlhdd4kcfjq54rzw9k81"; @@ -6052,8 +6602,8 @@ "splines-0.2"="bn6gc1n3vbzrns1pzdjc4hf647g6pgj5"; "splines.doc-0.2"="91g13liz4sfn16vzcvlpqhm388wwvs02"; "splines.source-0.2"="p527173paps7gqz8wq02jkl6nbx8vw6z"; -"suanpan-2016"="vnglmgbg19g42b79q34fzqr4hjzy7dmc"; -"suanpan.doc-2016"="lvbx0yizc42hgqymw9yscja667h4mz1a"; +"suanpan-2017"="vnglmgbg19g42b79q34fzqr4hjzy7dmc"; +"suanpan.doc-2017"="lvbx0yizc42hgqymw9yscja667h4mz1a"; "textpath-1.6"="97b12i6v4bz6095z7i7yjf7c3fqg232d"; "textpath.doc-1.6"="zliwrx3n2r3xjhdi0c80rncxwk5whg76"; "threeddice-1.0"="91chpiy1n4mg3vcabcm8li91q9lnkcvc"; @@ -6061,95 +6611,184 @@ "abc-2.0b"="pmaw58frrdbnj81n21mg15yiz7sp0rci"; "abc.doc-2.0b"="gild9nm8zph2kr6mj9w0sans8r1jz114"; "abc.source-2.0b"="g8a921yi51lvw6mqj1hxmkwqqh9fkl03"; -"autosp.doc-2016"="qp3c8bp43mx19x8v6cr4qij1p5f2mgnc"; +"autosp.doc-2017"="qkicqm9xkw73rympfn9i8kwj9fhwvwxj"; "bagpipe-3.02"="z9akwcd2fdwzps3bws9vamik64pyyl73"; "bagpipe.doc-3.02"="6ssnq5756qnhlbyn08pncriz5la8hpzy"; "figbas-1.0.3"="xkm3zvkdi7512qnk4kfrb875c3q2gfr0"; "figbas.doc-1.0.3"="pal9rb3bmrypdk6icdv7fyhdfn48qfsy"; "gchords-1.20"="06q4p9d1j06dz7sqmjyka4k6r2x3l7nd"; "gchords.doc-1.20"="icn914698j8gkir78wqnjqw08n2zhsdx"; -"gregoriotex-4.1.4"="9dn095sbd85px033kxdjwngavqiyqqnd"; -"gregoriotex.doc-4.1.4"="2mm4s6q2bifvh5cfpm5pk8mvcks9fkxm"; +"gregoriotex-5.0.2"="cvw74kvscywh89lmqwq25l4cw23a8x6r"; +"gregoriotex.doc-5.0.2"="8jj4ryaybvgb57wxxpydidr4ldr98r36"; "gtrcrd-1.1"="mqaamg8ick2z265cwl1yd6n81f76y8b8"; "gtrcrd.doc-1.1"="scx1xk6y85zfbn82aqf3cw1sx0prfmgh"; "guitar-1.6"="xw88497a60kkbh8pribpsi80bj2wdvw2"; "guitar.doc-1.6"="5y7s8gbahfqzm50z6dgr667f1rgswvzh"; "guitar.source-1.6"="7i8ma18fm6piiwsccj8lq6nn446mvqrw"; -"guitarchordschemes-0.6"="73vkv0clj18k41slqmy7165n4nkd1cfj"; -"guitarchordschemes.doc-0.6"="ac6i30kr25pk8d0j98lbjaylrhiddkzg"; -"harmony-2016"="isfyzam48q2f90vyh78rp5df93wzdfq4"; -"harmony.doc-2016"="5zy2cf5afrxlmmxlsycqg3crcl5irkb1"; -"leadsheets-0.3a"="bqsfkvrgg25zwfgz2zfiq04gv5586bpk"; -"leadsheets.doc-0.3a"="jqzxrrms8vg9jqgli2rf8r9vmsx3ka73"; +"guitarchordschemes-0.7"="snccmsq130kvjn2ly56cjck56df5mdzx"; +"guitarchordschemes.doc-0.7"="p74vljfafyj0ap707aydgpf4xs2pabr8"; +"harmony-2017"="isfyzam48q2f90vyh78rp5df93wzdfq4"; +"harmony.doc-2017"="5zy2cf5afrxlmmxlsycqg3crcl5irkb1"; +"leadsheets-0.5b"="j73sldpahwci9i8yc04dpwn9l4jcvbn2"; +"leadsheets.doc-0.5b"="6wvwwqq7zsb3mkjw24yhz87g8agnafil"; "lilyglyphs-0.2.3"="qn7pjnhq8aaynk7s8mis9g0y0m16fbnh"; "lilyglyphs.doc-0.2.3"="89k4bzc0jy0yx59y8ssiqvjgqspsfyry"; "lilyglyphs.source-0.2.3"="30yzqq1pw4mh74c87xxk12n834vpq8m6"; "m-tx-0.62a"="b48d6wbmivx7hfcj3kyq1zkchcdnvbgx"; -"m-tx.doc-0.62a"="hgi6v9ckba1yznxk69r9njyhcfd5qnj9"; +"m-tx.doc-0.62a"="qrflz9hi5sqhnmlqnli46xr039sbvdyz"; +"musicography-2017"="zphbpfrh2dc1b758gc0z0f5wqhzf9y08"; +"musicography.doc-2017"="cyp85z5w0rlygrp8qymnkq619p53d4ix"; "musixguit-1.2.2"="29kbldyqlcf8xs5yh5gsx0m7liwbnqg1"; "musixguit.doc-1.2.2"="pam1limbbmc1jvhznsvrwslmlr86y7vf"; -"musixtex-1.23"="brwdmknizhi0pxaw7qrfijgn0z7plxg5"; -"musixtex.doc-1.23"="9s0h6ra5fbk0mmj1lkzvz965w0fsqwma"; -"musixtex.source-1.23"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1"; -"musixtex-fonts-2016"="a8kdi135xis6qcwy90yisg4wafklmw2y"; -"musixtex-fonts.doc-2016"="91fl3b700pvjqkwsl6h29f0z5i5781s3"; -"musixtnt-2016"="6412y8lh8awml9xs7ybcnhkgyjrc08vx"; -"musixtnt.doc-2016"="44c1fndj5grvw5q4jxyk0dgqxr56lzvd"; +"musixtex-1.25"="viclihkq5gmrflwca3cpyfsk24wbvj72"; +"musixtex.doc-1.25"="viyg92n86lpydg93v9sq16gskd4n1nsp"; +"musixtex.source-1.25"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1"; +"musixtex-fonts-2017"="a8kdi135xis6qcwy90yisg4wafklmw2y"; +"musixtex-fonts.doc-2017"="91fl3b700pvjqkwsl6h29f0z5i5781s3"; +"musixtnt-2017"="6412y8lh8awml9xs7ybcnhkgyjrc08vx"; +"musixtnt.doc-2017"="44c1fndj5grvw5q4jxyk0dgqxr56lzvd"; +"octave-2017"="x1a1668c4p2ik48xz5klvyxkagamqk23"; +"octave.doc-2017"="dbq2bcyj2w3saanvi32mmlx4waaizbla"; "piano-1.0"="vbbcddqx5sk4gg9w1882g4a8lrnnqn2d"; "piano.doc-1.0"="bn1c29lffw62jsyiygh3i0biaaz0asmv"; -"pmx-2.74"="ap9b6q3zjq8kab8s567yyzwnrhrpy3qm"; -"pmx.doc-2.74"="b7bzp8lzvq4dmmdn2l23xys4li4lrl4c"; +"pmx-2.76"="n7cbx9548xym6j0s3kiivrlfvbmdxdsg"; +"pmx.doc-2.76"="wpdffh373k6brk2jjyj0pc66rrjghddj"; "pmxchords-2.0.2"="wwn3da9f9br7dpfhq7yg9j2f64bb9183"; "pmxchords.doc-2.0.2"="f33mk2mv8pjl4ikg3kvig5lr94iwrm4m"; "songbook-4.5"="jimhdkxsiqzkwnsjsw1rynkrfhhh5n0d"; "songbook.doc-4.5"="62n794w3gxyivisl16xrz9lg2r0a0s38"; "songbook.source-4.5"="nyn7mkdylkpywca50izj2czf485s8sm5"; -"songs-2.14"="nxqx6rp5bvc9rz7rqy5j56n75yaf4g7a"; -"songs.doc-2.14"="h6rq14cjccgndsra0md8z95r0v93a2sl"; -"songs.source-2.14"="64sk2rr4nz8fjy0r6avylyj7jgcb4rkg"; +"songs-3.0"="sdy6ynmyz3w3y0ss1yiaindzmwpadqwi"; +"songs.doc-3.0"="zpkiq08d6igq9wvg4qhl02b7mk5zfj6y"; +"songs.source-3.0"="0lab84qhskdc7fvf8my7g3lcs9ikblh1"; "xpiano-1.0"="ha9dpa3kpmhbzy3f16d7s6mlvh563mgj"; "xpiano.doc-1.0"="x579hyy5sibzsn9ldrkwsqrjjrji0xak"; "xpiano.source-1.0"="77wwb6wxd7c9cqmjlq9cij6p4ibr3r3r"; -"aleph.doc-2016"="38l1vnjk496hhcqxk45w10plif8jslbd"; -"lambda-2016"="ykxajgkmkbqp7l79c4bcm5qg4xnyilxp"; -"antomega-0.8"="jxriw18jifvf24fz8nqql5izp67p8z5a"; -"antomega.doc-0.8"="q9jb5ks7gfxg5gjhkpng5bl0wwbwp2ph"; -"antomega.source-0.8"="l2gs7sapppwxiy712i8vkwfmmc96ch1s"; -"omega-2016"="0v7wvg0vkrwbarcxfnp8k6w09j86y1pv"; -"omega.doc-2016"="zily3hjd30g14zrvj67hdp8nkxk9l5g2"; -"mxedruli-3.3c"="f866q8w776cr7k7mxll72va7zb0avsl3"; -"mxedruli.doc-3.3c"="vhcvl3k5lzb1f0g0ghz1rf3cnsy0cp58"; -"omegaware.doc-2016"="7bgc1pl1384g5zl9qxcdi231pvvwf4az"; -"otibet-2016"="66pn5bmsfw3d7l1prcr8p5v6w93lqfrm"; -"otibet.doc-2016"="i308lrxhgqi1gpsh5b5961xisbb9i3si"; -"otibet.source-2016"="hspwgiv9bs4ncmy1yi02jw8ghw2lxcpm"; +"abbr-2017"="n55llxl7fjmx6p1z3ckjfj94dxkg1n0v"; +"abbr.doc-2017"="9lgcwpp4fw2zjx2rsp9w5szi6v2pdsn4"; +"abstyles-2017"="2zmzwsgwh4rv6ysnjjk35cihbifs0jir"; +"abstyles.doc-2017"="xba8x95rimsa16xhr7nziglk7djzv6w8"; +"apnum-1.6"="sg23pp5g0fk07k7dzrx7s9l5apvpis88"; +"apnum.doc-1.6"="rgdcfmfi5ds10py28mvyb25dld6hisgv"; +"autoaligne-1.3"="r7iil28qiajpx846ml1h5d192s3k4g9g"; +"autoaligne.doc-1.3"="ajr6zrx9nspbmy29vdhyi5hnzf26zyif"; +"barr-2017"="rsgsgzki68jgx8d4r05qj1awvi02rm33"; +"barr.doc-2017"="jfhxfjazvlpcvrl6zjd1sw2ghmcsscmr"; +"bitelist-0.1"="22q3ivacwl5p0c8plgg1gjz8413l601b"; +"bitelist.doc-0.1"="n00mlj88l6djwcxzj0l6pxiiba94kpl3"; +"bitelist.source-0.1"="w38ccrprx1rn0pc34mr29bnx7gaxa7k8"; +"borceux-2017"="ls6xjxrggjzphr4pl71m2va9mndh1r7v"; +"borceux.doc-2017"="zdg5n9rxc2sfkyi1am8jka05avi7hyng"; +"c-pascal-1.2"="m4x5kfq1vm6vzv0ic910fqi1qijn7g34"; +"c-pascal.doc-1.2"="v6wqph0gaibfv4cwph5w0axp5sf70m6w"; +"catcodes-r0.2"="haljpnhhzvyhmnda9vgk77md5zm88773"; +"catcodes.doc-r0.2"="4227wyg04xryg33b39d81nlh6aaja1lq"; +"catcodes.source-r0.2"="6ljn2lwg4bzr9c02d01vh0saja9sz9yf"; +"chronosys-1.2"="qswnnwyghvsbjf3ddvbl7nl00qxwhs6h"; +"chronosys.doc-1.2"="m11jpa7crg095qf03qx7gcrvcb41f83a"; +"colorsep-2017"="il1sig8hzmvq8q0hlbh6fir15rrl5zc7"; +"dinat-2.5"="a1gcgwkj0pd1lqdm20356fbjram3wpa0"; +"dinat.doc-2.5"="6dzss5231fdqjzs8j7z4gfx5iga4m895"; +"dirtree-0.32"="xgxmz79hj1q6qyfkdvgj5nm26865dfmm"; +"dirtree.doc-0.32"="im2rhm2fmqk1snrhvrsm112jw1hwcyw8"; +"dirtree.source-0.32"="pyfcid8hir7vvm6fpwimlfgs65dgzfm1"; +"docbytex-2017"="m4jkx2gf05q3ffwfkrk4x9bcwf9f3dmw"; +"docbytex.doc-2017"="01w9mkddxm1l9i12i5n5i5ar81xfn9b5"; +"dowith-r0.32"="vdgkjxphpmycfcsimxih7gnhv58hd9vs"; +"dowith.doc-r0.32"="ql8hdyxcgss7rvlp1913rp52wn4wjvxn"; +"dowith.source-r0.32"="xq0r5c58clz8qzbhz01gv2ph1rs9wg1n"; +"eijkhout-2017"="hdb3ag2knc67ksx39hmax8x83l0d41kl"; +"encxvlna-1.1"="kz3nvz29czk573cxbi5a5l3mbjs3vfkh"; +"encxvlna.doc-1.1"="gv5k36s89g2zslq75s2j7ffvwdiz4lkb"; +"epigram-2017"="0mg36ybg934n4jxgpf88lnvvc0za59ya"; +"epsf-2.7.4"="55vrh3nmvb5p1nkkpwhrq9glsf64bc3k"; +"epsf.doc-2.7.4"="b78n5gm14qk3brywpz4prglkqnpx9fpg"; "epsf-dvipdfmx-2014"="qvf8n367wnjahzv8bgh7rmqqgnwraa0p"; "epsf-dvipdfmx.doc-2014"="b290mp5xqfqzzxa92s9j798qyycaph9a"; -"figflow-2016"="166qngk7yy25v0rbjavi53m0sazk90gn"; -"figflow.doc-2016"="l92iyzsg4fwkc3nalswwpnz99kfcm1q9"; -"fixpdfmag-2016"="8djdk0baqcg84v6qrmdzckq7k97h4nkv"; +"fenixpar-0.92"="61jkr83g6i0bqmp0qg4w09gj7gwcdn96"; +"fenixpar.doc-0.92"="95h02nbzq72mmblzawgqsk8530wi1dpb"; +"figflow-2017"="166qngk7yy25v0rbjavi53m0sazk90gn"; +"figflow.doc-2017"="l92iyzsg4fwkc3nalswwpnz99kfcm1q9"; +"fixpdfmag-2017"="8djdk0baqcg84v6qrmdzckq7k97h4nkv"; +"fltpoint-1.1b"="q48n0d38d8y8m4z6lgmfza4gh1mrzkjn"; +"fltpoint.doc-1.1b"="6ljc5c3g53ig6yj7blcfqy43yvlw5fqf"; +"fltpoint.source-1.1b"="l5ybd1xn6abfhq5kjhvig8zsp721ldzg"; +"fntproof-2017"="bkh1b1j8zlbzmhpif5ji82gwmvg0aprj"; +"fntproof.doc-2017"="hhhxpfkwqpdj0wz78pzg4nbfyzh3j82f"; "font-change-2015.2"="rvxfsxkwag1pzhh448n737b6ngadrlyg"; "font-change.doc-2015.2"="14ck6s61lx6gyqmf6i9659lvwd3zh6hs"; "fontch-2.2"="0h81qy37h3jb2m6g18969189a1jbi73a"; "fontch.doc-2.2"="csygimfjbm36zfm403jz4kw39zv23zzb"; +"fontname-2017"="sczdif1wria35c8rn5d5lp89pmwf2qp7"; +"fontname.doc-2017"="d7n633f3c9jagmc0yr7439m681ff4yxj"; +"gates-0.2"="awaxppd6dhv239x03vpwy2hn2zwldmna"; +"gates.doc-0.2"="qqmjk1276kdv0rvsv86gi7ysl3warg95"; +"genmisc-2017"="wyk31w93k04bqfqik1ad1q7bx88m6v4b"; "getoptk-1.0"="2crphpdvd2wcnqrxm180im84ask9hcq3"; "getoptk.doc-1.0"="vcj36dsv4y0k8czii5fb5b51c57c7rsd"; "gfnotation-2.9"="3gkmqmawpzqvqsqcmrfc50261mqv8nmm"; "gfnotation.doc-2.9"="rwivp94nr9a35q0ram2d4wmwj8gzbhk6"; -"graphics-pln-2016"="i32nn2v5zvdg8rdga9kyyz8m9dgfdig2"; -"graphics-pln.doc-2016"="z4kx3vqp4s3zaysha9waghvyd8fcl11k"; -"graphics-pln.source-2016"="227hkqk1dsl5rm1ark6kdzcrjynf0yvw"; +"gobble-0.1"="6hlqjaz609rn1q7v2vacb428m3prpdq3"; +"gobble.doc-0.1"="5h4fnic16yz5x517wsfr5l0wna69an8z"; +"gobble.source-0.1"="mxi6gci6g3y41ywya5cq1vrdqzc83jab"; +"graphics-pln-2017"="3nfl9ir19rl1sm0f943p79nx218y61x1"; +"graphics-pln.doc-2017"="m95zpr9shhsqrnid0dnggvs6i0zyw809"; +"graphics-pln.source-2017"="227hkqk1dsl5rm1ark6kdzcrjynf0yvw"; +"gtl-0.2"="qgz26n49hlpc5s3ckkbxciamp1qvii9w"; +"gtl.doc-0.2"="wk69mj67d9nfqvyk3cw2crczk4mnjffq"; +"gtl.source-0.2"="4cza716i596dxxd0byx4jb7xgy6sc4wz"; +"hlist-0.11"="zxglyva456i86zmawizc4scm5cjgw89n"; +"hlist.doc-0.11"="0k1ysa58wbhw02564py59gcwzhlaiffr"; "hyplain-1.0"="cdn3m5p0va7v16wfr2hxi7sbbkvai0h4"; "hyplain.doc-1.0"="37fvn4xi8ibli2622n1adyzgnnhrs05n"; -"js-misc-2016"="shwn2dwi83plybk71sjp3i1drw7xxd18"; -"js-misc.doc-2016"="ppwwslknxds8l1spalpgj950n9amsinz"; +"ifetex-1.2"="nwg19z2dwa5jm6s0yczb1kiqdpmgrmx0"; +"ifetex.doc-1.2"="gimfp74mz131q7ldvfbvqscbi9qwk0fc"; +"ifetex.source-1.2"="67xfw4zg52v5m44d1kw6i32rb81k2yb8"; +"insbox-2.2"="n1wbssqq7h2g00jmvy1g9cx2pb8lp8n3"; +"insbox.doc-2.2"="i5c06kh17g5ghsjivlxsipgkd0ab05x9"; +"js-misc-2017"="shwn2dwi83plybk71sjp3i1drw7xxd18"; +"js-misc.doc-2017"="ppwwslknxds8l1spalpgj950n9amsinz"; +"lambda-lists-2017"="kpvnf57b1s1whhrrrng7j0zvf0cka90v"; +"lambda-lists.doc-2017"="ai0gzwilj0cm1129pl5nlwc9ddsgpchk"; +"langcode-0.2"="6fwjx029l2nalfz81qfn1k7yp0z7iycb"; +"langcode.doc-0.2"="vq8m73ckjicm53q7v8q5k0rhldq55hkc"; +"langcode.source-0.2"="nk07pqb0mfq3vzpdddhb8w3w85svpbq9"; +"lecturer-2017"="4014kfbhxnf4wb9ndfh0qfwbbrvz0wwa"; +"lecturer.doc-2017"="avsvzihsa6jn0abvd4122k358w5sf4y0"; +"librarian-1.0"="5siy7c2xclp1c305vqiayp0n5dzil1gh"; +"librarian.doc-1.0"="8nxz7ac5hdp9820nsfkvhvv0bn55idq2"; +"listofitems-1.5"="d14kxmn6jpxh98ad5xiy6qzk1mcib0hs"; +"listofitems.doc-1.5"="vxckcblj82whkf0xwsbwkr057n4ccbwl"; +"mathdots-0.9"="6avfq6dlhbqw1i3jrjgcdbdzx2a0w5nq"; +"mathdots.doc-0.9"="syy0i8rjssr81sy26xcx43jbripqx9d9"; +"mathdots.source-0.9"="zpl4xjhcq4hs18hqiyljy3lfyx9xbng3"; +"metatex-1.1"="jidirfi30wf0b4aq279lim2pylirmv3r"; +"metatex.doc-1.1"="b0rgim8d9dns88zvf283czk4zgsvvi3b"; +"midnight-2017"="5zah5lcyxgq6zxdpazqy3lqv7vxl9dcr"; +"midnight.doc-2017"="cl4ff07jfflwqpmbi7d1phc65hvhaif7"; "mkpattern-1.2"="q3wl8iaijlhsg5qx35f5gcmz6gwj543g"; "mkpattern.doc-1.2"="8hx2z63klm8dmyiyfg069qy4vf5qzc4f"; -"newsletr-2016"="1hrni43c6y624w9nryc8q8rd4w6jjap3"; -"newsletr.doc-2016"="p8jfq33i8ah2a35a7d1rb0s3dz0nicvd"; -"pitex-2016"="6hpvvpnw3bp3sa442b33xsphhyx0vk4b"; -"pitex.doc-2016"="b1y9bprx9harpgqmbchh33gwnc8khzsa"; +"multido-1.42"="xvw8537j730srqyigrb1q367g73zh29q"; +"multido.doc-1.42"="qp7jdx0jca995df559f1ji2l32jz2h12"; +"multido.source-1.42"="qc1473wf17ppqxy11xgz226w4d8zrxk8"; +"navigator-1.1"="0q23aqjf31y78hxmlhx4mf04c95rwdn3"; +"navigator.doc-1.1"="vxgrfimg900qa0ibwpbwcbv63rbaplp3"; +"newsletr-2017"="1hrni43c6y624w9nryc8q8rd4w6jjap3"; +"newsletr.doc-2017"="p8jfq33i8ah2a35a7d1rb0s3dz0nicvd"; +"ofs-2017"="1vqjznrdyjqn6ygq61h8rnwjymkx5kpj"; +"ofs.doc-2017"="8i8acpk75frksj5wshpjpcazbd93whzy"; +"olsak-misc-2017"="vipxn7qlib4hmx4043jgrcp159j1gbjg"; +"olsak-misc.doc-2017"="wd8fi2c7arsvhdy7372gw7vkvpc9mv6f"; +"path-3.05"="gxlifrd0kfxajy8viylk3wsfkycd96xv"; +"path.doc-3.05"="0pbd67di200vghv2a4bp7vwss7bsbkjv"; +"pdf-trans-2.4"="f2qw1mx9qql6xqsnnwcvqx59baz3gzyl"; +"pdf-trans.doc-2.4"="vbg7kp37w1p727nia0p1imyvxhqgzgna"; +"pitex-2017"="6hpvvpnw3bp3sa442b33xsphhyx0vk4b"; +"pitex.doc-2017"="b1y9bprx9harpgqmbchh33gwnc8khzsa"; "placeins-plain-2.0"="b0dxmvbqfwm4cycyqm9ir7dl7dbgq37x"; +"plainpkg-0.4a"="xsvwz9z9f2jirfyzggiv49y0rfmhmnaj"; +"plainpkg.doc-0.4a"="b0c8mi4mr6bjdhrwbcplwjw920l4zmbc"; +"plainpkg.source-0.4a"="lcrm6734c3dv44wqcf4sp1c1aic0vqqw"; "plipsum-4.3"="8jq9bahjflimbxs6vmwz2nl50jsy6ygh"; "plipsum.doc-4.3"="9jp6ipn24yrl486b96ln2nk8i15h9fjs"; "plnfss-1.1"="wkcli3ca9m6grq1ccbc5jjychw9sdrzx"; @@ -6158,15 +6797,49 @@ "plstmary.doc-0.5c"="jp2lgn5yq10g0jj5hihbcl77hpy2ryfr"; "present-2.2"="w9872dq3x09s66fmaxhv0ad27y9f48in"; "present.doc-2.2"="g4wqrsc8jgsjkwmrp3z6xmhpd0k1xg1m"; -"resumemac-2016"="8kydfyx795317240qryrp7zjvpbcd43r"; -"resumemac.doc-2016"="avh8y1vj230yn8bq0mb0mngrki4h0czy"; -"texinfo-5.1"="mank3amcnmc5iy63vny8156f2vnlvh8d"; -"timetable-2016"="ca6qybasxlgqhmlqyjr1dw3n3j2455wb"; -"treetex-2016"="gkvpkgqggl2s86h7rmad9z3ax6wrq3hk"; -"treetex.doc-2016"="5r9rz97y0r280vn642x65xgcffb073gx"; -"varisize-2016"="h0jdsw1dapsq7ml9hibgg9571da7lipy"; -"varisize.doc-2016"="af8xf6nzd3h9fm52gn6xpa886lzdpz8h"; -"xii.doc-2016"="h6cnm10jv759abw65bbkyhniq7dw5qh9"; +"randomlist-1.3"="nfdsmsl3s1wj8p236s3hmwhwfdx289wb"; +"randomlist.doc-1.3"="c6zlhgw9k14wrqffy277jwj3nqp8vsl2"; +"randomlist.source-1.3"="w61n9d30k1gjjrykxps0ssap7xncdfh2"; +"resumemac-2017"="8kydfyx795317240qryrp7zjvpbcd43r"; +"resumemac.doc-2017"="avh8y1vj230yn8bq0mb0mngrki4h0czy"; +"schemata-0.8"="3qik2nhhwhpgkwnay4rsmglh6kffm1pz"; +"schemata.doc-0.8"="7rggpri0l5pj9rppz8ynd8d6jz0v7ssp"; +"schemata.source-0.8"="qixmvsyiaj3yl78053y2s8xgp8ba06f5"; +"shade-1"="4ywc6gkvkgm5fiq6avik748vzj7f23g2"; +"shade.doc-1"="ax6w6sfryrzmjdff803hp6qfc9x7knkf"; +"simplekv-0.1"="hzrb8zzk62jc89bn9hmsg8xskkf7jnyl"; +"simplekv.doc-0.1"="fygasbjw3slr4d11asghdnw57i0r4qqp"; +"systeme-0.3"="z5imn7jxp57sqqh6qhliinmacb8krj3j"; +"systeme.doc-0.3"="p4w018mvrms7kv9q23ff3wq6bjz1a220"; +"tabto-generic-2017"="libhmc3f9mcs93xzi22qhk8nyy0vzv4x"; +"termmenu-2017"="b9z1s2xibg6vcrd5qv1n1zlparqlwf3h"; +"termmenu.doc-2017"="0fqaygp9h3wr9x8ghfkxnsi9w1wfjis6"; +"termmenu.source-2017"="xygav2l9gll238dyqa8126sn9hc1n1w2"; +"tex-ps-2017"="jnzaqr3pc6a2bfh7jlsysc8hy30cq4xp"; +"tex-ps.doc-2017"="g377qq7n63mqil18vlfgimfd589pa1qm"; +"tex4ht-2017"="qbfxx7ipwz1warbpfk1m88zqjap0hj1d"; +"tex4ht.doc-2017"="hi6p91idcncr8n8hiz6vb4fpwggm1d78"; +"texapi-1.04"="4ysk0vfpgxfdkpaag4982k7ni4qkksjd"; +"texapi.doc-1.04"="l2753w2z702418c8shbami8hzdsyz4lx"; +"texinfo-5.1"="dq24mpwkc7jacni9cn3jppy79s057s9w"; +"timetable-2017"="ca6qybasxlgqhmlqyjr1dw3n3j2455wb"; +"tracklang-1.3.4"="gj0vs4fplc62n4gvr1dpv178djvhp9a7"; +"tracklang.doc-1.3.4"="lh0zdd16b49hipr5bfcdvsra3y43hh63"; +"tracklang.source-1.3.4"="h3hqiqmink97g2qf34zqqxxiad92dsx6"; +"treetex-2017"="gkvpkgqggl2s86h7rmad9z3ax6wrq3hk"; +"treetex.doc-2017"="5r9rz97y0r280vn642x65xgcffb073gx"; +"trigonometry-2017"="ji2axcciqhac3aaly221w3bja28yb2nw"; +"trigonometry.doc-2017"="drmmcz6w0mvdzmf10dpikm8iagq3hjyf"; +"upca-2017"="hfay60269pv5n1r64q1r9d0lqljih70w"; +"upca.doc-2017"="czzbjifd9bdw0g9c8s2b76sq1cmw3hjp"; +"varisize-2017"="h0jdsw1dapsq7ml9hibgg9571da7lipy"; +"varisize.doc-2017"="af8xf6nzd3h9fm52gn6xpa886lzdpz8h"; +"xii.doc-2017"="h6cnm10jv759abw65bbkyhniq7dw5qh9"; +"xlop-0.26"="vjjxxxwsq6pshgia7z796rwmhc5sjqnn"; +"xlop.doc-0.26"="gl0qca1pp05fh8a1baylvl2a26s549y2"; +"xlop.source-0.26"="hdfdp7jn8hch5fydl1zddlfh1av08dxp"; +"yax-1.03"="7kwmcvp6dlxj4jp0xp599f6469zhwnwl"; +"yax.doc-1.03"="4fh5pdqkifpv1zynkl1ycw0xi817wy5h"; "auto-pst-pdf-0.6"="64qw6a4r38bsb4z3giwdvx18k60x0bch"; "auto-pst-pdf.doc-0.6"="syhgg4sidch19kh1l9nda10dq7kvyvjq"; "auto-pst-pdf.source-0.6"="j5n1kpkc88ry8nmb9hd3g382dm1x8c9x"; @@ -6190,24 +6863,25 @@ "pst-3d-1.10"="pg6n52kv7lk6i6rfqyzijfrxdbv7ym5x"; "pst-3d.doc-1.10"="x7bl3prki06ki517r33ab7pz72n0ycz0"; "pst-3d.source-1.10"="xchbmh6g5zwja9xgxlkdb04qx4kplclx"; -"pst-3dplot-2.01"="4gl2v6hvb4176cnbgzghcdsw9p1kv50k"; -"pst-3dplot.doc-2.01"="rzm0slr5fmswcx9mw9axk1rzn7n4sv5s"; +"pst-3dplot-2.04"="m0ww4lfmigs5knn6i9x5qnd1hw1cvcb9"; +"pst-3dplot.doc-2.04"="jd1vzccssibgymacp05maz256a6iif2v"; "pst-abspos-0.2"="bbag5d5l1pad71rrc51lbd8k11jm7nn2"; "pst-abspos.doc-0.2"="70m0f6dbxy9j9iwxx92kj2k4vwqsbrc8"; "pst-abspos.source-0.2"="3bnsfp2rj4rviirll63zljd7wady41q5"; "pst-am-1.02"="pydkanpjfkw4s25m2rnxxmx2nq94rsk9"; "pst-am.doc-1.02"="5sy24k5ivs70h1zg0knnfxyw0k0244nr"; "pst-am.source-1.02"="ay1y6q7kmpib5bslmylx5xag413a425z"; +"pst-arrow-0.01"="13pfic6an180whl8c9flfsw83ldrgj39"; +"pst-arrow.doc-0.01"="60rhkqwp0mbrn1ddp4n5akj3b6w03pjs"; "pst-asr-1.3"="78h56zzm2yq7nv40l2aql6ihrx7da5gk"; "pst-asr.doc-1.3"="qx4jpg74zpjjjh01bwxmw7lyip0nwxfc"; "pst-bar-0.92"="a5456vc3299z2n5di8kfv5q07bnp7fvz"; "pst-bar.doc-0.92"="6p7ag1iq37p5rkvd3a6b32cxnj8jqkz0"; "pst-bar.source-0.92"="grywxwwpmwyf94rwa8pmcxvbf0r0xanz"; -"pst-barcode-0.15"="ldhjjgyqs07yfxny8d1pv64p92g78f7r"; -"pst-barcode.doc-0.15"="bijch9qrqq5rdl979pnmaagbdv9krqvk"; -"pst-bezier-0.01"="63mvm18i5hmsrxnzngs44ys62m84n8dm"; -"pst-bezier.doc-0.01"="sfxj0k6iv787y88lp2myay851rhdzhzb"; -"pst-bezier.source-0.01"="9f6mpd3p4q947039y5qk5n1bws89d0la"; +"pst-barcode-0.18"="mvdpfn6iwpyycb8sfa91jw0mxyq6ai5d"; +"pst-barcode.doc-0.18"="xbyg4yj85i4pj46b8bxha5w8268j1k7f"; +"pst-bezier-0.03"="7gw43wmghlvfv0vmbxb9m75wki7k90ij"; +"pst-bezier.doc-0.03"="1dldcqv70p1iscmp22jh0gkvg9c2z112"; "pst-blur-2.0"="xlvdgcpxbaqdw7qfp36xx9brl93gknak"; "pst-blur.doc-2.0"="s2nqfv19ihhsx64hixcj74b9314q0r4v"; "pst-blur.source-2.0"="km82lbn5chcrqzg19kyyczzzrladh5yy"; @@ -6215,10 +6889,10 @@ "pst-bspline.doc-1.62"="vk4iq1imd58w0f8a93c7zf56yb0hkr91"; "pst-calendar-0.47"="nsnyxxld6q4jzvc8kwysbwn9y6fxi9g1"; "pst-calendar.doc-0.47"="jvwhyiz2cfzcx6mpwkahmpcb3fyl6yqq"; -"pst-cie-1.05"="3xz9p53r09n86gpf7z7fmv482il5pjxj"; -"pst-cie.doc-1.05"="5nrh275pznx5mwyh13x8vdjaqyqk7gby"; -"pst-circ-2.13"="2drfi18qqddcfvyhif6n0wnij9pb3h1r"; -"pst-circ.doc-2.13"="y8h5hmjvc2grbvz101p8193jljgpkws2"; +"pst-cie-1.06"="gxxwapvfgmfvbc2xk0j51jj1br0v9ssb"; +"pst-cie.doc-1.06"="1sfdjwhw8fss94m00bsgdbsdhn0rnf04"; +"pst-circ-2.14"="wlskq8g5nkx7ramgybavficfk6w0c55v"; +"pst-circ.doc-2.14"="yn80b73w9193r7nwf6wb3h0jwf7yhz3f"; "pst-coil-1.07"="2ai64805vflnfx112c8p0jqf1ad477wn"; "pst-coil.doc-1.07"="209y878cmqrykmakyy38075dkdfff6nb"; "pst-cox-0.98_Beta"="c03maichp45vxcy6n3p210gpvypr5v2p"; @@ -6235,16 +6909,15 @@ "pst-eps-1.0"="djkk1cq45fzh2q1pvl23aiqi8b2znqrk"; "pst-eps.doc-1.0"="i903x3p9wwb1jjf5al8azqr3iasmxkyk"; "pst-eps.source-1.0"="r6jcjqy0f5mnkkahzqf9qnfrgwqh52h8"; -"pst-eucl-1.52"="fqynbdixxpnnjvq67h9aym08k2jf3a11"; -"pst-eucl.doc-1.52"="ip0h0is17lbfqzkalykbkhjxaxga6g76"; -"pst-exa-0.05"="qlh2xf8m1if1s44hzkwgjmqwbv47d8xj"; -"pst-exa.doc-0.05"="kn0kgnd8nn9l66s4i5274241q3pjgmi9"; +"pst-eucl-1.56"="rb1769g6vgjrq6vx79s4c6z6cy58898r"; +"pst-eucl.doc-1.56"="cwizlv632bcddknihhwbf4kiqxs13ka7"; +"pst-exa-0.06"="1jqv019148d2s5n7cmlclldqd3mzk08w"; +"pst-exa.doc-0.06"="v45ljmsk7y4p256vikzyk7w0z1vnybqz"; "pst-fill-1.01"="llnpvgwf57n20wh4p9xfbwcxzlwky62z"; "pst-fill.doc-1.01"="2wyyhm91dszgjzpvfsyyz7wk3z8k345w"; "pst-fill.source-1.01"="yg27p6nlmkzbkjrygc2kc6bxj6hm9fdk"; -"pst-fit-0.01"="1hdzll7859ci3r2j4igff3702hq92gm2"; -"pst-fit.doc-0.01"="csb85a5gs2qm1gdm72dvf0fynzjm0ph9"; -"pst-fit.source-0.01"="2gcl9m50kkskczdy1b7mq9s4l10rnrw8"; +"pst-fit-0.02"="glmix9zjghzn0pa092yf6qppyax0grf3"; +"pst-fit.doc-0.02"="d2ilipqghmv5i4jmjh63199kn78i4brk"; "pst-fr3d-1.10"="wcwbrmyh4mn9af5skqaj9pljkc79chwq"; "pst-fr3d.doc-1.10"="hcf0909wnb4qdhrcy5bsgi7bjhkd3rs3"; "pst-fr3d.source-1.10"="fyqkqk6p5m83q133ngw9a3j6gpzy8aii"; @@ -6253,14 +6926,16 @@ "pst-fun-0.04"="klmswb8gqb538ghlay62dwg1asiq8l13"; "pst-fun.doc-0.04"="xafzv4wa5hzqmclbv7s7xh0ba2kaay69"; "pst-fun.source-0.04"="s7173q9a44aqd43d8bwcrskc9bsh1c1r"; -"pst-func-0.82"="jnpg44h0r5dp71vqx43vjayr4q4x70sd"; -"pst-func.doc-0.82"="szzcm14zac5mdzrw22sn8y4v3xm31crf"; +"pst-func-0.88"="and4w7rpprax4adl8a7xs30sdsmql9b4"; +"pst-func.doc-0.88"="h0y8flqqydsr9bkmvbxyyani5pxldrhn"; "pst-gantt-0.22a"="ghji2bp2wz4xgkmh2vrfyxh933r8dr3q"; "pst-gantt.doc-0.22a"="zvdlzyll48hrl970ms6j7pgwp2f2vmy3"; -"pst-geo-2.03"="fvjp2dqa5g1r1fd5xhvvjq4bddq2qq0r"; -"pst-geo.doc-2.03"="jmlc0ghj022k48555c5zp629pz3mpwd1"; -"pst-ghsb-2016"="rzy3vznyr6jd0b0vr9h6ajlqc11bp9rz"; -"pst-ghsb.doc-2016"="5w079f1q4w8yxs4546qzx2c21vrhm2ym"; +"pst-geo-0.06"="p2q2w8rl3z8xvdylc8inm2i4zbh8jxc8"; +"pst-geo.doc-0.06"="1kjhmh2naj1v43rhl7kssy7y9gq0ming"; +"pst-geometrictools-1.1"="rx8v1nyhqrny92sqsrwzsra4mhrh7xnh"; +"pst-geometrictools.doc-1.1"="20k0sg2qkfzkcpq1qa42195dw9swjx3h"; +"pst-ghsb-2017"="rzy3vznyr6jd0b0vr9h6ajlqc11bp9rz"; +"pst-ghsb.doc-2017"="5w079f1q4w8yxs4546qzx2c21vrhm2ym"; "pst-gr3d-1.34"="wpbib4n4j2fmgbirhq8xha4di6f3w1xa"; "pst-gr3d.doc-1.34"="ipap5gil3j6hkdcl1l1y0a6fnj754zq9"; "pst-gr3d.source-1.34"="l6i8dnqgpl8iwsmbhiw3a043pbxb3k7m"; @@ -6294,23 +6969,22 @@ "pst-math.doc-0.63"="0ad7biw2p83k17sy74drsl8daw716pk2"; "pst-mirror-1.01"="l1qs4938r324dv9w1ij2xfwk16nslyhk"; "pst-mirror.doc-1.01"="varxk1wyh1lc7yv5n3ad1yp583rchj3l"; -"pst-node-1.36"="52w16inwk9k56xcp74pbqz3mrki706ds"; -"pst-node.doc-1.36"="z2j1izw5a9amm724id8n8vzm63kjdaqn"; +"pst-node-1.39"="m4qqbm10zq8xqwjbrk6d3p9xlich0c9n"; +"pst-node.doc-1.39"="3bp341yw9k84gllar81hd6ak439l3q2y"; "pst-ob3d-0.21"="b133mvl37zxxqny148r3mnwijp69jzc2"; "pst-ob3d.doc-0.21"="v0d9mrz4dvpk0qix4fiy632jfhfhqy4l"; "pst-ob3d.source-0.21"="yqjb2ifyxj2mvs11lxq32dgdr74af9p3"; -"pst-ode-0.7"="ypsyjv4jbx3wx8ql7m6hyd1j7jmg6h43"; -"pst-ode.doc-0.7"="91p3icsarksw1ycm172mavpax0jjavhi"; +"pst-ode-0.11"="li4g5a2l6znwrgs7lrhi2n2fs7snshzh"; +"pst-ode.doc-0.11"="183l2sh29n1hkhx8lmqdi71p1a6a6pb9"; "pst-optexp-5.2"="6k171kswlvjz2qrgsr43llpn8a8fx2b9"; "pst-optexp.doc-5.2"="8nfgcfs6614n1szf9c8b7mjk43f2vqah"; "pst-optexp.source-5.2"="krh33kab76gxw3vjcaja3y8vk2xjpgla"; -"pst-optic-1.01"="n9371pi9hjwj7mcsjfr056c960j7c01s"; -"pst-optic.doc-1.01"="6m1l8j6ms1m0r8g74xs74ivicvndn5df"; -"pst-optic.source-1.01"="0h3yma6n7wvbx468z5c6i73v3klv9m4x"; +"pst-optic-1.02"="fmp70zsr3gfcxc9d7mik8y7fdq9bhv9z"; +"pst-optic.doc-1.02"="bw2k4jbxfdwyn7pfn708wd3ff8nr14ww"; "pst-osci-2.82"="5rwmmzwp7jwfv40cg66gi0n75mlvn851"; "pst-osci.doc-2.82"="nmgp00q4xifasnxnckw04kmd8qxxdd7k"; -"pst-ovl-0.07"="bwafjjmyj2zf19x5i5y6cqidp65kp621"; -"pst-ovl.doc-0.07"="69mxvilq908b0pcar5clcp4gp7c3fi6a"; +"pst-ovl-0.07a"="g6sni4112p1kyribk7p6rv1mwwjb7xb4"; +"pst-ovl.doc-0.07a"="n23m8iv4lv4009x9l6sa177jyfjkp0pi"; "pst-pad-0.3b"="x3762zh9c5shzl02r9ssykd2a0rqpk7k"; "pst-pad.doc-0.3b"="ymjpw81y22mbmf62735kqi80yhylvazg"; "pst-pad.source-0.3b"="7cqccc3ps8qdhbykgc6yyygjds46p5av"; @@ -6322,49 +6996,55 @@ "pst-platon-0.01"="c1crbkzj0vvblf8n894g91q7qig185w5"; "pst-platon.doc-0.01"="54icmvjwsbljdbq03j3npmwr9j85cdpg"; "pst-platon.source-0.01"="bs136jlsz9yxiw062dlck6km6fsapgjv"; -"pst-plot-1.75"="1zi1imlnf6xai6xhi52bqq5rqd43qbxg"; -"pst-plot.doc-1.75"="vjhw8dyq2n8c4hvmjf7pmljmkf35xi4g"; +"pst-plot-1.84"="a10g7rhbg2jrxkm73avbb9csi6bi3d14"; +"pst-plot.doc-1.84"="6ndjai9liadbz3xj8l0nr5a025svg110"; +"pst-poker-0.02"="ayld7472rgn8zy8fbvf9465p5v691bk7"; +"pst-poker.doc-0.02"="xfcxnvwibnl8nqq94sc32ikkmnlscv89"; "pst-poly-1.63"="caj343wmgfxzbzchalw7w14jazj3xb3n"; "pst-poly.doc-1.63"="gq61g8l852k4m8n69kzqdx1sii0jr41n"; -"pst-pulley-0.01"="jvxjh78x37gj05wnb5riz21kkazdyaln"; -"pst-pulley.doc-0.01"="xmd23dn9xblhsj95q62c97x3r9xw5i7j"; -"pst-pulley.source-0.01"="n8kd5kim8a12ja8racd7xy3sz856f991"; -"pst-qtree-2016"="6slxqgzm8pzscdf79x1y4zp3rav425g3"; -"pst-qtree.doc-2016"="9bp342h5rimv9wyjncj9m9bb3x2pb77p"; +"pst-pulley-0.02"="d7y0xspcv55vq4xhhpwhl9a3q33fpyga"; +"pst-pulley.doc-0.02"="6g5jnm4i5lrxqb45mn60g7nlc9xq13cg"; +"pst-qtree-2017"="6slxqgzm8pzscdf79x1y4zp3rav425g3"; +"pst-qtree.doc-2017"="9bp342h5rimv9wyjncj9m9bb3x2pb77p"; +"pst-rputover-1.0"="39c8h8wq8rcby34dnpq8f9d87zlfd0p8"; +"pst-rputover.doc-1.0"="apm70lr0xn7hgj16acpcll9wd3jcxqbn"; "pst-rubans-1.2"="akzd33l39b9gh53hkqzaznb6j6rrbif5"; "pst-rubans.doc-1.2"="sa01cv2q19w3rxlib2j2wppvbjcbn6z8"; "pst-rubans.source-1.2"="vanr4y960njpckxcy8i10jh8fxmdd94m"; +"pst-shell-0.03"="kllra0m3v64wiw4mg1wjqwcwapgbqw34"; +"pst-shell.doc-0.03"="j8j9vfqbw1bzbncflx0wk7awr599pp2m"; +"pst-shell.source-0.03"="4zzi02gy69lscpmwmsy5i6dzck63ql10"; "pst-sigsys-1.4"="89mhw4a91vxvm6jr2806w7sdgm0sldzq"; "pst-sigsys.doc-1.4"="1x1s3l6z4rr8s1s8smck8x8vkg9sb7k5"; "pst-slpe-1.31"="i8wqm7c5rr1gvrcqdhzgc3wjsnvhxnaq"; "pst-slpe.doc-1.31"="d63x21a81b3chx59ygn3niagb12lq0vq"; "pst-slpe.source-1.31"="b8pbhx17ad49g92il07bx2347lim9kr7"; -"pst-solarsystem-0.12"="s8kd8xj2mv939y4x8d1qj7gzp0ic7j2j"; -"pst-solarsystem.doc-0.12"="8ck7j4f14zjzvcz0xb9fpm3cay2hmgki"; -"pst-solarsystem.source-0.12"="zig04547z0ggxsg1gwanzkqxpkx64nym"; -"pst-solides3d-4.30"="9svz46366bqla75i3rrdjgqsjb4xvm6z"; -"pst-solides3d.doc-4.30"="qh7rc9jl7m1fkpq40wba4s5i4qcqgnwa"; +"pst-solarsystem-0.13"="k3gvgdnwv5054qph6ljijgwlr4mhrsmy"; +"pst-solarsystem.doc-0.13"="sh4if86rr6p8bmjrfndh8lfsibjmlj8l"; +"pst-solides3d-4.34"="j69csa2fcbv1ih3ay93n0qd8wv04q6di"; +"pst-solides3d.doc-4.34"="mqhqa0qzn96gkrjcaywszpikz8klpc5d"; "pst-soroban-1.0"="q71r7bilwmgxxvcqngmn9w63cqwh526i"; "pst-soroban.doc-1.0"="ds57w9f3d4dy5c17xsvrmzs09iccanh7"; "pst-soroban.source-1.0"="sj27j1n05dfq3szxyifzd24i44c4ls40"; "pst-spectra-0.91"="7h48zv55xaxbgccdp7710lh3y2s334sn"; "pst-spectra.doc-0.91"="sc2zbs93vbzp4jqgwwxh7pga2ngrwxnz"; +"pst-spinner-1.02"="c25gya6x35s07ki87x3f8jm85a0hsdqb"; +"pst-spinner.doc-1.02"="b15zdksxzk1dr3rmgi5qfkqwq131qnv2"; "pst-spirograph-0.41"="2mkxc7vrmv5xa7aggmpc27wss9gw8zzr"; "pst-spirograph.doc-0.41"="4q5pbwicrqkpmfr7zwa0ykmfy32y4iks"; "pst-stru-0.13"="9xzgq9yp4wh3939dxg4wvkzsvq8za3vw"; "pst-stru.doc-0.13"="pm4nj6rck0s7gjhkfjg3i4xa8qd1dihi"; -"pst-support.doc-2016"="z97cka1jrk6jji8lczqfxc09cqj7f34x"; +"pst-support.doc-2017"="z97cka1jrk6jji8lczqfxc09cqj7f34x"; "pst-text-1.00"="cz2rwirb2xh5yp257rn8i6s0vdns1cpl"; "pst-text.doc-1.00"="xmxlml48x6y95arijiba41m9i201hy3q"; "pst-text.source-1.00"="kzl944rkvz2bjwv6dgq8qhmmmfqxchc2"; "pst-thick-1.0"="b2dnjagm4kkgxfjilahizzyq6mb1cx5f"; "pst-thick.doc-1.0"="jkybjsqnnavyazal3bf4z54ldqnw1gw5"; "pst-thick.source-1.0"="1kjjkqgz4fwghaialrqvgnfq57vl13k5"; -"pst-tools-0.05"="mlc1gkgi32j85fvf2n0k58b2yfss4wc5"; -"pst-tools.doc-0.05"="w2n6gihycll03p7pm9cyl52kz6cz9c6x"; -"pst-tree-1.12"="ax45ifqcw3idmjv3mbvgmn829g2yca1q"; -"pst-tree.doc-1.12"="bj13spjygv5c3ldd8l8hxzkapw09hz4c"; -"pst-tree.source-1.12"="qkiyldmxjd38zyczmbrq16amblqwa4qf"; +"pst-tools-0.09"="ds5ss7w0v0afygykvaqc85j6m12dhjky"; +"pst-tools.doc-0.09"="8h66rj9gxr5n8g07kd22i1fgrvnixdmm"; +"pst-tree-1.13"="l1m6c66jv4v02n4mjv9ddgh84qbyllqw"; +"pst-tree.doc-1.13"="jgcx73vrpiwvlq9rg1iszm57bj1qsr73"; "pst-tvz-1.01"="0xky3nd1q8kv7vbs73dcbwgjqbysrwi8"; "pst-tvz.doc-1.01"="hrigaq1rz3hd5l4969913apdwayy1ifr"; "pst-tvz.source-1.01"="zs1dh6kiphzy0p7nj7i1faldamjsc1j0"; @@ -6373,17 +7053,19 @@ "pst-uml.source-0.83"="50n69kfybcg2qlxjy9d0f330rxy23sv6"; "pst-vectorian-0.4"="45j3kc2ma7yvpk73724419zxzajyyc0p"; "pst-vectorian.doc-0.4"="kr9cw6fs2rra7ymmza9mf3winvj17c0j"; +"pst-vehicle-1.2"="fzkkfjzb0s227y1942p89g2s3qn5bgdr"; +"pst-vehicle.doc-1.2"="152w1jskf5ninr660a9cjbyh9q4bhphj"; "pst-vowel-1.0"="aq45bsp7d1rdflxvs1aga0kqmn9b3zd8"; "pst-vowel.doc-1.0"="zm075772viyjnm1akx6ixk61gb33nq8m"; "pst-vue3d-1.24"="kdnn3bssm9xrfr42ni1n8kg04r899624"; "pst-vue3d.doc-1.24"="qg9v649wjxjfrp14f3ac4shp5nfad89m"; "pst-vue3d.source-1.24"="zxk7phlcdh2g1x9l4mps6ncwxc8ydryi"; -"pst2pdf-0.16"="1kjw0j82pb00fwy917jdhfb2gly6ds2i"; -"pst2pdf.doc-0.16"="qdrz94v1zmclri1rh582qbn2d6wqaa0j"; -"pstricks-2.68"="x1c7cj8im1d8r526kzh08lrxnk3bhdic"; -"pstricks.doc-2.68"="lwv4j4wp8sgpcfqc9ri4gy9r1yz8zvcg"; -"pstricks-add-3.80"="y9155n1s6c6fgg9d11awd311hwd96zgv"; -"pstricks-add.doc-3.80"="zbkzqs5z4cr0r9vfdhz3cphg59xbmb9n"; +"pst2pdf-0.18"="rafm5fyifzzz21336l2yvnqs1ynrcrh4"; +"pst2pdf.doc-0.18"="hpjd3gxsk0lmajf2fpac7ykhrznzsily"; +"pstricks-2.77"="4pkfaqg4ai639y5c6d54s2dwg9fda5fv"; +"pstricks.doc-2.77"="xax0m7fnkacwhzh713yx8x03jid25lkl"; +"pstricks-add-3.84"="rw69449rg24rc3hqavx1cgj6rf9kpzak"; +"pstricks-add.doc-3.84"="lkqz96g9y7lmwdxkbl6jfw1bzpqlh4h2"; "pstricks_calcnotes.doc-1.2"="4q48najl98h9lb1866avfw6c5ir7p4bj"; "uml-0.11"="ggl1iw3qhzysy0fza2dbl3igwlcq3i0n"; "uml.doc-0.11"="rhj5ivlvx43d8c700117lklmgardm76a"; @@ -6399,11 +7081,13 @@ "IEEEtran.doc-1.8b"="zdc3y0lkjpis1fdkshd6bwsmkxr6w2aj"; "aastex-6.0"="s6k6maiimq07jvyjy6i16z7wnybs5j6y"; "aastex.doc-6.0"="sr7n3cm23yfbc9a4pfs3k3w584kxhqmk"; +"abnt-2017"="b5g6psg1s6ggwfib0b0hkdkyj4nbhh7h"; +"abnt.doc-2017"="d95fssk38pnnab13fm03hyajaz8vrl49"; "abntex2-1.9.6"="asw2qc8f7hg5ziyp6xw7n0zz2wyxlr68"; "abntex2.doc-1.9.6"="mswyx4k6c3n31h69arb4385066dhblpj"; -"acmart-1.12"="bpg2bx1hff813nx03gxqlh0j5vzkiwzn"; -"acmart.doc-1.12"="lsmy0ffvhgszlw8r4gxjldsbak897n15"; -"acmart.source-1.12"="wacxhbabid3p5jp7pyq0dvmbbs4chv6a"; +"acmart-1.47"="k2wg5i82fhh6kx6q3gy1vj8wigmbi70j"; +"acmart.doc-1.47"="xlzbwjnmw47jpq1g6c80jj1llazwfqvy"; +"acmart.source-1.47"="gqxjiqwwbyzxspkpsnwrjf1phra7gwcd"; "acmconf-1.3"="9wid04wqz4l1xisvlng52xabw9m0p1k5"; "acmconf.doc-1.3"="66xjqp6a86iq2908p77cz57651av2i23"; "acmconf.source-1.3"="7ssw68bvkxxixxmf9ygp7szxmc59fvik"; @@ -6425,20 +7109,20 @@ "aiaa.source-3.6"="wllq5qv20bc4f7m098yn1f5slyrdxazz"; "ametsoc-4.3.2"="4v5ya7z7mbbxqxkjp5madwpn3m456gpp"; "ametsoc.doc-4.3.2"="nzphxaasrrgxhiwixz6k6qikbg6z45gi"; -"anufinalexam.doc-2016"="qb1dvx5ryz6p5dia1z13aa0h0822f814"; -"aomart-1.14a"="gdkgy7mjfr1anw8b6558dp7n6sm4flx2"; -"aomart.doc-1.14a"="jxbfcpr0la1pm8yiyfhh8p157jxn1vx5"; -"aomart.source-1.14a"="rkqfzg6zkl0dpx5v1vn3gyi6p3j4gb89"; +"anufinalexam.doc-2017"="qb1dvx5ryz6p5dia1z13aa0h0822f814"; +"aomart-1.20"="v73qxy1qy9pczanjda8w1yim0z3xnmka"; +"aomart.doc-1.20"="7ii7p60i1jscbm662fyjm50ysx995nqf"; +"aomart.source-1.20"="yjf95fz8dx3h6gk07q3452fqjf3pkxvl"; "apa-1.3.4"="g7ywm2jp0b70qdwmm59m4rr8glx3wc66"; "apa.doc-1.3.4"="vjg7gj1wi6mb9b1qyfsznhgcbvivdn1c"; -"apa6-2.20"="xv96gdw8qbl5q8l6vxzdy60bzvnq87af"; -"apa6.doc-2.20"="kjh8xm376iq3p70y5fl49y4zvh8p4y12"; -"apa6.source-2.20"="asfncwprysdcalfxsf151wx7hn01wxvr"; +"apa6-2.32"="8b479v28qw8k5hxpfc1vhkyf44f6wxbs"; +"apa6.doc-2.32"="hmb1y0jdxnz23azfaphhlzkxcs50krhp"; +"apa6.source-2.32"="lvjgha718vdc0d4a9xg568n3nfdah16j"; "apa6e-0.3"="0bilb5nbgi83kp1w7d1kci1akg36nv1z"; "apa6e.doc-0.3"="p7ir3azb68s9pms0gpa968gffr2qr0xw"; "apa6e.source-0.3"="baqh9z3mlxqy4kklhnb9a66gj36lnhxk"; -"arsclassica-4.0.3"="p3w5b12aass8kmjc6dkdsszwnjy688gk"; -"arsclassica.doc-4.0.3"="w0b84pppd9jzj1h4iy8ys9y1hmilj31r"; +"arsclassica-March_2017"="50nd02nyaxyxcy9d2sf78fh4yhxgwxdq"; +"arsclassica.doc-March_2017"="cam8jmh3p9ir7p0y59w1ppy2zw8bvygb"; "articleingud-0.3"="45hkl8j1hxdww0igp85iifrdz4g4h18l"; "articleingud.doc-0.3"="00653rqfzjv2f4wl77vznk2p1pi6f2fd"; "articleingud.source-0.3"="24wwfplzs8477i5kl1ks5fvkd8w1lv76"; @@ -6446,51 +7130,64 @@ "asaetr.doc-1.0a"="8d1x4sq5xpgc1kb5ys4dp02i2r1p3ha1"; "ascelike-2.3"="b7ff1cj0jmbdr6wrvcqr37byak164fy3"; "ascelike.doc-2.3"="sqynsfl8cm40n0r7v2a7qlhxx6zny623"; -"bangorcsthesis-1.5.0"="bm47is7rj8j29lc31lzy8jfb4zqx8s30"; -"bangorcsthesis.doc-1.5.0"="md1x5ifg2hyaxw75garyg15ikqxrz5f4"; -"bangorcsthesis.source-1.5.0"="mqdabxha4bhdn15zrpx6v4lfd0vjpn0p"; +"aucklandthesis-2017"="gqqynyfp4l80jc7a90by84wjmn22s0br"; +"aucklandthesis.doc-2017"="jr76ykx7f98jvfjy7dr767xspb50rsnw"; +"bangorcsthesis-1.5.2"="ky8ixx69nxccn4a343bs2g2bqzwbxkyy"; +"bangorcsthesis.doc-1.5.2"="qa5s7byik9gmrf7b6amx1l3d50qakmhh"; +"bangorcsthesis.source-1.5.2"="cjriqlf0zm0jw6l9g53j3msy14r4j62s"; +"bangorexam-1.3.0"="k3xv30md9cy8wyb4pikiavw6c9qkff7v"; +"bangorexam.doc-1.3.0"="gycbbqixfn0hbqgi2lvgbsfn8slyzakf"; +"bangorexam.source-1.3.0"="yfx2g8vb5fzdjdfq5z9949khiwd1vgwv"; "beamer-FUBerlin.doc-0.02b"="k09b82znxfk7gi7cxpkffs65v3q5siph"; "beamer-verona-0.2"="jgqm1267x276xsdikvc586h946xfzhcv"; "beamer-verona.doc-0.2"="skxiv6nxw4vk3c7ppl2bripmlkada52x"; -"bgteubner-2.02"="wbm0wx7ir27gllk28g0fiz099nwwqrbz"; -"bgteubner.doc-2.02"="fz678npdkkgyhyf2qk7f2jpapkkzlz1z"; -"bgteubner.source-2.02"="jyxc2j6yjwrd28ris1mwps0c71z5v26x"; -"br-lex-2016"="1bqx45q1pirhxhlcsfhqy78765skgrnl"; -"br-lex.doc-2016"="8jjgnwg9glhkwlbn79bz13pklnyhvq24"; +"beilstein-1.2"="7njrzm474yiswp5zdv08nx001685dyqi"; +"beilstein.doc-1.2"="1hjzhlwy1kdaz8457n9ly89qjj0140wa"; +"beilstein.source-1.2"="8y4p09higdscj2f74gjbdl4c3ddhbmwv"; +"bgteubner-2.11"="kjykk4kfr7iig49zpd26kga2p4kki4gq"; +"bgteubner.doc-2.11"="wi654djqdqp0hff6cshv1hfkhmgcacs7"; +"bgteubner.source-2.11"="jhqhmr6bb4ldma4dscl9l4csan3qrv6q"; +"br-lex-2017"="ipw7gwrsdv691vnv257w9i15f465irnv"; +"br-lex.doc-2017"="kai74ysi41iw5bc9rjv8saj7qh7n0s12"; "brandeis-dissertation-2.0"="8nqvv44ahsf5nxn6m4qrd5yiarim1zr9"; "brandeis-dissertation.doc-2.0"="lfpykcdb4yrf7pz7b1ljrissjlk4v20v"; "brandeis-dissertation.source-2.0"="xnp41jb8wf2zlrcqikp6qxnhw9k6j1z6"; "cascadilla-1.8.2"="03g1znhjzcvxvclzwb33lrm6703j1xxw"; "cascadilla.doc-1.8.2"="njy3lpaw3lch5x3p1mm07zis50z38ps1"; -"chem-journal-2016"="8rsrybpvzqr389ip3lfkjna1vy6lclv1"; -"classicthesis-4.2"="z7kzmwqa72x76sbcjk96wpcxi81hp1pr"; -"classicthesis.doc-4.2"="y1j93vs8bl92259cc7jfzy6b3xax3gi9"; +"cesenaexam-0.2"="0n58an00m7xywgjxd4mk4jvr3wkla1sg"; +"cesenaexam.doc-0.2"="1cq9yg0f3j9s40jrkzgxnpk2ya88jgiv"; +"cesenaexam.source-0.2"="213fs3j3x9f0330jy9hfxmq3dhpl1lgf"; +"chem-journal-2017"="8rsrybpvzqr389ip3lfkjna1vy6lclv1"; +"cje-1.01"="8hqxfzxk4i09244jw9z5j42qjxn6d5vf"; +"cje.doc-1.01"="4b2dpc6jcdp0bwhfjlv4l8j5q8p0kf8j"; +"classicthesis-4.4"="7fa8sv17vk1vgwkmw1cafrly07pc61kg"; +"classicthesis.doc-4.4"="b40106sfiwgqc60slyap8mniy9xys70c"; "cleanthesis-0.3.1"="rs5scswkmbikw0r4xs8wc86js9fsfaa3"; "cleanthesis.doc-0.3.1"="640j45873rghdx1c5h0n08a3z3ca5q17"; -"cmpj-2.05"="awd4vc139sm6ffq56s2sgqmkmaxja6n6"; -"cmpj.doc-2.05"="zbqhnyqgks8jr91m5yr7aqf97f7gxffx"; +"cmpj-3.01"="4imggckmccyqhm3fdl7v8kwsakfjknmd"; +"cmpj.doc-3.01"="3r41m4byz5qrlhng3sajvnwqf8zqjxfy"; "confproc-0.8"="6anwdx64g1yfr109jrnqfml6bqj8l98a"; "confproc.doc-0.8"="qczsp87rylnxkd8nsi14kjahnkh57i6m"; "confproc.source-0.8"="f8yczf6glbb74hvfga786qvamllnza9c"; -"cquthesis-0.9.7"="bxsxhzsa0wvqir69ipkc9r05zblpnsl5"; -"cquthesis.doc-0.9.7"="a9rmgwlhp08kqgj0i13ghwxalwgpqp8i"; -"cquthesis.source-0.9.7"="lcdl08m48a6k6rvdc3g3h7qrwbpx1rxh"; -"dccpaper-1.4.1"="79jv4cagpvwvxbhc2pjcvpp8p1rrng8b"; -"dccpaper.doc-1.4.1"="bf1j7mmd145b4pgy4j1xl17gd5cmsx85"; -"dccpaper.source-1.4.1"="1x48vgdn9ir0480hbdl0fqw16dza8q2l"; +"cquthesis-1.20"="lqh5vlm7gnd48vzh0pjmq2qvrvy71rjd"; +"cquthesis.doc-1.20"="dyw7s4pysii278m73mck8qrsk0jvs74g"; +"cquthesis.source-1.20"="c0y7gpa2vx36lj1dqafwjayq9rj3plqg"; +"dccpaper-1.6"="2cbir3v5ihswwanppdg4my02sp87clrj"; +"dccpaper.doc-1.6"="r2frh2ika6lrrpw0bncvi9q70xlha8gc"; +"dccpaper.source-1.6"="pjladkb5sa1v4psplxyjxd5r5w7bw0jy"; "dithesis-0.2"="y0xrpjxnblvgahdwyfhm2hag5hss6qzv"; "dithesis.doc-0.2"="b7ka35ywbrn2m3a6b8cyzyvajwxyvdkl"; -"ebook-2016"="08y1g19fvjskwm55g1av1x8bs95vmc6y"; -"ebook.doc-2016"="kw04pn3a7pbkgxjrn1p12z65j8k4n3fk"; +"ebook-2017"="08y1g19fvjskwm55g1av1x8bs95vmc6y"; +"ebook.doc-2017"="kw04pn3a7pbkgxjrn1p12z65j8k4n3fk"; "ebsthesis-1.0"="3f8i1srqx6hh10rrjshsispqr3wdhm0m"; "ebsthesis.doc-1.0"="wic4wfgihf2yyk40937hr2g59933cyy5"; "ebsthesis.source-1.0"="q1lhixwgkc6zis1sgsnwzsd0p7spp0zz"; -"ejpecp-1.4"="yiczzp81d0dysry5nw2y4hqa83n29fph"; -"ejpecp.doc-1.4"="22yybl8rkbx4kw4zfhk8yic3rdrcrw6y"; -"ejpecp.source-1.4"="0dlkxprs13gvcv039d1zigy3wp0466px"; -"ekaia-1.02"="78afi3wg60g034ij8pq3lq73rlhp94dc"; -"ekaia.doc-1.02"="cnjh3a2jdh5g65527vd3zq0vkm64yz31"; -"ekaia.source-1.02"="q1y0pgy7j2nwzshylrrvjfw2f9xjgv4f"; +"ejpecp-1.5"="vzfnvl9rxwbkfyv5pd759d2pgn1gr4qz"; +"ejpecp.doc-1.5"="4449msv5iq090x7r41q1m4l6dnvi7fzp"; +"ejpecp.source-1.5"="sqklvmybkamm25bavxc232grpjv58wmh"; +"ekaia-1.04"="9nf7f8bpgwlwvi7q7fm0k3q0kxbmqxf8"; +"ekaia.doc-1.04"="m3bjh6g13dv06w2p1jqls18cck4gzwf4"; +"ekaia.source-1.04"="gr1gbgpy03z7j1s8bcapf6nqzyjxbzx9"; "elbioimp-1.2"="wp7pv78ijjgb48majhg8pjqcmkq29jbl"; "elbioimp.doc-1.2"="0515vzg1miiljb8grlb8idsb2y9gfcdc"; "elbioimp.source-1.2"="lzbvgi6d0w8wwf052v6a1gzz2qfvpkn4"; @@ -6500,9 +7197,9 @@ "elteikthesis-1.2"="fq911ak06fd2h6brn2zsb20pkqgl4kb4"; "elteikthesis.doc-1.2"="b5ja8g2vrf7gxpsfwshly6h3i0h0kw7d"; "elteikthesis.source-1.2"="iyrmq8s585am0kb3ixgbi2g3n7aqxwr2"; -"emisa-2.1"="adflhhffv72fkn5zinylhhgply4gxz1x"; -"emisa.doc-2.1"="mnm14xwymj9d0mnxrlq8n4y54ssfavfm"; -"emisa.source-2.1"="67gqf6nylj2hgkx6cnfgg3vdzjl75p11"; +"emisa-2.1.1"="18lkpz7s4imwxhh9gb92z8vm42113m5g"; +"emisa.doc-2.1.1"="l3yvr8m9vqkvraix5cfym1ggqvp68v55"; +"emisa.source-2.1.1"="l3afagwzm9s33clz2n94d6rw2cgkrc9i"; "erdc-1.1"="pmxparxijq91mlqb2z2ci0mk9as4r1nz"; "erdc.doc-1.1"="a7f0jw1j2l0md2s4hdzv6gb1v867nk8n"; "erdc.source-1.1"="5rf897hybsib6915bvyp0nai8j7bszgb"; @@ -6517,30 +7214,39 @@ "fcltxdoc-1.0"="gr5vxdra4lcsljhm591xs1b6z4ci2ddc"; "fcltxdoc.doc-1.0"="mibli0mi846flzm0id9z0cr8x90rivgw"; "fcltxdoc.source-1.0"="yn567l5sbbrrdbcmiqdpyq8kq5y1ni1v"; -"fei-2.0"="s3279szy4ji5rzlqkmjxibb1qczvk0d9"; -"fei.doc-2.0"="mcj607d8jgwv83abfnqfz14v9170mfla"; -"fei.source-2.0"="lazcajxlfhhhx1z6h8xk3sk8mn89iz9k"; +"fei-4.1"="iffa6bcr44gyblz4412900vw1mk1yff7"; +"fei.doc-4.1"="ziidcv4d8pijn1nnnybfmy52lk51r3yk"; +"fei.source-4.1"="br856c89j6dkc6favifj084lw84ydy1b"; "gaceta-1.06"="gkwy4pkpzmykxm2rqldpjfh5q5m87ca1"; "gaceta.doc-1.06"="zbxs7kz33kbvx4g5zykh33zn2g9z2cp1"; "gatech-thesis-1.8"="q85fv2ikl3ikw9ja5j7sgygyi6v1x2kp"; "gatech-thesis.doc-1.8"="q97libi0drg6plfjps8p9fd7fxbxg34n"; -"gradstudentresume-2016"="bmmfv6i9zhk617r9a59yz4m0g14s1q1b"; -"gradstudentresume.doc-2016"="xw0w9hwnyhb6xszynfvz489c9j0vyxsk"; +"gradstudentresume-2017"="bmmfv6i9zhk617r9a59yz4m0g14s1q1b"; +"gradstudentresume.doc-2017"="xw0w9hwnyhb6xszynfvz489c9j0vyxsk"; +"grant-0.0.3"="a9bjc5a9i24mymq11dsw78gck3pdb16n"; +"grant.doc-0.0.3"="39g10k0rwfx678fnc8vx6j77wvn8f5c0"; +"grant.source-0.0.3"="4cfhdbqmffiypcs88iij2fxc5lmylxfk"; "gsemthesis-0.9.4"="jhw29zl7f93xh641ws6ydqh62cv1kbbj"; "gsemthesis.doc-0.9.4"="3nw8q8pxsfdbd4gmly0bg8ig15ccpy1q"; "gsemthesis.source-0.9.4"="w1k5h97pgahsar4r1sbg6i2dj4npr6y0"; -"gzt-0.95a"="66bnyyjxac96wmwqh0y00cq95pyw30cn"; -"gzt.doc-0.95a"="dvkjf4wan69n7qwbpn4nrbbm8abhxy9a"; -"gzt.source-0.95a"="myn1r8b1q38d4dhv0w0jxj60shg15sdb"; +"gzt-0.97"="6l094jyfaqzf23z23gg3ssbbn65dc0g4"; +"gzt.doc-0.97"="yp2ci7c9b5r92aaycmqbmfypgjf52dy8"; +"gzt.source-0.97"="6pw3hscx9h13migi8li1n5vn4az2pii7"; "h2020proposal-1.0"="sdm13gcvhga8q32ai16mnz2rfsnwb7bz"; "h2020proposal.doc-1.0"="8nsjvgzyw9137ncq9v48dhlncb10snyn"; "har2nat-1.0"="yn5d36r1lnx5xhrk46laka9crikcd5yl"; "har2nat.doc-1.0"="8gh35w4a8j117z6dzy9p7mmbxsh789zf"; -"hobete-2016"="k2agw9n4s8imsfi399r1n3v80sdxc41s"; -"hobete.doc-2016"="n60jvwc9ca27sxbyjam8jpp6b73ydc4g"; -"hustthesis-1.2"="xn837s3m5kfppm64m0jy50q0zijvvdbx"; -"hustthesis.doc-1.2"="v39zs0q1147iizz7j37yxy7gp4fb3d83"; -"hustthesis.source-1.2"="3jbl3mpn55kzgc489ls0mv08z12fya8r"; +"hecthese-1.1"="fj72nahca2yrd27fl1nigdhzzsalfd8s"; +"hecthese.doc-1.1"="8fg8i7x9f872mfc1mxr5ii2yx8h71x09"; +"hecthese.source-1.1"="8klyvrqilgw12r0jhw7clrmxxh4lbq40"; +"hithesis-1.0.2"="mc36w0marknbcjbdkc8k3s2bjq4pggzl"; +"hithesis.doc-1.0.2"="m5kaps5hi3y3lqsby97rw6fcxsv782yd"; +"hithesis.source-1.0.2"="4s62sjbbrgmay2zfnndvp20g60b536ss"; +"hobete-2017"="k2agw9n4s8imsfi399r1n3v80sdxc41s"; +"hobete.doc-2017"="n60jvwc9ca27sxbyjam8jpp6b73ydc4g"; +"hustthesis-1.4"="f7wr0296h2a3i6vahvrxysl7dr03sihs"; +"hustthesis.doc-1.4"="jknn279nybf7j78y4s99abb6znbkif9w"; +"hustthesis.source-1.4"="j828cim80xhwzjvn6drhy5qzr8sx87w2"; "icsv-0.2"="3k7if2nxgb8zcyr7j29v3pxcqcyygg3k"; "icsv.doc-0.2"="n714ksda39kc8zsqd1x7lnq3crg2w6fi"; "icsv.source-0.2"="h08pzrpgwn88gz0d6kyrvnyjrra6f3vz"; @@ -6549,28 +7255,42 @@ "ijmart-1.7"="nh0kksmb0z5k95s15bwxrbqxxnlq81l2"; "ijmart.doc-1.7"="b88j6a249p8f9bp35a8p019l02s7lbfc"; "ijmart.source-1.7"="y5wyzz6jr5lp0syjywlvdpb3s02cb7ks"; -"imac-2016"="w4g9hwgh6wvbhf5v8xfjcba6chqlp32z"; -"imac.doc-2016"="5qid3adma0486l4li4mmrgxl9lykzfz3"; +"ijsra-1.1"="zj3pf34flbmdy98fzmshxdwhsm9gypb3"; +"ijsra.doc-1.1"="pmw844flk212zpdvcp026c63snmasbsf"; +"imac-2017"="w4g9hwgh6wvbhf5v8xfjcba6chqlp32z"; +"imac.doc-2017"="5qid3adma0486l4li4mmrgxl9lykzfz3"; "imtekda-1.7"="rm2w2mx8mxzxjwgsw6gk0i64c2wb0yxa"; "imtekda.doc-1.7"="m50cfbqcjz4ylda5myzz4idaqfv40nay"; "imtekda.source-1.7"="wrx5ndn59k0rlz19iq8r4fzb4yly9hr2"; +"iscram-1.0.2"="bib03bq4zlcni182mpqmgdd2g6dh27ip"; +"iscram.doc-1.0.2"="mdgll4mymf7k1kaqjlfq1ici0m9rl71i"; "jacow-1.95"="gkj6s2lf2wnnr4n34v88iwhd10lkdp46"; "jacow.doc-1.95"="3l02236m9jc5z0xlirpab9vy7aj48n6w"; -"jmlr-1.21"="rkbbway8fzk5j8abvzk0y8h5xgr92d2i"; -"jmlr.doc-1.21"="5z61vpc12q8w6lkin1swwm336dipfkqb"; -"jmlr.source-1.21"="mn4kmxwmllzh8p33xf1dh5kxni2zzm79"; +"jmlr-1.24"="rnmwix9b0hfdm6zys2zbzy2rx1rfas98"; +"jmlr.doc-1.24"="b7aj9p4s5xzpv2jkih803zx713lp212g"; +"jmlr.source-1.24"="bncl60ks6g38pj64ig53q0s3kr3fpws9"; "jpsj-1.2.2"="xpasajag9rdz7nr5xk7k40g181lyc45x"; "jpsj.doc-1.2.2"="994fxd5c7947y4s7g71i7031l72qj26b"; "kdgdocs-1.0"="i0v1kfpnhn5210jj5vd2pyi9s9h1vhmr"; "kdgdocs.doc-1.0"="0gfi3rfrsjaw25g7mxk7mai8mxy968m1"; "kdgdocs.source-1.0"="dcafx36f7id055kdwvfsci6wq2ya50c8"; -"kluwer-2016"="y63q5nz0rhxlj362cbj5a4x3wm8imiri"; -"kluwer.doc-2016"="q85mq4id3y04wwq7f8is8lwh7gbzyxxn"; -"kluwer.source-2016"="q4k0f4qgzcxgnxblw1776dhk57i2zq6d"; +"kluwer-2017"="y63q5nz0rhxlj362cbj5a4x3wm8imiri"; +"kluwer.doc-2017"="q85mq4id3y04wwq7f8is8lwh7gbzyxxn"; +"kluwer.source-2017"="q4k0f4qgzcxgnxblw1776dhk57i2zq6d"; "ksp-thesis-1.0.2"="244sggimcsxbqkh6g9nndxvdvr6agqvv"; "ksp-thesis.doc-1.0.2"="jngi4gfc4r6dkp6xggyg2s05zj38s1vz"; -"langsci-2016"="39db4ra115hrb95swzbikpv13bax2gjb"; -"langsci.doc-2016"="1rj0mj3qb4wqav1c3y8f2khjyx4cf3dr"; +"ku-template-2017"="y4a82aasjcgjmbxaagjbd1cpz575s8i5"; +"ku-template.doc-2017"="n8wjmji2234ivr98avh9nksa57wa2nxw"; +"langsci-2017"="gzyg6wg1ckrxhbwvr6lgsbiwazlyf5ik"; +"langsci.doc-2017"="plijg3jgwwm41h21bsh0mi6h4mgg5mvr"; +"limecv-0.1.1"="hncbcz8dnz42908pzzd2ynfzfpl3j7zs"; +"limecv.doc-0.1.1"="1igi5hm73ds2gpar5m8794kx7z4zvjic"; +"limecv.source-0.1.1"="x8k7gmr8vnpsx1fvmhfdb0vq8sv0yc7c"; +"lion-msc-0.27"="6b6bg86gr57ldh3giniicp6j41bpqx5a"; +"lion-msc.doc-0.27"="q9jflbrgsf7qhbqm5sl6w6qbaz1jv7yk"; +"lni-1.3"="myr195vgv4d2zczny263qvkm0sjl2103"; +"lni.doc-1.3"="wcip524a7rwqpszj2ms96h6zyw3a321d"; +"lni.source-1.3"="alkhxgz4bbrgvw9vwjyxs0p0mk0nnch0"; "lps-0.7"="njaym8455i99rr0vplxlpn95cbp8sv9h"; "lps.doc-0.7"="9qg688yrg4lfkb284shpgan08vfi5sxn"; "lps.source-0.7"="d2jid2g08c51lpixvbqp13hkvmbhw2f2"; @@ -6588,77 +7308,88 @@ "mentis.source-1.5"="x8djid957v6324m74fn1m8l9hcp7mr1g"; "mnras-3.0"="ib7iykfq2gzv7iljfpqnncwdha05sv36"; "mnras.doc-3.0"="jns5g8cd4c28jqy106ard1pca1pl0p4k"; -"msu-thesis-2.6b"="fs3d3csn7phspbsvbp7d8xrw1dqfkv5d"; -"msu-thesis.doc-2.6b"="5ivf6bskrxrdnz7cgmcmll6xw9k4nq7d"; -"mugsthesis-2016"="cfkw21f3xy6pchbq7ryw2df8bdssilc5"; -"mugsthesis.doc-2016"="xqm757zbzxi9ag50dd22274bk5n1897h"; -"mugsthesis.source-2016"="6awfcfhsqggxvxxxmfbi77pa6bwchg79"; +"msu-thesis-2.7"="7jhb17sa5zm9xg25p06p8hniqyz27a2h"; +"msu-thesis.doc-2.7"="6ykqwgvzhw15ycdq44q8kx37q2xphb3l"; +"mucproc-1.02"="d1xzqp0nvkk4zdf1zcrhngvlc0q412gp"; +"mucproc.doc-1.02"="zpky6iahkhynyv72lg94ankg9wn7gwd7"; +"mucproc.source-1.02"="pxysp457kvf603nz6lwaj55cmlc41n0m"; +"mugsthesis-2017"="cfkw21f3xy6pchbq7ryw2df8bdssilc5"; +"mugsthesis.doc-2017"="xqm757zbzxi9ag50dd22274bk5n1897h"; +"mugsthesis.source-2017"="6awfcfhsqggxvxxxmfbi77pa6bwchg79"; "musuos-1.1d"="v0bx55bnw5lcpq1w0zxfkf1hlxahxj0x"; "musuos.doc-1.1d"="iqviyy26inh9bw04maby457bvxip69xw"; "musuos.source-1.1d"="rx3zcmp2mw88f3jxa0igajz4dzvx135m"; -"muthesis-2016"="w6llbyp3d615mpjazf9i746acl0hqvpb"; -"muthesis.doc-2016"="776dszqb0k9nffhnln310dg20n4z0dlr"; -"mynsfc-1.00"="adgwrf18i0niks19k4v734yayv64yd0s"; -"mynsfc.doc-1.00"="w66524yi4bq6dn0z4i6z2djrgpih4x9d"; -"mynsfc.source-1.00"="1f8v4gbx30rb43cxngmb4nmfk98qjrvd"; +"muthesis-2017"="w6llbyp3d615mpjazf9i746acl0hqvpb"; +"muthesis.doc-2017"="776dszqb0k9nffhnln310dg20n4z0dlr"; +"mynsfc-1.01"="j3jb9xyv9javnbk9r6fb11ygnd9ygpfx"; +"mynsfc.doc-1.01"="5zlf94gdmkxg37zdwq04w4pzfgransf1"; +"mynsfc.source-1.01"="zzmxbw2xfk91lv6isc6raqnqmvk4da6x"; "nature-1.0"="147ghy9qhv5w2p0rh84wrpdgk5cwrd1y"; "nature.doc-1.0"="lvavrpl6wrkxpsidgbzil8g117kkwdf6"; -"nddiss-3.0"="f7q91xxxls5q46xzjpb1pd19mv4rfqcb"; -"nddiss.doc-3.0"="7v4swldnh8h17nkz59ki5ay12i919nj9"; -"nddiss.source-3.0"="qd15pyqi4pyvph772p8yhf74wvk6fd8v"; -"ndsu-thesis-2016"="s34hzsbsw6q3r3dhis599h8nwps63x8x"; -"ndsu-thesis.doc-2016"="9236s704rjqnfh36yl7y3j3gzj7232kk"; -"nih-2016"="cv6rcwrnq8rpwmmxva32233isckys2md"; -"nih.doc-2016"="n3j1f7kbygyh0ljz1796b0ywkifvykbh"; -"nihbiosketch-2016"="da0kk90h0paw6wp0x43cqcfm18bh9ajz"; -"nihbiosketch.doc-2016"="l6nx5x7lb8sqfbmac215xbrn36ifx6fc"; +"navydocs-1.1"="kn549s2m1h0i9ir8q01il9ww3yw05wx0"; +"navydocs.doc-1.1"="72l419vyq79lrhlflxnivg66b9vkbx5m"; +"navydocs.source-1.1"="xcwc5yyvhjhrdjrj9w9prp72mpqlvq3r"; +"nddiss-3.2017.2"="gsqqnmrgc27i78c6s4y1zy7i5yi66yix"; +"nddiss.doc-3.2017.2"="p28y66qyk1zkhmp6f11rkidfjmvpnlgx"; +"nddiss.source-3.2017.2"="7kbka2v5nsdg4wfrv69zsx92rrlax0zw"; +"ndsu-thesis-2017"="s34hzsbsw6q3r3dhis599h8nwps63x8x"; +"ndsu-thesis.doc-2017"="9236s704rjqnfh36yl7y3j3gzj7232kk"; +"nih-2017"="cv6rcwrnq8rpwmmxva32233isckys2md"; +"nih.doc-2017"="n3j1f7kbygyh0ljz1796b0ywkifvykbh"; +"nihbiosketch-2017"="da0kk90h0paw6wp0x43cqcfm18bh9ajz"; +"nihbiosketch.doc-2017"="l6nx5x7lb8sqfbmac215xbrn36ifx6fc"; "nostarch-1.3"="5ir7wwqflr7ac9wdz3qq50232lrxk79r"; "nostarch.doc-1.3"="l4v9sg6lhii6m7z83ap9fghjkzhc1d6k"; "nostarch.source-1.3"="sn4i3aqmh4r4yfj1dq5ipqyy4424kns6"; +"novel-1.43"="wnpxghjdh08v2m8z019axk6i13cd81jn"; +"novel.doc-1.43"="l0bb6dki6hm2jx83ar6lfrpa75xqv11d"; "nrc-2.01a"="pwgmkqwj9nh6c5ibhgz0gx4fha8y4mfa"; "nrc.doc-2.01a"="y8ga6db77g42jblz5hpvk3vhcsj6zczs"; "nrc.source-2.01a"="14br9wclpq3sfj0gcb8q3ws6nz3ws7jw"; -"nwejm-0.97"="sak2srkb6qsvp2v4innin68ilzr469vj"; -"nwejm.doc-0.97"="kzzc1xabcgvly7p0inpsqy3r7fsli41v"; -"nwejm.source-0.97"="17x4q8iqyy4sr1c3sfvv6nsmxlq4zj92"; +"nwejm-0.98d"="wx70rrg71x1wb37wmirwydw8axscj30k"; +"nwejm.doc-0.98d"="gpwk6baaaxwbyzp7xk4lw08jnyy5wzh0"; +"nwejm.source-0.98d"="8s0yfrb39p2nrmxn1wg6nck7zrdaj5mx"; "onrannual-1.1"="zfqaz0fi36py1y5izbphl677ny5mcrl6"; "onrannual.doc-1.1"="hxdcfp7y4lcpc2j1d25sx3p0nga1435h"; "opteng-1.0"="fnx8hnwcpahlkw6h2q1hbnkwa3kfr477"; "opteng.doc-1.0"="24dy7xc4wlz223svmhsv4k05bw6b12af"; -"philosophersimprint-1.3"="r438qj06dgc5z5753ii4nnr384dhwbnc"; -"philosophersimprint.doc-1.3"="7bl8ngzhsjrycayzsm9f4n8cbjxsylf9"; -"philosophersimprint.source-1.3"="qi13l9mwdw3ng108zmg944ynw25csljl"; +"philosophersimprint-1.4"="cdw4cms8w2z5lvj17ayb1yg3075qfpik"; +"philosophersimprint.doc-1.4"="j5ri2kgr97c4z3mzf5kilcwjlqliibjp"; +"philosophersimprint.source-1.4"="i6h47warmh5zlaswpq62mvbc6nkl3hij"; "pittetd-1.618"="1jjhfr2c6ycp2c6r3kg0y4fziq3vjpv5"; "pittetd.doc-1.618"="9394r72nr766i8mnb24s4qr4jp15jci4"; "pittetd.source-1.618"="s0apvlg01wkfzhzp5cgy3jwxx9z14469"; -"pkuthss-1.7.3"="dcpz45y8kymf2ykcfwfdbjvbmd92ylaa"; -"pkuthss.doc-1.7.3"="d7zc4mrgnym40n1c4v63mq8lp6ws5rsd"; +"pkuthss-1.7.4"="pcg59sbk0barbkc718mspqv4wgjyjzyi"; +"pkuthss.doc-1.7.4"="1pa6li051iy8zfcyzvqxpzn7jml4yvhi"; "powerdot-FUBerlin-0.01"="r89y2lmmzzyln4jx6kzdn4rb84jz7w15"; "powerdot-FUBerlin.doc-0.01"="gy9ianzkp3a81sga5i1xp4kzsnyppzb2"; "pracjourn-0.4n"="iv8vll5az565ki1vcjpacrcb369z2g4c"; "pracjourn.doc-0.4n"="kvvb2vn1z5phqxy9jiwgj9rgc1fpabhj"; "pracjourn.source-0.4n"="vl8rarvx6whc3ph6pw892ldwiwzvc78x"; -"procIAGssymp-2016"="cvcsi5gr6ndjlvabqwkk4spmd8y9fqz1"; -"procIAGssymp.doc-2016"="y08ng1769j9ffib4fpi6rb86dvj4y0a8"; -"proposal-2016"="3nnzzlv4rcr3v671fipw679yq7ndbw9j"; -"proposal.doc-2016"="hx9nsm0fidsia9v6iki5l4cb500kjm2k"; -"proposal.source-2016"="3md53b23cqzdhjyzk2hw4gsjr5flngfw"; +"procIAGssymp-2017"="cvcsi5gr6ndjlvabqwkk4spmd8y9fqz1"; +"procIAGssymp.doc-2017"="y08ng1769j9ffib4fpi6rb86dvj4y0a8"; +"proposal-2017"="3nnzzlv4rcr3v671fipw679yq7ndbw9j"; +"proposal.doc-2017"="hx9nsm0fidsia9v6iki5l4cb500kjm2k"; +"proposal.source-2017"="3md53b23cqzdhjyzk2hw4gsjr5flngfw"; "psu-thesis-1.1"="mfm31zjkdhv8g59fzcnxiwrj5l3im13a"; "psu-thesis.doc-1.1"="xqrlld1bn1kyqymprpchwp525n1jbmhd"; "ptptex-0.91"="w61zrgirw5as67kcbi3yrx5pzpw7dj36"; "ptptex.doc-0.91"="h0fi9wq2asps1aiwkvrwj93dkzzhclsy"; -"resphilosophica-1.28"="486i15l2a2xpjbx01bbknlr9n00bq00w"; -"resphilosophica.doc-1.28"="24sa5avi0jfkn58rybi82gwnzxlqx4mm"; -"resphilosophica.source-1.28"="ci6xi6453li6jm47pj6pbn07173zffrv"; +"resphilosophica-1.31"="7559kilc9c43911asxardq7rkys37h3v"; +"resphilosophica.doc-1.31"="l99zw3207kainx7alwlig5mzv9ichsq2"; +"resphilosophica.source-1.31"="ivfy2kjka0bcsa2n1bri1ic9a2hipck6"; "resumecls-0.3.2"="niqlfjipn9h1dchnx63w89i097kf58il"; "resumecls.doc-0.3.2"="7jcdgicys21bhfhyn1aflyvry0yy7sxk"; "resumecls.source-0.3.2"="wpgzwjw6nmg6dq02jdxq12fx7hnmff29"; "revtex-4.1r"="bk25w1asnzgz3m3hbz9vq4wha12xs41h"; "revtex.doc-4.1r"="lcbzvj00nnrnrjja5vcpzdmc6dmk3k56"; "revtex.source-4.1r"="32rs8695805n82m58hqf0bww2mqnvynw"; -"revtex4-2016"="c7hlwwdvdqpigljx4wnizy53fs0v2dmh"; -"revtex4.doc-2016"="6whihhpzkygb24qs4xk92vjy580dayns"; -"revtex4.source-2016"="0pq58vkvfc191123k78zaiyy3mxk1m1h"; +"revtex4-2017"="c7hlwwdvdqpigljx4wnizy53fs0v2dmh"; +"revtex4.doc-2017"="6whihhpzkygb24qs4xk92vjy580dayns"; +"revtex4.source-2017"="0pq58vkvfc191123k78zaiyy3mxk1m1h"; +"rutitlepage-1.0"="a1n4m7cac5knv65x53rlvba61hpadmvb"; +"rutitlepage.doc-1.0"="y797dhmlp9nd1sws91ixz30n0rv3ga57"; +"rutitlepage.source-1.0"="425dvih79kx8ddzb4as308f796bi7m1p"; "ryethesis-1.36"="vvsqlw02q3ivwlzw3rp0x6vhfdqvfhda"; "ryethesis.doc-1.36"="xpba1bqp48y0q99kn8w504pzj3176nf7"; "ryethesis.source-1.36"="4dddvz7f28pbzyymssgsilsyig9rzp45"; @@ -6697,44 +7428,44 @@ "suftesi-2.9"="h9bfwxab3hg48q45qpkfm1f23igr073v"; "suftesi.doc-2.9"="sjlghwc1j7mbk103wk4nb817z1m46rkm"; "suftesi.source-2.9"="0b7ji3a3pxs6wrc9mx7791gsb6bcmjzl"; -"sugconf-2016"="9bgrgs1gqxlj5czai1l1m45z3z4xbr6d"; -"sugconf.doc-2016"="siyxf3blr7z953fm4xy61z4jfx589bcb"; +"sugconf-2017"="9bgrgs1gqxlj5czai1l1m45z3z4xbr6d"; +"sugconf.doc-2017"="siyxf3blr7z953fm4xy61z4jfx589bcb"; "tabriz-thesis-1.1"="9k4d01w35206y8gw5f76ffx6abvdhgwf"; "tabriz-thesis.doc-1.1"="cga6sdf865mjmzaa39173gy5vinshqpv"; "texilikechaps-1.0a"="v3x5w1a3lblqc3pks3yzychj64rvr67l"; "texilikecover-0.1"="fn8g82q7mvdqaa3i14nsc95wjlp0ziyl"; -"thesis-ekf-1.1"="jzw6c55jw8s6zi1n3b257m4170cwxg73"; -"thesis-ekf.doc-1.1"="6b376447wn7j1dn67i63kz811cfhar1n"; -"thesis-ekf.source-1.1"="s1kmgh95jm7y6lvxci5s9ia8bnm5wdyd"; +"thesis-ekf-2.1"="mrxpgrhbnj7hz3iwyb33yw87hz55a7d8"; +"thesis-ekf.doc-2.1"="wsa59q13haak74fxlnp61nvmbhhi9y0q"; +"thesis-ekf.source-2.1"="6qa9fi9ifflj03fx8p6a9lzn9zby8698"; "thesis-titlepage-fhac-0.1"="dmyydjxrj16hf8gh7qyp564d195kzmwp"; "thesis-titlepage-fhac.doc-0.1"="g4jw0jyl09vq4hglb14jx355v9kli1bx"; "thesis-titlepage-fhac.source-0.1"="zp492p2j40bpphwr3zhjcqiwnj18yk56"; -"thuthesis-5.3.1"="qy8n5x27zqm6ramvqbnf7yrlq519ygri"; -"thuthesis.doc-5.3.1"="f7cyjl6smf3p185wxmnnrcqgjayb6388"; -"thuthesis.source-5.3.1"="9h2sf8snz1smi468j7apfmd4pjsvrax6"; -"toptesi-5.91"="558pgw7x7bmllz8arqnajvz9vshb19fz"; -"toptesi.doc-5.91"="ygcdqnd0nk4294m7r2ihl6wjixhzg4ak"; -"toptesi.source-5.91"="wlfhgcwhh24lkabsl00hrr8j6sfgq8qc"; -"tudscr-2.04e"="pppqxigzfh8487xq7hl28zpip2sy3x55"; -"tudscr.doc-2.04e"="76rjgaarhcnqy1a6brzdh0sfkvy17zgb"; -"tudscr.source-2.04e"="m17ql2ab37kj60d0qk5x5isbszi6wxlr"; -"tugboat-2.17"="52zas8k8576rv5rs8h6xbgd47pf40a19"; -"tugboat.doc-2.17"="vvz3fcg9r4m8ah9xa3cd55qwwggpafnk"; -"tugboat.source-2.17"="xxy197vfavfrvvahg3wbib2y7ik2zjng"; -"tugboat-plain-1.21"="pydb1fx5x9fwd53pbq5ikfkyal7bn6fk"; -"tugboat-plain.doc-1.21"="asysg9xakhqwa7l8ngnayxn6gf93s9x4"; +"thuthesis-5.3.2"="y0zj5y18jypx1vhhw7wlws8bkhgwv077"; +"thuthesis.doc-5.3.2"="k0rx70yjc5m23n8n05hc1haqf6ygpy5c"; +"thuthesis.source-5.3.2"="2q75igan9rnm681z17wspkizaw7n9fyh"; +"toptesi-6.1.09"="9xsgzl74a9w41xah2gjwfz3635072fjg"; +"toptesi.doc-6.1.09"="jhnf3zpp58bqbznv4a5cyvvmfqh48m39"; +"toptesi.source-6.1.09"="a23slrx9fpvg3v3qa337d454gfg0nxwm"; +"tudscr-2.05m"="rlfxi0lf0yy473933ds0w4f88iaxs2by"; +"tudscr.doc-2.05m"="zf1a6mamshb3h9ijkcf13191bp5yra8q"; +"tudscr.source-2.05m"="rblvasxg57wsh98wiykpsfsb9xdk9nds"; +"tugboat-2.18"="4xp5d9hwx58mdxdihjpmja5qlh69q03v"; +"tugboat.doc-2.18"="hizwp9yi6rfk4mhp3yslhz1sx3097hp7"; +"tugboat.source-2.18"="m82bqm4ampqdz416xvfpfk5v7102xyc4"; +"tugboat-plain-1.23"="5gg97ya5rlspsjgxp6h6sl75bgy4krpa"; +"tugboat-plain.doc-1.23"="5wndvzkgnq5p1bnkzlbxkadwi2gpc2lc"; "tui-1.9"="s71xp2jz0v4wlvgvx9f9r62i2clj8grw"; "tui.doc-1.9"="ddway3iy2gx447ypp2cd4vlvhjvnlh0l"; "turabian-0.1.0"="mkjjkq2fpg1lipzwqn7k0p77j2i3znm0"; "turabian.doc-0.1.0"="b1pxcnzj5k4l9r571yi924kykw4wk7vd"; -"uaclasses-2016"="d8zwjxcvgb1rnfv239xwf1qblqpzk32c"; -"uaclasses.doc-2016"="mv9hypafmsgnh5pxl2n0929ib8zgrda0"; -"uaclasses.source-2016"="mzvrcc6gvds2bw1a7cdkjd5n9dm3gczq"; +"uaclasses-2017"="d8zwjxcvgb1rnfv239xwf1qblqpzk32c"; +"uaclasses.doc-2017"="mv9hypafmsgnh5pxl2n0929ib8zgrda0"; +"uaclasses.source-2017"="mzvrcc6gvds2bw1a7cdkjd5n9dm3gczq"; "uafthesis-12.12"="8qdm4v22s3r9g8q16sjnw3bzx1j9w16a"; "uafthesis.doc-12.12"="d1nns5qzwkrywy9cghr19i70bp16fvw2"; -"uantwerpendocs-1.7"="d9gp6k1gkz5wvpad4j3iz1xbcn1707lp"; -"uantwerpendocs.doc-1.7"="jb39j0v3dcgz74ykfrry6bfdgwhcnljk"; -"uantwerpendocs.source-1.7"="4l88156s8s4b81zsyam4niprcrb6jm9w"; +"uantwerpendocs-1.8"="xhk8q4hhvv1plfv5b0433m197rgkvkr0"; +"uantwerpendocs.doc-1.8"="xkjc2fshzrq3a3k11yd86pia4105bdcq"; +"uantwerpendocs.source-1.8"="f4gdf9izvvfangh939cip1w99s1im1k3"; "ucbthesis-3.5"="zagmch6rnvnjiy9y0nacc5ciwqv5xsad"; "ucbthesis.doc-3.5"="xzypd8jcnsipjflhcjvznd9y7fcqmm51"; "ucdavisthesis-1.3"="naibrb9h1lg8y22j26wygm9zxcv3rfc2"; @@ -6744,15 +7475,18 @@ "ucthesis.doc-3.2"="515r7ha1aq9f0zxlgiz2zv2aph460aad"; "uestcthesis-1.1.0"="h0cz0i3vnalcc3i77qhb941yymg6bl2q"; "uestcthesis.doc-1.1.0"="7w5wa8z24nrcsd9gfba6ixwq5wi4jp23"; +"uhhassignment-1.0"="0dv6x7f2zzvgqd104aak9j360pqwfy1r"; +"uhhassignment.doc-1.0"="c0impmampnwvrisg300yrmc4zh891r15"; +"uhhassignment.source-1.0"="59yahjzr20xn4j3lnjxf17dwr4vsyy1m"; "uiucredborder-1.00"="qmpx3zbgnl6224cyigggmsp8a2vndjxv"; "uiucredborder.doc-1.00"="vc4l9nvnvlfsn44vr48s4irjwaifg8wr"; "uiucredborder.source-1.00"="l9b35lm36c8gnl1jd9mpxqk07j22b8d3"; "uiucthesis-2.25"="62smailyn66fyhpdgrmjx0p9m0j0n12y"; "uiucthesis.doc-2.25"="ygqpzgk5jslsnqa813k0l2nvw2j8gnwq"; "uiucthesis.source-2.25"="lkq6bvdvm6ya5q5wp263zqkk7y4ig57a"; -"ulthese-4.2"="w6qr311m0wiyndalagllsan96a3pcd49"; -"ulthese.doc-4.2"="6c3hr2p3glprr45c72awhhgahy9hi2qj"; -"ulthese.source-4.2"="zq83bfd384r5862n4jn5g1r38sj19sgm"; +"ulthese-4.4"="dlcv9nkbqjcxyb7fvcl8mg6nfsy1v93r"; +"ulthese.doc-4.4"="r04ssdfdkza8n6syri5r09b3x7d22m26"; +"ulthese.source-4.4"="x26g2kavc5jv5a3p5nrpsy6idvpmnmi0"; "umbclegislation-2016-6-8"="wjkna9qn6g0w0axsgpa80vc8d8jsl94y"; "umbclegislation.doc-2016-6-8"="44hd3iax5vblcr03xxgxccmbrf4y5sma"; "umich-thesis-1.20"="mgwbc9lzd25w17fm9j2098r6y0q1k688"; @@ -6760,8 +7494,10 @@ "umthesis-0.2"="xsgr2p3cw7q2gv7b2sr6xvcp186cvsy1"; "umthesis.doc-0.2"="p64jg8jns4xp4y400hwbbbzz2wbpsmas"; "unamth-template.doc-2.0"="jn6hykpgd53yn4px4rp9yk0sp688dqi8"; -"unamthesis-2.02"="2y37l3cxz8b0h769bbvh1lajiwfi7z81"; -"unamthesis.doc-2.02"="p459xn1jn9f1nqzfa04rsn5cyv8xmcmh"; +"unamthesis-2.1"="jvpbqfbpvrzbvs67r0phdrkrvxxjjcyz"; +"unamthesis.doc-2.1"="jfqnn8prn8x9p68k70b64zd1759v92ak"; +"unitn-bimrep-2017"="s3x065jkvzazjx24an10jbwj47903gjl"; +"unitn-bimrep.doc-2017"="k2iakhx4fkiz9ckglr1pvnrqday0sbnp"; "unswcover-1.0"="5bqxws27nxyhgrlc6c9k9v5pm8jvdhzc"; "unswcover.doc-1.0"="9c32r1x4094k8saz0w3bcbca28vgl3zj"; "uothesis-2.5.6"="zbf8swc2haqsdr7sibm4lz9sqyhbfaqs"; @@ -6769,18 +7505,18 @@ "uothesis.source-2.5.6"="ppxr7m777ymzzcl34i9qsil0z859wdxl"; "uowthesis-1.0a"="g346f0s4phiqykd0n27hgy7f3vh9vp6l"; "uowthesis.doc-1.0a"="h9g1mwp55hj3jsqmn0fmpjm95g4139rn"; -"uowthesistitlepage-2.0"="29b3r6wfpk8vh132a8fk5xsf79xs1wj2"; -"uowthesistitlepage.doc-2.0"="kpfyii5m77dagy53dragdl9pc38irn4p"; -"urcls-1.1"="6ag871hlyhb3fj1s0dy35h4s97pmy271"; -"urcls.doc-1.1"="6r5l2274cymvg6dif8p8fmmm1i0n0z9c"; +"uowthesistitlepage-3.0.1"="27sk8zllk19qflnr5am2r0cjrx4n89r2"; +"uowthesistitlepage.doc-3.0.1"="wyz7yz7j3jp1v2z5vildp8lb0li8786p"; +"urcls-2.0"="cijzaxab03vy218s758w4xb0r5vwb65s"; +"urcls.doc-2.0"="z4v3vq1gcr0cxx8ar4pcw03pk5n8mc7m"; "uspatent-1.0"="lqv4zrqgwdhav1075ym1wp3cmy7r3ahw"; "uspatent.doc-1.0"="0pa1qihx7vyc5lfkzr7bbakkphzmxp2p"; "ut-thesis-2.1"="wz086qs6isll7wfa16yf154zqdbwz7zw"; "ut-thesis.doc-2.1"="yqaa6h1yz1401ljb6wxnlz3rqmlr7fy0"; "uwthesis-6.13"="1z7cpyrzcb9ga77d9a58jm9234w2zafy"; "uwthesis.doc-6.13"="w30d568jxqqwdfbrpm8s1i7ylssiz3gc"; -"vancouver-2016"="2yp7l10k8yz7nr3nh9sj0ix8s9q79b5i"; -"vancouver.doc-2016"="gan4b1yrhwvqxnywn8rb6ckqvgv9m9m5"; +"vancouver-2017"="2yp7l10k8yz7nr3nh9sj0ix8s9q79b5i"; +"vancouver.doc-2017"="gan4b1yrhwvqxnywn8rb6ckqvgv9m9m5"; "wsemclassic-1.0.1"="8rl3dlv1f1vrklknkssldjnkgdwdcipd"; "wsemclassic.doc-1.0.1"="n0wnf463jpcq8lbgk45h3924c4qm2r2z"; "wsemclassic.source-1.0.1"="l4db45ax258zsrgvnw5gq0knflxx2nb5"; @@ -6790,195 +7526,18 @@ "xduthesis-1.00"="qxvczdxndgw1n1hxzrr5scvnrgcl3q3f"; "xduthesis.doc-1.00"="a58xwk250qq99pyz4rj2br4dqfzhhmxv"; "xduthesis.source-1.00"="nw0j5z9vd83a3idksbq2338j8ir01fr6"; -"yathesis-0.99m"="2dq6cjg98y57hzcxjpc3wmf7lpdnqz7m"; -"yathesis.doc-0.99m"="0824c9qnv1diqxmidwjlqjl3pi3g71yl"; -"yathesis.source-0.99m"="fadiypnbpxvkkwl89vkcpn6brac3fds2"; +"yathesis-0.99p"="qc2y8yxc63kf38ygcrkw20cn4r5b6vvb"; +"yathesis.doc-0.99p"="163rpff67cfqgbb9hdm3k1jcpyzzyqff"; +"yathesis.source-0.99p"="w6i7khjk4nxvvrgniln67xi896q5jq10"; "york-thesis-3.6"="rm9hh3b6cq902rr4crmv6c3z3ll2680b"; "york-thesis.doc-3.6"="fa7z6lks54czsfd04igviykcij1h5lih"; "york-thesis.source-3.6"="83mnkcdmb930lfh4130vcr82d5lp3f3h"; -"SIstyle-2.3a"="35jza92m3n8nhfnqxpi4yx5xi90hf5mb"; -"SIstyle.doc-2.3a"="7y6y0ks7aa4yvqcw4jzh7rrrajm5lyfz"; -"SIstyle.source-2.3a"="i5kmfn2pan7a6bvl7saij0wbfq7xsx8g"; -"SIunits-1.36"="jpghwsag31g9f2lnzdzmfg1rg1vjxihs"; -"SIunits.doc-1.36"="1qalyh0q4lvlxxmwykaq3bp3sw76sscg"; -"SIunits.source-1.36"="6v2lr8gjm3f2kyqh7pc06ay5iswbi7p2"; -"alg-2016"="2z4gi58401dsjwivwji0b169ihz3assx"; -"alg.doc-2016"="43bcrdwkqnx6rharxz9l106cxycm408z"; -"alg.source-2016"="yq6bvw0bwwqq8c367ml9p9cbimqhkr1v"; -"algorithm2e-5.1"="3gdx3wrx3hazpfw0ak0w1b4mpcb72qj4"; -"algorithm2e.doc-5.1"="2bd49vn9cq35ywgpmvp7xw8vfpwbs732"; -"algorithmicx-2016"="8hvwf9c6b51yc623g8ivxqzwd10c1j7s"; -"algorithmicx.doc-2016"="1xcga5bk7fgqq2dad5mzv2v2x0m6hqrd"; -"algorithms-0.1"="s07h59vabig8jdk2d7r98hdnxpyq52sm"; -"algorithms.doc-0.1"="vwq0lnznxpwi4zpp4hjaljdfc3c2h6yw"; -"algorithms.source-0.1"="cskf3mpv2rk435przyidljaijx46fiy9"; -"biocon-2016"="d5164k5f9rh092j3yd5vysfzcp6qbvc7"; -"biocon.doc-2016"="w3c6g9qr6s5pm76jq7v0fk4fs90p5d20"; -"bitpattern-2016"="s1gn3l5lfz24xgg768032s318gzx96zy"; -"bitpattern.doc-2016"="8nq9nd4qsrixnnw32saxp6272d26w040"; -"bitpattern.source-2016"="1xa4jib8aihzccs6lrijw5x0cvhlrkcl"; -"bohr-1.0"="5r65jri672mlqzhd26dmys54sj19c8kz"; -"bohr.doc-1.0"="8gsrm5xrxfqqgpljlyizlcdz4lw3xk9h"; -"bpchem-1.06"="w8788zaka42fy1ksfsfxdsgijszmqjvk"; -"bpchem.doc-1.06"="py1xswacp8w7qvf1v2dn1pnhx9lwrf1k"; -"bpchem.source-1.06"="nf39x6lbn1mbrb0qdczyja4r1agglkhb"; -"bytefield-2.3"="rnmfh9nw5a9j74ys22kr0szlvacyzdl3"; -"bytefield.doc-2.3"="qysnw5hdx3scm23yfwcw63dzncfrmh1w"; -"bytefield.source-2.3"="vrnmpjw97hwzqpqbijwc65klk0rmgdzr"; -"chemarrow-0.9"="mb0i68z92909632g3xd1m3ahvmg0nj72"; -"chemarrow.doc-0.9"="h7g7ldb9837ngsxbmxm2c902bk0k2wdg"; -"chemarrow.source-0.9"="05g345ir5pvd4wik23yykarizwp0l506"; -"chemcompounds-2016"="7m2snwdxnachamq617zap92fsgdqhay3"; -"chemcompounds.doc-2016"="imzf21bm33j290wmy96hx88ahf5zgbff"; -"chemcompounds.source-2016"="nwcxbn1ivdiswdqyr319y93l76527amj"; -"chemcono-1.3"="kppxwgnwc7f62n7bwi2gnb6zndxv4bag"; -"chemcono.doc-1.3"="r527psyb3zf91x0xd6ywiv429b0rmicp"; -"chemexec-1.0"="szl9xw9iiql9yi7la6hwcwx8frhdxkck"; -"chemexec.doc-1.0"="q7rkw9ny7g93m4xm5jvs17v8x4nwb2p1"; -"chemformula-4.15b"="jbgg5j80iafbb5vcz2kjaywq261f508h"; -"chemformula.doc-4.15b"="0jsgqqrkd3qxsgjgxw790nnnlh92r9lk"; -"chemgreek-1.0e"="vc3rbqz862kyx06ms2jsyxd1xag21f8x"; -"chemgreek.doc-1.0e"="2xalvg64h8vqnafcz6hjkj4f4502l8kx"; -"chemmacros-5.7a"="02fcklka2w6dx6da7ipnbjd9x41f5aha"; -"chemmacros.doc-5.7a"="1h7s400izjas91f3339q2f4jzrc3nm9g"; -"chemnum-1.2"="nk857am82h2zfh8f5l81sm3xrrg0vawm"; -"chemnum.doc-1.2"="awwrxj67jwai17nvgpgl2lx10n8wm741"; -"chemschemex-1.0"="jrpkchi45q2k3csw7hiahg73j15qba9c"; -"chemschemex.doc-1.0"="ahlswf4y85bxjfxljby25pnxf13sv139"; -"chemschemex.source-1.0"="irhcqmjd6kl9kv54icxy7i2m8h8840qn"; -"chemstyle-2.0m"="lzbqwhh58y559q5lbxnbbz21rfxp1rcn"; -"chemstyle.doc-2.0m"="zv454b37y12fspkcphm6qs0yy7x7768s"; -"chemstyle.source-2.0m"="v52wrccz5gh3pswpfilm4qs48bplws5s"; -"clrscode-1.7"="6w0y1xknbskhhahx05688943y4pqr22s"; -"clrscode.doc-1.7"="m1syqr9a0x2546s5qpslia4ic5zmf961"; -"clrscode3e-2016"="0fz3frh68k47pdn3way6fbpiagyillgk"; -"clrscode3e.doc-2016"="91b116aqyihwlizzw1apmvd8kaaia407"; -"complexity-0.76"="j5mbhnplpiykaxrb4znw92ax6swd90ai"; -"complexity.doc-0.76"="jqvlbh8786qn3lmqzp7jirwbl9n5x15d"; -"computational-complexity-2.25f"="lf5mq80f1rdl64g0gsa2jsqrxv3ydpcl"; -"computational-complexity.doc-2.25f"="28gs7lby763li1069qhfx64llfpkxs2l"; -"computational-complexity.source-2.25f"="br0rz33ycmvpsn5fdhvcjlpffhssnw08"; -"cryptocode-0.1"="a8n95hv90vi0bx2azmdxlvhvq5jx3384"; -"cryptocode.doc-0.1"="fz2j47nnxvzn5hymz7r66cq43pw859dv"; -"digiconfigs-0.5"="r2ph2xkdaslj50qk54n7a1xx37n8pq19"; -"digiconfigs.doc-0.5"="vignfzc0zrhrx0jgybwmfcgyfcgaqhim"; -"drawstack-2016"="kdcvc0kd9lm3zxd2zszwriab31p26wrv"; -"drawstack.doc-2016"="plmy162h6z23pzimj4i5wjpih0m21z3p"; -"dyntree-1.0"="820wp3d1dcdm5vxihmk93wqc8qw4rqf4"; -"dyntree.doc-1.0"="j334vdgmzrhlv3x0ihzpa9j2rbbd9xhz"; -"dyntree.source-1.0"="ha5c29s0f6j3r5f3b2v7v7bgxaks28b2"; -"eltex-2.0"="n3kq7kl8i0b1k89i94i4k30qcy31lhfz"; -"eltex.doc-2.0"="pnvsk55d11vh82nn0a77lskyma1mqmpw"; -"endiagram-0.1d"="lvncrih9fmmsd6571dklnq2vzh7jdxv5"; -"endiagram.doc-0.1d"="7nqf9zgjslck0853xy6r6i938k9pd76z"; -"engtlc-3.2"="dc257zhqmzl7yymbv9prpiam1mvznhnm"; -"engtlc.doc-3.2"="d6mmmsi3kr2dlz2g6iwynabjlw1jyp46"; -"fouridx-2.00"="lxj3924da4bfn7605g2akgd3ccynizqc"; -"fouridx.doc-2.00"="ic4hkzvwc05qm91h90cx645gpskcm8f4"; -"fouridx.source-2.00"="zgb2xfg0wl5ld4b5v8rn72mxmfy3qy38"; -"functan-2016"="68wga1s4yiamylxfjma76hirgk867yym"; -"functan.doc-2016"="h6jwmv7wp2a8whhi34r62xvi1qll0vb7"; -"functan.source-2016"="rk42vz9n59n31xx5my1ahlnxmagzap7a"; -"galois-1.5"="b8khw120ihwg30l5wiyrpigb0n76j4pg"; -"galois.doc-1.5"="pl6jyfxfim7igp5lhhsdghiz6awrsf42"; -"galois.source-1.5"="pf7dxm40jcipslw88sqascls74wnvhyn"; -"gastex-2.8"="7ncqqh3yaip7f6fpv1cs57wlsw4krkzk"; -"gastex.doc-2.8"="y3ybpis1prha863r0486c1wr24wfy0y8"; -"gene-logic-1.4"="w7b16bvypbh9l3kiwbgha3dyh4dlqpq4"; -"gene-logic.doc-1.4"="nzraabszgvj8b0j503f7h892grbqjjrp"; -"ghsystem-4.6"="azgk9w1jrwk82c18x13x40k26sdvmlwh"; -"ghsystem.doc-4.6"="x8ih5q7h20q3d7xq4zkvzxa388a6xv6v"; -"gu-2016"="4m173j1ac2aiji1xjpxccd5bnasv68hd"; -"gu.doc-2016"="vkm8qnzqcdqh4xv4axh9sfy65bx2jji2"; -"hep-1.0"="f70qsf585a6rw0lzizd5ps7lcv2qqsl9"; -"hep.doc-1.0"="aqaxn42inmw854cm1qps4fkcijc11fm8"; -"hepnames-2.0"="3f4dycnxwd41da8gh67gs89xcb3l7zl7"; -"hepnames.doc-2.0"="99jvklmwjkmrlmr9jfgdax0j9ikr7b60"; -"hepparticles-2.0"="m5541j0ip82ygflxc174k8xzr2kx4fh1"; -"hepparticles.doc-2.0"="34viq0myldrs90f8y0dflrjxhimnzkq7"; -"hepthesis-1.5.0"="f5aa7mifhw0rgysdk9ca5m0ham4w9003"; -"hepthesis.doc-1.5.0"="acwsd53mgzw9gnf6axg96ipkmmdp2bww"; -"hepunits-1.1.1"="a3yzdj6ykcd4522cknwng48wbig08kg0"; -"hepunits.doc-1.1.1"="x8d9hwb5z12ng0ndny3b9vgja741bg9z"; -"karnaugh-2016"="8s95y2qxd4i5g5q1x0a7h8iwsci6dls2"; -"karnaugh.doc-2016"="85z4avy6yfziaqd7b4w077ys394a3y4z"; -"karnaughmap-2.0"="52mx0flzri3z9y5fc1rgg665z2rpk01n"; -"karnaughmap.doc-2.0"="8m2xi7580kgrxq9v5dkcfcxhn757i7zm"; -"karnaughmap.source-2.0"="47f879r3821kwn8pwpyhh5874adx6f3i"; -"lstbayes-2016"="lxhp6nq4by8gbl32ybrswb9qzczbc7d2"; -"lstbayes.doc-2016"="17v0vhn9s0qpr059q9pb28vp5kzz69nm"; -"lstbayes.source-2016"="yvd7lqni2hmliwcqh18wxm6rjaj63a2i"; -"matlab-prettifier-0.3"="j5p21f3rgbx8hyf7rdjbpn845mw8fgih"; -"matlab-prettifier.doc-0.3"="zssm3k92kxa3mjja3r4sq2574f7byspr"; -"matlab-prettifier.source-0.3"="nkp80iyfa519dkk8gh7pk7fxbj4yn1lj"; -"mhchem-2016"="1saywy0m5qn67kc53ymrfndgnsz9jf8i"; -"mhchem.doc-2016"="52n5cgcwl12fxmhi1gzh4vsk1ny2n86a"; -"miller-1.2"="vgpbb05dlbyp2phs7cpwrl9l8v7yczdb"; -"miller.doc-1.2"="fj6s0x2rzvldwm2lrmjx0f3hy9l4ih51"; -"miller.source-1.2"="9n5iljgqg52bzz39i2ailg3wjgfvgvx3"; -"mychemistry-1.99b"="8swklvjnvwzm43kg3q8ydiczfl8l75xy"; -"mychemistry.doc-1.99b"="immlivqi6jjsf5g4mkkr1nls63hb5nqm"; -"nuc-0.1"="4mmxcaippf5kwp6sgcwbcf55m4j415ma"; -"nuc.doc-0.1"="b0pkc17fxlgygmfvr84gq1gf58w95a30"; -"nucleardata-2016"="krd7wxd7a1wg9zsk5zsbjargada985x8"; -"nucleardata.doc-2016"="lbpwri196qknhkilw3djw8i9axzm59w5"; -"nucleardata.source-2016"="2wv4km92p8brwlq7n2cryx8jvbjwjm6j"; -"objectz-2016"="jxzqzh7y1nihr8m7jrsnbw7jh187031h"; -"objectz.doc-2016"="d8rk9nql7l67xn6hyvwg4x3xxkpb407i"; -"objectz.source-2016"="62cr53ff66gqjf6y2i01gr70bblhn18z"; -"physics-1.3"="y7b93d3qrc6674j33cy58v5c6fhlg3dy"; -"physics.doc-1.3"="ksf5jd2gfrq4dj2p1x2iwpgik5vb4pl6"; -"pseudocode-2016"="bmn68g4pm7wga21yf97mrnmwc588gn6h"; -"pseudocode.doc-2016"="1hm6d3af5zjrpvx9h5ihd6qqyg2384xl"; -"pygmentex-0.8"="bnyslpaj6qfdmak1k1bjyrk0jvflvg1l"; -"pygmentex.doc-0.8"="crqmqfjxlpwibbb9s7sp9qkafnk38f8c"; -"sasnrdisplay-0.93"="qjpcpxjkpv4phwd4x6g42072343pn9jk"; -"sasnrdisplay.doc-0.93"="a9kmvwgbh2ih7vwah1my0gs2dhdzmz6w"; -"sciposter-1.18"="mi8zk7ik6q8rvncwp5m0ch6mfysil8fh"; -"sciposter.doc-1.18"="wan5jxr0084sid3zv4cdhr5kmdv1rjh6"; -"sclang-prettifier-0.1"="594wn96i6q9wgshyqmy7211c2x4j1fih"; -"sclang-prettifier.doc-0.1"="zy33dy1dq1lh9zzqvxh3zwqv53yw2xn6"; -"sclang-prettifier.source-0.1"="0k4nc1bkrw4l66wr47pd6dgigdgs5i0s"; -"sfg-0.91"="5j8965gkq0p9s9ryvy8ym22qz206igqh"; -"sfg.doc-0.91"="ydamww1x4qxpg5bsrcacmfwkkv9c876p"; -"simpler-wick-1.0.0"="pmjzl9cnwrzxhjiwbrjxfd66lamrhvj3"; -"simpler-wick.doc-1.0.0"="pg2id6jpail1iiz92xdr1bvi2725lj8z"; -"simplewick-1.2a"="hfv61gj0g68m17iiimvp1zqzi7ri2z67"; -"simplewick.doc-1.2a"="kxfipc2w97479is7sdd9fmahrbwfk2l7"; -"simplewick.source-1.2a"="48db2ywp9dg6nd5xbclw2w85id3mf97r"; -"siunitx-2.6q"="yih56wwxqk8jn8x03jy0clm8w28jyvmc"; -"siunitx.doc-2.6q"="jzzy4yg1yg1hjh0acba8p9sx4iiyxklf"; -"siunitx.source-2.6q"="2kz69pplf381rxik8za1lq6agk9waps8"; -"steinmetz-1.0"="v8vskhmyjdhc7yi21b9i11j4lfzmhypm"; -"steinmetz.doc-1.0"="5y0xh86b75lm16kjjl4cjs7vvylr6wn3"; -"steinmetz.source-1.0"="m31y5wd20vck85yj3zps711zi6bpcdym"; -"struktex-141"="gv8q53fnzn49ig88gz3nzk0fd3a9hk7w"; -"struktex.doc-141"="c6yijrx42fzk1lbci4rm5xs407zi00s4"; -"struktex.source-141"="s0rqbynnpr0q90xnmzxikj8hxxfi29sr"; -"substances-0.2a"="wwjn0lkspnwgla7j46j2iwlvdrsvdyzs"; -"substances.doc-0.2a"="apg59a7fh980vddnfzjspsyq1jfnvsn7"; -"t-angles-2016"="an3w3nw07gc6hyzfjk4bd0j4swj8qr4p"; -"t-angles.doc-2016"="68ylwxvywabhyfqzlb7d642cmhdj3g2j"; -"textopo-1.5"="rvcbhsz8win1g08s6az11ji6ryd9b1fl"; -"textopo.doc-1.5"="3f9w8nbyyjismgdxb5daijc88hfp8m8k"; -"textopo.source-1.5"="4h2x01rkf91dha2yxqpdfgv5qsmz34sx"; -"ulqda-1.1"="llh5ji3r34m637hzb9qi4z0d6hap8fcy"; -"ulqda.doc-1.1"="w5anmbpapkg5r1bi0gvh1wqrqjivgmz1"; -"ulqda.source-1.1"="pl71x58ifcpllalxfw1snj2r464qvx3w"; -"unitsdef-0.2"="j5dhzwnaizymvvj0cvvn8hcjgpiaw3xj"; -"unitsdef.doc-0.2"="m3n8c9wpk9m0il8yn3ip4kwvlbyzfndw"; -"unitsdef.source-0.2"="rpwd7p723jsqcmcl28kkfg3fg9dmyfxa"; -"xymtex-5.06"="lh5pr87m1xhyaj74pmwc8vx3an7gppxw"; -"xymtex.doc-5.06"="bbknma6166kqvxhj3523p85lq7qn1ydc"; -"xymtex.source-5.06"="is60w9mjif26y9s3vv8c0v26z16m97g3"; -"youngtab-1.1"="jknzzzxpa549x22gcar9aq433zwidbm4"; -"youngtab.doc-1.1"="1vrl9pqjlxs1izrw4a5d922v9ll8rv3h"; -"youngtab.source-1.1"="dbcchlqr498s741q1990aal2gm39bljz"; -"texworks-2016"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; -"texworks.doc-2016"="gphjjma2ws68drzz6rmmj1hjb7bxc7ma"; +"texworks.doc-2017"="gphjjma2ws68drzz6rmmj1hjb7bxc7ma"; "arabxetex-1.2.1"="yfvy3m6rz45z7frgsw6cg8hk8kqdxfs4"; "arabxetex.doc-1.2.1"="f8rpfy5hna1b6flvq6y2balxypjm6280"; "arabxetex.source-1.2.1"="n7qncmdmzvkjxwn5d5nhwy3660ymvwx8"; +"awesomebox-0.1"="463zn5m1jkidpqk4z7kmixkpyg7k38r9"; +"awesomebox.doc-0.1"="p0b1w2nd7wr37ji7ln4cbzm3w2cygxlb"; "bidi-atbegshi-0.1"="qm4zcsccvzxixab9dalzvlwkniwckpjw"; "bidi-atbegshi.doc-0.1"="lgp4qynjnz73qdhy543halrvx52gs2xj"; "bidicontour-0.2"="dayiq858hr4ln8503y0xw8vqvfjjb91m"; @@ -6997,63 +7556,62 @@ "fontbook-0.2"="af0x6y47qcbfhzs3ngyazacn289x99y4"; "fontbook.doc-0.2"="yvq7kxismw59wayzyv379hjd0kw048k2"; "fontbook.source-0.2"="46vhgm8k7pxwxpb654fg3aj96555fanw"; -"fontwrap-2016"="ap8pwxj94larm8p1dngr1mhdavncplq6"; -"fontwrap.doc-2016"="p3m3czhwc1i2psby8dkm5zkpmzzkk91m"; +"fontwrap-2017"="ap8pwxj94larm8p1dngr1mhdavncplq6"; +"fontwrap.doc-2017"="p3m3czhwc1i2psby8dkm5zkpmzzkk91m"; "interchar-0.2"="mphh4cmn49y1fr2klr1n5c2mjxryyjzm"; "interchar.doc-0.2"="077lc5c3w5gq2cm2983fqlbhizjssgyy"; -"mathspec-0.2"="l72igqacpw3x7p25r1d2lady70wi4nww"; -"mathspec.doc-0.2"="in3a1raj3m7w3kcwdh54nqhp3774m0ir"; -"philokalia-1.1"="3fsg1ng519iplfs1xgpwm7vgzq9q424z"; -"philokalia.doc-1.1"="5x65nmvqidlhxja6j954snv2h7ai4pmy"; -"philokalia.source-1.1"="l0i5nkjias17d8dblgmh1aym3ps9kz4k"; -"polyglossia-1.42.4"="csnxk84k28xvpajix45dyjhqrs054rxy"; -"polyglossia.doc-1.42.4"="62m2fgqmplp2z5pb4sv038i1f0ynxhmw"; -"polyglossia.source-1.42.4"="92wvkanrs6mq0kgd878c0my5fab6960f"; +"na-position-1.0"="8afdykn462mcqd4xlqipkfbnamwzivzv"; +"na-position.doc-1.0"="d43q7ql7q3b9x23rw1nwkrswq6jpfmpg"; +"philokalia-1.2"="6lcrild0p9jahhgpc1xzz445hh2s1cxy"; +"philokalia.doc-1.2"="k1mn8vwlhrs9bwy87gx2zpn2viidlh0p"; +"philokalia.source-1.2"="80nd8ig65k3xjn92rv7n8g17qq0k4q7p"; "ptext-1.1"="zy9vq5spxci68zhbfa947x5gmr90ckzf"; "ptext.doc-1.1"="3dsbqbc9n66hhw8nk4l7rlcbfw5b9pvm"; -"quran-1.14"="m20x7pin3agw5czxa1wb5l8yr97fybhw"; -"quran.doc-1.14"="pk6rz26l3nc8vbvllmk2d4lafgrrbhib"; +"quran-1.261"="hb4qnk7dssr717i6abz1g7cwx00p1533"; +"quran.doc-1.261"="8w05kkp3zdnndqrb965dlrs894y7381l"; "realscripts-0.3d"="h3nl45fx6790wmrfqgnxsy0v46i7gfmy"; "realscripts.doc-0.3d"="4mm7a354ll0wca7q9nkazx29qbdah3ca"; "realscripts.source-0.3d"="ngb2fqcmc4j1ijax0qrrdpf0g4587qb5"; -"ucharclasses-2.2.1"="mbx4byaa18al2ykbxhyrhaq6vq5nqca4"; -"ucharclasses.doc-2.2.1"="rshnlwkavzq6g3m81zgslpv76szqfgxi"; +"simple-resume-cv-2017"="vjigpisca1m0lvq3rdc8148lc2in4zmh"; +"simple-resume-cv.doc-2017"="aaxl68aklgpv8996xzd0jgc5gw3859ar"; +"simple-thesis-dissertation-2017"="p1bspb2n9dc7zk0myww59v973rjshfy0"; +"simple-thesis-dissertation.doc-2017"="hrb22ycqxdy8ndw4x6ifl6jifswb7mgw"; +"ucharclasses-2.3.0"="ss0jlhd052vay3g42nys4mj4mcf5iqgn"; +"ucharclasses.doc-2.3.0"="v76523pb2c60ppcz26pywk8jzipshr9x"; +"unicode-bidi-0.01"="mix51h9rwgjic1g32jx0mv8hh574yn69"; +"unicode-bidi.doc-0.01"="8x4zk0spvhmq3sc8ygvidk03gfzm2875"; "unisugar-0.92"="wfr974a1y4wzlbw0wwzfr6r0yp9nyasl"; "unisugar.doc-0.92"="hcnqifbhpj44cwbr8sh4c71phg4i5327"; -"xebaposter-2.42"="5cn1vi1adxly2gy46kha0pcagkhi787z"; -"xebaposter.doc-2.42"="vsn5hgw0gwwcc3xbpqh6zkxxr22a5vag"; -"xecjk-3.4.0"="kpbym4nnsr37n6s4j5mkprpyrajcqamd"; -"xecjk.doc-3.4.0"="3pdx5zhxhx4w6wa0vx1sml3b4pmy0ia9"; -"xecjk.source-3.4.0"="2f9fzam7s0ksj0dhbgbs8d4xwpk29jc8"; +"xdvi-22.87.03"="g5irfc0gf7bra3vngv6kdbkhbyicdz84"; +"xdvi.doc-22.87.03"="h2d03izpvnpsii465g3hf299z3ndv4vl"; +"xebaposter-2.51"="glxmnnhjpy8wjab9avncl4v0wmdf0pv7"; +"xebaposter.doc-2.51"="sbpqsj7cqhhhs9gq8jia92hxrdgnhzkk"; +"xechangebar-1.0"="1f2zszj2l5mkqv5zs5bs8g5w4c8rirpv"; +"xechangebar.doc-1.0"="xbirklnxaljhxxghr1prqq7zb9l0mgzm"; +"xecjk-3.5.0"="idphnmr44wx62a893idiga9s10x5rx73"; +"xecjk.doc-3.5.0"="hi04rmiy5j0v2imv9ic14yk1nx2v5p46"; +"xecjk.source-3.5.0"="pa8c51ay3szyx0j080lwvhz4nz7a6l16"; "xecolor-0.1"="pdybpn00rxsb5ipxx377a77xnmmf5i43"; "xecolor.doc-0.1"="vl2lpda4kkr2q8gzj6ii2rjfccx6qvl0"; "xecyr-1.1"="m8yhfaydf5s8357m1hkd2hv267zvwnax"; "xecyr.doc-1.1"="pw3llm228dnfs7in0vajnf8skb99c9wv"; "xeindex-0.3"="85d9z28381jg0jbkwrjrqlcifp23qsxh"; "xeindex.doc-0.3"="7q7gxhy5zx11dmwvlfivg91v0gbp8pgw"; -"xepersian-16.5"="ysapn4hz01s1658g4rsgjizdh2xd312h"; -"xepersian.doc-16.5"="vnqry4y48glwh6rcr0kf1f9xkx4ms051"; -"xepersian.source-16.5"="jam7fn9dacy3qw8i0vc2cj40hczlv96n"; -"xesearch-2016"="0155d7ag68wpw66xqql0as3ldig0vx2s"; -"xesearch.doc-2016"="9nhi7api073chyc59c6i3wd6gvzmrm32"; +"xesearch-2017"="0155d7ag68wpw66xqql0as3ldig0vx2s"; +"xesearch.doc-2017"="9nhi7api073chyc59c6i3wd6gvzmrm32"; "xespotcolor-2.0a"="vsdrrcvm377salld5myd4aknid3phcvl"; "xespotcolor.doc-2.0a"="mzibfcv18iwwwd71id0qajhk55kvnn39"; "xespotcolor.source-2.0a"="lpc06f6qc8sff0jn78jsvmd43az18vgy"; -"xetex-def-4.08"="2yaq6qvr0azaji14k3x2qhyb9g4rzfw0"; -"xetex-def.doc-4.08"="fgki99j55swpk2d53gqg0vcdfh75ia0d"; "xetex-itrans-4.2"="m9f0xqxgxpqsi5bml6mpgxvqjjpz1fkf"; "xetex-itrans.doc-4.2"="nlixz1jqx1al7xks2bp723yl63whrhzh"; -"xetex-pstricks-2016"="4vaa9mkycwc7kwaxbzjfypk3xx7nyxqh"; -"xetex-pstricks.doc-2016"="lqs6hni0df78jwiy8k0hxzpwlpn0kfd0"; +"xetex-pstricks-2017"="4vaa9mkycwc7kwaxbzjfypk3xx7nyxqh"; +"xetex-pstricks.doc-2017"="lqs6hni0df78jwiy8k0hxzpwlpn0kfd0"; "xetex-tibetan-0.1"="yzps4y2frsplnawgai9s9xb6vpk9h4zf"; "xetex-tibetan.doc-0.1"="m49lmg8669bbir9hcj33clc2v811xdvb"; -"xetexfontinfo-2016"="jzx2is0hbcggma6s0pdzq21hcb5j8vgi"; -"xetexfontinfo.doc-2016"="h4i3q0c5rpbw8pssb7d6nyy7kqvkkj98"; -"xetexko-2.15"="bjh7ks7yl46vblxpgc8wffm659jnai9l"; -"xetexko.doc-2.15"="bd6p1s3m70ifgm9b212svdqlf0q1mhjz"; -"xevlna-1.0"="bzbr6pd0y36k56da34w6z84i81gqcmc5"; -"xevlna.doc-1.0"="41il4y5hjab9sakp81490x4g61srj8zv"; -"xltxtra-0.6"="gr3v05m1pm9j55smbfy71vfn3kg1kpz4"; -"xltxtra.doc-0.6"="0zsznrgvzqcfi0ypxkbk3vqslwyap7l9"; -"xltxtra.source-0.6"="cw6kmfdgyz9ds3gdjlgy2bh16i6fxip7"; +"xetexfontinfo-2017"="jzx2is0hbcggma6s0pdzq21hcb5j8vgi"; +"xetexfontinfo.doc-2017"="h4i3q0c5rpbw8pssb7d6nyy7kqvkkj98"; +"xetexko-2.17"="izdd8p6d8kgzgp39bf8czdhm48jd9dk6"; +"xetexko.doc-2.17"="8qpgrljl4l4z5r559xr17vdjc17lr7vm"; +"xevlna-1.1"="jwpjj1b3y45n3lksn9wvsh3hyccy1i00"; +"xevlna.doc-1.1"="4559f3ddvnis97px7180q0is9n4aqq2h"; } diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix index 4d891c0758c7..afc7bdb151f7 100644 --- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -12,6 +12,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; + version = "1.2"; }; "Asana-Math" = { stripPrefix = 0; @@ -39,7 +40,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "15"; + version = "22"; }; "HA-prosper" = { stripPrefix = 0; @@ -145,6 +146,12 @@ tl: { # no indentation hasRunfiles = true; version = "2.0b"; }; +"abnt" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "abntex2" = { stripPrefix = 0; sha512.run = ""; @@ -178,7 +185,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.7.2"; + version = "1.8.0"; }; "accanthis" = { stripPrefix = 0; @@ -198,7 +205,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.10d"; + version = "3.10i"; }; "acmart" = { stripPrefix = 0; @@ -206,7 +213,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.12"; + version = "1.47"; }; "acmconf" = { stripPrefix = 0; @@ -221,7 +228,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.5b"; + version = "2.7c"; }; "acronym" = { stripPrefix = 0; @@ -251,7 +258,24 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; + sha512.source = ""; hasRunfiles = true; + version = "2.0"; +}; +"actuarialsymbol" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0a"; +}; +"addfont" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1"; }; "addlines" = { stripPrefix = 0; @@ -421,6 +445,12 @@ tl: { # no indentation deps."latex" = tl."latex"; deps."plain" = tl."plain"; deps."lambda" = tl."lambda"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."antomega" = tl."antomega"; + deps."latex-fonts" = tl."latex-fonts"; + deps."omega" = tl."omega"; sha512.run = ""; sha512.doc = ""; }; @@ -439,12 +469,27 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"algobox" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.2a"; +}; +"algolrevived" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.01"; +}; "algorithm2e" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "5.1"; + version = "5.2"; }; "algorithmicx" = { stripPrefix = 0; @@ -460,13 +505,20 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"alkalami" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.000"; +}; "allrunes" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.1"; + version = "2.1.1"; }; "almfixed" = { stripPrefix = 0; @@ -510,7 +562,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.108"; + version = "0.109"; }; "amsaddr" = { stripPrefix = 0; @@ -527,6 +579,11 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"amscls-doc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; +}; "amsfonts" = { stripPrefix = 0; sha512.run = ""; @@ -558,7 +615,6 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.15b"; }; "amsmath-it" = { stripPrefix = 0; @@ -575,6 +631,12 @@ tl: { # no indentation }; "amstex" = { deps."tex" = tl."tex"; + deps."amsfonts" = tl."amsfonts"; + deps."amstex" = tl."amstex"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."plain" = tl."plain"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -669,7 +731,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.14a"; + version = "1.20"; }; "apa" = { stripPrefix = 0; @@ -684,7 +746,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.20"; + version = "2.32"; }; "apa6e" = { stripPrefix = 0; @@ -702,6 +764,12 @@ tl: { # no indentation hasRunfiles = true; version = "6.03"; }; +"apalike-german" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "apalike2" = { stripPrefix = 0; sha512.run = ""; @@ -742,6 +810,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"apxproof" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0.5"; +}; "arabi" = { stripPrefix = 0; sha512.run = ""; @@ -762,7 +838,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.3"; + version = "1.9.1"; }; "arabtex" = { stripPrefix = 0; @@ -791,14 +867,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.0"; + version = "3.0a"; }; "archaeologie" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.0"; + version = "2.3.3"; }; "archaic" = { stripPrefix = 0; @@ -822,6 +898,12 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"arimo" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "armtex" = { stripPrefix = 0; sha512.run = ""; @@ -840,6 +922,12 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"arphic-ttf" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "arrayjobx" = { stripPrefix = 0; sha512.run = ""; @@ -860,7 +948,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "4.0.3"; + version = "March_2017"; }; "articleingud" = { stripPrefix = 0; @@ -967,7 +1055,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.38"; + version = "2.41"; }; "asymptote-by-example-zh-cn" = { stripPrefix = 0; @@ -998,7 +1086,13 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.8"; + version = "1.9"; +}; +"aucklandthesis" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; }; "augie" = { stripPrefix = 0; @@ -1021,6 +1115,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.5"; }; +"aurl" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "authoraftertitle" = { stripPrefix = 0; sha512.run = ""; @@ -1041,6 +1141,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.6"; }; +"autoaligne" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.3"; +}; "autoarea" = { stripPrefix = 0; sha512.run = ""; @@ -1048,6 +1155,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.3a"; }; +"autobreak" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.3"; +}; "automata" = { stripPrefix = 0; sha512.run = ""; @@ -1088,6 +1203,21 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"awesomebox" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; +}; +"axodraw2" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "2.1.0b"; +}; "b1encoding" = { stripPrefix = 0; sha512.run = ""; @@ -1102,7 +1232,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.9r"; + version = "3.14"; }; "babel-albanian" = { stripPrefix = 0; @@ -1112,13 +1242,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.0c"; }; -"babel-bahasa" = { +"babel-azerbaijani" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0l"; + version = "1.0a"; }; "babel-basque" = { stripPrefix = 0; @@ -1206,7 +1336,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.3p"; + version = "3.3q"; }; "babel-esperanto" = { stripPrefix = 0; @@ -1230,6 +1360,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; + version = "1.3q"; }; "babel-french" = { stripPrefix = 0; @@ -1237,7 +1368,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.2c"; + version = "3.3d"; }; "babel-friulan" = { stripPrefix = 0; @@ -1253,6 +1384,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; + version = "4.3c"; }; "babel-georgian" = { stripPrefix = 0; @@ -1267,7 +1399,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.7b"; + version = "2.9"; }; "babel-greek" = { stripPrefix = 0; @@ -1275,7 +1407,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.9f"; + version = "1.9g"; }; "babel-hebrew" = { stripPrefix = 0; @@ -1300,6 +1432,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2b"; }; +"babel-indonesian" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0m"; +}; "babel-interlingua" = { stripPrefix = 0; sha512.run = ""; @@ -1324,6 +1464,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.3n"; }; +"babel-japanese" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "2.1"; +}; "babel-kurmanji" = { stripPrefix = 0; sha512.run = ""; @@ -1355,6 +1503,14 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"babel-malay" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0m"; +}; "babel-norsk" = { stripPrefix = 0; sha512.run = ""; @@ -1416,7 +1572,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.3h"; + version = "1.3j"; }; "babel-samin" = { stripPrefix = 0; @@ -1440,6 +1596,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; + version = "1.0d"; }; "babel-serbianc" = { stripPrefix = 0; @@ -1518,7 +1675,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1l"; + version = "1.4b"; }; "babel-vietnamese" = { stripPrefix = 0; @@ -1559,6 +1716,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"baekmuk" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "2.2"; +}; "bagpipe" = { stripPrefix = 0; sha512.run = ""; @@ -1572,7 +1736,15 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5.0"; + version = "1.5.2"; +}; +"bangorexam" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.3.0"; }; "bangtex" = { stripPrefix = 0; @@ -1641,7 +1813,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.07"; + version = "1.072"; +}; +"baskervillef" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.043"; }; "basque-book" = { stripPrefix = 0; @@ -1705,7 +1884,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1.2"; + version = "0.1.3"; }; "bclogo" = { stripPrefix = 0; @@ -1721,7 +1900,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.36"; + version = "3.43"; }; "beamer-FUBerlin" = { stripPrefix = 0; @@ -1785,6 +1964,21 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"beamerswitch" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.2"; +}; +"beamertheme-cuerna" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; "beamertheme-detlevcm" = { stripPrefix = 0; sha512.run = ""; @@ -1805,7 +1999,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "beamertheme-phnompenh" = { stripPrefix = 0; @@ -1854,6 +2048,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.6"; }; +"beilstein" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.2"; +}; "belleek" = { stripPrefix = 0; sha512.run = ""; @@ -1908,6 +2110,13 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"beuron" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; +}; "bewerbung" = { stripPrefix = 0; sha512.run = ""; @@ -1943,7 +2152,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.02"; + version = "2.11"; }; "bguq" = { stripPrefix = 0; @@ -1968,6 +2177,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.5"; }; +"bib2gls" = { + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "bibarts" = { stripPrefix = 0; sha512.run = ""; @@ -1980,7 +2196,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; sha512.source = ""; - version = "2.4"; + version = "2.7"; }; "bibexport" = { sha512.run = ""; @@ -2001,28 +2217,43 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.4"; + version = "3.7"; }; "biblatex-abnt" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0.1"; + version = "3.1"; }; "biblatex-anonymous" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.2.2"; + version = "2.6.0"; }; "biblatex-apa" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "6.9"; + version = "7.4"; +}; +"biblatex-archaeology" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.2"; +}; +"biblatex-arthistory-bonn" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; }; "biblatex-bookinarticle" = { stripPrefix = 0; @@ -2036,7 +2267,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.1.1"; + version = "2.3.0"; }; "biblatex-bwl" = { stripPrefix = 0; @@ -2050,42 +2281,69 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2.6"; + version = "0.2.7"; +}; +"biblatex-cheatsheet" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; }; "biblatex-chem" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1p"; + version = "1.1t"; }; "biblatex-chicago" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0rc1"; + version = "1.0rc4"; +}; +"biblatex-claves" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.2.0"; }; "biblatex-dw" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.6a"; + version = "1.7"; +}; +"biblatex-enc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; }; "biblatex-fiwi" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.5"; + version = "1.6c"; +}; +"biblatex-gb7714-2015" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0h"; }; "biblatex-gost" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.6"; + version = "1.16"; }; "biblatex-historian" = { stripPrefix = 0; @@ -2099,14 +2357,21 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1n"; + version = "1.2d"; +}; +"biblatex-ijsra" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; }; "biblatex-iso690" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.3.1"; + version = "0.3.2"; }; "biblatex-juradiss" = { stripPrefix = 0; @@ -2115,6 +2380,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.1g"; }; +"biblatex-lni" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.4"; +}; "biblatex-luh-ipw" = { stripPrefix = 0; sha512.run = ""; @@ -2127,21 +2399,21 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.10.0"; + version = "1.12.2"; }; "biblatex-mla" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.5"; + version = "1.9"; }; "biblatex-morenames" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1.0"; + version = "1.3.1"; }; "biblatex-multiple-dm" = { stripPrefix = 0; @@ -2162,7 +2434,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2g"; + version = "1.3b"; }; "biblatex-nejm" = { stripPrefix = 0; @@ -2171,12 +2443,27 @@ tl: { # no indentation hasRunfiles = true; version = "0.4"; }; +"biblatex-nottsclassic" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; +}; "biblatex-opcit-booktitle" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.5.0a"; + version = "1.8.0"; +}; +"biblatex-oxref" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.10"; }; "biblatex-philosophy" = { stripPrefix = 0; @@ -2184,49 +2471,63 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.8"; + version = "1.9.7"; }; "biblatex-phys" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0a"; + version = "1.0b"; }; "biblatex-publist" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2"; + version = "1.7"; }; "biblatex-realauthor" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.5.0"; + version = "2.7.0"; +}; +"biblatex-sbl" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.8.1"; }; "biblatex-science" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1f"; + version = "1.1g"; +}; +"biblatex-shortfields" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0.0"; }; "biblatex-source-division" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.4.0"; + version = "2.4.2"; }; "biblatex-subseries" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1.0"; + version = "1.2.0"; }; "biblatex-swiss-legal" = { stripPrefix = 0; @@ -2240,14 +2541,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.3"; }; "biblatex-true-citepages-omit" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2.0a"; + version = "2.0.0"; }; "bibleref" = { stripPrefix = 0; @@ -2255,7 +2556,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.14"; + version = "1.17"; }; "bibleref-french" = { stripPrefix = 0; @@ -2300,7 +2601,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1"; + version = "0.1.2"; }; "biblist" = { stripPrefix = 0; @@ -2327,7 +2628,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.3"; }; "bibtexu" = { sha512.run = ""; @@ -2363,7 +2664,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "19.6"; + version = "31.5"; }; "bidi-atbegshi" = { stripPrefix = 0; @@ -2421,6 +2722,14 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"binarytree" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.01"; +}; "binomexp" = { stripPrefix = 0; sha512.run = ""; @@ -2429,12 +2738,25 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"biochemistry-colors" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.00"; +}; "biocon" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; }; +"biolett-bst" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "bitelist" = { stripPrefix = 0; sha512.run = ""; @@ -2521,7 +2843,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2a"; + version = "1.2b"; }; "bodegraph" = { stripPrefix = 0; @@ -2586,7 +2908,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1.1"; + version = "2.1"; }; "bookdb" = { stripPrefix = 0; @@ -2655,7 +2977,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "1.02d"; }; "bophook" = { stripPrefix = 0; @@ -2707,7 +3029,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.06"; + version = "1.1"; }; "bpolynomial" = { stripPrefix = 0; @@ -2771,13 +3093,20 @@ tl: { # no indentation hasRunfiles = true; version = "1.40"; }; +"bredzenie" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "breqn" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.98d"; + version = "0.98e"; }; "bropd" = { stripPrefix = 0; @@ -2826,28 +3155,35 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.5"; + version = "1.1"; +}; +"bxcalc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; }; "bxcjkjatype" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2c"; + version = "0.3"; }; "bxdpx-beamer" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.3"; }; "bxdvidriver" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.2a"; }; "bxeepic" = { stripPrefix = 0; @@ -2863,34 +3199,55 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"bxjalipsum" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.3a"; +}; +"bxjaprnind" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.3b"; +}; "bxjscls" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1e"; + version = "1.7"; }; "bxnewfont" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.2b"; +}; +"bxorigcapt" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2a"; }; "bxpapersize" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.3b"; }; "bxpdfver" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2a"; + version = "0.4"; }; "bytefield" = { stripPrefix = 0; @@ -2898,7 +3255,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.3"; + version = "2.4"; }; "c-pascal" = { stripPrefix = 0; @@ -2976,6 +3333,12 @@ tl: { # no indentation hasRunfiles = true; version = "001.000"; }; +"callouts" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "calrsfs" = { stripPrefix = 0; sha512.run = ""; @@ -2988,14 +3351,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.2"; + version = "2.4.2"; }; "calxxxx-yyyy" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0i"; + version = "20.17a"; }; "cancel" = { stripPrefix = 0; @@ -3146,7 +3509,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "cc-pl" = { stripPrefix = 0; @@ -3221,7 +3584,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.6"; + version = "1.7"; }; "celtic" = { stripPrefix = 0; @@ -3238,6 +3601,14 @@ tl: { # no indentation hasRunfiles = true; version = "3.21"; }; +"cesenaexam" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.2"; +}; "cfr-initials" = { stripPrefix = 0; sha512.run = ""; @@ -3313,11 +3684,19 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"cheatsheet" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.8"; +}; "checkcites" = { sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0i"; + version = "2.0"; }; "checklistings" = { sha512.run = ""; @@ -3373,28 +3752,28 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2d"; + version = "1.2e"; }; "chemformula" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "4.15b"; + version = "4.15e"; }; "chemgreek" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0e"; + version = "1.1"; }; "chemmacros" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "5.7a"; + version = "5.8b"; }; "chemnum" = { stripPrefix = 0; @@ -3409,7 +3788,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "chemstyle" = { stripPrefix = 0; @@ -3461,7 +3840,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "chextras" = { stripPrefix = 0; @@ -3488,7 +3867,15 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.2.3"; + version = "0.2.5"; +}; +"childdoc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.5"; }; "chivo" = { stripPrefix = 0; @@ -3509,7 +3896,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.7.5"; + version = "1.7.6"; }; "chletter" = { stripPrefix = 0; @@ -3558,7 +3945,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1"; + version = "0.2.1"; }; "cinzel" = { stripPrefix = 0; @@ -3579,7 +3966,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.6"; + version = "0.8.3"; }; "cite" = { stripPrefix = 0; @@ -3595,12 +3982,19 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"cje" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.01"; +}; "cjhebrew" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1a"; + version = "0.2a"; }; "cjk" = { stripPrefix = 0; @@ -3620,7 +4014,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "20160115.0"; + version = "20170624.0"; }; "cjk-ko" = { stripPrefix = 0; @@ -3654,7 +4048,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "4.2"; + version = "4.4"; }; "classpack" = { stripPrefix = 0; @@ -3712,7 +4106,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "clrscode" = { stripPrefix = 0; @@ -3824,7 +4218,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.05"; + version = "3.01"; }; "cmsd" = { stripPrefix = 0; @@ -3877,7 +4271,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.03a"; + version = "1.042"; }; "codedoc" = { stripPrefix = 0; @@ -3909,6 +4303,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"coelacanth" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "collcell" = { stripPrefix = 0; sha512.run = ""; @@ -3931,12 +4331,12 @@ tl: { # no indentation deps."bibtex" = tl."bibtex"; deps."cm" = tl."cm"; deps."dvipdfmx" = tl."dvipdfmx"; - deps."dvipdfmx-def" = tl."dvipdfmx-def"; deps."dvips" = tl."dvips"; deps."enctex" = tl."enctex"; deps."etex" = tl."etex"; deps."etex-pkg" = tl."etex-pkg"; deps."glyphlist" = tl."glyphlist"; + deps."graphics-def" = tl."graphics-def"; deps."gsftopk" = tl."gsftopk"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; @@ -3979,6 +4379,7 @@ tl: { # no indentation deps."beebe" = tl."beebe"; deps."besjournals" = tl."besjournals"; deps."bestpapers" = tl."bestpapers"; + deps."bib2gls" = tl."bib2gls"; deps."bibarts" = tl."bibarts"; deps."biber" = tl."biber"; deps."bibexport" = tl."bibexport"; @@ -3987,19 +4388,26 @@ tl: { # no indentation deps."biblatex-abnt" = tl."biblatex-abnt"; deps."biblatex-anonymous" = tl."biblatex-anonymous"; deps."biblatex-apa" = tl."biblatex-apa"; + deps."biblatex-archaeology" = tl."biblatex-archaeology"; + deps."biblatex-arthistory-bonn" = tl."biblatex-arthistory-bonn"; deps."biblatex-bookinarticle" = tl."biblatex-bookinarticle"; deps."biblatex-bookinother" = tl."biblatex-bookinother"; deps."biblatex-bwl" = tl."biblatex-bwl"; deps."biblatex-caspervector" = tl."biblatex-caspervector"; deps."biblatex-chem" = tl."biblatex-chem"; deps."biblatex-chicago" = tl."biblatex-chicago"; + deps."biblatex-claves" = tl."biblatex-claves"; deps."biblatex-dw" = tl."biblatex-dw"; + deps."biblatex-enc" = tl."biblatex-enc"; deps."biblatex-fiwi" = tl."biblatex-fiwi"; + deps."biblatex-gb7714-2015" = tl."biblatex-gb7714-2015"; deps."biblatex-gost" = tl."biblatex-gost"; deps."biblatex-historian" = tl."biblatex-historian"; deps."biblatex-ieee" = tl."biblatex-ieee"; + deps."biblatex-ijsra" = tl."biblatex-ijsra"; deps."biblatex-iso690" = tl."biblatex-iso690"; deps."biblatex-juradiss" = tl."biblatex-juradiss"; + deps."biblatex-lni" = tl."biblatex-lni"; deps."biblatex-luh-ipw" = tl."biblatex-luh-ipw"; deps."biblatex-manuscripts-philology" = tl."biblatex-manuscripts-philology"; deps."biblatex-mla" = tl."biblatex-mla"; @@ -4008,12 +4416,16 @@ tl: { # no indentation deps."biblatex-musuos" = tl."biblatex-musuos"; deps."biblatex-nature" = tl."biblatex-nature"; deps."biblatex-nejm" = tl."biblatex-nejm"; + deps."biblatex-nottsclassic" = tl."biblatex-nottsclassic"; deps."biblatex-opcit-booktitle" = tl."biblatex-opcit-booktitle"; + deps."biblatex-oxref" = tl."biblatex-oxref"; deps."biblatex-philosophy" = tl."biblatex-philosophy"; deps."biblatex-phys" = tl."biblatex-phys"; deps."biblatex-publist" = tl."biblatex-publist"; deps."biblatex-realauthor" = tl."biblatex-realauthor"; + deps."biblatex-sbl" = tl."biblatex-sbl"; deps."biblatex-science" = tl."biblatex-science"; + deps."biblatex-shortfields" = tl."biblatex-shortfields"; deps."biblatex-source-division" = tl."biblatex-source-division"; deps."biblatex-subseries" = tl."biblatex-subseries"; deps."biblatex-swiss-legal" = tl."biblatex-swiss-legal"; @@ -4024,6 +4436,7 @@ tl: { # no indentation deps."bibtopic" = tl."bibtopic"; deps."bibtopicprefix" = tl."bibtopicprefix"; deps."bibunits" = tl."bibunits"; + deps."biolett-bst" = tl."biolett-bst"; deps."bookdb" = tl."bookdb"; deps."breakcites" = tl."breakcites"; deps."cell" = tl."cell"; @@ -4057,8 +4470,10 @@ tl: { # no indentation deps."jneurosci" = tl."jneurosci"; deps."jurabib" = tl."jurabib"; deps."ksfh_nat" = tl."ksfh_nat"; + deps."ltb2bib" = tl."ltb2bib"; deps."listbib" = tl."listbib"; deps."logreq" = tl."logreq"; + deps."luabibentry" = tl."luabibentry"; deps."margbib" = tl."margbib"; deps."multibib" = tl."multibib"; deps."multibibliography" = tl."multibibliography"; @@ -4066,6 +4481,7 @@ tl: { # no indentation deps."nar" = tl."nar"; deps."nmbib" = tl."nmbib"; deps."notes2bib" = tl."notes2bib"; + deps."notex-bst" = tl."notex-bst"; deps."oscola" = tl."oscola"; deps."perception" = tl."perception"; deps."pnas2009" = tl."pnas2009"; @@ -4107,6 +4523,7 @@ tl: { # no indentation deps."dviasm" = tl."dviasm"; deps."dvicopy" = tl."dvicopy"; deps."dvidvi" = tl."dvidvi"; + deps."dviinfox" = tl."dviinfox"; deps."dviljk" = tl."dviljk"; deps."dvipng" = tl."dvipng"; deps."dvipos" = tl."dvipos"; @@ -4118,7 +4535,9 @@ tl: { # no indentation deps."installfont" = tl."installfont"; deps."lacheck" = tl."lacheck"; deps."latex-git-log" = tl."latex-git-log"; + deps."latex-papersize" = tl."latex-papersize"; deps."latex2man" = tl."latex2man"; + deps."latex2nemeth" = tl."latex2nemeth"; deps."latexdiff" = tl."latexdiff"; deps."latexfileversion" = tl."latexfileversion"; deps."latexmk" = tl."latexmk"; @@ -4135,6 +4554,7 @@ tl: { # no indentation deps."pdfbook2" = tl."pdfbook2"; deps."pdfcrop" = tl."pdfcrop"; deps."pdfjam" = tl."pdfjam"; + deps."pdflatexpicscale" = tl."pdflatexpicscale"; deps."pdftools" = tl."pdftools"; deps."pdfxup" = tl."pdfxup"; deps."pfarrei" = tl."pfarrei"; @@ -4155,8 +4575,11 @@ tl: { # no indentation deps."texfot" = tl."texfot"; deps."texliveonfly" = tl."texliveonfly"; deps."texloganalyser" = tl."texloganalyser"; + deps."texosquery" = tl."texosquery"; deps."texware" = tl."texware"; deps."tie" = tl."tie"; + deps."tlcockpit" = tl."tlcockpit"; + deps."tlshell" = tl."tlshell"; deps."tpic2pdftex" = tl."tpic2pdftex"; deps."typeoutfileinfo" = tl."typeoutfileinfo"; deps."web" = tl."web"; @@ -4168,28 +4591,29 @@ tl: { # no indentation deps."collection-basic" = tl."collection-basic"; deps."context" = tl."context"; deps."jmn" = tl."jmn"; + deps."context-notes-zh-cn" = tl."context-notes-zh-cn"; deps."context-account" = tl."context-account"; deps."context-algorithmic" = tl."context-algorithmic"; deps."context-animation" = tl."context-animation"; deps."context-annotation" = tl."context-annotation"; deps."context-bnf" = tl."context-bnf"; deps."context-chromato" = tl."context-chromato"; + deps."context-cmscbf" = tl."context-cmscbf"; + deps."context-cmttbf" = tl."context-cmttbf"; deps."context-construction-plan" = tl."context-construction-plan"; deps."context-cyrillicnumbers" = tl."context-cyrillicnumbers"; deps."context-degrade" = tl."context-degrade"; deps."context-fancybreak" = tl."context-fancybreak"; deps."context-filter" = tl."context-filter"; - deps."context-fixme" = tl."context-fixme"; deps."context-french" = tl."context-french"; deps."context-fullpage" = tl."context-fullpage"; - deps."context-games" = tl."context-games"; deps."context-gantt" = tl."context-gantt"; deps."context-gnuplot" = tl."context-gnuplot"; + deps."context-inifile" = tl."context-inifile"; + deps."context-layout" = tl."context-layout"; deps."context-letter" = tl."context-letter"; deps."context-lettrine" = tl."context-lettrine"; - deps."context-lilypond" = tl."context-lilypond"; deps."context-mathsets" = tl."context-mathsets"; - deps."context-notes-zh-cn" = tl."context-notes-zh-cn"; deps."context-rst" = tl."context-rst"; deps."context-ruby" = tl."context-ruby"; deps."context-simplefonts" = tl."context-simplefonts"; @@ -4212,6 +4636,7 @@ tl: { # no indentation deps."adfsymbols" = tl."adfsymbols"; deps."aecc" = tl."aecc"; deps."alegreya" = tl."alegreya"; + deps."algolrevived" = tl."algolrevived"; deps."allrunes" = tl."allrunes"; deps."almfixed" = tl."almfixed"; deps."anonymouspro" = tl."anonymouspro"; @@ -4219,8 +4644,9 @@ tl: { # no indentation deps."antt" = tl."antt"; deps."archaic" = tl."archaic"; deps."arev" = tl."arev"; - deps."ascii-font" = tl."ascii-font"; + deps."arimo" = tl."arimo"; deps."asapsym" = tl."asapsym"; + deps."ascii-font" = tl."ascii-font"; deps."aspectratio" = tl."aspectratio"; deps."astro" = tl."astro"; deps."augie" = tl."augie"; @@ -4230,6 +4656,7 @@ tl: { # no indentation deps."barcodes" = tl."barcodes"; deps."baskervald" = tl."baskervald"; deps."baskervaldx" = tl."baskervaldx"; + deps."baskervillef" = tl."baskervillef"; deps."bbding" = tl."bbding"; deps."bbm" = tl."bbm"; deps."bbm-macros" = tl."bbm-macros"; @@ -4238,6 +4665,7 @@ tl: { # no indentation deps."belleek" = tl."belleek"; deps."bera" = tl."bera"; deps."berenisadf" = tl."berenisadf"; + deps."beuron" = tl."beuron"; deps."bguq" = tl."bguq"; deps."blacklettert1" = tl."blacklettert1"; deps."boisik" = tl."boisik"; @@ -4267,10 +4695,12 @@ tl: { # no indentation deps."cmpica" = tl."cmpica"; deps."cmtiup" = tl."cmtiup"; deps."cochineal" = tl."cochineal"; + deps."coelacanth" = tl."coelacanth"; deps."comfortaa" = tl."comfortaa"; deps."comicneue" = tl."comicneue"; deps."concmath-fonts" = tl."concmath-fonts"; deps."cookingsymbols" = tl."cookingsymbols"; + deps."cormorantgaramond" = tl."cormorantgaramond"; deps."countriesofeurope" = tl."countriesofeurope"; deps."courier-scaled" = tl."courier-scaled"; deps."crimson" = tl."crimson"; @@ -4279,6 +4709,7 @@ tl: { # no indentation deps."dancers" = tl."dancers"; deps."dantelogo" = tl."dantelogo"; deps."dejavu" = tl."dejavu"; + deps."dejavu-otf" = tl."dejavu-otf"; deps."dice" = tl."dice"; deps."dictsym" = tl."dictsym"; deps."dingbat" = tl."dingbat"; @@ -4317,10 +4748,10 @@ tl: { # no indentation deps."fontawesome" = tl."fontawesome"; deps."fontmfizz" = tl."fontmfizz"; deps."fonts-churchslavonic" = tl."fonts-churchslavonic"; - deps."old-arrows" = tl."old-arrows"; deps."fourier" = tl."fourier"; deps."fouriernc" = tl."fouriernc"; deps."frcursive" = tl."frcursive"; + deps."frederika2016" = tl."frederika2016"; deps."genealogy" = tl."genealogy"; deps."gentium-tug" = tl."gentium-tug"; deps."gfsartemisia" = tl."gfsartemisia"; @@ -4332,6 +4763,7 @@ tl: { # no indentation deps."gillcm" = tl."gillcm"; deps."gillius" = tl."gillius"; deps."gnu-freefont" = tl."gnu-freefont"; + deps."gofonts" = tl."gofonts"; deps."gothic" = tl."gothic"; deps."greenpoint" = tl."greenpoint"; deps."grotesq" = tl."grotesq"; @@ -4375,12 +4807,15 @@ tl: { # no indentation deps."merriweather" = tl."merriweather"; deps."miama" = tl."miama"; deps."mintspirit" = tl."mintspirit"; + deps."missaali" = tl."missaali"; deps."mnsymbol" = tl."mnsymbol"; + deps."montserrat" = tl."montserrat"; deps."mweights" = tl."mweights"; deps."newpx" = tl."newpx"; deps."newtx" = tl."newtx"; deps."newtxsf" = tl."newtxsf"; deps."newtxtt" = tl."newtxtt"; + deps."niceframe-type1" = tl."niceframe-type1"; deps."nimbus15" = tl."nimbus15"; deps."nkarta" = tl."nkarta"; deps."noto" = tl."noto"; @@ -4390,6 +4825,7 @@ tl: { # no indentation deps."ocr-b-outline" = tl."ocr-b-outline"; deps."ogham" = tl."ogham"; deps."oinuit" = tl."oinuit"; + deps."old-arrows" = tl."old-arrows"; deps."oldlatin" = tl."oldlatin"; deps."oldstandard" = tl."oldstandard"; deps."opensans" = tl."opensans"; @@ -4420,6 +4856,7 @@ tl: { # no indentation deps."sauterfonts" = tl."sauterfonts"; deps."schulschriften" = tl."schulschriften"; deps."semaphor" = tl."semaphor"; + deps."shobhika" = tl."shobhika"; deps."skull" = tl."skull"; deps."sourcecodepro" = tl."sourcecodepro"; deps."sourcesanspro" = tl."sourcesanspro"; @@ -4433,13 +4870,16 @@ tl: { # no indentation deps."tempora" = tl."tempora"; deps."tengwarscript" = tl."tengwarscript"; deps."tfrupee" = tl."tfrupee"; + deps."tinos" = tl."tinos"; deps."tpslifonts" = tl."tpslifonts"; deps."trajan" = tl."trajan"; deps."txfontsb" = tl."txfontsb"; + deps."txuprcal" = tl."txuprcal"; deps."typicons" = tl."typicons"; deps."umtypewriter" = tl."umtypewriter"; deps."universa" = tl."universa"; deps."universalis" = tl."universalis"; + deps."uppunctlm" = tl."uppunctlm"; deps."urwchancal" = tl."urwchancal"; deps."venturisadf" = tl."venturisadf"; deps."wsuipa" = tl."wsuipa"; @@ -4514,13 +4954,25 @@ tl: { # no indentation "collection-formatsextra" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; + deps."collection-latex" = tl."collection-latex"; deps."edmac" = tl."edmac"; deps."eplain" = tl."eplain"; + deps."jadetex" = tl."jadetex"; deps."lollipop" = tl."lollipop"; deps."mltex" = tl."mltex"; + deps."passivetex" = tl."passivetex"; deps."psizzl" = tl."psizzl"; deps."startex" = tl."startex"; deps."texsis" = tl."texsis"; + deps."xmltex" = tl."xmltex"; + deps."xmltexconfig" = tl."xmltexconfig"; + deps."aleph" = tl."aleph"; + deps."antomega" = tl."antomega"; + deps."lambda" = tl."lambda"; + deps."mxedruli" = tl."mxedruli"; + deps."omega" = tl."omega"; + deps."omegaware" = tl."omegaware"; + deps."otibet" = tl."otibet"; sha512.run = ""; }; "collection-games" = { @@ -4552,90 +5004,13 @@ tl: { # no indentation deps."sgame" = tl."sgame"; deps."skak" = tl."skak"; deps."skaknew" = tl."skaknew"; + deps."soup" = tl."soup"; deps."sudoku" = tl."sudoku"; deps."sudokubundle" = tl."sudokubundle"; deps."xq" = tl."xq"; deps."xskak" = tl."xskak"; sha512.run = ""; }; -"collection-genericextra" = { - stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."abbr" = tl."abbr"; - deps."abstyles" = tl."abstyles"; - deps."barr" = tl."barr"; - deps."bitelist" = tl."bitelist"; - deps."borceux" = tl."borceux"; - deps."c-pascal" = tl."c-pascal"; - deps."catcodes" = tl."catcodes"; - deps."chronosys" = tl."chronosys"; - deps."colorsep" = tl."colorsep"; - deps."dinat" = tl."dinat"; - deps."dirtree" = tl."dirtree"; - deps."docbytex" = tl."docbytex"; - deps."dowith" = tl."dowith"; - deps."eijkhout" = tl."eijkhout"; - deps."encxvlna" = tl."encxvlna"; - deps."epigram" = tl."epigram"; - deps."fenixpar" = tl."fenixpar"; - deps."fltpoint" = tl."fltpoint"; - deps."fntproof" = tl."fntproof"; - deps."gates" = tl."gates"; - deps."gobble" = tl."gobble"; - deps."gtl" = tl."gtl"; - deps."ifetex" = tl."ifetex"; - deps."iftex" = tl."iftex"; - deps."insbox" = tl."insbox"; - deps."lambda-lists" = tl."lambda-lists"; - deps."langcode" = tl."langcode"; - deps."lecturer" = tl."lecturer"; - deps."librarian" = tl."librarian"; - deps."mathdots" = tl."mathdots"; - deps."metatex" = tl."metatex"; - deps."midnight" = tl."midnight"; - deps."navigator" = tl."navigator"; - deps."ofs" = tl."ofs"; - deps."pdf-trans" = tl."pdf-trans"; - deps."plainpkg" = tl."plainpkg"; - deps."schemata" = tl."schemata"; - deps."shade" = tl."shade"; - deps."systeme" = tl."systeme"; - deps."tabto-generic" = tl."tabto-generic"; - deps."termmenu" = tl."termmenu"; - deps."tracklang" = tl."tracklang"; - deps."texapi" = tl."texapi"; - deps."upca" = tl."upca"; - deps."xlop" = tl."xlop"; - deps."yax" = tl."yax"; - sha512.run = ""; -}; -"collection-genericrecommended" = { - stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."apnum" = tl."apnum"; - deps."epsf" = tl."epsf"; - deps."fontname" = tl."fontname"; - deps."genmisc" = tl."genmisc"; - deps."kastrup" = tl."kastrup"; - deps."multido" = tl."multido"; - deps."path" = tl."path"; - deps."tex-ps" = tl."tex-ps"; - deps."ulem" = tl."ulem"; - sha512.run = ""; -}; -"collection-htmlxml" = { - stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-latex" = tl."collection-latex"; - deps."classpack" = tl."classpack"; - deps."jadetex" = tl."jadetex"; - deps."passivetex" = tl."passivetex"; - deps."tex4ht" = tl."tex4ht"; - deps."xmltex" = tl."xmltex"; - deps."xmltexconfig" = tl."xmltexconfig"; - sha512.run = ""; -}; "collection-humanities" = { stripPrefix = 0; deps."collection-latex" = tl."collection-latex"; @@ -4661,9 +5036,9 @@ tl: { # no indentation deps."juramisc" = tl."juramisc"; deps."jurarsp" = tl."jurarsp"; deps."ledmac" = tl."ledmac"; - deps."leipzig" = tl."leipzig"; deps."lexikon" = tl."lexikon"; deps."lexref" = tl."lexref"; + deps."ling-macros" = tl."ling-macros"; deps."linguex" = tl."linguex"; deps."liturg" = tl."liturg"; deps."metrix" = tl."metrix"; @@ -4673,6 +5048,7 @@ tl: { # no indentation deps."plari" = tl."plari"; deps."play" = tl."play"; deps."poemscol" = tl."poemscol"; + deps."poetry" = tl."poetry"; deps."poetrytex" = tl."poetrytex"; deps."qobitree" = tl."qobitree"; deps."qtree" = tl."qtree"; @@ -4684,24 +5060,17 @@ tl: { # no indentation deps."sides" = tl."sides"; deps."stage" = tl."stage"; deps."textglos" = tl."textglos"; + deps."theatre" = tl."theatre"; deps."thalie" = tl."thalie"; deps."tree-dvips" = tl."tree-dvips"; deps."verse" = tl."verse"; deps."xyling" = tl."xyling"; sha512.run = ""; }; -"collection-langafrican" = { - stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."ethiop" = tl."ethiop"; - deps."ethiop-t1" = tl."ethiop-t1"; - deps."fc" = tl."fc"; - deps."hyphen-ethiopic" = tl."hyphen-ethiopic"; - sha512.run = ""; -}; "collection-langarabic" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; + deps."alkalami" = tl."alkalami"; deps."amiri" = tl."amiri"; deps."arabi" = tl."arabi"; deps."arabi-add" = tl."arabi-add"; @@ -4715,15 +5084,19 @@ tl: { # no indentation deps."hyphen-farsi" = tl."hyphen-farsi"; deps."imsproc" = tl."imsproc"; deps."lshort-persian" = tl."lshort-persian"; + deps."luabidi" = tl."luabidi"; + deps."na-box" = tl."na-box"; deps."persian-bib" = tl."persian-bib"; deps."simurgh" = tl."simurgh"; deps."tram" = tl."tram"; + deps."xepersian" = tl."xepersian"; sha512.run = ""; }; "collection-langchinese" = { stripPrefix = 0; deps."collection-langcjk" = tl."collection-langcjk"; deps."arphic" = tl."arphic"; + deps."arphic-ttf" = tl."arphic-ttf"; deps."asymptote-by-example-zh-cn" = tl."asymptote-by-example-zh-cn"; deps."asymptote-faq-zh-cn" = tl."asymptote-faq-zh-cn"; deps."asymptote-manual-zh-cn" = tl."asymptote-manual-zh-cn"; @@ -4736,7 +5109,10 @@ tl: { # no indentation deps."latex-notes-zh-cn" = tl."latex-notes-zh-cn"; deps."lshort-chinese" = tl."lshort-chinese"; deps."texlive-zh-cn" = tl."texlive-zh-cn"; + deps."texproposal" = tl."texproposal"; + deps."upzhkinsoku" = tl."upzhkinsoku"; deps."xpinyin" = tl."xpinyin"; + deps."zhlipsum" = tl."zhlipsum"; deps."zhmetrics" = tl."zhmetrics"; deps."zhmetrics-uptex" = tl."zhmetrics-uptex"; deps."zhnumber" = tl."zhnumber"; @@ -4754,7 +5130,10 @@ tl: { # no indentation deps."cjkutils" = tl."cjkutils"; deps."dnp" = tl."dnp"; deps."garuda-c90" = tl."garuda-c90"; + deps."fixjfm" = tl."fixjfm"; + deps."jfmutil" = tl."jfmutil"; deps."norasi-c90" = tl."norasi-c90"; + deps."pxtatescale" = tl."pxtatescale"; deps."xcjk2uni" = tl."xcjk2uni"; deps."zxjafont" = tl."zxjafont"; sha512.run = ""; @@ -4778,6 +5157,7 @@ tl: { # no indentation deps."eskd" = tl."eskd"; deps."eskdx" = tl."eskdx"; deps."gost" = tl."gost"; + deps."hyphen-belarusian" = tl."hyphen-belarusian"; deps."hyphen-bulgarian" = tl."hyphen-bulgarian"; deps."hyphen-churchslavonic" = tl."hyphen-churchslavonic"; deps."hyphen-mongolian" = tl."hyphen-mongolian"; @@ -4794,6 +5174,7 @@ tl: { # no indentation deps."mongolian-babel" = tl."mongolian-babel"; deps."montex" = tl."montex"; deps."mpman-ru" = tl."mpman-ru"; + deps."numnameru" = tl."numnameru"; deps."pst-eucl-translation-bg" = tl."pst-eucl-translation-bg"; deps."ruhyphen" = tl."ruhyphen"; deps."russ" = tl."russ"; @@ -4834,14 +5215,18 @@ tl: { # no indentation deps."FAQ-en" = tl."FAQ-en"; deps."MemoirChapStyles" = tl."MemoirChapStyles"; deps."Type1fonts" = tl."Type1fonts"; + deps."amscls-doc" = tl."amscls-doc"; deps."amslatex-primer" = tl."amslatex-primer"; deps."around-the-bend" = tl."around-the-bend"; deps."ascii-chart" = tl."ascii-chart"; + deps."biblatex-cheatsheet" = tl."biblatex-cheatsheet"; deps."components-of-TeX" = tl."components-of-TeX"; deps."comprehensive" = tl."comprehensive"; deps."dickimaw" = tl."dickimaw"; + deps."docsurvey" = tl."docsurvey"; deps."dtxtut" = tl."dtxtut"; deps."first-latex-doc" = tl."first-latex-doc"; + deps."forest-quickstart" = tl."forest-quickstart"; deps."gentle" = tl."gentle"; deps."guide-to-latex" = tl."guide-to-latex"; deps."happy4th" = tl."happy4th"; @@ -4853,6 +5238,7 @@ tl: { # no indentation deps."latex-course" = tl."latex-course"; deps."latex-doc-ptr" = tl."latex-doc-ptr"; deps."latex-graphics-companion" = tl."latex-graphics-companion"; + deps."latex-refsheet" = tl."latex-refsheet"; deps."latex-veryshortguide" = tl."latex-veryshortguide"; deps."latex-web-companion" = tl."latex-web-companion"; deps."latex2e-help-texinfo" = tl."latex2e-help-texinfo"; @@ -4863,11 +5249,11 @@ tl: { # no indentation deps."lshort-english" = tl."lshort-english"; deps."macros2e" = tl."macros2e"; deps."math-e" = tl."math-e"; + deps."math-into-latex-4" = tl."math-into-latex-4"; deps."maths-symbols" = tl."maths-symbols"; deps."memdesign" = tl."memdesign"; deps."metafont-beginners" = tl."metafont-beginners"; deps."metapost-examples" = tl."metapost-examples"; - deps."mil3" = tl."mil3"; deps."patgen2-tutorial" = tl."patgen2-tutorial"; deps."pictexsum" = tl."pictexsum"; deps."plain-doc" = tl."plain-doc"; @@ -4883,8 +5269,8 @@ tl: { # no indentation deps."texbytopic" = tl."texbytopic"; deps."titlepages" = tl."titlepages"; deps."tlc2" = tl."tlc2"; + deps."undergradmath" = tl."undergradmath"; deps."visualfaq" = tl."visualfaq"; - deps."voss-mathmode" = tl."voss-mathmode"; deps."webguide" = tl."webguide"; deps."xetexref" = tl."xetexref"; sha512.run = ""; @@ -4923,7 +5309,6 @@ tl: { # no indentation deps."finbib" = tl."finbib"; deps."gloss-occitan" = tl."gloss-occitan"; deps."hrlatex" = tl."hrlatex"; - deps."hyphen-armenian" = tl."hyphen-armenian"; deps."hyphen-croatian" = tl."hyphen-croatian"; deps."hyphen-danish" = tl."hyphen-danish"; deps."hyphen-dutch" = tl."hyphen-dutch"; @@ -4998,6 +5383,7 @@ tl: { # no indentation "collection-langgerman" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; + deps."apalike-german" = tl."apalike-german"; deps."babel-german" = tl."babel-german"; deps."bibleref-german" = tl."bibleref-german"; deps."booktabs-de" = tl."booktabs-de"; @@ -5026,10 +5412,12 @@ tl: { # no indentation deps."lshort-german" = tl."lshort-german"; deps."lualatex-doc-de" = tl."lualatex-doc-de"; deps."microtype-de" = tl."microtype-de"; + deps."milog" = tl."milog"; deps."presentations" = tl."presentations"; deps."r_und_s" = tl."r_und_s"; deps."templates-fenn" = tl."templates-fenn"; deps."templates-sommer" = tl."templates-sommer"; + deps."termcal-de" = tl."termcal-de"; deps."texlive-de" = tl."texlive-de"; deps."tipa-de" = tl."tipa-de"; deps."translation-arsclassica-de" = tl."translation-arsclassica-de"; @@ -5075,24 +5463,6 @@ tl: { # no indentation deps."yannisgr" = tl."yannisgr"; sha512.run = ""; }; -"collection-langindic" = { - stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."bangtex" = tl."bangtex"; - deps."bengali" = tl."bengali"; - deps."burmese" = tl."burmese"; - deps."devnag" = tl."devnag"; - deps."ebong" = tl."ebong"; - deps."hyphen-indic" = tl."hyphen-indic"; - deps."hyphen-sanskrit" = tl."hyphen-sanskrit"; - deps."sanskrit" = tl."sanskrit"; - deps."sanskrit-t1" = tl."sanskrit-t1"; - deps."velthuis" = tl."velthuis"; - deps."wnri" = tl."wnri"; - deps."wnri-latex" = tl."wnri-latex"; - deps."xetex-devanagari" = tl."xetex-devanagari"; - sha512.run = ""; -}; "collection-langitalian" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; @@ -5117,29 +5487,39 @@ tl: { # no indentation "collection-langjapanese" = { stripPrefix = 0; deps."collection-langcjk" = tl."collection-langcjk"; + deps."babel-japanese" = tl."babel-japanese"; deps."bxbase" = tl."bxbase"; deps."bxcjkjatype" = tl."bxcjkjatype"; + deps."bxjalipsum" = tl."bxjalipsum"; + deps."bxjaprnind" = tl."bxjaprnind"; deps."bxjscls" = tl."bxjscls"; + deps."bxorigcapt" = tl."bxorigcapt"; deps."convbkmk" = tl."convbkmk"; + deps."ifptex" = tl."ifptex"; + deps."ifxptex" = tl."ifxptex"; deps."ipaex" = tl."ipaex"; - deps."japanese" = tl."japanese"; deps."japanese-otf" = tl."japanese-otf"; deps."japanese-otf-uptex" = tl."japanese-otf-uptex"; - deps."jfontmaps" = tl."jfontmaps"; + deps."jlreq" = tl."jlreq"; deps."jsclasses" = tl."jsclasses"; deps."lshort-japanese" = tl."lshort-japanese"; deps."luatexja" = tl."luatexja"; + deps."mendex-doc" = tl."mendex-doc"; deps."pbibtex-base" = tl."pbibtex-base"; deps."platex" = tl."platex"; + deps."platex-tools" = tl."platex-tools"; + deps."platexcheat" = tl."platexcheat"; deps."ptex" = tl."ptex"; deps."ptex-base" = tl."ptex-base"; deps."ptex-fonts" = tl."ptex-fonts"; + deps."ptex-fontmaps" = tl."ptex-fontmaps"; deps."ptex2pdf" = tl."ptex2pdf"; deps."pxbase" = tl."pxbase"; deps."pxchfon" = tl."pxchfon"; deps."pxcjkcat" = tl."pxcjkcat"; deps."pxjahyper" = tl."pxjahyper"; deps."pxrubrica" = tl."pxrubrica"; + deps."pxufont" = tl."pxufont"; deps."uplatex" = tl."uplatex"; deps."uptex" = tl."uptex"; deps."uptex-base" = tl."uptex-base"; @@ -5152,6 +5532,7 @@ tl: { # no indentation "collection-langkorean" = { stripPrefix = 0; deps."collection-langcjk" = tl."collection-langcjk"; + deps."baekmuk" = tl."baekmuk"; deps."cjk-ko" = tl."cjk-ko"; deps."kotex-oblivoir" = tl."kotex-oblivoir"; deps."kotex-plain" = tl."kotex-plain"; @@ -5160,6 +5541,8 @@ tl: { # no indentation deps."lshort-korean" = tl."lshort-korean"; deps."nanumtype1" = tl."nanumtype1"; deps."uhc" = tl."uhc"; + deps."unfonts-core" = tl."unfonts-core"; + deps."unfonts-extra" = tl."unfonts-extra"; sha512.run = ""; }; "collection-langother" = { @@ -5167,29 +5550,52 @@ tl: { # no indentation deps."collection-basic" = tl."collection-basic"; deps."amsldoc-vn" = tl."amsldoc-vn"; deps."aramaic-serto" = tl."aramaic-serto"; - deps."babel-bahasa" = tl."babel-bahasa"; + deps."hyphen-armenian" = tl."hyphen-armenian"; + deps."babel-azerbaijani" = tl."babel-azerbaijani"; deps."babel-esperanto" = tl."babel-esperanto"; deps."babel-georgian" = tl."babel-georgian"; deps."babel-hebrew" = tl."babel-hebrew"; + deps."babel-indonesian" = tl."babel-indonesian"; deps."babel-interlingua" = tl."babel-interlingua"; + deps."babel-malay" = tl."babel-malay"; deps."babel-sorbian" = tl."babel-sorbian"; deps."babel-thai" = tl."babel-thai"; deps."babel-vietnamese" = tl."babel-vietnamese"; + deps."bangtex" = tl."bangtex"; + deps."bengali" = tl."bengali"; + deps."burmese" = tl."burmese"; deps."cjhebrew" = tl."cjhebrew"; deps."ctib" = tl."ctib"; + deps."ebong" = tl."ebong"; + deps."ethiop" = tl."ethiop"; + deps."ethiop-t1" = tl."ethiop-t1"; + deps."fc" = tl."fc"; deps."fonts-tlwg" = tl."fonts-tlwg"; deps."hyphen-afrikaans" = tl."hyphen-afrikaans"; deps."hyphen-coptic" = tl."hyphen-coptic"; deps."hyphen-esperanto" = tl."hyphen-esperanto"; + deps."hyphen-ethiopic" = tl."hyphen-ethiopic"; deps."hyphen-georgian" = tl."hyphen-georgian"; + deps."hyphen-indic" = tl."hyphen-indic"; deps."hyphen-indonesian" = tl."hyphen-indonesian"; deps."hyphen-interlingua" = tl."hyphen-interlingua"; + deps."hyphen-sanskrit" = tl."hyphen-sanskrit"; deps."hyphen-thai" = tl."hyphen-thai"; deps."hyphen-turkmen" = tl."hyphen-turkmen"; + deps."latex-mr" = tl."latex-mr"; + deps."latexbangla" = tl."latexbangla"; deps."lshort-thai" = tl."lshort-thai"; deps."lshort-vietnamese" = tl."lshort-vietnamese"; deps."ntheorem-vn" = tl."ntheorem-vn"; + deps."padauk" = tl."padauk"; + deps."sanskrit" = tl."sanskrit"; + deps."sanskrit-t1" = tl."sanskrit-t1"; + deps."thaienum" = tl."thaienum"; + deps."velthuis" = tl."velthuis"; deps."vntex" = tl."vntex"; + deps."wnri" = tl."wnri"; + deps."wnri-latex" = tl."wnri-latex"; + deps."xetex-devanagari" = tl."xetex-devanagari"; sha512.run = ""; }; "collection-langpolish" = { @@ -5197,6 +5603,7 @@ tl: { # no indentation deps."collection-latex" = tl."collection-latex"; deps."collection-basic" = tl."collection-basic"; deps."babel-polish" = tl."babel-polish"; + deps."bredzenie" = tl."bredzenie"; deps."cc-pl" = tl."cc-pl"; deps."gustlib" = tl."gustlib"; deps."gustprog" = tl."gustprog"; @@ -5258,7 +5665,6 @@ tl: { # no indentation deps."babelbib" = tl."babelbib"; deps."carlisle" = tl."carlisle"; deps."colortbl" = tl."colortbl"; - deps."dvisvgm-def" = tl."dvisvgm-def"; deps."fancyhdr" = tl."fancyhdr"; deps."fix2col" = tl."fix2col"; deps."geometry" = tl."geometry"; @@ -5274,7 +5680,6 @@ tl: { # no indentation deps."mptopdf" = tl."mptopdf"; deps."natbib" = tl."natbib"; deps."oberdiek" = tl."oberdiek"; - deps."pdftex-def" = tl."pdftex-def"; deps."pslatex" = tl."pslatex"; deps."psnfss" = tl."psnfss"; deps."pspicture" = tl."pspicture"; @@ -5301,6 +5706,8 @@ tl: { # no indentation deps."acronym" = tl."acronym"; deps."acroterm" = tl."acroterm"; deps."actuarialangle" = tl."actuarialangle"; + deps."actuarialsymbol" = tl."actuarialsymbol"; + deps."addfont" = tl."addfont"; deps."addlines" = tl."addlines"; deps."adjmulticol" = tl."adjmulticol"; deps."adjustbox" = tl."adjustbox"; @@ -5328,6 +5735,7 @@ tl: { # no indentation deps."assignment" = tl."assignment"; deps."assoccnt" = tl."assoccnt"; deps."attachfile" = tl."attachfile"; + deps."aurl" = tl."aurl"; deps."authoraftertitle" = tl."authoraftertitle"; deps."authorindex" = tl."authorindex"; deps."autonum" = tl."autonum"; @@ -5344,6 +5752,7 @@ tl: { # no indentation deps."beamerdarkthemes" = tl."beamerdarkthemes"; deps."beamerposter" = tl."beamerposter"; deps."beamersubframe" = tl."beamersubframe"; + deps."beamertheme-cuerna" = tl."beamertheme-cuerna"; deps."beamertheme-detlevcm" = tl."beamertheme-detlevcm"; deps."beamertheme-epyt" = tl."beamertheme-epyt"; deps."beamertheme-metropolis" = tl."beamertheme-metropolis"; @@ -5359,6 +5768,7 @@ tl: { # no indentation deps."bibletext" = tl."bibletext"; deps."bigfoot" = tl."bigfoot"; deps."bigints" = tl."bigints"; + deps."biochemistry-colors" = tl."biochemistry-colors"; deps."bizcard" = tl."bizcard"; deps."blindtext" = tl."blindtext"; deps."blkarray" = tl."blkarray"; @@ -5379,6 +5789,7 @@ tl: { # no indentation deps."breakurl" = tl."breakurl"; deps."bullcntr" = tl."bullcntr"; deps."bussproofs" = tl."bussproofs"; + deps."bxcalc" = tl."bxcalc"; deps."bxdpx-beamer" = tl."bxdpx-beamer"; deps."bxdvidriver" = tl."bxdvidriver"; deps."bxenclose" = tl."bxenclose"; @@ -5416,18 +5827,22 @@ tl: { # no indentation deps."changes" = tl."changes"; deps."chappg" = tl."chappg"; deps."chapterfolder" = tl."chapterfolder"; + deps."cheatsheet" = tl."cheatsheet"; deps."chet" = tl."chet"; deps."chextras" = tl."chextras"; + deps."childdoc" = tl."childdoc"; deps."chkfloat" = tl."chkfloat"; deps."chletter" = tl."chletter"; deps."chngcntr" = tl."chngcntr"; deps."chronology" = tl."chronology"; deps."circ" = tl."circ"; deps."classics" = tl."classics"; + deps."classpack" = tl."classpack"; deps."clefval" = tl."clefval"; deps."cleveref" = tl."cleveref"; deps."clipboard" = tl."clipboard"; deps."clock" = tl."clock"; + deps."cloze" = tl."cloze"; deps."cmdstring" = tl."cmdstring"; deps."cmdtrack" = tl."cmdtrack"; deps."cmsd" = tl."cmsd"; @@ -5458,7 +5873,9 @@ tl: { # no indentation deps."continue" = tl."continue"; deps."contour" = tl."contour"; deps."contracard" = tl."contracard"; + deps."conv-xkv" = tl."conv-xkv"; deps."cooking" = tl."cooking"; + deps."cooking-units" = tl."cooking-units"; deps."cool" = tl."cool"; deps."coollist" = tl."coollist"; deps."coolstr" = tl."coolstr"; @@ -5475,9 +5892,12 @@ tl: { # no indentation deps."cprotect" = tl."cprotect"; deps."crbox" = tl."crbox"; deps."crossreference" = tl."crossreference"; + deps."crossreftools" = tl."crossreftools"; deps."csquotes" = tl."csquotes"; + deps."css-colors" = tl."css-colors"; deps."csvsimple" = tl."csvsimple"; deps."cuisine" = tl."cuisine"; + deps."currency" = tl."currency"; deps."currfile" = tl."currfile"; deps."currvita" = tl."currvita"; deps."cutwin" = tl."cutwin"; @@ -5565,9 +5985,12 @@ tl: { # no indentation deps."dprogress" = tl."dprogress"; deps."drac" = tl."drac"; deps."draftcopy" = tl."draftcopy"; + deps."draftfigure" = tl."draftfigure"; deps."draftwatermark" = tl."draftwatermark"; deps."dtk" = tl."dtk"; + deps."dtxdescribe" = tl."dtxdescribe"; deps."dtxgallery" = tl."dtxgallery"; + deps."ducksay" = tl."ducksay"; deps."dvdcoll" = tl."dvdcoll"; deps."dynamicnumber" = tl."dynamicnumber"; deps."dynblocks" = tl."dynblocks"; @@ -5575,6 +5998,7 @@ tl: { # no indentation deps."easy" = tl."easy"; deps."easy-todo" = tl."easy-todo"; deps."easyfig" = tl."easyfig"; + deps."easyformat" = tl."easyformat"; deps."easylist" = tl."easylist"; deps."easyreview" = tl."easyreview"; deps."ebezier" = tl."ebezier"; @@ -5611,6 +6035,7 @@ tl: { # no indentation deps."epiolmec" = tl."epiolmec"; deps."eqell" = tl."eqell"; deps."eqlist" = tl."eqlist"; + deps."eqnalign" = tl."eqnalign"; deps."eqname" = tl."eqname"; deps."eqparbox" = tl."eqparbox"; deps."errata" = tl."errata"; @@ -5621,8 +6046,8 @@ tl: { # no indentation deps."etaremune" = tl."etaremune"; deps."etextools" = tl."etextools"; deps."etoc" = tl."etoc"; - deps."etoolbox" = tl."etoolbox"; deps."eukdate" = tl."eukdate"; + deps."eulerpx" = tl."eulerpx"; deps."europasscv" = tl."europasscv"; deps."europecv" = tl."europecv"; deps."everyhook" = tl."everyhook"; @@ -5651,13 +6076,15 @@ tl: { # no indentation deps."fancytabs" = tl."fancytabs"; deps."fancytooltips" = tl."fancytooltips"; deps."fcolumn" = tl."fcolumn"; + deps."fetchcls" = tl."fetchcls"; deps."ffslides" = tl."ffslides"; + deps."fgruler" = tl."fgruler"; deps."fibeamer" = tl."fibeamer"; deps."fifo-stack" = tl."fifo-stack"; deps."figsize" = tl."figsize"; deps."filecontents" = tl."filecontents"; + deps."filecontentsdef" = tl."filecontentsdef"; deps."filedate" = tl."filedate"; - deps."filehook" = tl."filehook"; deps."fileinfo" = tl."fileinfo"; deps."filemod" = tl."filemod"; deps."fink" = tl."fink"; @@ -5691,6 +6118,7 @@ tl: { # no indentation deps."fontaxes" = tl."fontaxes"; deps."fonttable" = tl."fonttable"; deps."footmisc" = tl."footmisc"; + deps."footmisx" = tl."footmisx"; deps."footnotebackref" = tl."footnotebackref"; deps."footnotehyper" = tl."footnotehyper"; deps."footnoterange" = tl."footnoterange"; @@ -5699,6 +6127,7 @@ tl: { # no indentation deps."foreign" = tl."foreign"; deps."forloop" = tl."forloop"; deps."formlett" = tl."formlett"; + deps."forms16be" = tl."forms16be"; deps."formular" = tl."formular"; deps."fragments" = tl."fragments"; deps."frame" = tl."frame"; @@ -5713,6 +6142,7 @@ tl: { # no indentation deps."fundus-calligra" = tl."fundus-calligra"; deps."fundus-cyr" = tl."fundus-cyr"; deps."fundus-sueterlin" = tl."fundus-sueterlin"; + deps."fvextra" = tl."fvextra"; deps."fwlw" = tl."fwlw"; deps."g-brief" = tl."g-brief"; deps."gauss" = tl."gauss"; @@ -5720,10 +6150,10 @@ tl: { # no indentation deps."gcite" = tl."gcite"; deps."gender" = tl."gender"; deps."genmpage" = tl."genmpage"; - deps."getargs" = tl."getargs"; deps."getfiledate" = tl."getfiledate"; deps."getitems" = tl."getitems"; deps."ginpenc" = tl."ginpenc"; + deps."gitfile-info" = tl."gitfile-info"; deps."gitinfo" = tl."gitinfo"; deps."gitinfo2" = tl."gitinfo2"; deps."gitlog" = tl."gitlog"; @@ -5750,11 +6180,14 @@ tl: { # no indentation deps."graphbox" = tl."graphbox"; deps."graphicx-psmin" = tl."graphicx-psmin"; deps."graphicxbox" = tl."graphicxbox"; + deps."grayhints" = tl."grayhints"; deps."grfpaste" = tl."grfpaste"; deps."grid" = tl."grid"; deps."grid-system" = tl."grid-system"; deps."gridset" = tl."gridset"; deps."guitlogo" = tl."guitlogo"; + deps."halloweenmath" = tl."halloweenmath"; + deps."hackthefootline" = tl."hackthefootline"; deps."handout" = tl."handout"; deps."hang" = tl."hang"; deps."hanging" = tl."hanging"; @@ -5797,11 +6230,13 @@ tl: { # no indentation deps."interfaces" = tl."interfaces"; deps."inversepath" = tl."inversepath"; deps."invoice" = tl."invoice"; + deps."invoice2" = tl."invoice2"; deps."iso" = tl."iso"; deps."iso10303" = tl."iso10303"; deps."isodate" = tl."isodate"; deps."isodoc" = tl."isodoc"; deps."isonums" = tl."isonums"; + deps."isopt" = tl."isopt"; deps."isorot" = tl."isorot"; deps."isotope" = tl."isotope"; deps."issuulinks" = tl."issuulinks"; @@ -5813,14 +6248,17 @@ tl: { # no indentation deps."kantlipsum" = tl."kantlipsum"; deps."kerntest" = tl."kerntest"; deps."keycommand" = tl."keycommand"; + deps."keyfloat" = tl."keyfloat"; deps."keyreader" = tl."keyreader"; deps."keystroke" = tl."keystroke"; deps."keyval2e" = tl."keyval2e"; deps."keyvaltable" = tl."keyvaltable"; deps."kix" = tl."kix"; + deps."knowledge" = tl."knowledge"; deps."koma-moderncvclassic" = tl."koma-moderncvclassic"; deps."koma-script-sfs" = tl."koma-script-sfs"; deps."komacv" = tl."komacv"; + deps."komacv-rg" = tl."komacv-rg"; deps."ktv-texdata" = tl."ktv-texdata"; deps."l3build" = tl."l3build"; deps."labbook" = tl."labbook"; @@ -5829,6 +6267,7 @@ tl: { # no indentation deps."lastpage" = tl."lastpage"; deps."latex-tds" = tl."latex-tds"; deps."latexdemo" = tl."latexdemo"; + deps."latexgit" = tl."latexgit"; deps."layouts" = tl."layouts"; deps."lazylist" = tl."lazylist"; deps."lcd" = tl."lcd"; @@ -5836,6 +6275,7 @@ tl: { # no indentation deps."leading" = tl."leading"; deps."leaflet" = tl."leaflet"; deps."leftidx" = tl."leftidx"; + deps."leipzig" = tl."leipzig"; deps."lengthconvert" = tl."lengthconvert"; deps."lettre" = tl."lettre"; deps."lettrine" = tl."lettrine"; @@ -5872,6 +6312,8 @@ tl: { # no indentation deps."ltxkeys" = tl."ltxkeys"; deps."ltxnew" = tl."ltxnew"; deps."ltxtools" = tl."ltxtools"; + deps."lua-check-hyphen" = tl."lua-check-hyphen"; + deps."luatodonotes" = tl."luatodonotes"; deps."macroswap" = tl."macroswap"; deps."magaz" = tl."magaz"; deps."mailing" = tl."mailing"; @@ -5887,6 +6329,7 @@ tl: { # no indentation deps."mandi" = tl."mandi"; deps."manfnt" = tl."manfnt"; deps."manuscript" = tl."manuscript"; + deps."marginfit" = tl."marginfit"; deps."marginfix" = tl."marginfix"; deps."marginnote" = tl."marginnote"; deps."markdown" = tl."markdown"; @@ -5897,6 +6340,7 @@ tl: { # no indentation deps."mbenotes" = tl."mbenotes"; deps."mcaption" = tl."mcaption"; deps."mceinleger" = tl."mceinleger"; + deps."mcexam" = tl."mcexam"; deps."mcite" = tl."mcite"; deps."mciteplus" = tl."mciteplus"; deps."mdframed" = tl."mdframed"; @@ -5905,6 +6349,7 @@ tl: { # no indentation deps."meetingmins" = tl."meetingmins"; deps."memexsupp" = tl."memexsupp"; deps."memory" = tl."memory"; + deps."mensa-tex" = tl."mensa-tex"; deps."menu" = tl."menu"; deps."menukeys" = tl."menukeys"; deps."method" = tl."method"; @@ -5913,6 +6358,7 @@ tl: { # no indentation deps."mftinc" = tl."mftinc"; deps."midpage" = tl."midpage"; deps."minibox" = tl."minibox"; + deps."minidocument" = tl."minidocument"; deps."minifp" = tl."minifp"; deps."minipage-marginpar" = tl."minipage-marginpar"; deps."minitoc" = tl."minitoc"; @@ -5927,6 +6373,7 @@ tl: { # no indentation deps."moderntimeline" = tl."moderntimeline"; deps."modref" = tl."modref"; deps."modroman" = tl."modroman"; + deps."modular" = tl."modular"; deps."monofill" = tl."monofill"; deps."moodle" = tl."moodle"; deps."moreenum" = tl."moreenum"; @@ -5937,6 +6384,7 @@ tl: { # no indentation deps."morewrites" = tl."morewrites"; deps."movie15" = tl."movie15"; deps."mparhack" = tl."mparhack"; + deps."mpostinl" = tl."mpostinl"; deps."msc" = tl."msc"; deps."msg" = tl."msg"; deps."mslapa" = tl."mslapa"; @@ -5948,6 +6396,7 @@ tl: { # no indentation deps."multidef" = tl."multidef"; deps."multienv" = tl."multienv"; deps."multiexpand" = tl."multiexpand"; + deps."multilang" = tl."multilang"; deps."multirow" = tl."multirow"; deps."mversion" = tl."mversion"; deps."mwe" = tl."mwe"; @@ -5985,6 +6434,8 @@ tl: { # no indentation deps."nopageno" = tl."nopageno"; deps."normalcolor" = tl."normalcolor"; deps."notes" = tl."notes"; + deps."notespages" = tl."notespages"; + deps."notestex" = tl."notestex"; deps."notoccite" = tl."notoccite"; deps."nowidow" = tl."nowidow"; deps."nox" = tl."nox"; @@ -5992,6 +6443,7 @@ tl: { # no indentation deps."numberedblock" = tl."numberedblock"; deps."numname" = tl."numname"; deps."numprint" = tl."numprint"; + deps."numspell" = tl."numspell"; deps."ocg-p" = tl."ocg-p"; deps."ocgx" = tl."ocgx"; deps."ocgx2" = tl."ocgx2"; @@ -6006,6 +6458,7 @@ tl: { # no indentation deps."outline" = tl."outline"; deps."outliner" = tl."outliner"; deps."outlines" = tl."outlines"; + deps."overlays" = tl."overlays"; deps."overpic" = tl."overpic"; deps."pagecolor" = tl."pagecolor"; deps."pagecont" = tl."pagecont"; @@ -6037,6 +6490,7 @@ tl: { # no indentation deps."pdfcprot" = tl."pdfcprot"; deps."pdfmarginpar" = tl."pdfmarginpar"; deps."pdfpagediff" = tl."pdfpagediff"; + deps."pdfreview" = tl."pdfreview"; deps."pdfscreen" = tl."pdfscreen"; deps."pdfslide" = tl."pdfslide"; deps."pdfsync" = tl."pdfsync"; @@ -6046,7 +6500,15 @@ tl: { # no indentation deps."perltex" = tl."perltex"; deps."permute" = tl."permute"; deps."petiteannonce" = tl."petiteannonce"; + deps."phffullpagefigure" = tl."phffullpagefigure"; + deps."phfnote" = tl."phfnote"; + deps."phfparen" = tl."phfparen"; + deps."phfqit" = tl."phfqit"; + deps."phfquotetext" = tl."phfquotetext"; + deps."phfsvnwatermark" = tl."phfsvnwatermark"; + deps."phfthm" = tl."phfthm"; deps."philex" = tl."philex"; + deps."phonenumbers" = tl."phonenumbers"; deps."photo" = tl."photo"; deps."piff" = tl."piff"; deps."pkgloader" = tl."pkgloader"; @@ -6077,11 +6539,13 @@ tl: { # no indentation deps."psfragx" = tl."psfragx"; deps."pst-pdf" = tl."pst-pdf"; deps."pstool" = tl."pstool"; + deps."pstring" = tl."pstring"; deps."pxgreeks" = tl."pxgreeks"; deps."python" = tl."python"; deps."qcm" = tl."qcm"; deps."qstest" = tl."qstest"; deps."qsymbols" = tl."qsymbols"; + deps."quicktype" = tl."quicktype"; deps."quotchap" = tl."quotchap"; deps."quoting" = tl."quoting"; deps."quotmark" = tl."quotmark"; @@ -6142,10 +6606,12 @@ tl: { # no indentation deps."seealso" = tl."seealso"; deps."selectp" = tl."selectp"; deps."semantic" = tl."semantic"; + deps."semantic-markup" = tl."semantic-markup"; deps."semioneside" = tl."semioneside"; deps."semproc" = tl."semproc"; deps."sepfootnotes" = tl."sepfootnotes"; deps."seqsplit" = tl."seqsplit"; + deps."sesstime" = tl."sesstime"; deps."sf298" = tl."sf298"; deps."sffms" = tl."sffms"; deps."sfmath" = tl."sfmath"; @@ -6160,6 +6626,7 @@ tl: { # no indentation deps."showcharinbox" = tl."showcharinbox"; deps."showdim" = tl."showdim"; deps."showexpl" = tl."showexpl"; + deps."showhyphens" = tl."showhyphens"; deps."showlabels" = tl."showlabels"; deps."sidecap" = tl."sidecap"; deps."sidenotes" = tl."sidenotes"; @@ -6179,6 +6646,7 @@ tl: { # no indentation deps."snapshot" = tl."snapshot"; deps."snotez" = tl."snotez"; deps."soul" = tl."soul"; + deps."spark-otf" = tl."spark-otf"; deps."sparklines" = tl."sparklines"; deps."sphack" = tl."sphack"; deps."splitindex" = tl."splitindex"; @@ -6202,6 +6670,7 @@ tl: { # no indentation deps."stringstrings" = tl."stringstrings"; deps."sttools" = tl."sttools"; deps."stubs" = tl."stubs"; + deps."studenthandouts" = tl."studenthandouts"; deps."subdepth" = tl."subdepth"; deps."subeqn" = tl."subeqn"; deps."subeqnarray" = tl."subeqnarray"; @@ -6249,6 +6718,7 @@ tl: { # no indentation deps."termcal" = tl."termcal"; deps."termlist" = tl."termlist"; deps."testhyphens" = tl."testhyphens"; + deps."testidx" = tl."testidx"; deps."tex-label" = tl."tex-label"; deps."texlogos" = tl."texlogos"; deps."texmate" = tl."texmate"; @@ -6257,7 +6727,6 @@ tl: { # no indentation deps."texshade" = tl."texshade"; deps."texvc" = tl."texvc"; deps."textfit" = tl."textfit"; - deps."textgreek" = tl."textgreek"; deps."textmerg" = tl."textmerg"; deps."textpos" = tl."textpos"; deps."theoremref" = tl."theoremref"; @@ -6277,6 +6746,7 @@ tl: { # no indentation deps."titlesec" = tl."titlesec"; deps."titling" = tl."titling"; deps."tocbibind" = tl."tocbibind"; + deps."tocdata" = tl."tocdata"; deps."tocloft" = tl."tocloft"; deps."tocvsec2" = tl."tocvsec2"; deps."todo" = tl."todo"; @@ -6300,6 +6770,7 @@ tl: { # no indentation deps."type1cm" = tl."type1cm"; deps."typed-checklist" = tl."typed-checklist"; deps."typeface" = tl."typeface"; + deps."typoaid" = tl."typoaid"; deps."typogrid" = tl."typogrid"; deps."uassign" = tl."uassign"; deps."ucs" = tl."ucs"; @@ -6314,7 +6785,9 @@ tl: { # no indentation deps."upquote" = tl."upquote"; deps."uri" = tl."uri"; deps."ushort" = tl."ushort"; + deps."uspace" = tl."uspace"; deps."uwmslide" = tl."uwmslide"; + deps."variablelm" = tl."variablelm"; deps."varindex" = tl."varindex"; deps."varsfromjobname" = tl."varsfromjobname"; deps."varwidth" = tl."varwidth"; @@ -6335,6 +6808,7 @@ tl: { # no indentation deps."vpe" = tl."vpe"; deps."vruler" = tl."vruler"; deps."vwcol" = tl."vwcol"; + deps."wallcalendar" = tl."wallcalendar"; deps."wallpaper" = tl."wallpaper"; deps."warning" = tl."warning"; deps."warpcol" = tl."warpcol"; @@ -6345,9 +6819,11 @@ tl: { # no indentation deps."wordcount" = tl."wordcount"; deps."wordlike" = tl."wordlike"; deps."wrapfig" = tl."wrapfig"; + deps."wtref" = tl."wtref"; deps."xargs" = tl."xargs"; deps."xassoccnt" = tl."xassoccnt"; deps."xcntperchap" = tl."xcntperchap"; + deps."xcolor-material" = tl."xcolor-material"; deps."xcolor-solarized" = tl."xcolor-solarized"; deps."xcomment" = tl."xcomment"; deps."xdoc" = tl."xdoc"; @@ -6356,6 +6832,7 @@ tl: { # no indentation deps."xhfill" = tl."xhfill"; deps."xifthen" = tl."xifthen"; deps."xint" = tl."xint"; + deps."xltabular" = tl."xltabular"; deps."xmpincl" = tl."xmpincl"; deps."xnewcommand" = tl."xnewcommand"; deps."xoptarg" = tl."xoptarg"; @@ -6364,15 +6841,18 @@ tl: { # no indentation deps."xprintlen" = tl."xprintlen"; deps."xpunctuate" = tl."xpunctuate"; deps."xsavebox" = tl."xsavebox"; + deps."xsim" = tl."xsim"; deps."xstring" = tl."xstring"; deps."xtab" = tl."xtab"; deps."xwatermark" = tl."xwatermark"; deps."xytree" = tl."xytree"; deps."yafoot" = tl."yafoot"; + deps."yaletter" = tl."yaletter"; deps."yagusylo" = tl."yagusylo"; deps."ycbook" = tl."ycbook"; deps."ydoc" = tl."ydoc"; deps."yplan" = tl."yplan"; + deps."zebra-goodies" = tl."zebra-goodies"; deps."zed-csp" = tl."zed-csp"; deps."ziffer" = tl."ziffer"; deps."zwgetfdate" = tl."zwgetfdate"; @@ -6394,21 +6874,26 @@ tl: { # no indentation deps."eso-pic" = tl."eso-pic"; deps."euenc" = tl."euenc"; deps."euler" = tl."euler"; + deps."etoolbox" = tl."etoolbox"; deps."extsizes" = tl."extsizes"; deps."fancybox" = tl."fancybox"; deps."fancyref" = tl."fancyref"; deps."fancyvrb" = tl."fancyvrb"; + deps."filehook" = tl."filehook"; deps."float" = tl."float"; deps."fontspec" = tl."fontspec"; deps."fp" = tl."fp"; deps."index" = tl."index"; deps."jknapltx" = tl."jknapltx"; deps."koma-script" = tl."koma-script"; + deps."latexbug" = tl."latexbug"; + deps."l3experimental" = tl."l3experimental"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; - deps."l3experimental" = tl."l3experimental"; deps."lineno" = tl."lineno"; deps."listings" = tl."listings"; + deps."lwarp" = tl."lwarp"; + deps."mathspec" = tl."mathspec"; deps."mathtools" = tl."mathtools"; deps."mdwtools" = tl."mdwtools"; deps."memoir" = tl."memoir"; @@ -6418,6 +6903,7 @@ tl: { # no indentation deps."ntgclass" = tl."ntgclass"; deps."parskip" = tl."parskip"; deps."pdfpages" = tl."pdfpages"; + deps."polyglossia" = tl."polyglossia"; deps."powerdot" = tl."powerdot"; deps."psfrag" = tl."psfrag"; deps."rcs" = tl."rcs"; @@ -6430,9 +6916,13 @@ tl: { # no indentation deps."textcase" = tl."textcase"; deps."thumbpdf" = tl."thumbpdf"; deps."typehtml" = tl."typehtml"; + deps."ucharcat" = tl."ucharcat"; deps."underscore" = tl."underscore"; + deps."unicode-math" = tl."unicode-math"; deps."xcolor" = tl."xcolor"; deps."xkeyval" = tl."xkeyval"; + deps."xltxtra" = tl."xltxtra"; + deps."xunicode" = tl."xunicode"; sha512.run = ""; }; "collection-luatex" = { @@ -6440,16 +6930,16 @@ tl: { # no indentation deps."collection-basic" = tl."collection-basic"; deps."checkcites" = tl."checkcites"; deps."chickenize" = tl."chickenize"; - deps."cloze" = tl."cloze"; + deps."combofont" = tl."combofont"; + deps."cstypo" = tl."cstypo"; deps."ctablestack" = tl."ctablestack"; deps."enigma" = tl."enigma"; + deps."fontloader-luaotfload" = tl."fontloader-luaotfload"; deps."interpreter" = tl."interpreter"; - deps."lua-check-hyphen" = tl."lua-check-hyphen"; deps."lua-visual-debug" = tl."lua-visual-debug"; deps."lua2dox" = tl."lua2dox"; - deps."luabibentry" = tl."luabibentry"; - deps."luabidi" = tl."luabidi"; deps."luacode" = tl."luacode"; + deps."luahyphenrules" = tl."luahyphenrules"; deps."luaindex" = tl."luaindex"; deps."luainputenc" = tl."luainputenc"; deps."luaintro" = tl."luaintro"; @@ -6458,91 +6948,184 @@ tl: { # no indentation deps."lualibs" = tl."lualibs"; deps."luamplib" = tl."luamplib"; deps."luaotfload" = tl."luaotfload"; - deps."luasseq" = tl."luasseq"; - deps."luatex-def" = tl."luatex-def"; + deps."luapackageloader" = tl."luapackageloader"; deps."luatex85" = tl."luatex85"; deps."luatexbase" = tl."luatexbase"; deps."luatexko" = tl."luatexko"; deps."luatextra" = tl."luatextra"; - deps."luatodonotes" = tl."luatodonotes"; deps."luaxml" = tl."luaxml"; + deps."nodetree" = tl."nodetree"; deps."odsfile" = tl."odsfile"; deps."placeat" = tl."placeat"; deps."selnolig" = tl."selnolig"; - deps."showhyphens" = tl."showhyphens"; deps."spelling" = tl."spelling"; - deps."ucharcat" = tl."ucharcat"; sha512.run = ""; }; -"collection-mathextra" = { +"collection-mathscience" = { stripPrefix = 0; deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; deps."collection-latex" = tl."collection-latex"; deps."12many" = tl."12many"; + deps."SIstyle" = tl."SIstyle"; + deps."SIunits" = tl."SIunits"; + deps."alg" = tl."alg"; + deps."algobox" = tl."algobox"; + deps."algorithm2e" = tl."algorithm2e"; + deps."algorithmicx" = tl."algorithmicx"; + deps."algorithms" = tl."algorithms"; deps."amstex" = tl."amstex"; + deps."apxproof" = tl."apxproof"; + deps."autobreak" = tl."autobreak"; + deps."axodraw2" = tl."axodraw2"; deps."backnaur" = tl."backnaur"; deps."begriff" = tl."begriff"; deps."binomexp" = tl."binomexp"; + deps."biocon" = tl."biocon"; + deps."bitpattern" = tl."bitpattern"; + deps."bohr" = tl."bohr"; deps."boldtensors" = tl."boldtensors"; deps."bosisio" = tl."bosisio"; + deps."bpchem" = tl."bpchem"; deps."bropd" = tl."bropd"; + deps."bytefield" = tl."bytefield"; deps."calculation" = tl."calculation"; deps."ccfonts" = tl."ccfonts"; + deps."chemarrow" = tl."chemarrow"; + deps."chemcompounds" = tl."chemcompounds"; + deps."chemcono" = tl."chemcono"; + deps."chemexec" = tl."chemexec"; + deps."chemformula" = tl."chemformula"; + deps."chemgreek" = tl."chemgreek"; + deps."chemmacros" = tl."chemmacros"; + deps."chemnum" = tl."chemnum"; + deps."chemschemex" = tl."chemschemex"; + deps."chemstyle" = tl."chemstyle"; + deps."clrscode" = tl."clrscode"; + deps."clrscode3e" = tl."clrscode3e"; deps."commath" = tl."commath"; + deps."complexity" = tl."complexity"; + deps."computational-complexity" = tl."computational-complexity"; deps."concmath" = tl."concmath"; deps."concrete" = tl."concrete"; deps."conteq" = tl."conteq"; + deps."correctmathalign" = tl."correctmathalign"; + deps."cryptocode" = tl."cryptocode"; deps."delim" = tl."delim"; + deps."delimset" = tl."delimset"; deps."delimseasy" = tl."delimseasy"; + deps."diffcoeff" = tl."diffcoeff"; + deps."digiconfigs" = tl."digiconfigs"; + deps."dijkstra" = tl."dijkstra"; deps."drawmatrix" = tl."drawmatrix"; + deps."drawstack" = tl."drawstack"; + deps."dyntree" = tl."dyntree"; deps."ebproof" = tl."ebproof"; deps."econometrics" = tl."econometrics"; + deps."eltex" = tl."eltex"; + deps."emf" = tl."emf"; + deps."endiagram" = tl."endiagram"; + deps."engtlc" = tl."engtlc"; deps."eqnarray" = tl."eqnarray"; + deps."eqnnumwarn" = tl."eqnnumwarn"; deps."extarrows" = tl."extarrows"; deps."extpfeil" = tl."extpfeil"; deps."faktor" = tl."faktor"; + deps."fnspe" = tl."fnspe"; + deps."fouridx" = tl."fouridx"; + deps."functan" = tl."functan"; + deps."galois" = tl."galois"; + deps."gastex" = tl."gastex"; + deps."gene-logic" = tl."gene-logic"; + deps."ghsystem" = tl."ghsystem"; + deps."gotoh" = tl."gotoh"; deps."grundgesetze" = tl."grundgesetze"; + deps."gu" = tl."gu"; + deps."hep" = tl."hep"; + deps."hepnames" = tl."hepnames"; + deps."hepparticles" = tl."hepparticles"; + deps."hepthesis" = tl."hepthesis"; + deps."hepunits" = tl."hepunits"; deps."interval" = tl."interval"; deps."ionumbers" = tl."ionumbers"; deps."isomath" = tl."isomath"; + deps."karnaugh" = tl."karnaugh"; + deps."karnaugh-map" = tl."karnaugh-map"; + deps."karnaughmap" = tl."karnaughmap"; deps."logicproof" = tl."logicproof"; + deps."longdivision" = tl."longdivision"; deps."lpform" = tl."lpform"; deps."lplfitch" = tl."lplfitch"; + deps."lstbayes" = tl."lstbayes"; deps."mathcomp" = tl."mathcomp"; deps."mathpartir" = tl."mathpartir"; + deps."mathpunctspace" = tl."mathpunctspace"; + deps."matlab-prettifier" = tl."matlab-prettifier"; deps."mattens" = tl."mattens"; + deps."mgltex" = tl."mgltex"; + deps."mhchem" = tl."mhchem"; deps."mhequ" = tl."mhequ"; + deps."miller" = tl."miller"; deps."multiobjective" = tl."multiobjective"; + deps."mychemistry" = tl."mychemistry"; deps."natded" = tl."natded"; deps."nath" = tl."nath"; + deps."nuc" = tl."nuc"; + deps."nucleardata" = tl."nucleardata"; + deps."objectz" = tl."objectz"; + deps."oplotsymbl" = tl."oplotsymbl"; deps."ot-tableau" = tl."ot-tableau"; deps."oubraces" = tl."oubraces"; deps."perfectcut" = tl."perfectcut"; + deps."physics" = tl."physics"; deps."prftree" = tl."prftree"; - deps."prooftrees" = tl."prooftrees"; deps."proba" = tl."proba"; + deps."prooftrees" = tl."prooftrees"; + deps."pseudocode" = tl."pseudocode"; + deps."pygmentex" = tl."pygmentex"; + deps."pythonhighlight" = tl."pythonhighlight"; deps."rec-thy" = tl."rec-thy"; + deps."revquantum" = tl."revquantum"; deps."ribbonproofs" = tl."ribbonproofs"; deps."rmathbr" = tl."rmathbr"; + deps."sasnrdisplay" = tl."sasnrdisplay"; + deps."sciposter" = tl."sciposter"; + deps."sclang-prettifier" = tl."sclang-prettifier"; + deps."scratchx" = tl."scratchx"; deps."sesamanuel" = tl."sesamanuel"; + deps."sfg" = tl."sfg"; deps."shuffle" = tl."shuffle"; + deps."simpler-wick" = tl."simpler-wick"; + deps."simplewick" = tl."simplewick"; + deps."siunitx" = tl."siunitx"; deps."skmath" = tl."skmath"; + deps."spalign" = tl."spalign"; + deps."stanli" = tl."stanli"; deps."statex" = tl."statex"; deps."statex2" = tl."statex2"; + deps."steinmetz" = tl."steinmetz"; deps."stmaryrd" = tl."stmaryrd"; + deps."struktex" = tl."struktex"; + deps."substances" = tl."substances"; deps."subsupscripts" = tl."subsupscripts"; deps."susy" = tl."susy"; deps."syllogism" = tl."syllogism"; deps."sympytexpackage" = tl."sympytexpackage"; deps."synproof" = tl."synproof"; + deps."t-angles" = tl."t-angles"; deps."tablor" = tl."tablor"; deps."tensor" = tl."tensor"; deps."tex-ewd" = tl."tex-ewd"; + deps."textgreek" = tl."textgreek"; + deps."textopo" = tl."textopo"; deps."thmbox" = tl."thmbox"; deps."turnstile" = tl."turnstile"; - deps."unicode-math" = tl."unicode-math"; + deps."ulqda" = tl."ulqda"; + deps."unitsdef" = tl."unitsdef"; deps."venn" = tl."venn"; + deps."witharrows" = tl."witharrows"; + deps."xymtex" = tl."xymtex"; deps."yhmath" = tl."yhmath"; + deps."youngtab" = tl."youngtab"; deps."ytableau" = tl."ytableau"; sha512.run = ""; }; @@ -6580,6 +7163,7 @@ tl: { # no indentation deps."mpattern" = tl."mpattern"; deps."mpcolornames" = tl."mpcolornames"; deps."mpgraphics" = tl."mpgraphics"; + deps."mptrees" = tl."mptrees"; deps."piechartmp" = tl."piechartmp"; deps."repere" = tl."repere"; deps."roex" = tl."roex"; @@ -6608,10 +7192,12 @@ tl: { # no indentation deps."leadsheets" = tl."leadsheets"; deps."lilyglyphs" = tl."lilyglyphs"; deps."m-tx" = tl."m-tx"; + deps."musicography" = tl."musicography"; deps."musixguit" = tl."musixguit"; deps."musixtex" = tl."musixtex"; deps."musixtex-fonts" = tl."musixtex-fonts"; deps."musixtnt" = tl."musixtnt"; + deps."octave" = tl."octave"; deps."piano" = tl."piano"; deps."pmx" = tl."pmx"; deps."pmxchords" = tl."pmxchords"; @@ -6620,19 +7206,6 @@ tl: { # no indentation deps."xpiano" = tl."xpiano"; sha512.run = ""; }; -"collection-omega" = { - stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; - deps."aleph" = tl."aleph"; - deps."antomega" = tl."antomega"; - deps."lambda" = tl."lambda"; - deps."mxedruli" = tl."mxedruli"; - deps."omega" = tl."omega"; - deps."omegaware" = tl."omegaware"; - deps."otibet" = tl."otibet"; - sha512.run = ""; -}; "collection-pictures" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; @@ -6642,6 +7215,8 @@ tl: { # no indentation deps."asypictureb" = tl."asypictureb"; deps."autoarea" = tl."autoarea"; deps."bardiag" = tl."bardiag"; + deps."beamerswitch" = tl."beamerswitch"; + deps."binarytree" = tl."binarytree"; deps."blochsphere" = tl."blochsphere"; deps."bloques" = tl."bloques"; deps."blox" = tl."blox"; @@ -6651,6 +7226,7 @@ tl: { # no indentation deps."braids" = tl."braids"; deps."bxeepic" = tl."bxeepic"; deps."cachepic" = tl."cachepic"; + deps."callouts" = tl."callouts"; deps."celtic" = tl."celtic"; deps."chemfig" = tl."chemfig"; deps."combinedgraphics" = tl."combinedgraphics"; @@ -6666,8 +7242,11 @@ tl: { # no indentation deps."dratex" = tl."dratex"; deps."drs" = tl."drs"; deps."duotenzor" = tl."duotenzor"; + deps."dynkin-diagrams" = tl."dynkin-diagrams"; + deps."ecgdraw" = tl."ecgdraw"; deps."eepic" = tl."eepic"; deps."ellipse" = tl."ellipse"; + deps."endofproofwd" = tl."endofproofwd"; deps."epspdf" = tl."epspdf"; deps."epspdfconversion" = tl."epspdfconversion"; deps."esk" = tl."esk"; @@ -6683,17 +7262,23 @@ tl: { # no indentation deps."gradientframe" = tl."gradientframe"; deps."grafcet" = tl."grafcet"; deps."graphviz" = tl."graphviz"; + deps."gtrlib-largetrees" = tl."gtrlib-largetrees"; deps."harveyballs" = tl."harveyballs"; deps."here" = tl."here"; deps."hf-tikz" = tl."hf-tikz"; deps."hobby" = tl."hobby"; deps."hvfloat" = tl."hvfloat"; + deps."istgame" = tl."istgame"; deps."knitting" = tl."knitting"; deps."knittingpattern" = tl."knittingpattern"; + deps."ladder" = tl."ladder"; deps."lapdf" = tl."lapdf"; deps."latex-make" = tl."latex-make"; deps."lpic" = tl."lpic"; deps."lroundrect" = tl."lroundrect"; + deps."luamesh" = tl."luamesh"; + deps."luasseq" = tl."luasseq"; + deps."maker" = tl."maker"; deps."makeshape" = tl."makeshape"; deps."mathspic" = tl."mathspic"; deps."miniplot" = tl."miniplot"; @@ -6732,11 +7317,15 @@ tl: { # no indentation deps."rviewport" = tl."rviewport"; deps."sa-tikz" = tl."sa-tikz"; deps."schemabloc" = tl."schemabloc"; + deps."scsnowman" = tl."scsnowman"; + deps."scratch" = tl."scratch"; deps."setdeck" = tl."setdeck"; deps."signchart" = tl."signchart"; deps."smartdiagram" = tl."smartdiagram"; deps."spath3" = tl."spath3"; + deps."spectralsequences" = tl."spectralsequences"; deps."swimgraf" = tl."swimgraf"; + deps."table-fct" = tl."table-fct"; deps."texdraw" = tl."texdraw"; deps."ticollege" = tl."ticollege"; deps."tipfr" = tl."tipfr"; @@ -6747,15 +7336,21 @@ tl: { # no indentation deps."tikz-dimline" = tl."tikz-dimline"; deps."tikz-feynman" = tl."tikz-feynman"; deps."tikz-inet" = tl."tikz-inet"; + deps."tikz-kalender" = tl."tikz-kalender"; deps."tikz-opm" = tl."tikz-opm"; + deps."tikz-optics" = tl."tikz-optics"; + deps."tikz-page" = tl."tikz-page"; deps."tikz-palattice" = tl."tikz-palattice"; deps."tikz-qtree" = tl."tikz-qtree"; deps."tikz-timing" = tl."tikz-timing"; + deps."tikzcodeblocks" = tl."tikzcodeblocks"; + deps."tikzducks" = tl."tikzducks"; deps."tikzinclude" = tl."tikzinclude"; deps."tikzmark" = tl."tikzmark"; deps."tikzorbital" = tl."tikzorbital"; deps."tikzpagenodes" = tl."tikzpagenodes"; deps."tikzpfeile" = tl."tikzpfeile"; + deps."tikzpeople" = tl."tikzpeople"; deps."tikzposter" = tl."tikzposter"; deps."tikzscale" = tl."tikzscale"; deps."tikzsymbols" = tl."tikzsymbols"; @@ -6779,39 +7374,102 @@ tl: { # no indentation deps."xypic" = tl."xypic"; sha512.run = ""; }; -"collection-plainextra" = { +"collection-plaingeneric" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; + deps."abbr" = tl."abbr"; + deps."abstyles" = tl."abstyles"; + deps."apnum" = tl."apnum"; + deps."autoaligne" = tl."autoaligne"; + deps."barr" = tl."barr"; + deps."bitelist" = tl."bitelist"; + deps."borceux" = tl."borceux"; + deps."c-pascal" = tl."c-pascal"; + deps."catcodes" = tl."catcodes"; + deps."chronosys" = tl."chronosys"; + deps."colorsep" = tl."colorsep"; + deps."dinat" = tl."dinat"; + deps."dirtree" = tl."dirtree"; + deps."docbytex" = tl."docbytex"; + deps."dowith" = tl."dowith"; + deps."eijkhout" = tl."eijkhout"; + deps."encxvlna" = tl."encxvlna"; + deps."epigram" = tl."epigram"; + deps."epsf" = tl."epsf"; deps."epsf-dvipdfmx" = tl."epsf-dvipdfmx"; + deps."fenixpar" = tl."fenixpar"; deps."figflow" = tl."figflow"; deps."fixpdfmag" = tl."fixpdfmag"; + deps."fltpoint" = tl."fltpoint"; + deps."fntproof" = tl."fntproof"; deps."font-change" = tl."font-change"; deps."fontch" = tl."fontch"; + deps."fontname" = tl."fontname"; + deps."gates" = tl."gates"; + deps."genmisc" = tl."genmisc"; deps."getoptk" = tl."getoptk"; deps."gfnotation" = tl."gfnotation"; + deps."gobble" = tl."gobble"; deps."graphics-pln" = tl."graphics-pln"; + deps."gtl" = tl."gtl"; + deps."hlist" = tl."hlist"; deps."hyplain" = tl."hyplain"; + deps."ifetex" = tl."ifetex"; + deps."iftex" = tl."iftex"; + deps."insbox" = tl."insbox"; deps."js-misc" = tl."js-misc"; + deps."kastrup" = tl."kastrup"; + deps."lambda-lists" = tl."lambda-lists"; + deps."langcode" = tl."langcode"; + deps."lecturer" = tl."lecturer"; + deps."librarian" = tl."librarian"; + deps."listofitems" = tl."listofitems"; + deps."mathdots" = tl."mathdots"; + deps."metatex" = tl."metatex"; + deps."midnight" = tl."midnight"; deps."mkpattern" = tl."mkpattern"; + deps."multido" = tl."multido"; + deps."navigator" = tl."navigator"; deps."newsletr" = tl."newsletr"; + deps."ofs" = tl."ofs"; + deps."olsak-misc" = tl."olsak-misc"; + deps."path" = tl."path"; + deps."pdf-trans" = tl."pdf-trans"; deps."pitex" = tl."pitex"; deps."placeins-plain" = tl."placeins-plain"; + deps."plainpkg" = tl."plainpkg"; deps."plipsum" = tl."plipsum"; deps."plnfss" = tl."plnfss"; deps."plstmary" = tl."plstmary"; deps."present" = tl."present"; + deps."randomlist" = tl."randomlist"; deps."resumemac" = tl."resumemac"; + deps."schemata" = tl."schemata"; + deps."shade" = tl."shade"; + deps."simplekv" = tl."simplekv"; + deps."systeme" = tl."systeme"; + deps."tabto-generic" = tl."tabto-generic"; + deps."termmenu" = tl."termmenu"; + deps."tex-ps" = tl."tex-ps"; + deps."tex4ht" = tl."tex4ht"; + deps."texapi" = tl."texapi"; deps."texinfo" = tl."texinfo"; deps."timetable" = tl."timetable"; + deps."tracklang" = tl."tracklang"; deps."treetex" = tl."treetex"; + deps."trigonometry" = tl."trigonometry"; + deps."ulem" = tl."ulem"; + deps."upca" = tl."upca"; deps."varisize" = tl."varisize"; deps."xii" = tl."xii"; + deps."xlop" = tl."xlop"; + deps."yax" = tl."yax"; sha512.run = ""; }; "collection-pstricks" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; - deps."collection-genericrecommended" = tl."collection-genericrecommended"; + deps."collection-plaingeneric" = tl."collection-plaingeneric"; deps."auto-pst-pdf" = tl."auto-pst-pdf"; deps."bclogo" = tl."bclogo"; deps."dsptricks" = tl."dsptricks"; @@ -6824,6 +7482,7 @@ tl: { # no indentation deps."pst-3d" = tl."pst-3d"; deps."pst-3dplot" = tl."pst-3dplot"; deps."pst-abspos" = tl."pst-abspos"; + deps."pst-arrow" = tl."pst-arrow"; deps."pst-am" = tl."pst-am"; deps."pst-asr" = tl."pst-asr"; deps."pst-bar" = tl."pst-bar"; @@ -6850,6 +7509,7 @@ tl: { # no indentation deps."pst-func" = tl."pst-func"; deps."pst-gantt" = tl."pst-gantt"; deps."pst-geo" = tl."pst-geo"; + deps."pst-geometrictools" = tl."pst-geometrictools"; deps."pst-ghsb" = tl."pst-ghsb"; deps."pst-gr3d" = tl."pst-gr3d"; deps."pst-grad" = tl."pst-grad"; @@ -6877,16 +7537,20 @@ tl: { # no indentation deps."pst-perspective" = tl."pst-perspective"; deps."pst-platon" = tl."pst-platon"; deps."pst-plot" = tl."pst-plot"; + deps."pst-poker" = tl."pst-poker"; deps."pst-poly" = tl."pst-poly"; deps."pst-pulley" = tl."pst-pulley"; deps."pst-qtree" = tl."pst-qtree"; + deps."pst-rputover" = tl."pst-rputover"; deps."pst-rubans" = tl."pst-rubans"; + deps."pst-shell" = tl."pst-shell"; deps."pst-sigsys" = tl."pst-sigsys"; deps."pst-slpe" = tl."pst-slpe"; deps."pst-solarsystem" = tl."pst-solarsystem"; deps."pst-solides3d" = tl."pst-solides3d"; deps."pst-soroban" = tl."pst-soroban"; deps."pst-spectra" = tl."pst-spectra"; + deps."pst-spinner" = tl."pst-spinner"; deps."pst-spirograph" = tl."pst-spirograph"; deps."pst-stru" = tl."pst-stru"; deps."pst-support" = tl."pst-support"; @@ -6897,6 +7561,7 @@ tl: { # no indentation deps."pst-tvz" = tl."pst-tvz"; deps."pst-uml" = tl."pst-uml"; deps."pst-vectorian" = tl."pst-vectorian"; + deps."pst-vehicle" = tl."pst-vehicle"; deps."pst-vowel" = tl."pst-vowel"; deps."pst-vue3d" = tl."pst-vue3d"; deps."pst2pdf" = tl."pst2pdf"; @@ -6914,6 +7579,7 @@ tl: { # no indentation deps."IEEEconf" = tl."IEEEconf"; deps."IEEEtran" = tl."IEEEtran"; deps."aastex" = tl."aastex"; + deps."abnt" = tl."abnt"; deps."abntex2" = tl."abntex2"; deps."acmart" = tl."acmart"; deps."acmconf" = tl."acmconf"; @@ -6933,14 +7599,19 @@ tl: { # no indentation deps."articleingud" = tl."articleingud"; deps."asaetr" = tl."asaetr"; deps."ascelike" = tl."ascelike"; + deps."aucklandthesis" = tl."aucklandthesis"; deps."bangorcsthesis" = tl."bangorcsthesis"; + deps."bangorexam" = tl."bangorexam"; deps."beamer-FUBerlin" = tl."beamer-FUBerlin"; deps."beamer-verona" = tl."beamer-verona"; + deps."beilstein" = tl."beilstein"; deps."bgteubner" = tl."bgteubner"; deps."br-lex" = tl."br-lex"; deps."brandeis-dissertation" = tl."brandeis-dissertation"; deps."cascadilla" = tl."cascadilla"; + deps."cesenaexam" = tl."cesenaexam"; deps."chem-journal" = tl."chem-journal"; + deps."cje" = tl."cje"; deps."classicthesis" = tl."classicthesis"; deps."cleanthesis" = tl."cleanthesis"; deps."cmpj" = tl."cmpj"; @@ -6965,24 +7636,33 @@ tl: { # no indentation deps."gaceta" = tl."gaceta"; deps."gatech-thesis" = tl."gatech-thesis"; deps."gradstudentresume" = tl."gradstudentresume"; + deps."grant" = tl."grant"; deps."gsemthesis" = tl."gsemthesis"; deps."gzt" = tl."gzt"; deps."h2020proposal" = tl."h2020proposal"; deps."har2nat" = tl."har2nat"; + deps."hecthese" = tl."hecthese"; + deps."hithesis" = tl."hithesis"; deps."hobete" = tl."hobete"; deps."hustthesis" = tl."hustthesis"; deps."icsv" = tl."icsv"; deps."ieeepes" = tl."ieeepes"; deps."ijmart" = tl."ijmart"; + deps."ijsra" = tl."ijsra"; deps."imac" = tl."imac"; deps."imtekda" = tl."imtekda"; + deps."iscram" = tl."iscram"; deps."jacow" = tl."jacow"; deps."jmlr" = tl."jmlr"; deps."jpsj" = tl."jpsj"; deps."kdgdocs" = tl."kdgdocs"; deps."kluwer" = tl."kluwer"; deps."ksp-thesis" = tl."ksp-thesis"; + deps."ku-template" = tl."ku-template"; deps."langsci" = tl."langsci"; + deps."limecv" = tl."limecv"; + deps."lion-msc" = tl."lion-msc"; + deps."lni" = tl."lni"; deps."lps" = tl."lps"; deps."matc3" = tl."matc3"; deps."matc3mem" = tl."matc3mem"; @@ -6990,13 +7670,16 @@ tl: { # no indentation deps."mentis" = tl."mentis"; deps."mnras" = tl."mnras"; deps."msu-thesis" = tl."msu-thesis"; + deps."mucproc" = tl."mucproc"; deps."mugsthesis" = tl."mugsthesis"; deps."musuos" = tl."musuos"; deps."muthesis" = tl."muthesis"; deps."mynsfc" = tl."mynsfc"; deps."nature" = tl."nature"; + deps."navydocs" = tl."navydocs"; deps."nddiss" = tl."nddiss"; deps."ndsu-thesis" = tl."ndsu-thesis"; + deps."novel" = tl."novel"; deps."nwejm" = tl."nwejm"; deps."nih" = tl."nih"; deps."nihbiosketch" = tl."nihbiosketch"; @@ -7017,6 +7700,7 @@ tl: { # no indentation deps."resumecls" = tl."resumecls"; deps."revtex" = tl."revtex"; deps."revtex4" = tl."revtex4"; + deps."rutitlepage" = tl."rutitlepage"; deps."ryethesis" = tl."ryethesis"; deps."sageep" = tl."sageep"; deps."sapthesis" = tl."sapthesis"; @@ -7051,6 +7735,7 @@ tl: { # no indentation deps."ucdavisthesis" = tl."ucdavisthesis"; deps."ucthesis" = tl."ucthesis"; deps."uestcthesis" = tl."uestcthesis"; + deps."uhhassignment" = tl."uhhassignment"; deps."uiucredborder" = tl."uiucredborder"; deps."uiucthesis" = tl."uiucthesis"; deps."ulthese" = tl."ulthese"; @@ -7059,6 +7744,7 @@ tl: { # no indentation deps."umich-thesis" = tl."umich-thesis"; deps."unamth-template" = tl."unamth-template"; deps."unamthesis" = tl."unamthesis"; + deps."unitn-bimrep" = tl."unitn-bimrep"; deps."unswcover" = tl."unswcover"; deps."uothesis" = tl."uothesis"; deps."urcls" = tl."urcls"; @@ -7075,84 +7761,6 @@ tl: { # no indentation deps."york-thesis" = tl."york-thesis"; sha512.run = ""; }; -"collection-science" = { - stripPrefix = 0; - deps."collection-latex" = tl."collection-latex"; - deps."SIstyle" = tl."SIstyle"; - deps."SIunits" = tl."SIunits"; - deps."alg" = tl."alg"; - deps."algorithm2e" = tl."algorithm2e"; - deps."algorithmicx" = tl."algorithmicx"; - deps."algorithms" = tl."algorithms"; - deps."biocon" = tl."biocon"; - deps."bitpattern" = tl."bitpattern"; - deps."bohr" = tl."bohr"; - deps."bpchem" = tl."bpchem"; - deps."bytefield" = tl."bytefield"; - deps."chemarrow" = tl."chemarrow"; - deps."chemcompounds" = tl."chemcompounds"; - deps."chemcono" = tl."chemcono"; - deps."chemexec" = tl."chemexec"; - deps."chemformula" = tl."chemformula"; - deps."chemgreek" = tl."chemgreek"; - deps."chemmacros" = tl."chemmacros"; - deps."chemnum" = tl."chemnum"; - deps."chemschemex" = tl."chemschemex"; - deps."chemstyle" = tl."chemstyle"; - deps."clrscode" = tl."clrscode"; - deps."clrscode3e" = tl."clrscode3e"; - deps."complexity" = tl."complexity"; - deps."computational-complexity" = tl."computational-complexity"; - deps."cryptocode" = tl."cryptocode"; - deps."digiconfigs" = tl."digiconfigs"; - deps."drawstack" = tl."drawstack"; - deps."dyntree" = tl."dyntree"; - deps."eltex" = tl."eltex"; - deps."endiagram" = tl."endiagram"; - deps."engtlc" = tl."engtlc"; - deps."fouridx" = tl."fouridx"; - deps."functan" = tl."functan"; - deps."galois" = tl."galois"; - deps."gastex" = tl."gastex"; - deps."gene-logic" = tl."gene-logic"; - deps."ghsystem" = tl."ghsystem"; - deps."gu" = tl."gu"; - deps."hep" = tl."hep"; - deps."hepnames" = tl."hepnames"; - deps."hepparticles" = tl."hepparticles"; - deps."hepthesis" = tl."hepthesis"; - deps."hepunits" = tl."hepunits"; - deps."karnaugh" = tl."karnaugh"; - deps."karnaughmap" = tl."karnaughmap"; - deps."lstbayes" = tl."lstbayes"; - deps."matlab-prettifier" = tl."matlab-prettifier"; - deps."mhchem" = tl."mhchem"; - deps."miller" = tl."miller"; - deps."mychemistry" = tl."mychemistry"; - deps."nuc" = tl."nuc"; - deps."nucleardata" = tl."nucleardata"; - deps."objectz" = tl."objectz"; - deps."physics" = tl."physics"; - deps."pseudocode" = tl."pseudocode"; - deps."pygmentex" = tl."pygmentex"; - deps."sasnrdisplay" = tl."sasnrdisplay"; - deps."sciposter" = tl."sciposter"; - deps."sclang-prettifier" = tl."sclang-prettifier"; - deps."sfg" = tl."sfg"; - deps."simpler-wick" = tl."simpler-wick"; - deps."simplewick" = tl."simplewick"; - deps."siunitx" = tl."siunitx"; - deps."steinmetz" = tl."steinmetz"; - deps."struktex" = tl."struktex"; - deps."substances" = tl."substances"; - deps."t-angles" = tl."t-angles"; - deps."textopo" = tl."textopo"; - deps."ulqda" = tl."ulqda"; - deps."unitsdef" = tl."unitsdef"; - deps."xymtex" = tl."xymtex"; - deps."youngtab" = tl."youngtab"; - sha512.run = ""; -}; "collection-texworks" = { stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; @@ -7167,6 +7775,7 @@ tl: { # no indentation stripPrefix = 0; deps."collection-basic" = tl."collection-basic"; deps."arabxetex" = tl."arabxetex"; + deps."awesomebox" = tl."awesomebox"; deps."bidi-atbegshi" = tl."bidi-atbegshi"; deps."bidicontour" = tl."bidicontour"; deps."bidipagegrid" = tl."bidipagegrid"; @@ -7177,24 +7786,25 @@ tl: { # no indentation deps."fontbook" = tl."fontbook"; deps."fontwrap" = tl."fontwrap"; deps."interchar" = tl."interchar"; - deps."mathspec" = tl."mathspec"; + deps."na-position" = tl."na-position"; deps."philokalia" = tl."philokalia"; - deps."polyglossia" = tl."polyglossia"; deps."ptext" = tl."ptext"; deps."quran" = tl."quran"; deps."realscripts" = tl."realscripts"; + deps."simple-resume-cv" = tl."simple-resume-cv"; + deps."simple-thesis-dissertation" = tl."simple-thesis-dissertation"; deps."ucharclasses" = tl."ucharclasses"; + deps."unicode-bidi" = tl."unicode-bidi"; deps."unisugar" = tl."unisugar"; deps."xebaposter" = tl."xebaposter"; + deps."xechangebar" = tl."xechangebar"; deps."xecjk" = tl."xecjk"; deps."xecolor" = tl."xecolor"; deps."xecyr" = tl."xecyr"; deps."xeindex" = tl."xeindex"; - deps."xepersian" = tl."xepersian"; deps."xesearch" = tl."xesearch"; deps."xespotcolor" = tl."xespotcolor"; deps."xetex" = tl."xetex"; - deps."xetex-def" = tl."xetex-def"; deps."xetex-itrans" = tl."xetex-itrans"; deps."xetex-pstricks" = tl."xetex-pstricks"; deps."xetex-tibetan" = tl."xetex-tibetan"; @@ -7202,8 +7812,6 @@ tl: { # no indentation deps."xetexfontinfo" = tl."xetexfontinfo"; deps."xetexko" = tl."xetexko"; deps."xevlna" = tl."xevlna"; - deps."xltxtra" = tl."xltxtra"; - deps."xunicode" = tl."xunicode"; sha512.run = ""; }; "collref" = { @@ -7245,7 +7853,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1.0"; + version = "1.2.0"; }; "colortab" = { stripPrefix = 0; @@ -7308,6 +7916,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.2.2"; }; +"combofont" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2"; +}; "comfortaa" = { stripPrefix = 0; sha512.run = ""; @@ -7321,7 +7936,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "comma" = { stripPrefix = 0; @@ -7350,7 +7965,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.7"; + version = "3.8"; }; "compactbib" = { stripPrefix = 0; @@ -7362,7 +7977,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.76"; + version = "0.81a"; }; "components-of-TeX" = { stripPrefix = 0; @@ -7373,7 +7988,7 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - version = "12.2"; + version = "12.3"; }; "computational-complexity" = { stripPrefix = 0; @@ -7451,6 +8066,7 @@ tl: { # no indentation deps."mflogo-font" = tl."mflogo-font"; deps."stmaryrd" = tl."stmaryrd"; deps."mptopdf" = tl."mptopdf"; + deps."context" = tl."context"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -7496,6 +8112,20 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"context-cmscbf" = { + stripPrefix = 0; + deps."context" = tl."context"; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; +"context-cmttbf" = { + stripPrefix = 0; + deps."context" = tl."context"; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "context-construction-plan" = { stripPrefix = 0; deps."context" = tl."context"; @@ -7531,12 +8161,6 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; -"context-fixme" = { - stripPrefix = 0; - deps."context" = tl."context"; - sha512.run = ""; - hasRunfiles = true; -}; "context-french" = { stripPrefix = 0; deps."context" = tl."context"; @@ -7551,14 +8175,6 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; -"context-games" = { - stripPrefix = 0; - deps."skaknew" = tl."skaknew"; - deps."context" = tl."context"; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; -}; "context-gantt" = { stripPrefix = 0; deps."context" = tl."context"; @@ -7574,6 +8190,20 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"context-inifile" = { + stripPrefix = 0; + deps."context" = tl."context"; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; +"context-layout" = { + stripPrefix = 0; + deps."context" = tl."context"; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "context-letter" = { stripPrefix = 0; deps."context" = tl."context"; @@ -7588,13 +8218,6 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; -"context-lilypond" = { - stripPrefix = 0; - deps."context" = tl."context"; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; -}; "context-mathsets" = { stripPrefix = 0; deps."context" = tl."context"; @@ -7705,6 +8328,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.0.1"; }; +"conv-xkv" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; "convbkmk" = { sha512.run = ""; sha512.doc = ""; @@ -7719,6 +8349,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.9b"; }; +"cooking-units" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.10"; +}; "cookingsymbols" = { stripPrefix = 0; sha512.run = ""; @@ -7790,6 +8428,20 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"cormorantgaramond" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "3.00"; +}; +"correctmathalign" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; +}; "coseoul" = { stripPrefix = 0; sha512.run = ""; @@ -7850,6 +8502,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; + version = "1.4"; }; "cprotect" = { stripPrefix = 0; @@ -7865,7 +8518,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.9.7"; + version = "1.20"; }; "crbox" = { stripPrefix = 0; @@ -7895,11 +8548,18 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"crossreftools" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; +}; "crossrefware" = { sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.0"; + version = "2.1a"; }; "crossword" = { stripPrefix = 0; @@ -7941,16 +8601,31 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "cslatex" = { deps."latex" = tl."latex"; + deps."cm" = tl."cm"; + deps."cslatex" = tl."cslatex"; + deps."csplain" = tl."csplain"; + deps."hyphen-base" = tl."hyphen-base"; + deps."latex-fonts" = tl."latex-fonts"; + deps."tex-ini-files" = tl."tex-ini-files"; sha512.run = ""; sha512.source = ""; hasRunfiles = true; }; "csplain" = { deps."tex" = tl."tex"; + deps."cm" = tl."cm"; + deps."cs" = tl."cs"; + deps."csplain" = tl."csplain"; + deps."hyphen-base" = tl."hyphen-base"; + deps."plain" = tl."plain"; + deps."enctex" = tl."enctex"; + deps."tex-ini-files" = tl."tex-ini-files"; + deps."luatex" = tl."luatex"; + deps."luatex85" = tl."luatex85"; sha512.run = ""; hasRunfiles = true; }; @@ -7959,7 +8634,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "5.1g"; + version = "5.2b"; }; "csquotes-de" = { stripPrefix = 0; @@ -7967,17 +8642,31 @@ tl: { # no indentation sha512.doc = ""; version = "1.01"; }; +"css-colors" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.02"; +}; "cstex" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; }; +"cstypo" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.03"; +}; "csvsimple" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.12"; + version = "1.20"; }; "ctable" = { stripPrefix = 0; @@ -8005,7 +8694,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.8.2"; + version = "1.9.1"; }; "ctanupload" = { sha512.run = ""; @@ -8020,7 +8709,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.4.2"; + version = "2.4.10"; }; "ctex-faq" = { stripPrefix = 0; @@ -8048,6 +8737,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.7"; }; +"currency" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.1"; +}; "currfile" = { stripPrefix = 0; sha512.run = ""; @@ -8090,7 +8787,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.53"; + version = "1.55"; }; "custom-bib" = { stripPrefix = 0; @@ -8125,7 +8822,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.64af"; + version = "3.64b"; }; "cweb-latex" = { stripPrefix = 0; @@ -8220,9 +8917,8 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "0.5"; + version = "0.6"; }; "datatool" = { stripPrefix = 0; @@ -8230,7 +8926,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.25"; + version = "2.27"; }; "dateiliste" = { stripPrefix = 0; @@ -8262,7 +8958,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5.1"; + version = "1.5.2"; }; "datetime2-bahasai" = { stripPrefix = 0; @@ -8382,7 +9078,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "1.02"; }; "datetime2-galician" = { stripPrefix = 0; @@ -8398,7 +9094,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "2.0"; }; "datetime2-greek" = { stripPrefix = 0; @@ -8502,7 +9198,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "1.01"; }; "datetime2-russian" = { stripPrefix = 0; @@ -8582,7 +9278,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "1.2"; }; "datetime2-usorbian" = { stripPrefix = 0; @@ -8613,7 +9309,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.4.1"; + version = "1.6"; }; "dcpic" = { stripPrefix = 0; @@ -8650,7 +9346,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.40"; + version = "0.41"; }; "dejavu" = { stripPrefix = 0; @@ -8659,6 +9355,13 @@ tl: { # no indentation hasRunfiles = true; version = "2.34"; }; +"dejavu-otf" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.02"; +}; "delim" = { stripPrefix = 0; sha512.run = ""; @@ -8674,6 +9377,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.0"; }; +"delimset" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "delimtxt" = { stripPrefix = 0; sha512.run = ""; @@ -8687,17 +9398,12 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.3"; + version = "0.7"; }; "detex" = { sha512.run = ""; sha512.doc = ""; }; -"devnag" = { - sha512.run = ""; - sha512.doc = ""; - version = "2.15.1"; -}; "dhua" = { stripPrefix = 0; sha512.run = ""; @@ -8718,7 +9424,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "diagmac2" = { stripPrefix = 0; @@ -8764,6 +9470,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"diffcoeff" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "digiconfigs" = { stripPrefix = 0; sha512.run = ""; @@ -8771,6 +9484,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.5"; }; +"dijkstra" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.11"; +}; "din1505" = { stripPrefix = 0; sha512.run = ""; @@ -8828,7 +9548,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.3.4"; + version = "1.5.0"; }; "dithesis" = { stripPrefix = 0; @@ -8881,7 +9601,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5.0"; + version = "1.6.0"; }; "docmfp" = { stripPrefix = 0; @@ -8899,6 +9619,11 @@ tl: { # no indentation hasRunfiles = true; version = "1.4"; }; +"docsurvey" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; +}; "doctools" = { stripPrefix = 0; sha512.run = ""; @@ -8996,7 +9721,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.2"; + version = "2.3"; }; "dozenal" = { stripPrefix = 0; @@ -9004,7 +9729,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "6.0"; + version = "7.1"; }; "dpfloat" = { stripPrefix = 0; @@ -9036,6 +9761,13 @@ tl: { # no indentation hasRunfiles = true; version = "2.16"; }; +"draftfigure" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2"; +}; "draftwatermark" = { stripPrefix = 0; sha512.run = ""; @@ -9064,7 +9796,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1.0"; + version = "1.5.0"; }; "drawstack" = { stripPrefix = 0; @@ -9121,13 +9853,21 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.04"; + version = "2.07a"; }; "dtl" = { sha512.run = ""; sha512.doc = ""; version = "0.6.1"; }; +"dtxdescribe" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.10"; +}; "dtxgallery" = { stripPrefix = 0; sha512.run = ""; @@ -9147,6 +9887,13 @@ tl: { # no indentation sha512.doc = ""; version = "2.1"; }; +"ducksay" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; +}; "duerer" = { stripPrefix = 0; sha512.run = ""; @@ -9215,24 +9962,22 @@ tl: { # no indentation hasRunfiles = true; version = "1.00"; }; +"dviinfox" = { + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.04"; +}; "dviljk" = { sha512.run = ""; sha512.doc = ""; }; "dvipdfmx" = { deps."glyphlist" = tl."glyphlist"; - deps."dvipdfmx-def" = tl."dvipdfmx-def"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; }; -"dvipdfmx-def" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; - version = "4.08"; -}; "dvipng" = { sha512.run = ""; sha512.doc = ""; @@ -9256,14 +10001,7 @@ tl: { # no indentation "dvisvgm" = { sha512.run = ""; sha512.doc = ""; - version = "1.15.1"; -}; -"dvisvgm-def" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; - version = "1.0a"; + version = "2.1.3"; }; "dynamicnumber" = { stripPrefix = 0; @@ -9280,6 +10018,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.2b"; }; +"dynkin-diagrams" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "dyntree" = { stripPrefix = 0; sha512.run = ""; @@ -9293,7 +10038,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "6.0"; + version = "6.01"; }; "ean" = { stripPrefix = 0; @@ -9328,6 +10073,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"easyformat" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.4.0"; +}; "easylist" = { stripPrefix = 0; sha512.run = ""; @@ -9381,7 +10133,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1"; + version = "2.0"; }; "ebsthesis" = { stripPrefix = 0; @@ -9412,6 +10164,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.3"; }; +"ecgdraw" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.1"; +}; "ecltree" = { stripPrefix = 0; sha512.run = ""; @@ -9568,7 +10328,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "ekaia" = { stripPrefix = 0; @@ -9576,7 +10336,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.02"; + version = "1.04"; }; "elbioimp" = { stripPrefix = 0; @@ -9608,14 +10368,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.24.11"; + version = "1.24.12"; }; "elements" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.2b"; }; "ellipse" = { stripPrefix = 0; @@ -9646,7 +10406,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.02"; + version = "0.03"; }; "elpres" = { stripPrefix = 0; @@ -9690,7 +10450,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.20"; + version = "1.23"; }; "emarks" = { stripPrefix = 0; @@ -9713,7 +10473,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.6d"; + version = "0.7"; +}; +"emf" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1"; }; "emisa" = { stripPrefix = 0; @@ -9721,7 +10488,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.1"; + version = "2.1.1"; }; "emp" = { stripPrefix = 0; @@ -9771,7 +10538,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5"; + version = "1.6"; }; "endiagram" = { stripPrefix = 0; @@ -9786,6 +10553,12 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"endofproofwd" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "engpron" = { stripPrefix = 0; sha512.run = ""; @@ -9821,7 +10594,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.8b"; + version = "0.9a"; }; "enumitem" = { stripPrefix = 0; @@ -9889,6 +10662,13 @@ tl: { # no indentation }; "eplain" = { deps."pdftex" = tl."pdftex"; + deps."babel" = tl."babel"; + deps."cm" = tl."cm"; + deps."eplain" = tl."eplain"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."latex-fonts" = tl."latex-fonts"; + deps."plain" = tl."plain"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; @@ -9946,7 +10726,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.24"; + version = "2.27"; }; "eqell" = { stripPrefix = 0; @@ -9962,6 +10742,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.1"; }; +"eqnalign" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0a"; +}; "eqname" = { stripPrefix = 0; sha512.run = ""; @@ -9975,13 +10763,20 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; +"eqnnumwarn" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "eqparbox" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "4.0"; + version = "4.1"; }; "erdc" = { stripPrefix = 0; @@ -9996,7 +10791,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.06"; + version = "1.08"; }; "errata" = { stripPrefix = 0; @@ -10017,7 +10812,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.0"; + version = "2.3"; }; "esdiff" = { stripPrefix = 0; @@ -10127,7 +10922,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.6"; + version = "2.7"; }; "etextools" = { stripPrefix = 0; @@ -10157,14 +10952,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.08g-doc"; + version = "1.08k"; }; "etoolbox" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.2a"; + version = "2.4"; }; "etoolbox-de" = { stripPrefix = 0; @@ -10196,6 +10991,13 @@ tl: { # no indentation hasRunfiles = true; version = "2.5"; }; +"eulerpx" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2.1"; +}; "eulervm" = { stripPrefix = 0; sha512.run = ""; @@ -10272,7 +11074,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.1.4"; }; "examdesign" = { stripPrefix = 0; @@ -10344,7 +11146,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "5.0b"; + version = "5.1b"; }; "export" = { stripPrefix = 0; @@ -10367,7 +11169,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.21b"; + version = "0.21i"; }; "exsol" = { stripPrefix = 0; @@ -10428,7 +11230,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.72"; + version = "3.02"; }; "facture" = { stripPrefix = 0; @@ -10436,7 +11238,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2.1"; + version = "1.2.2"; }; "faktor" = { stripPrefix = 0; @@ -10458,7 +11260,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.1"; + version = "3.9a"; }; "fancyhdr-it" = { stripPrefix = 0; @@ -10510,7 +11312,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.8"; + version = "1.9"; }; "fancytooltips" = { stripPrefix = 0; @@ -10547,7 +11349,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.11"; + version = "1.14"; }; "fbithesis" = { stripPrefix = 0; @@ -10613,7 +11415,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.0"; + version = "4.1"; }; "fenixpar" = { stripPrefix = 0; @@ -10628,7 +11430,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.6"; +}; +"fetchcls" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; }; "feupphdteses" = { stripPrefix = 0; @@ -10675,13 +11484,21 @@ tl: { # no indentation hasRunfiles = true; version = "1.25"; }; +"fgruler" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "fibeamer" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1.5"; + version = "1.1.7"; }; "fifinddo-info" = { stripPrefix = 0; @@ -10738,6 +11555,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; +"filecontentsdef" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.2"; +}; "filedate" = { stripPrefix = 0; sha512.run = ""; @@ -10800,7 +11625,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "4.1"; + version = "4.2"; }; "first-latex-doc" = { stripPrefix = 0; @@ -10821,7 +11646,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.3.40"; + version = "0.3.48"; }; "fix2col" = { stripPrefix = 0; @@ -10846,6 +11671,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.3a"; }; +"fixjfm" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.6"; +}; "fixlatvian" = { stripPrefix = 0; sha512.run = ""; @@ -10868,7 +11700,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "4.2"; + version = "4.4"; }; "fixmetodonotes" = { stripPrefix = 0; @@ -11003,7 +11835,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.01"; + version = "3.04"; }; "fn2end" = { stripPrefix = 0; @@ -11047,6 +11879,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.4e"; }; +"fnspe" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.2a"; +}; "fntproof" = { stripPrefix = 0; sha512.run = ""; @@ -11132,6 +11971,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.933"; }; +"fontloader-luaotfload" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "fontmfizz" = { stripPrefix = 0; sha512.run = ""; @@ -11154,7 +12000,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "fonts-tlwg" = { stripPrefix = 0; @@ -11162,7 +12008,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.6.3"; + version = "0.6.4"; }; "fontspec" = { stripPrefix = 0; @@ -11171,11 +12017,12 @@ tl: { # no indentation deps."l3packages" = tl."l3packages"; deps."xunicode" = tl."xunicode"; deps."lm" = tl."lm"; + deps."euenc" = tl."euenc"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.5a"; + version = "2.6e"; }; "fonttable" = { stripPrefix = 0; @@ -11183,7 +12030,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.6b"; + version = "1.6c"; }; "fontware" = { sha512.run = ""; @@ -11211,6 +12058,14 @@ tl: { # no indentation hasRunfiles = true; version = "5.5b"; }; +"footmisx" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "20161201"; +}; "footnotebackref" = { stripPrefix = 0; sha512.run = ""; @@ -11224,7 +12079,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.9e"; + version = "1.0"; }; "footnoterange" = { stripPrefix = 0; @@ -11259,11 +12114,17 @@ tl: { # no indentation }; "forest" = { stripPrefix = 0; + deps."elocalloc" = tl."elocalloc"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.0.3"; + version = "2.1.5"; +}; +"forest-quickstart" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; }; "forloop" = { stripPrefix = 0; @@ -11277,6 +12138,8 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; + sha512.source = ""; + version = "2016.11-3"; }; "formlett" = { stripPrefix = 0; @@ -11285,6 +12148,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.3"; }; +"forms16be" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.2"; +}; "formular" = { stripPrefix = 0; sha512.run = ""; @@ -11375,6 +12246,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"frederika2016" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.000_2016_initial_release"; +}; "frege" = { stripPrefix = 0; sha512.run = ""; @@ -11462,6 +12340,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"fvextra" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.3.1"; +}; "fwlw" = { stripPrefix = 0; sha512.run = ""; @@ -11592,7 +12478,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.00"; + version = "1.21"; }; "genmisc" = { stripPrefix = 0; @@ -11663,13 +12549,6 @@ tl: { # no indentation hasRunfiles = true; version = "1.4"; }; -"getargs" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; - version = "1.01"; -}; "getfiledate" = { stripPrefix = 0; sha512.run = ""; @@ -11689,7 +12568,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.8"; + version = "1.9"; }; "getoptk" = { stripPrefix = 0; @@ -11771,7 +12650,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "4.6"; + version = "4.8"; }; "gillcm" = { stripPrefix = 0; @@ -11802,6 +12681,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"gitfile-info" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.3"; +}; "gitinfo" = { stripPrefix = 0; sha512.run = ""; @@ -11843,7 +12730,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "4.25"; + version = "4.33"; }; "glossaries-danish" = { stripPrefix = 0; @@ -11875,7 +12762,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.06"; + version = "1.20"; }; "glossaries-french" = { stripPrefix = 0; @@ -11883,7 +12770,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "glossaries-german" = { stripPrefix = 0; @@ -12018,7 +12905,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.9.1"; + version = "0.9.2"; }; "go" = { stripPrefix = 0; @@ -12035,13 +12922,19 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"gofonts" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "gost" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2d"; + version = "1.2i"; }; "gothic" = { stripPrefix = 0; @@ -12050,6 +12943,14 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"gotoh" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.1"; +}; "gradientframe" = { stripPrefix = 0; sha512.run = ""; @@ -12071,6 +12972,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.3.5"; }; +"grant" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.0.3"; +}; "graphbox" = { stripPrefix = 0; sha512.run = ""; @@ -12081,6 +12990,7 @@ tl: { # no indentation }; "graphics" = { stripPrefix = 0; + deps."graphics-cfg" = tl."graphics-cfg"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; @@ -12092,6 +13002,12 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"graphics-def" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "graphics-pln" = { stripPrefix = 0; sha512.run = ""; @@ -12123,6 +13039,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.94"; }; +"grayhints" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; "greek-fontenc" = { stripPrefix = 0; sha512.run = ""; @@ -12167,7 +13090,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "4.1.4"; + version = "5.0.2"; }; "grfpaste" = { stripPrefix = 0; @@ -12242,6 +13165,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"gtrlib-largetrees" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; "gu" = { stripPrefix = 0; sha512.run = ""; @@ -12266,7 +13196,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.6"; + version = "0.7"; }; "guitlogo" = { stripPrefix = 0; @@ -12293,7 +13223,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.95a"; + version = "0.97"; }; "h2020proposal" = { stripPrefix = 0; @@ -12302,6 +13232,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"hackthefootline" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "hacm" = { stripPrefix = 0; sha512.run = ""; @@ -12309,12 +13245,20 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"halloweenmath" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.10a"; +}; "handout" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2.1a"; + version = "1.6.0"; }; "hands" = { stripPrefix = 0; @@ -12326,7 +13270,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.0"; + version = "2.1"; }; "hanging" = { stripPrefix = 0; @@ -12417,7 +13361,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "havannah" = { stripPrefix = 0; @@ -12440,6 +13384,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; +"hecthese" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.1"; +}; "helvetic" = { stripPrefix = 0; sha512.run = ""; @@ -12471,7 +13423,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.5.0"; + version = "1.5.1"; }; "hepunits" = { stripPrefix = 0; @@ -12491,7 +13443,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.08"; + version = "1.09"; }; "hexgame" = { stripPrefix = 0; @@ -12543,7 +13495,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1a"; + version = "1.2"; }; "hitec" = { stripPrefix = 0; @@ -12552,6 +13504,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.0beta"; }; +"hithesis" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0.2"; +}; "hletter" = { stripPrefix = 0; sha512.run = ""; @@ -12559,13 +13519,20 @@ tl: { # no indentation hasRunfiles = true; version = "4.2"; }; +"hlist" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.11"; +}; "hobby" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.7"; + version = "1.8"; }; "hobete" = { stripPrefix = 0; @@ -12617,14 +13584,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2"; + version = "1.4"; }; "hvfloat" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2a"; }; "hvindex" = { stripPrefix = 0; @@ -12661,7 +13628,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "6.83p"; + version = "6.85a"; }; "hyperref-docsrc" = { stripPrefix = 0; @@ -12674,7 +13641,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.9"; + version = "3.3"; }; "hyph-utf8" = { stripPrefix = 0; @@ -12724,6 +13691,13 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"hyphen-belarusian" = { + stripPrefix = 0; + deps."hyphen-base" = tl."hyphen-base"; + deps."hyph-utf8" = tl."hyph-utf8"; + sha512.run = ""; + hasRunfiles = true; +}; "hyphen-bulgarian" = { stripPrefix = 0; deps."hyphen-base" = tl."hyphen-base"; @@ -13245,7 +14219,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.4"; + version = "0.4a"; +}; +"ifptex" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.2c"; }; "ifsym" = { stripPrefix = 0; @@ -13275,6 +14256,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.6"; }; +"ifxptex" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1b"; +}; "iitem" = { stripPrefix = 0; sha512.run = ""; @@ -13298,6 +14286,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"ijsra" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; +}; "imac" = { stripPrefix = 0; sha512.run = ""; @@ -13317,7 +14312,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.3c"; + version = "1.3e"; }; "imfellenglish" = { stripPrefix = 0; @@ -13382,7 +14377,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.10"; + version = "1.113"; }; "index" = { stripPrefix = 0; @@ -13496,6 +14491,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"invoice2" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; "ionumbers" = { stripPrefix = 0; sha512.run = ""; @@ -13522,7 +14524,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.3b"; + version = "0.4a"; +}; +"iscram" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0.2"; }; "iso" = { stripPrefix = 0; @@ -13570,6 +14579,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"isopt" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.01"; +}; "isorot" = { stripPrefix = 0; sha512.run = ""; @@ -13593,6 +14609,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"istgame" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "itnumpar" = { stripPrefix = 0; sha512.run = ""; @@ -13633,6 +14656,34 @@ tl: { # no indentation deps."passivetex" = tl."passivetex"; deps."pdftex" = tl."pdftex"; deps."tex" = tl."tex"; + deps."amsfonts" = tl."amsfonts"; + deps."babel" = tl."babel"; + deps."cm" = tl."cm"; + deps."colortbl" = tl."colortbl"; + deps."cyrillic" = tl."cyrillic"; + deps."ec" = tl."ec"; + deps."fancyhdr" = tl."fancyhdr"; + deps."graphics" = tl."graphics"; + deps."graphics-cfg" = tl."graphics-cfg"; + deps."graphics-def" = tl."graphics-def"; + deps."hyperref" = tl."hyperref"; + deps."hyphen-base" = tl."hyphen-base"; + deps."ifxetex" = tl."ifxetex"; + deps."jadetex" = tl."jadetex"; + deps."latex-fonts" = tl."latex-fonts"; + deps."latexconfig" = tl."latexconfig"; + deps."marvosym" = tl."marvosym"; + deps."oberdiek" = tl."oberdiek"; + deps."psnfss" = tl."psnfss"; + deps."stmaryrd" = tl."stmaryrd"; + deps."symbol" = tl."symbol"; + deps."tex-ini-files" = tl."tex-ini-files"; + deps."tipa" = tl."tipa"; + deps."tools" = tl."tools"; + deps."ulem" = tl."ulem"; + deps."url" = tl."url"; + deps."wasysym" = tl."wasysym"; + deps."zapfding" = tl."zapfding"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; @@ -13646,14 +14697,6 @@ tl: { # no indentation hasRunfiles = true; version = "1.12"; }; -"japanese" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - sha512.source = ""; - hasRunfiles = true; - version = "1.3"; -}; "japanese-otf" = { stripPrefix = 0; sha512.run = ""; @@ -13669,14 +14712,13 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.17"; + version = "0.18"; }; -"jfontmaps" = { +"jfmutil" = { sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "20151002.0"; + version = "1.1.0"; }; "jknapltx" = { stripPrefix = 0; @@ -13690,13 +14732,19 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"jlreq" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "jmlr" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.21"; + version = "1.24"; }; "jmn" = { stripPrefix = 0; @@ -13735,7 +14783,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2"; + version = "1.5"; }; "jumplines" = { stripPrefix = 0; @@ -13811,6 +14859,14 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"karnaugh-map" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.1"; +}; "karnaughmap" = { stripPrefix = 0; sha512.run = ""; @@ -13856,6 +14912,14 @@ tl: { # no indentation hasRunfiles = true; version = "3.1415"; }; +"keyfloat" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.15"; +}; "keyreader" = { stripPrefix = 0; sha512.run = ""; @@ -13917,6 +14981,14 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"knowledge" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.08"; +}; "knuth" = { stripPrefix = 0; sha512.run = ""; @@ -13949,7 +15021,7 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; hasRunfiles = true; - version = "3.20"; + version = "3.24"; }; "koma-script-examples" = { stripPrefix = 0; @@ -13969,7 +15041,15 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0.1"; + version = "1.1.1"; +}; +"komacv-rg" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.9"; }; "kotex-oblivoir" = { stripPrefix = 0; @@ -13978,7 +15058,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.1.7"; + version = "2.1.8"; }; "kotex-plain" = { stripPrefix = 0; @@ -14035,6 +15115,12 @@ tl: { # no indentation hasRunfiles = true; version = "05.34"; }; +"ku-template" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "kurier" = { stripPrefix = 0; sha512.run = ""; @@ -14084,7 +15170,6 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "SVN_6608"; }; "l3experimental" = { stripPrefix = 0; @@ -14092,7 +15177,6 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "SVN_6495"; }; "l3kernel" = { stripPrefix = 0; @@ -14100,7 +15184,6 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "SVN_6512"; }; "l3packages" = { stripPrefix = 0; @@ -14108,7 +15191,6 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "SVN_6512"; }; "labbook" = { stripPrefix = 0; @@ -14136,6 +15218,12 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; }; +"ladder" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "lambda" = { stripPrefix = 0; sha512.run = ""; @@ -14194,6 +15282,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; + version = "2017-01-01_PL1"; }; "latex-bib-ex" = { stripPrefix = 0; @@ -14207,6 +15296,13 @@ tl: { # no indentation }; "latex-bin" = { deps."latex" = tl."latex"; + deps."babel" = tl."babel"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."latex-fonts" = tl."latex-fonts"; + deps."tex-ini-files" = tl."tex-ini-files"; + deps."latexconfig" = tl."latexconfig"; + deps."unicode-data" = tl."unicode-data"; sha512.run = ""; sha512.doc = ""; }; @@ -14249,7 +15345,13 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.2.2"; + version = "2.2.3"; +}; +"latex-mr" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + version = "1.0"; }; "latex-notes-zh-cn" = { stripPrefix = 0; @@ -14257,12 +15359,24 @@ tl: { # no indentation sha512.doc = ""; version = "1.20"; }; +"latex-papersize" = { + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.62"; +}; "latex-referenz" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; version = "2"; }; +"latex-refsheet" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + version = "1.2"; +}; "latex-tabellen" = { stripPrefix = 0; sha512.run = ""; @@ -14303,7 +15417,13 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.24"; + version = "1.26"; +}; +"latex2nemeth" = { + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; }; "latex4wp" = { stripPrefix = 0; @@ -14317,6 +15437,21 @@ tl: { # no indentation sha512.doc = ""; version = "1.0.10"; }; +"latexbangla" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2"; +}; +"latexbug" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0d"; +}; "latexcheat" = { stripPrefix = 0; sha512.run = ""; @@ -14363,7 +15498,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1.1"; + version = "1.2.1"; }; "latexfileinfo-pkgs" = { stripPrefix = 0; @@ -14379,18 +15514,25 @@ tl: { # no indentation hasRunfiles = true; version = "0.3"; }; +"latexgit" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; "latexindent" = { sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.1R"; + version = "3.3"; }; "latexmk" = { sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "4.45"; + version = "4.52c"; }; "latexmp" = { stripPrefix = 0; @@ -14403,15 +15545,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "lato" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "2.2"; + version = "3.0"; }; "layaureo" = { stripPrefix = 0; @@ -14478,7 +15619,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.3a"; + version = "0.5b"; }; "leaflet" = { stripPrefix = 0; @@ -14486,7 +15627,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1a"; + version = "1.1b"; }; "lecturer" = { stripPrefix = 0; @@ -14500,7 +15641,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.19.3"; + version = "0.19.4"; }; "leftidx" = { stripPrefix = 0; @@ -14515,7 +15656,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "2.0"; }; "lengthconvert" = { stripPrefix = 0; @@ -14530,7 +15671,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.353"; + version = "3.000"; }; "lettrine" = { stripPrefix = 0; @@ -14615,21 +15756,21 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.00"; + version = "1.01"; }; "libertinus" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "6.2"; + version = "6.4"; }; "libertinust1math" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.00"; + version = "1.1.4"; }; "libgreek" = { stripPrefix = 0; @@ -14685,7 +15826,15 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.1"; + version = "2.2"; +}; +"limecv" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.1.1"; }; "linearA" = { stripPrefix = 0; @@ -14710,6 +15859,12 @@ tl: { # no indentation hasRunfiles = true; version = "4.41"; }; +"ling-macros" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "linguex" = { stripPrefix = 0; sha512.run = ""; @@ -14724,6 +15879,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"lion-msc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.27"; +}; "lipsum" = { stripPrefix = 0; sha512.run = ""; @@ -14783,6 +15945,13 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"listofitems" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.5"; +}; "listofsymbols" = { stripPrefix = 0; sha512.run = ""; @@ -14835,6 +16004,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"lni" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.3"; +}; "lobster2" = { stripPrefix = 0; sha512.run = ""; @@ -14900,11 +16077,21 @@ tl: { # no indentation version = "1.0"; }; "lollipop" = { + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."lollipop" = tl."lollipop"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; version = "1.07"; }; +"longdivision" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "longfbox" = { stripPrefix = 0; sha512.run = ""; @@ -14987,7 +16174,7 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - version = "5.0.5"; + version = "5.10"; }; "lshort-czech" = { stripPrefix = 0; @@ -15028,7 +16215,7 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - version = "3.0a"; + version = "3.0b"; }; "lshort-italian" = { stripPrefix = 0; @@ -15135,7 +16322,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1.5"; + version = "0.1.8"; }; "ltablex" = { stripPrefix = 0; @@ -15151,6 +16338,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.74d"; }; +"ltb2bib" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.01"; +}; "ltxdockit" = { stripPrefix = 0; sha512.run = ""; @@ -15217,7 +16412,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.4"; + version = "0.5"; }; "lua-visual-debug" = { stripPrefix = 0; @@ -15255,6 +16450,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.2a"; }; +"luahyphenrules" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "luaindex" = { stripPrefix = 0; sha512.run = ""; @@ -15295,7 +16497,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.6"; + version = "1.7"; }; "lualibs" = { stripPrefix = 0; @@ -15303,7 +16505,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.4"; + version = "2.5"; +}; +"luamesh" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.51"; }; "luamplib" = { stripPrefix = 0; @@ -15311,14 +16520,22 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.11.3"; + version = "2.12.1"; }; "luaotfload" = { + deps."lualibs" = tl."lualibs"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.7-fix-3"; + version = "2.8-fix-2"; +}; +"luapackageloader" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; }; "luasseq" = { stripPrefix = 0; @@ -15328,17 +16545,18 @@ tl: { # no indentation hasRunfiles = true; }; "luatex" = { + deps."cm" = tl."cm"; + deps."etex" = tl."etex"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."luatex" = tl."luatex"; + deps."plain" = tl."plain"; + deps."tex-ini-files" = tl."tex-ini-files"; + deps."unicode-data" = tl."unicode-data"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; }; -"luatex-def" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; - version = "0.01e"; -}; "luatex85" = { stripPrefix = 0; sha512.run = ""; @@ -15361,14 +16579,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "20160618.0"; + version = "20170904.0"; }; "luatexko" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.15"; + version = "1.18"; }; "luatextra" = { stripPrefix = 0; @@ -15384,7 +16602,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.3"; + version = "0.4"; }; "luaxml" = { stripPrefix = 0; @@ -15393,6 +16611,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.0.2"; }; +"lwarp" = { + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.41"; +}; "lxfonts" = { stripPrefix = 0; sha512.run = ""; @@ -15460,7 +16685,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1b"; + version = "0.1c"; }; "makebarcode" = { stripPrefix = 0; @@ -15532,6 +16757,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.0.6"; }; +"maker" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "makeshape" = { stripPrefix = 0; sha512.run = ""; @@ -15546,7 +16778,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.5.1"; + version = "2.6.1"; }; "manfnt" = { stripPrefix = 0; @@ -15575,6 +16807,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0c"; }; +"marginfit" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "marginfix" = { stripPrefix = 0; sha512.run = ""; @@ -15589,7 +16829,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2"; + version = "1.2b"; }; "markdown" = { stripPrefix = 0; @@ -15597,7 +16837,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0.1"; + version = "2.5.4"; }; "marvosym" = { stripPrefix = 0; @@ -15634,6 +16874,11 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; }; +"math-into-latex-4" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; +}; "mathabx" = { stripPrefix = 0; sha512.run = ""; @@ -15652,7 +16897,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.08"; + version = "1.09"; }; "mathastext" = { stripPrefix = 0; @@ -15660,7 +16905,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.3p"; + version = "1.3r"; }; "mathcomp" = { stripPrefix = 0; @@ -15709,6 +16954,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.003"; }; +"mathpunctspace" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "maths-symbols" = { stripPrefix = 0; sha512.run = ""; @@ -15720,7 +16972,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.2b"; }; "mathspic" = { sha512.run = ""; @@ -15734,7 +16986,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.18"; + version = "1.19"; }; "matlab-prettifier" = { stripPrefix = 0; @@ -15779,12 +17031,19 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"mcexam" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.3"; +}; "mcf2graph" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.94"; + version = "4.28"; }; "mcite" = { stripPrefix = 0; @@ -15846,7 +17105,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.69"; + version = "0.86"; }; "medstarbeamer" = { stripPrefix = 0; @@ -15890,6 +17149,17 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"mendex-doc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; +}; +"mensa-tex" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "mentis" = { stripPrefix = 0; sha512.run = ""; @@ -15912,7 +17182,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "merriweather" = { stripPrefix = 0; @@ -15922,6 +17192,7 @@ tl: { # no indentation }; "metafont" = { deps."kpathsea" = tl."kpathsea"; + deps."metafont" = tl."metafont"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -15983,7 +17254,7 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.source = ""; - version = "0.55"; + version = "0.56"; }; "metauml" = { stripPrefix = 0; @@ -16021,6 +17292,13 @@ tl: { # no indentation deps."hyphen-polish" = tl."hyphen-polish"; deps."pdftex" = tl."pdftex"; deps."tex" = tl."tex"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."mex" = tl."mex"; + deps."plain" = tl."plain"; + deps."tex-ini-files" = tl."tex-ini-files"; + deps."enctex" = tl."enctex"; + deps."utf8mex" = tl."utf8mex"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; @@ -16039,7 +17317,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.02"; + version = "2.04"; }; "mflogo" = { stripPrefix = 0; @@ -16098,8 +17376,17 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"mgltex" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "4.2"; +}; "mhchem" = { stripPrefix = 0; + deps."chemgreek" = tl."chemgreek"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -16125,7 +17412,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.6a"; + version = "2.7"; }; "microtype-de" = { stripPrefix = 0; @@ -16146,11 +17433,6 @@ tl: { # no indentation hasRunfiles = true; version = "1.1a"; }; -"mil3" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; -}; "miller" = { stripPrefix = 0; sha512.run = ""; @@ -16159,6 +17441,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"milog" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "minibox" = { stripPrefix = 0; sha512.run = ""; @@ -16167,6 +17456,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.2a"; }; +"minidocument" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "minifp" = { stripPrefix = 0; sha512.run = ""; @@ -16209,7 +17506,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.2.1"; + version = "2.5"; }; "mintspirit" = { stripPrefix = 0; @@ -16223,7 +17520,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.8d"; + version = "1.8f"; +}; +"missaali" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.004"; }; "mkgrkindex" = { sha512.run = ""; @@ -16267,6 +17571,14 @@ tl: { # no indentation }; "mltex" = { deps."latex" = tl."latex"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."babel" = tl."babel"; + deps."latexconfig" = tl."latexconfig"; + deps."latex-fonts" = tl."latex-fonts"; + deps."knuth-lib" = tl."knuth-lib"; + deps."mltex" = tl."mltex"; + deps."plain" = tl."plain"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -16340,6 +17652,12 @@ tl: { # no indentation hasRunfiles = true; version = "1"; }; +"modular" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "mongolian-babel" = { stripPrefix = 0; sha512.run = ""; @@ -16364,6 +17682,13 @@ tl: { # no indentation hasRunfiles = true; version = "IVu.04.092"; }; +"montserrat" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.01"; +}; "moodle" = { stripPrefix = 0; sha512.run = ""; @@ -16417,7 +17742,6 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.2e"; }; "movie15" = { stripPrefix = 0; @@ -16475,11 +17799,28 @@ tl: { # no indentation sha512.doc = ""; version = "1.004"; }; +"mpostinl" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.12"; +}; "mptopdf" = { + deps."mptopdf" = tl."mptopdf"; + deps."plain" = tl."plain"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; }; +"mptrees" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "17.06"; +}; "ms" = { stripPrefix = 0; sha512.run = ""; @@ -16513,7 +17854,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.6b"; + version = "2.7"; }; "mtgreek" = { stripPrefix = 0; @@ -16523,6 +17864,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.1+"; }; +"mucproc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.02"; +}; "mugsthesis" = { stripPrefix = 0; sha512.run = ""; @@ -16606,6 +17955,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.4"; }; +"multilang" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.9"; +}; "multiobjective" = { stripPrefix = 0; sha512.run = ""; @@ -16618,8 +17975,9 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; + sha512.source = ""; hasRunfiles = true; - version = "1.6"; + version = "2.2"; }; "munich" = { stripPrefix = 0; @@ -16627,6 +17985,12 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"musicography" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "musixguit" = { stripPrefix = 0; sha512.run = ""; @@ -16639,7 +18003,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.23"; + version = "1.25"; }; "musixtex-fonts" = { stripPrefix = 0; @@ -16681,7 +18045,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.74"; + version = "0.75"; }; "mwe" = { stripPrefix = 0; @@ -16733,7 +18097,21 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.00"; + version = "1.01"; +}; +"na-box" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; +"na-position" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; }; "nag" = { stripPrefix = 0; @@ -16749,7 +18127,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.5"; + version = "3.2"; }; "namespc" = { stripPrefix = 0; @@ -16806,6 +18184,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"navydocs" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.1"; +}; "ncclatex" = { stripPrefix = 0; sha512.run = ""; @@ -16832,7 +18218,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.0"; + version = "3.2017.2"; }; "ndsu-thesis" = { stripPrefix = 0; @@ -16902,7 +18288,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.295"; + version = "1.321"; }; "newsletr" = { stripPrefix = 0; @@ -16920,24 +18306,25 @@ tl: { # no indentation }; "newtx" = { stripPrefix = 0; + deps."kastrup" = tl."kastrup"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.466"; + version = "1.527"; }; "newtxsf" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.04"; + version = "1.05"; }; "newtxtt" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.052"; + version = "1.055"; }; "newunicodechar" = { stripPrefix = 0; @@ -16991,6 +18378,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.1c"; }; +"niceframe-type1" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "nicetext" = { stripPrefix = 0; sha512.run = ""; @@ -17031,7 +18424,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.04"; + version = "1.06"; }; "nmbib" = { stripPrefix = 0; @@ -17048,6 +18441,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"nodetree" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.2"; +}; "noindentafter" = { stripPrefix = 0; sha512.run = ""; @@ -17147,6 +18548,26 @@ tl: { # no indentation hasRunfiles = true; version = "2.0k"; }; +"notespages" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.8.1"; +}; +"notestex" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; +"notex-bst" = { + stripPrefix = 0; + sha512.run = ""; + hasRunfiles = true; +}; "noto" = { stripPrefix = 0; sha512.run = ""; @@ -17159,6 +18580,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"novel" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.43"; +}; "nowidow" = { stripPrefix = 0; sha512.run = ""; @@ -17217,6 +18645,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; + version = "1.01d"; }; "numberedblock" = { stripPrefix = 0; @@ -17238,6 +18667,12 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"numnameru" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "numprint" = { stripPrefix = 0; sha512.run = ""; @@ -17246,13 +18681,20 @@ tl: { # no indentation hasRunfiles = true; version = "1.39"; }; +"numspell" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.2"; +}; "nwejm" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.97"; + version = "0.98d"; }; "oberdiek" = { stripPrefix = 0; @@ -17295,7 +18737,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.17"; + version = "0.32"; }; "ocherokee" = { stripPrefix = 0; @@ -17322,6 +18764,12 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"octave" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "octavo" = { stripPrefix = 0; sha512.run = ""; @@ -17361,7 +18809,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2"; + version = "2.0"; }; "oldlatin" = { stripPrefix = 0; @@ -17374,9 +18822,8 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "2.0.2"; + version = "2.2"; }; "oldstyle" = { stripPrefix = 0; @@ -17386,6 +18833,12 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"olsak-misc" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "omega" = { stripPrefix = 0; sha512.run = ""; @@ -17402,7 +18855,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.10"; + version = "0.20"; }; "onrannual" = { stripPrefix = 0; @@ -17427,6 +18880,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"oplotsymbl" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.4"; +}; "opteng" = { stripPrefix = 0; sha512.run = ""; @@ -17439,7 +18899,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "2.5"; }; "optional" = { stripPrefix = 0; @@ -17474,7 +18934,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "ot-tableau" = { stripPrefix = 0; @@ -17528,6 +18988,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"overlays" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "2.7"; +}; "overlock" = { stripPrefix = 0; sha512.run = ""; @@ -17538,8 +19005,9 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; + sha512.source = ""; hasRunfiles = true; - version = "0.53"; + version = "1.0"; }; "pacioli" = { stripPrefix = 0; @@ -17548,13 +19016,20 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"padauk" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "3.002"; +}; "pagecolor" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0h"; + version = "1.0i"; }; "pagecont" = { stripPrefix = 0; @@ -17643,7 +19118,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.5"; + version = "2.7"; }; "parallel" = { stripPrefix = 0; @@ -17671,7 +19146,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1"; + version = "3"; }; "parrun" = { stripPrefix = 0; @@ -17700,7 +19175,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.09d"; + version = "1.6"; }; "pas-crosswords" = { stripPrefix = 0; @@ -17780,7 +19255,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.1k"; + version = "0.1l"; }; "pb-diagram" = { stripPrefix = 0; @@ -17859,6 +19334,12 @@ tl: { # no indentation hasRunfiles = true; version = "2.02"; }; +"pdflatexpicscale" = { + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.31"; +}; "pdfmarginpar" = { stripPrefix = 0; sha512.run = ""; @@ -17880,7 +19361,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.5f"; + version = "0.5k"; +}; +"pdfreview" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; }; "pdfscreen" = { stripPrefix = 0; @@ -17903,17 +19391,16 @@ tl: { # no indentation }; "pdftex" = { deps."kpathsea" = tl."kpathsea"; + deps."cm" = tl."cm"; + deps."etex" = tl."etex"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."plain" = tl."plain"; + deps."tex-ini-files" = tl."tex-ini-files"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; }; -"pdftex-def" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; - version = "0.06h"; -}; "pdftools" = { sha512.run = ""; sha512.doc = ""; @@ -17946,7 +19433,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5.8"; + version = "1.5.84"; }; "pdfxup" = { sha512.run = ""; @@ -17978,7 +19465,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.0"; + version = "2.2"; }; "perltex" = { sha512.run = ""; @@ -18022,7 +19509,7 @@ tl: { # no indentation }; "pgf" = { stripPrefix = 0; - deps."xkeyval" = tl."xkeyval"; + deps."ms" = tl."ms"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; @@ -18109,7 +19596,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.13"; + version = "1.15"; }; "phaistos" = { stripPrefix = 0; @@ -18119,6 +19606,62 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"phffullpagefigure" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; +"phfnote" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; +"phfparen" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; +"phfqit" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "2.0"; +}; +"phfquotetext" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; +"phfsvnwatermark" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; +"phfthm" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "philex" = { stripPrefix = 0; sha512.run = ""; @@ -18132,7 +19675,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "philosophersimprint" = { stripPrefix = 0; @@ -18140,7 +19683,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.3"; + version = "1.4"; +}; +"phonenumbers" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "2.0"; }; "phonetic" = { stripPrefix = 0; @@ -18153,7 +19703,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2.0"; + version = "1.3.2"; }; "photo" = { stripPrefix = 0; @@ -18273,7 +19823,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.7.3"; + version = "1.7.4"; }; "pl" = { stripPrefix = 0; @@ -18288,7 +19838,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.1"; + version = "0.1d1"; }; "placeins" = { stripPrefix = 0; @@ -18345,11 +19895,29 @@ tl: { # no indentation }; "platex" = { deps."ptex" = tl."ptex"; + deps."babel" = tl."babel"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."latex" = tl."latex"; + deps."latex-fonts" = tl."latex-fonts"; + deps."ptex-fonts" = tl."ptex-fonts"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; }; +"platex-tools" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; +"platexcheat" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + version = "2.0"; +}; "play" = { stripPrefix = 0; sha512.run = ""; @@ -18403,7 +19971,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.74"; + version = "2.76"; }; "pmxchords" = { sha512.run = ""; @@ -18423,7 +19991,15 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.72"; + version = "2.85"; +}; +"poetry" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; }; "poetrytex" = { stripPrefix = 0; @@ -18441,7 +20017,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.3.3"; + version = "1.3.4"; }; "poltawski" = { stripPrefix = 0; @@ -18469,7 +20045,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.17"; + version = "0.19"; }; "polynomial" = { stripPrefix = 0; @@ -18506,7 +20082,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5a"; + version = "1.5c"; }; "powerdot-FUBerlin" = { stripPrefix = 0; @@ -18584,14 +20160,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "11.89"; + version = "11.91"; }; "prftree" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "printlen" = { stripPrefix = 0; @@ -18613,7 +20189,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.04"; + version = "3.05"; }; "procIAGssymp" = { stripPrefix = 0; @@ -18640,7 +20216,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.3.12"; + version = "3.3.14"; }; "progress" = { stripPrefix = 0; @@ -18662,14 +20238,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.01"; + version = "1.02"; }; "prooftrees" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.4"; + version = "0.6"; }; "properties" = { stripPrefix = 0; @@ -18697,7 +20273,6 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.5"; }; "protocol" = { stripPrefix = 0; @@ -18808,7 +20383,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.01"; + version = "2.04"; }; "pst-abspos" = { stripPrefix = 0; @@ -18826,6 +20401,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.02"; }; +"pst-arrow" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.01"; +}; "pst-asr" = { stripPrefix = 0; sha512.run = ""; @@ -18846,15 +20428,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.15"; + version = "0.18"; }; "pst-bezier" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "0.01"; + version = "0.03"; }; "pst-blur" = { stripPrefix = 0; @@ -18883,14 +20464,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.05"; + version = "1.06"; }; "pst-circ" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.13"; + version = "2.14"; }; "pst-coil" = { stripPrefix = 0; @@ -18943,7 +20524,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.52"; + version = "1.56"; }; "pst-eucl-translation-bg" = { stripPrefix = 0; @@ -18956,7 +20537,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.05"; + version = "0.06"; }; "pst-fill" = { stripPrefix = 0; @@ -18970,9 +20551,8 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "0.01"; + version = "0.02"; }; "pst-fr3d" = { stripPrefix = 0; @@ -19002,7 +20582,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.82"; + version = "0.88"; }; "pst-gantt" = { stripPrefix = 0; @@ -19016,7 +20596,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.03"; + version = "0.06"; +}; +"pst-geometrictools" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; }; "pst-ghsb" = { stripPrefix = 0; @@ -19132,7 +20719,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.36"; + version = "1.39"; }; "pst-ob3d" = { stripPrefix = 0; @@ -19147,7 +20734,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.7"; + version = "0.11"; }; "pst-optexp" = { stripPrefix = 0; @@ -19161,9 +20748,8 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "1.01"; + version = "1.02"; }; "pst-osci" = { stripPrefix = 0; @@ -19177,7 +20763,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.07"; + version = "0.07a"; }; "pst-pad" = { stripPrefix = 0; @@ -19192,7 +20778,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1v"; + version = "1.2d"; }; "pst-pdgr" = { stripPrefix = 0; @@ -19222,7 +20808,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.75"; + version = "1.84"; +}; +"pst-poker" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.02"; }; "pst-poly" = { stripPrefix = 0; @@ -19235,9 +20828,8 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "0.01"; + version = "0.02"; }; "pst-qtree" = { stripPrefix = 0; @@ -19245,6 +20837,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"pst-rputover" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "pst-rubans" = { stripPrefix = 0; sha512.run = ""; @@ -19253,6 +20852,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"pst-shell" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.03"; +}; "pst-sigsys" = { stripPrefix = 0; sha512.run = ""; @@ -19272,16 +20879,15 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "0.12"; + version = "0.13"; }; "pst-solides3d" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "4.30"; + version = "4.34"; }; "pst-soroban" = { stripPrefix = 0; @@ -19298,6 +20904,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.91"; }; +"pst-spinner" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.02"; +}; "pst-spirograph" = { stripPrefix = 0; sha512.run = ""; @@ -19338,15 +20951,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.05"; + version = "0.09"; }; "pst-tree" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - sha512.source = ""; hasRunfiles = true; - version = "1.12"; + version = "1.13"; }; "pst-tvz" = { stripPrefix = 0; @@ -19372,6 +20984,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.4"; }; +"pst-vehicle" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.2"; +}; "pst-vowel" = { stripPrefix = 0; sha512.run = ""; @@ -19391,7 +21010,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.16"; + version = "0.18"; }; "pstool" = { stripPrefix = 0; @@ -19399,7 +21018,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5c"; + version = "1.5d"; }; "pstools" = { sha512.run = ""; @@ -19412,14 +21031,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.68"; + version = "2.77"; }; "pstricks-add" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.80"; + version = "3.84"; }; "pstricks_calcnotes" = { stripPrefix = 0; @@ -19427,6 +21046,12 @@ tl: { # no indentation sha512.doc = ""; version = "1.2"; }; +"pstring" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "psu-thesis" = { stripPrefix = 0; sha512.run = ""; @@ -19441,16 +21066,13 @@ tl: { # no indentation version = "p17"; }; "ptex" = { - deps."tex" = tl."tex"; - deps."latex" = tl."latex"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."adobemapping" = tl."adobemapping"; - deps."ipaex" = tl."ipaex"; - deps."japanese" = tl."japanese"; - deps."japanese-otf" = tl."japanese-otf"; - deps."pbibtex-base" = tl."pbibtex-base"; deps."ptex-base" = tl."ptex-base"; deps."ptex-fonts" = tl."ptex-fonts"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."plain" = tl."plain"; + deps."etex" = tl."etex"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -19461,6 +21083,16 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"ptex-fontmaps" = { + deps."arphic-ttf" = tl."arphic-ttf"; + deps."baekmuk" = tl."baekmuk"; + deps."ipaex" = tl."ipaex"; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "20170624.0"; +}; "ptex-fonts" = { stripPrefix = 0; sha512.run = ""; @@ -19471,7 +21103,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.8"; + version = "20170622.0"; }; "ptext" = { stripPrefix = 0; @@ -19518,14 +21150,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.5"; + version = "1.1b"; }; "pxchfon" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.7h"; + version = "1.1b"; }; "pxcjkcat" = { stripPrefix = 0; @@ -19553,7 +21185,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.3"; + version = "0.3a"; }; "pxpgfmark" = { stripPrefix = 0; @@ -19568,6 +21200,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; + version = "1.3a"; +}; +"pxtatescale" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.4"; }; "pxtxalfa" = { stripPrefix = 0; @@ -19576,6 +21216,13 @@ tl: { # no indentation hasRunfiles = true; version = "1"; }; +"pxufont" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.3"; +}; "pygmentex" = { sha512.run = ""; sha512.doc = ""; @@ -19589,19 +21236,25 @@ tl: { # no indentation hasRunfiles = true; version = "0.21"; }; +"pythonhighlight" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "pythontex" = { sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.13"; + version = "0.16"; }; "qcircuit" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.5.2"; + version = "2.5.3"; }; "qcm" = { stripPrefix = 0; @@ -19658,6 +21311,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"quicktype" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; +}; "quotchap" = { stripPrefix = 0; sha512.run = ""; @@ -19687,7 +21347,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.14"; + version = "1.261"; }; "r_und_s" = { stripPrefix = 0; @@ -19701,7 +21361,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.3"; + version = "1.4"; }; "ran_toks" = { stripPrefix = 0; @@ -19709,7 +21369,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0e"; + version = "1.1"; }; "randbild" = { stripPrefix = 0; @@ -19719,6 +21379,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"randomlist" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.3"; +}; "randomwalk" = { stripPrefix = 0; sha512.run = ""; @@ -19769,7 +21437,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.2"; + version = "2.0"; }; "realboxes" = { stripPrefix = 0; @@ -19792,7 +21460,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.3"; + version = "2.1"; }; "recipe" = { stripPrefix = 0; @@ -19839,7 +21507,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1.1"; + version = "1.1.2"; }; "reflectgraphics" = { stripPrefix = 0; @@ -19903,7 +21571,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.13.1"; + version = "2.24.2"; }; "relenc" = { stripPrefix = 0; @@ -19938,7 +21606,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "13.12"; + version = "17.05"; }; "repltext" = { stripPrefix = 0; @@ -19954,7 +21622,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.28"; + version = "1.31"; }; "resumecls" = { stripPrefix = 0; @@ -19975,6 +21643,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; }; +"revquantum" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.11"; +}; "revtex" = { stripPrefix = 0; sha512.run = ""; @@ -20142,7 +21818,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.1e"; + version = "3.1f"; }; "rsfs" = { stripPrefix = 0; @@ -20182,7 +21858,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.0"; + version = "4.0"; }; "ruhyphen" = { stripPrefix = 0; @@ -20205,6 +21881,14 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"rutitlepage" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "rviewport" = { stripPrefix = 0; sha512.run = ""; @@ -20256,6 +21940,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; + version = "2.2.1"; }; "sanskrit-t1" = { stripPrefix = 0; @@ -20281,7 +21966,6 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1"; }; "sapthesis" = { stripPrefix = 0; @@ -20360,14 +22044,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.7"; + version = "1.8"; }; "scanpages" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.04"; + version = "1.05a"; }; "schemabloc" = { stripPrefix = 0; @@ -20425,11 +22109,7 @@ tl: { # no indentation deps."collection-formatsextra" = tl."collection-formatsextra"; deps."collection-fontutils" = tl."collection-fontutils"; deps."collection-games" = tl."collection-games"; - deps."collection-genericextra" = tl."collection-genericextra"; - deps."collection-genericrecommended" = tl."collection-genericrecommended"; - deps."collection-htmlxml" = tl."collection-htmlxml"; deps."collection-humanities" = tl."collection-humanities"; - deps."collection-langafrican" = tl."collection-langafrican"; deps."collection-langarabic" = tl."collection-langarabic"; deps."collection-langchinese" = tl."collection-langchinese"; deps."collection-langcjk" = tl."collection-langcjk"; @@ -20440,7 +22120,6 @@ tl: { # no indentation deps."collection-langfrench" = tl."collection-langfrench"; deps."collection-langgerman" = tl."collection-langgerman"; deps."collection-langgreek" = tl."collection-langgreek"; - deps."collection-langindic" = tl."collection-langindic"; deps."collection-langitalian" = tl."collection-langitalian"; deps."collection-langjapanese" = tl."collection-langjapanese"; deps."collection-langkorean" = tl."collection-langkorean"; @@ -20452,15 +22131,13 @@ tl: { # no indentation deps."collection-latexextra" = tl."collection-latexextra"; deps."collection-latexrecommended" = tl."collection-latexrecommended"; deps."collection-luatex" = tl."collection-luatex"; - deps."collection-mathextra" = tl."collection-mathextra"; + deps."collection-mathscience" = tl."collection-mathscience"; deps."collection-metapost" = tl."collection-metapost"; deps."collection-music" = tl."collection-music"; - deps."collection-omega" = tl."collection-omega"; deps."collection-pictures" = tl."collection-pictures"; - deps."collection-plainextra" = tl."collection-plainextra"; + deps."collection-plaingeneric" = tl."collection-plaingeneric"; deps."collection-pstricks" = tl."collection-pstricks"; deps."collection-publishers" = tl."collection-publishers"; - deps."collection-science" = tl."collection-science"; deps."collection-texworks" = tl."collection-texworks"; deps."collection-xetex" = tl."collection-xetex"; sha512.run = ""; @@ -20494,11 +22171,11 @@ tl: { # no indentation deps."collection-context" = tl."collection-context"; deps."collection-fontutils" = tl."collection-fontutils"; deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-genericrecommended" = tl."collection-genericrecommended"; deps."collection-langpolish" = tl."collection-langpolish"; deps."collection-latex" = tl."collection-latex"; deps."collection-latexrecommended" = tl."collection-latexrecommended"; deps."collection-metapost" = tl."collection-metapost"; + deps."collection-plaingeneric" = tl."collection-plaingeneric"; deps."collection-texworks" = tl."collection-texworks"; deps."collection-xetex" = tl."collection-xetex"; sha512.run = ""; @@ -20507,6 +22184,7 @@ tl: { # no indentation stripPrefix = 0; deps."kpathsea" = tl."kpathsea"; deps."hyphen-base" = tl."hyphen-base"; + deps."tetex" = tl."tetex"; sha512.run = ""; }; "scheme-medium" = { @@ -20516,7 +22194,6 @@ tl: { # no indentation deps."collection-context" = tl."collection-context"; deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; deps."collection-fontutils" = tl."collection-fontutils"; - deps."collection-genericrecommended" = tl."collection-genericrecommended"; deps."collection-langczechslovak" = tl."collection-langczechslovak"; deps."collection-langenglish" = tl."collection-langenglish"; deps."collection-langeuropean" = tl."collection-langeuropean"; @@ -20529,9 +22206,9 @@ tl: { # no indentation deps."collection-latex" = tl."collection-latex"; deps."collection-latexrecommended" = tl."collection-latexrecommended"; deps."collection-luatex" = tl."collection-luatex"; - deps."collection-mathextra" = tl."collection-mathextra"; + deps."collection-mathscience" = tl."collection-mathscience"; deps."collection-metapost" = tl."collection-metapost"; - deps."collection-plainextra" = tl."collection-plainextra"; + deps."collection-plaingeneric" = tl."collection-plaingeneric"; deps."collection-texworks" = tl."collection-texworks"; deps."collection-xetex" = tl."collection-xetex"; sha512.run = ""; @@ -20631,12 +22308,10 @@ tl: { # no indentation deps."tamethebeast" = tl."tamethebeast"; deps."tds" = tl."tds"; deps."tex-refs" = tl."tex-refs"; - deps."voss-mathmode" = tl."voss-mathmode"; deps."collection-basic" = tl."collection-basic"; deps."collection-context" = tl."collection-context"; deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; deps."collection-fontutils" = tl."collection-fontutils"; - deps."collection-genericrecommended" = tl."collection-genericrecommended"; deps."collection-langcjk" = tl."collection-langcjk"; deps."collection-langcyrillic" = tl."collection-langcyrillic"; deps."collection-langczechslovak" = tl."collection-langczechslovak"; @@ -20652,35 +22327,14 @@ tl: { # no indentation deps."collection-langspanish" = tl."collection-langspanish"; deps."collection-latex" = tl."collection-latex"; deps."collection-latexrecommended" = tl."collection-latexrecommended"; - deps."collection-mathextra" = tl."collection-mathextra"; + deps."collection-mathscience" = tl."collection-mathscience"; deps."collection-metapost" = tl."collection-metapost"; - deps."collection-omega" = tl."collection-omega"; + deps."collection-formatsextra" = tl."collection-formatsextra"; deps."collection-pictures" = tl."collection-pictures"; - deps."collection-plainextra" = tl."collection-plainextra"; + deps."collection-plaingeneric" = tl."collection-plaingeneric"; deps."collection-pstricks" = tl."collection-pstricks"; sha512.run = ""; }; -"scheme-xml" = { - stripPrefix = 0; - deps."context" = tl."context"; - deps."jadetex" = tl."jadetex"; - deps."ltxmisc" = tl."ltxmisc"; - deps."marvosym" = tl."marvosym"; - deps."metapost" = tl."metapost"; - deps."passivetex" = tl."passivetex"; - deps."stmaryrd" = tl."stmaryrd"; - deps."tex4ht" = tl."tex4ht"; - deps."tipa" = tl."tipa"; - deps."ucs" = tl."ucs"; - deps."wasy" = tl."wasy"; - deps."wasysym" = tl."wasysym"; - deps."xmltex" = tl."xmltex"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-latex" = tl."collection-latex"; - deps."collection-omega" = tl."collection-omega"; - sha512.run = ""; -}; "schule" = { stripPrefix = 0; sha512.run = ""; @@ -20719,6 +22373,20 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"scratch" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.32"; +}; +"scratchx" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; +}; "screenplay" = { stripPrefix = 0; sha512.run = ""; @@ -20732,7 +22400,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "scrjrnl" = { stripPrefix = 0; @@ -20749,6 +22417,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.1d"; }; +"scsnowman" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.2"; +}; "sdrt" = { stripPrefix = 0; sha512.run = ""; @@ -20798,7 +22473,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "seetexk" = { sha512.run = ""; @@ -20826,6 +22501,12 @@ tl: { # no indentation hasRunfiles = true; version = "2.0"; }; +"semantic-markup" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "semaphor" = { stripPrefix = 0; sha512.run = ""; @@ -20860,7 +22541,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.3b"; + version = "0.3c"; }; "sepnum" = { stripPrefix = 0; @@ -20909,6 +22590,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.6"; }; +"sesstime" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "setdeck" = { stripPrefix = 0; sha512.run = ""; @@ -20945,7 +22634,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "sffms" = { stripPrefix = 0; @@ -21022,7 +22711,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.1"; + version = "2.1b"; }; "shipunov" = { stripPrefix = 0; @@ -21031,6 +22720,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"shobhika" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.04"; +}; "shorttoc" = { stripPrefix = 0; sha512.run = ""; @@ -21068,7 +22764,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.3l"; + version = "0.3o"; }; "showhyphens" = { stripPrefix = 0; @@ -21138,6 +22834,18 @@ tl: { # no indentation hasRunfiles = true; version = "1.5b"; }; +"simple-resume-cv" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; +"simple-thesis-dissertation" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "simplecd" = { stripPrefix = 0; sha512.run = ""; @@ -21154,6 +22862,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.6a"; }; +"simplekv" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; +}; "simpler-wick" = { stripPrefix = 0; sha512.run = ""; @@ -21195,7 +22910,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.6q"; + version = "2.7j"; }; "skak" = { stripPrefix = 0; @@ -21224,7 +22939,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.4a"; + version = "1.5"; }; "skeycommand" = { stripPrefix = 0; @@ -21246,7 +22961,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.4"; + version = "0.4b"; }; "skrapport" = { stripPrefix = 0; @@ -21254,7 +22969,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.12e"; + version = "0.12h"; }; "skull" = { stripPrefix = 0; @@ -21290,7 +23005,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.3"; + version = "0.3b"; }; "smartref" = { stripPrefix = 0; @@ -21335,7 +23050,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.14"; + version = "3.0"; }; "sort-by-letters" = { stripPrefix = 0; @@ -21358,6 +23073,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.4"; }; +"soup" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "sourcecodepro" = { stripPrefix = 0; sha512.run = ""; @@ -21370,7 +23093,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "sourceserifpro" = { stripPrefix = 0; @@ -21379,6 +23102,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"spalign" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; "spanish-mx" = { stripPrefix = 0; sha512.run = ""; @@ -21386,12 +23116,19 @@ tl: { # no indentation hasRunfiles = true; version = "1.1a"; }; +"spark-otf" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.04"; +}; "sparklines" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.6"; + version = "1.7"; }; "spath3" = { stripPrefix = 0; @@ -21401,6 +23138,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"spectralsequences" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1.1"; +}; "spelling" = { stripPrefix = 0; sha512.run = ""; @@ -21535,13 +23279,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.24"; + version = "4.01"; }; "stage" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; + version = "1.00"; }; "standalone" = { stripPrefix = 0; @@ -21551,6 +23296,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"stanli" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "3.0"; +}; "starfont" = { stripPrefix = 0; sha512.run = ""; @@ -21678,7 +23430,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "141"; + version = "2.2b-6"; }; "sttools" = { stripPrefix = 0; @@ -21686,7 +23438,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.8"; + version = "2.0"; }; "stubs" = { stripPrefix = 0; @@ -21695,6 +23447,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.1.1"; }; +"studenthandouts" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; +}; "sty2dtx" = { sha512.run = ""; sha512.doc = ""; @@ -21855,7 +23614,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "2.00b"; }; "svg-inkscape" = { stripPrefix = 0; @@ -22003,6 +23762,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"table-fct" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1"; +}; "tableaux" = { stripPrefix = 0; sha512.run = ""; @@ -22066,7 +23832,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.10"; + version = "2.01"; }; "tabto-generic" = { stripPrefix = 0; @@ -22144,7 +23910,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "talk" = { stripPrefix = 0; @@ -22186,7 +23952,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.11a"; + version = "0.12"; }; "tcldoc" = { stripPrefix = 0; @@ -22201,7 +23967,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.93"; + version = "4.11"; }; "tdclock" = { stripPrefix = 0; @@ -22287,6 +24053,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.8"; }; +"termcal-de" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "termlist" = { stripPrefix = 0; sha512.run = ""; @@ -22310,6 +24082,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.7"; }; +"testidx" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.1"; +}; "tetex" = { sha512.run = ""; sha512.doc = ""; @@ -22327,6 +24107,9 @@ tl: { # no indentation "tex" = { deps."kpathsea" = tl."kpathsea"; deps."plain" = tl."plain"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; sha512.run = ""; sha512.doc = ""; version = "3.14159265"; @@ -22397,7 +24180,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1d"; + version = "0.1e"; }; "tex4ht" = { sha512.run = ""; @@ -22425,7 +24208,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "3.0"; + version = "3.1"; }; "texdef" = { sha512.run = ""; @@ -22444,7 +24227,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1"; + version = "1.3"; }; "texdoc" = { deps."kpathsea" = tl."kpathsea"; @@ -22462,7 +24245,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.32"; + version = "1.37"; }; "texilikechaps" = { stripPrefix = 0; @@ -22584,6 +24367,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.2.0"; }; +"texosquery" = { + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.6"; +}; "texpower" = { stripPrefix = 0; deps."tpslifonts" = tl."tpslifonts"; @@ -22593,6 +24383,12 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"texproposal" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + version = "1.4"; +}; "texshade" = { stripPrefix = 0; sha512.run = ""; @@ -22603,6 +24399,11 @@ tl: { # no indentation }; "texsis" = { deps."tex" = tl."tex"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."plain" = tl."plain"; + deps."texsis" = tl."texsis"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -22633,6 +24434,7 @@ tl: { # no indentation }; "textgreek" = { stripPrefix = 0; + deps."greek-fontenc" = tl."greek-fontenc"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; @@ -22685,7 +24487,6 @@ tl: { # no indentation "texworks" = { sha512.run = ""; sha512.doc = ""; - hasRunfiles = true; }; "tfrupee" = { stripPrefix = 0; @@ -22695,13 +24496,26 @@ tl: { # no indentation hasRunfiles = true; version = "1.02"; }; +"thaienum" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2"; +}; "thalie" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.8"; + version = "0.9b"; +}; +"theatre" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + version = "0.1"; }; "theoremref" = { stripPrefix = 0; @@ -22715,7 +24529,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "2.1"; }; "thesis-titlepage-fhac" = { stripPrefix = 0; @@ -22810,14 +24624,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "5.3.1"; + version = "5.3.2"; }; "ticket" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.4b"; + version = "0.4d"; }; "ticollege" = { stripPrefix = 0; @@ -22857,7 +24671,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "tikz-dimline" = { stripPrefix = 0; @@ -22880,6 +24694,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"tikz-kalender" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.4a"; +}; "tikz-opm" = { stripPrefix = 0; sha512.run = ""; @@ -22887,12 +24708,27 @@ tl: { # no indentation hasRunfiles = true; version = "0.1.1"; }; +"tikz-optics" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2.3"; +}; +"tikz-page" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "tikz-palattice" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.21"; + version = "2.3"; }; "tikz-qtree" = { stripPrefix = 0; @@ -22910,6 +24746,20 @@ tl: { # no indentation hasRunfiles = true; version = "0.7d"; }; +"tikzcodeblocks" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.11"; +}; +"tikzducks" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.4"; +}; "tikzinclude" = { stripPrefix = 0; sha512.run = ""; @@ -22924,7 +24774,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "tikzorbital" = { stripPrefix = 0; @@ -22940,6 +24790,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"tikzpeople" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.4"; +}; "tikzpfeile" = { stripPrefix = 0; sha512.run = ""; @@ -22970,7 +24827,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "4.0"; + version = "4.07"; }; "times" = { stripPrefix = 0; @@ -22988,6 +24845,12 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"tinos" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "tipa" = { stripPrefix = 0; sha512.run = ""; @@ -23030,7 +24893,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "titleref" = { stripPrefix = 0; @@ -23129,6 +24992,17 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; }; +"tlcockpit" = { + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; +}; +"tlshell" = { + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "tocbibind" = { stripPrefix = 0; sha512.run = ""; @@ -23137,13 +25011,21 @@ tl: { # no indentation hasRunfiles = true; version = "1.5k"; }; +"tocdata" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.12"; +}; "tocloft" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.3f"; + version = "2.3i"; }; "tocvsec2" = { stripPrefix = 0; @@ -23167,7 +25049,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0.4"; + version = "1.0.5"; }; "tokenizer" = { stripPrefix = 0; @@ -23203,7 +25085,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "5.91"; + version = "6.1.09"; }; "totcount" = { stripPrefix = 0; @@ -23239,7 +25121,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.0"; + version = "2.1"; }; "tracklang" = { stripPrefix = 0; @@ -23247,7 +25129,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2"; + version = "1.3.4"; }; "trajan" = { stripPrefix = 0; @@ -23278,7 +25160,7 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - version = "1.0"; + version = "2.0"; }; "translation-chemsym-de" = { stripPrefix = 0; @@ -23330,7 +25212,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.4a"; + version = "1.7a"; }; "tree-dvips" = { stripPrefix = 0; @@ -23353,6 +25235,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.01"; }; +"trigonometry" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "trimspaces" = { stripPrefix = 0; sha512.run = ""; @@ -23409,7 +25297,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.04e"; + version = "2.05m"; }; "tufte-latex" = { stripPrefix = 0; @@ -23430,14 +25318,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.17"; + version = "2.18"; }; "tugboat-plain" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.21"; + version = "1.23"; }; "tui" = { stripPrefix = 0; @@ -23518,6 +25406,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"txuprcal" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.00"; +}; "type1cm" = { stripPrefix = 0; sha512.run = ""; @@ -23561,6 +25456,13 @@ tl: { # no indentation hasRunfiles = true; version = "2.0.7"; }; +"typoaid" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.4.7"; +}; "typogrid" = { stripPrefix = 0; sha512.run = ""; @@ -23589,7 +25491,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.7"; + version = "1.8"; }; "uassign" = { stripPrefix = 0; @@ -23626,7 +25528,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.2.1"; + version = "2.3.0"; }; "ucs" = { stripPrefix = 0; @@ -23648,7 +25550,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.5.2"; + version = "1.6.0"; }; "uebungsblatt" = { stripPrefix = 0; @@ -23670,6 +25572,14 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"uhhassignment" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.0"; +}; "uhrzeit" = { stripPrefix = 0; sha512.run = ""; @@ -23718,7 +25628,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "4.2"; + version = "4.4"; }; "umbclegislation" = { stripPrefix = 0; @@ -23781,7 +25691,12 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.02"; + version = "2.1"; +}; +"undergradmath" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; }; "underlin" = { stripPrefix = 0; @@ -23812,6 +25727,18 @@ tl: { # no indentation hasRunfiles = true; version = "1.0l"; }; +"unfonts-core" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; +"unfonts-extra" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "uni-wtal-ger" = { stripPrefix = 0; sha512.run = ""; @@ -23826,12 +25753,19 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"unicode-bidi" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.01"; +}; "unicode-data" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.4a"; + version = "1.6"; }; "unicode-math" = { stripPrefix = 0; @@ -23840,7 +25774,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.8c"; + version = "0.8h"; }; "unisugar" = { stripPrefix = 0; @@ -23849,6 +25783,12 @@ tl: { # no indentation hasRunfiles = true; version = "0.92"; }; +"unitn-bimrep" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; +}; "units" = { stripPrefix = 0; sha512.run = ""; @@ -23914,7 +25854,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.0"; + version = "3.0.1"; }; "upca" = { stripPrefix = 0; @@ -23929,6 +25869,12 @@ tl: { # no indentation }; "uplatex" = { deps."uptex" = tl."uptex"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."babel" = tl."babel"; + deps."latex" = tl."latex"; + deps."latex-fonts" = tl."latex-fonts"; + deps."uptex-fonts" = tl."uptex-fonts"; sha512.run = ""; sha512.doc = ""; sha512.source = ""; @@ -23939,6 +25885,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; + version = "20170808"; +}; +"uppunctlm" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1"; }; "upquote" = { stripPrefix = 0; @@ -23949,16 +25903,14 @@ tl: { # no indentation version = "1.3"; }; "uptex" = { - deps."adobemapping" = tl."adobemapping"; - deps."convbkmk" = tl."convbkmk"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."ipaex" = tl."ipaex"; - deps."japanese" = tl."japanese"; - deps."japanese-otf" = tl."japanese-otf"; - deps."latex" = tl."latex"; - deps."ptex" = tl."ptex"; deps."uptex-base" = tl."uptex-base"; deps."uptex-fonts" = tl."uptex-fonts"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."knuth-lib" = tl."knuth-lib"; + deps."plain" = tl."plain"; + deps."etex" = tl."etex"; + deps."ptex-base" = tl."ptex-base"; sha512.run = ""; sha512.doc = ""; version = "1.20"; @@ -23976,12 +25928,19 @@ tl: { # no indentation sha512.source = ""; hasRunfiles = true; }; +"upzhkinsoku" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.2a"; +}; "urcls" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.1"; + version = "2.0"; }; "uri" = { stripPrefix = 0; @@ -24028,6 +25987,13 @@ tl: { # no indentation hasRunfiles = true; version = "2.2"; }; +"uspace" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.04"; +}; "uspatent" = { stripPrefix = 0; sha512.run = ""; @@ -24079,6 +26045,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"variablelm" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.1.1"; +}; "variations" = { stripPrefix = 0; sha512.run = ""; @@ -24105,7 +26078,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.5"; + version = "1.0"; }; "varwidth" = { stripPrefix = 0; @@ -24129,12 +26102,11 @@ tl: { # no indentation version = "1.0"; }; "velthuis" = { - stripPrefix = 0; deps."xetex-devanagari" = tl."xetex-devanagari"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.15.1"; + version = "2.17"; }; "venn" = { stripPrefix = 0; @@ -24261,7 +26233,7 @@ tl: { # no indentation stripPrefix = 0; sha512.run = ""; sha512.doc = ""; - version = "0.62"; + version = "0.64"; }; "vlna" = { sha512.run = ""; @@ -24304,12 +26276,6 @@ tl: { # no indentation sha512.doc = ""; version = "0.1"; }; -"voss-mathmode" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - version = "2.47"; -}; "vpe" = { sha512.run = ""; sha512.doc = ""; @@ -24337,6 +26303,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"wallcalendar" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.3.1"; +}; "wallpaper" = { stripPrefix = 0; sha512.run = ""; @@ -24404,7 +26377,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.1"; + version = "1.4"; }; "williams" = { stripPrefix = 0; @@ -24417,7 +26390,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.1.0"; + version = "0.2.0"; +}; +"witharrows" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; }; "wnri" = { stripPrefix = 0; @@ -24469,6 +26449,13 @@ tl: { # no indentation sha512.doc = ""; hasRunfiles = true; }; +"wtref" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.3.2"; +}; "xargs" = { stripPrefix = 0; sha512.run = ""; @@ -24482,14 +26469,14 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.9"; + version = "1.5"; }; "xcharter" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.078a"; + version = "1.1"; }; "xcite" = { stripPrefix = 0; @@ -24512,7 +26499,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.2"; + version = "0.4"; }; "xcolor" = { stripPrefix = 0; @@ -24522,13 +26509,21 @@ tl: { # no indentation hasRunfiles = true; version = "2.12"; }; +"xcolor-material" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.1"; +}; "xcolor-solarized" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.3"; + version = "0.4"; }; "xcomment" = { stripPrefix = 0; @@ -24565,14 +26560,21 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "22.87"; + version = "22.87.03"; }; "xebaposter" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.42"; + version = "2.51"; +}; +"xechangebar" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "1.0"; }; "xecjk" = { stripPrefix = 0; @@ -24580,7 +26582,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "3.4.0"; + version = "3.5.0"; }; "xecolor" = { stripPrefix = 0; @@ -24608,7 +26610,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.0"; + version = "1.2"; }; "xepersian" = { stripPrefix = 0; @@ -24616,7 +26618,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "16.5"; + version = "19.3"; }; "xesearch" = { stripPrefix = 0; @@ -24635,17 +26637,18 @@ tl: { # no indentation "xetex" = { deps."xetexconfig" = tl."xetexconfig"; deps."latex" = tl."latex"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."tex-ini-files" = tl."tex-ini-files"; + deps."unicode-data" = tl."unicode-data"; + deps."etex" = tl."etex"; + deps."plain" = tl."plain"; + deps."babel" = tl."babel"; + deps."latex-fonts" = tl."latex-fonts"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; }; -"xetex-def" = { - stripPrefix = 0; - sha512.run = ""; - sha512.doc = ""; - hasRunfiles = true; - version = "4.08"; -}; "xetex-devanagari" = { stripPrefix = 0; sha512.run = ""; @@ -24689,7 +26692,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "2.15"; + version = "2.17"; }; "xetexref" = { stripPrefix = 0; @@ -24701,7 +26704,7 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "xfor" = { stripPrefix = 0; @@ -24717,7 +26720,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.7"; + version = "3.0"; }; "xhfill" = { stripPrefix = 0; @@ -24750,7 +26753,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "1.2g"; + version = "1.2o"; }; "xits" = { stripPrefix = 0; @@ -24774,7 +26777,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.25"; + version = "0.26"; +}; +"xltabular" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.03"; }; "xltxtra" = { stripPrefix = 0; @@ -24790,6 +26800,13 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."tex" = tl."tex"; deps."xmltexconfig" = tl."xmltexconfig"; + deps."babel" = tl."babel"; + deps."cm" = tl."cm"; + deps."hyphen-base" = tl."hyphen-base"; + deps."latex-fonts" = tl."latex-fonts"; + deps."latexconfig" = tl."latexconfig"; + deps."tex-ini-files" = tl."tex-ini-files"; + deps."xmltex" = tl."xmltex"; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; @@ -24860,7 +26877,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.3"; + version = "2.5"; }; "xprintlen" = { stripPrefix = 0; @@ -24890,7 +26907,14 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.2"; + version = "0.7"; +}; +"xsim" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.10"; }; "xskak" = { stripPrefix = 0; @@ -24979,6 +27003,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"yaletter" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "1.1"; +}; "yannisgr" = { stripPrefix = 0; sha512.run = ""; @@ -24991,7 +27023,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "0.99m"; + version = "0.99p"; }; "yax" = { stripPrefix = 0; @@ -25083,12 +27115,27 @@ tl: { # no indentation sha512.run = ""; hasRunfiles = true; }; +"zebra-goodies" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + hasRunfiles = true; + version = "0.1.0"; +}; "zed-csp" = { stripPrefix = 0; sha512.run = ""; sha512.doc = ""; hasRunfiles = true; }; +"zhlipsum" = { + stripPrefix = 0; + sha512.run = ""; + sha512.doc = ""; + sha512.source = ""; + hasRunfiles = true; + version = "0.4"; +}; "zhmetrics" = { stripPrefix = 0; sha512.run = ""; @@ -25110,7 +27157,7 @@ tl: { # no indentation sha512.doc = ""; sha512.source = ""; hasRunfiles = true; - version = "2.4"; + version = "2.5"; }; "zhspacing" = { stripPrefix = 0; @@ -25164,6 +27211,6 @@ tl: { # no indentation sha512.run = ""; sha512.doc = ""; hasRunfiles = true; - version = "0.6"; + version = "0.6b"; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh index 9c5424e881e3..5faef7fe5df5 100644 --- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks+=(addTeXMFPath) +addEnvHooks "$targetOffset" addTeXMFPath diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index 65bc240af001..9a60ebf17be8 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "flvtool2"; version = "1.0.6"; - sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; + source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; meta = { homepage = https://github.com/unnu/flvtool2; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 7439af275608..25752afd995b 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -77,11 +77,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.12.0"; + version = "3.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0ljras4bgxpmk1l3plialmhi7jsm2cpzx0dcs9411ijykzkamdkd"; + sha256 = "12v3zz69iql4ggiz9x7h27vyq9y9jlm46yczxyg62j89m2iyr5bl"; }; checkInputs = [ @@ -101,7 +101,7 @@ in with localPython.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://aws.amazon.com/elasticbeanstalk/; + homepage = https://aws.amazon.com/elasticbeanstalk/; description = "A command line interface for Elastic Beanstalk."; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index caea7c21c91b..60ccc0f4724a 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -31,6 +31,10 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable oauthlib pyserial configobj pyyaml requests jsonpatch ]; + checkInputs = with pythonPackages; [ contextlib2 httpretty mock unittest2 ]; + + doCheck = false; + meta = { homepage = http://cloudinit.readthedocs.org; description = "Provides configuration and customization of cloud instance"; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix new file mode 100644 index 000000000000..120727f3873d --- /dev/null +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -0,0 +1,15 @@ +{ buildGoPackage, fetchurl }: + +buildGoPackage + { name = "cri-tools-1.0.0-alpha.0"; + src = fetchurl + { url = "https://github.com/kubernetes-incubator/cri-tools/archive/v1.0.0-alpha.0.tar.gz"; + sha256 = "1la26f38xafb7g9hrppjq7gmajiyr8idcwbian7n412q9m0lb3ic"; + }; + + goPackagePath = "github.com/kubernetes-incubator/cri-tools"; + subPackages = [ "cmd/crictl" "cmd/critest" ]; + + goDeps = ./deps.nix; + } + diff --git a/pkgs/tools/virtualization/cri-tools/deps.nix b/pkgs/tools/virtualization/cri-tools/deps.nix new file mode 100644 index 000000000000..796e335c0f84 --- /dev/null +++ b/pkgs/tools/virtualization/cri-tools/deps.nix @@ -0,0 +1,48 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "94b8a116fbf1cd90e68d8f5361b520d326a66f9b"; + sha256 = "0winmx2dx9chrv9ab4cl1i00z2vag2swy2lfwiy8jx73qhaf9g4d"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "57d7f151236665c12202a51c21bc939eb5d5ba91"; + sha256 = "0sdpymjw6wqs1fc2q3h0v60slbd0p5qqr23ssff72wprn8520q37"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "91d8586aac31d9086939d077ba556d2c7fb157b4"; + sha256 = "1672igw8c0hp8qkwns69n5k8qgr1rzjaah9gjh37am34v172vgl7"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "109fef42a850b1af9d332a4ba433f65436be66c7"; + sha256 = "1yspxap56fgk0vh2n8jxl3j870yig7swpv8w4w7l92jawrfxv1zf"; + }; + } + { + goPackagePath = "k8s.io/kubernetes"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kubernetes"; + rev = "ea2fbd4de4b38aae93ec397cb5ea4d9eb6aefef8"; + sha256 = "1108d2h7px0b4gqc9xrwb0w5dhs5kxxbbvbcr938ipgln250qrpz"; + }; + } +] diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index bd766d7c5a9f..a923d73c03e4 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -45,6 +45,8 @@ buildPythonApplication rec { propagatedBuildInputs = [ boto setuptools ]; + doCheck = false; + meta = with lib; { description = "Google Compute Engine tools and services"; homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5dcdbc12f6a1..a93350f52f46 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -60,6 +60,7 @@ mapAliases (rec { gettextWithExpat = gettext; # 2016-02-19 gdb-multitarget = gdb; # added 2017-11-13 git-hub = gitAndTools.git-hub; # added 2016-04-29 + go-pup = pup; # added 2017-12-19 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gst_ffmpeg = gst-ffmpeg; # added 2017-02 @@ -78,7 +79,7 @@ mapAliases (rec { htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 - inherit (haskell.compiler) jhc uhc; # 2015-05-15 + inherit (haskell.compiler) uhc; # 2015-05-15 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 @@ -94,6 +95,7 @@ mapAliases (rec { libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 + libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libtidy = html-tidy; # added 2014-12-21 links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 @@ -152,6 +154,8 @@ mapAliases (rec { system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 + transmission_gtk = transmission-gtk; # added 2018-01-06 + transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 @@ -159,6 +163,7 @@ mapAliases (rec { vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 + winusb = woeusb; # added 2017-12-22 x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35410042d2ed..51585e4948db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27,16 +27,14 @@ with pkgs; # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = forceSystem "i686-linux" "i386"; - callPackage_i686 = pkgsi686Linux.callPackage; + callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + then pkgsi686Linux.callPackage + else throw "callPackage_i686 not supported on system '${stdenv.system}'"; # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. - stdenv_32bit = lowPrio ( - if system == "x86_64-linux" then - overrideCC stdenv gcc_multi - else - stdenv); + stdenv_32bit = lowPrio (if hostPlatform.is32bit then stdenv else multiStdenv); stdenvNoCC = stdenv.override { cc = null; }; @@ -188,7 +186,10 @@ with pkgs; # `fetchurl' downloads a file from the network. fetchurl = import ../build-support/fetchurl { - inherit curl stdenv; + inherit stdenv; + # On darwin, libkrb5 needs bootstrap_cmds which would require + # converting many packages to fetchurl_boot to avoid evaluation cycles. + curl = curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; }); }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -206,6 +207,8 @@ with pkgs; fetchzip = callPackage ../build-support/fetchzip { }; + fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; + fetchFromGitHub = { owner, repo, rev, name ? "source", fetchSubmodules ? false, private ? false, @@ -289,6 +292,9 @@ with pkgs; inherit url; }; + ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } + ../build-support/setup-hooks/ld-is-cc-hook.sh; + libredirect = callPackage ../build-support/libredirect { }; madonctl = callPackage ../applications/misc/madonctl { }; @@ -310,6 +316,8 @@ with pkgs; inherit kernel rootModules allowMissing; }; + mkShell = callPackage ../build-support/mkshell { }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; @@ -434,6 +442,10 @@ with pkgs; airsonic = callPackage ../servers/misc/airsonic { }; + airspy = callPackage ../applications/misc/airspy { }; + + airtame = callPackage ../applications/misc/airtame { }; + aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; albert = libsForQt5.callPackage ../applications/misc/albert {}; @@ -527,13 +539,13 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; - awscli = pythonPackages.callPackage ../tools/admin/awscli { }; + awscli = pythonPackages.awscli; awsebcli = callPackage ../tools/virtualization/awsebcli {}; awslogs = callPackage ../tools/admin/awslogs { }; - aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; + aws_shell = pythonPackages.aws_shell; azure-cli = nodePackages.azure-cli; @@ -573,6 +585,8 @@ with pkgs; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bmap-tools = callPackage ../tools/misc/bmap-tools { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; bonfire = callPackage ../tools/misc/bonfire { }; @@ -603,6 +617,8 @@ with pkgs; git-fire = callPackage ../tools/misc/git-fire { }; + gitless = callPackage ../applications/version-management/gitless/default.nix { }; + grc = callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { @@ -616,6 +632,9 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; + pass-otp = callPackage ../tools/security/pass-otp { }; + + gopass = callPackage ../tools/security/gopass { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -655,6 +674,8 @@ with pkgs; arc-theme = callPackage ../misc/themes/arc { }; + arc-kde-theme = callPackage ../misc/themes/arc-kde { }; + adapta-gtk-theme = callPackage ../misc/themes/adapta { }; aria2 = callPackage ../tools/networking/aria2 { @@ -701,7 +722,7 @@ with pkgs; azureus = callPackage ../tools/networking/p2p/azureus { }; - backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; + backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; backup = callPackage ../tools/backup/backup { }; @@ -765,6 +786,10 @@ with pkgs; blockdiag = pythonPackages.blockdiag; + blsd = callPackage ../tools/misc/blsd { + libgit2 = libgit2_0_25; + }; + bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; bmon = callPackage ../tools/misc/bmon { }; @@ -858,7 +883,14 @@ with pkgs; caddy = callPackage ../servers/caddy { }; traefik = callPackage ../servers/traefik { }; + calamares = libsForQt59.callPackage ../tools/misc/calamares { + python = python3; + boost = pkgs.boost.override { python = python3; }; + libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; }; + }; + capstone = callPackage ../development/libraries/capstone { }; + unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; cataract = callPackage ../applications/misc/cataract { }; cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; @@ -949,6 +981,8 @@ with pkgs; coursier = callPackage ../development/tools/coursier {}; + cri-tools = callPackage ../tools/virtualization/cri-tools {}; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -1042,6 +1076,8 @@ with pkgs; elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { }; + elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; + elm-github-install = callPackage ../tools/package-management/elm-github-install { }; emby = callPackage ../servers/emby { }; @@ -1062,6 +1098,8 @@ with pkgs; f3 = callPackage ../tools/filesystems/f3 { }; + fac = callPackage ../development/tools/fac { }; + facedetect = callPackage ../tools/graphics/facedetect { }; facter = callPackage ../tools/system/facter { }; @@ -1076,6 +1114,8 @@ with pkgs; filebench = callPackage ../tools/misc/filebench { }; + fileshelter = callPackage ../servers/web-apps/fileshelter { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1106,9 +1146,7 @@ with pkgs; geekbench = callPackage ../tools/misc/geekbench { }; - gencfsm = callPackage ../tools/security/gencfsm { - vala = vala_0_34; - }; + gencfsm = callPackage ../tools/security/gencfsm { }; genromfs = callPackage ../tools/filesystems/genromfs { }; @@ -1150,6 +1188,8 @@ with pkgs; hid-listen = callPackage ../tools/misc/hid-listen { }; + home-manager = callPackage ../tools/package-management/home-manager {}; + hostsblock = callPackage ../tools/misc/hostsblock { }; hr = callPackage ../applications/misc/hr { }; @@ -1174,6 +1214,8 @@ with pkgs; iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; + lynis = callPackage ../tools/security/lynis { }; + mathics = pythonPackages.mathics; masscan = callPackage ../tools/security/masscan { }; @@ -1192,6 +1234,12 @@ with pkgs; nfdump = callPackage ../tools/networking/nfdump { }; + nrsc5 = callPackage ../applications/misc/nrsc5 { }; + + onboard = callPackage ../applications/misc/onboard { }; + + optar = callPackage ../tools/graphics/optar {}; + patdiff = callPackage ../tools/misc/patdiff { }; playerctl = callPackage ../tools/audio/playerctl { }; @@ -1225,7 +1273,7 @@ with pkgs; libkrb5 = null; systemd = null; jemalloc = null; - libmysql = null; + mysql = null; postgresql = null; libdbi = null; net_snmp = null; @@ -1305,8 +1353,12 @@ with pkgs; bats = callPackage ../development/interpreters/bats { }; + bdsync = callPackage ../tools/backup/bdsync { }; + beanstalkd = callPackage ../servers/beanstalkd { }; + beegfs = callPackage ../os-specific/linux/beegfs { }; + beets = callPackage ../tools/audio/beets { pythonPackages = python2Packages; }; @@ -1318,13 +1370,15 @@ with pkgs; bgs = callPackage ../tools/X11/bgs { }; biber = callPackage ../tools/typesetting/biber { - inherit (perlPackages) + inherit (perlPackages) buildPerlModule autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K - ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils - ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + DateTime DateTimeFormatBuilder DateTimeCalendarJulian + ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize; + ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey + TestDifferences; }; blueman = callPackage ../tools/bluetooth/blueman { @@ -1382,6 +1436,8 @@ with pkgs; caudec = callPackage ../applications/audio/caudec { }; + ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { }; + ccid = callPackage ../tools/security/ccid { }; ccrypt = callPackage ../tools/security/ccrypt { }; @@ -1440,7 +1496,8 @@ with pkgs; # Use Citrix Receiver 13.4.0 below if you get "A network error occured (SSL error 4)" # See https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/?p=1977735 - citrix_receiver = hiPrio citrix_receiver_13_7_0; + citrix_receiver = hiPrio citrix_receiver_13_8_0; + citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; }; citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; }; citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; }; citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; }; @@ -1475,7 +1532,6 @@ with pkgs; convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libmysql = mysql.lib; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; @@ -1503,8 +1559,7 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - gnome_common = gnome3.gnome_common; - vala = vala_0_34; + inherit (gnome3) gnome_common libgee; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -1515,7 +1570,7 @@ with pkgs; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf glib; + inherit (gnome3) dconf gconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -1530,7 +1585,6 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { - clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -1645,6 +1699,7 @@ with pkgs; idnSupport = true; ldapSupport = true; gssSupport = true; + brotliSupport = true; }; curl = callPackage ../tools/networking/curl rec { @@ -1653,6 +1708,7 @@ with pkgs; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; + gssSupport = true; }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; @@ -1780,17 +1836,7 @@ with pkgs; dleyna-server = callPackage ../development/libraries/dleyna-server { }; - dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix { - stdenv = if stdenv.hostPlatform.isDarwin then - stdenv - else - # Doesn't build with gcc6 on linux - overrideCC stdenv gcc5; - }; - - dmd = callPackage ../development/compilers/dmd { - bootstrapDmd = dmd_2_067_1; - }; + dmd = callPackage ../development/compilers/dmd { }; dmg2img = callPackage ../tools/misc/dmg2img { }; @@ -1817,8 +1863,11 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; - dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { }; - + dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { + inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + inherit (darwin) cf-private; + wxGTK = wxGTK31; + }; doomseeker = callPackage ../applications/misc/doomseeker { }; slade = callPackage ../applications/misc/slade { @@ -2001,6 +2050,8 @@ with pkgs; pillow; }; + fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { }; + fanficfare = callPackage ../tools/text/fanficfare { }; fastd = callPackage ../tools/networking/fastd { }; @@ -2026,7 +2077,6 @@ with pkgs; m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { - clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -2037,6 +2087,8 @@ with pkgs; cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { }; libpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { }; + + skk = callPackage ../tools/inputmethods/fcitx-engines/fcitx-skk { }; }; fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; @@ -2203,6 +2255,8 @@ with pkgs; garmintools = callPackage ../development/libraries/garmintools {}; + gauge = callPackage ../development/tools/gauge { }; + gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; }; @@ -2348,7 +2402,7 @@ with pkgs; }; gnupg = gnupg22; - gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -2373,8 +2427,6 @@ with pkgs; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - go-pup = callPackage ../development/tools/pup { }; - go-sct = callPackage ../tools/X11/go-sct { }; # rename to upower-notify? @@ -2399,6 +2451,8 @@ with pkgs; gpodder = callPackage ../applications/audio/gpodder { }; + gpredict = callPackage ../applications/science/astronomy/gpredict { }; + gptfdisk = callPackage ../tools/system/gptfdisk { }; grafx2 = callPackage ../applications/graphics/grafx2 {}; @@ -2903,6 +2957,8 @@ with pkgs; kdbplus = callPackage_i686 ../applications/misc/kdbplus { }; + kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { }; + keepalived = callPackage ../tools/networking/keepalived { }; kexectools = callPackage ../os-specific/linux/kexectools { }; @@ -2932,10 +2988,6 @@ with pkgs; kpcli = callPackage ../tools/security/kpcli { }; - # kget is part of kde-applications but the released version is still for KDE 4 - # This needs to move to the proper place when the "frameworks" branch is released - kget = libsForQt5.callPackage ../applications/networking/kget { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; @@ -3104,6 +3156,10 @@ with pkgs; nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {}; nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; }; + nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix { + nodejs = pkgs.nodejs-8_x; + }; + nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; }; @@ -3157,6 +3213,8 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; + liblouis = callPackage ../development/libraries/liblouis { }; + liboauth = callPackage ../development/libraries/liboauth { }; libsidplayfp = callPackage ../development/libraries/libsidplayfp { }; @@ -3197,6 +3255,8 @@ with pkgs; libibverbs = callPackage ../development/libraries/libibverbs { }; + libxc = callPackage ../development/libraries/libxc { }; + libxcomp = callPackage ../development/libraries/libxcomp { }; libxl = callPackage ../development/libraries/libxl {}; @@ -3213,6 +3273,8 @@ with pkgs; limesurvey = callPackage ../servers/limesurvey { }; + localtime = callPackage ../tools/system/localtime { }; + logcheck = callPackage ../tools/system/logcheck { inherit (perlPackages) mimeConstruct; }; @@ -3246,7 +3308,9 @@ with pkgs; ltris = callPackage ../games/ltris { }; lxc = callPackage ../os-specific/linux/lxc { }; - lxcfs = callPackage ../os-specific/linux/lxcfs { }; + lxcfs = callPackage ../os-specific/linux/lxcfs { + enableDebugBuild = config.lxcfs.enableDebugBuild or false; + }; lxd = callPackage ../tools/admin/lxd { }; lzfse = callPackage ../tools/compression/lzfse { }; @@ -3494,6 +3558,8 @@ with pkgs; mycli = callPackage ../tools/admin/mycli { }; + mydumper = callPackage ../tools/backup/mydumper { }; + mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; mysqltuner = callPackage ../tools/misc/mysqltuner { }; @@ -3512,6 +3578,10 @@ with pkgs; nbd = callPackage ../tools/networking/nbd { }; + nccl = callPackage ../development/libraries/science/math/nccl { + cudatoolkit = cudatoolkit8; + }; + ndjbdns = callPackage ../tools/networking/ndjbdns { }; ndppd = callPackage ../applications/networking/ndppd { }; @@ -3589,6 +3659,8 @@ with pkgs; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; + nextcloud = callPackage ../servers/nextcloud { }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -3609,6 +3681,8 @@ with pkgs; nomad = callPackage ../applications/networking/cluster/nomad { }; + miller = callPackage ../tools/text/miller { }; + milu = callPackage ../applications/misc/milu { }; mpack = callPackage ../tools/networking/mpack { }; @@ -3842,7 +3916,7 @@ with pkgs; pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs]; + buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; }); pamtester = callPackage ../tools/security/pamtester { }; @@ -3867,6 +3941,10 @@ with pkgs; pepper = callPackage ../tools/admin/salt/pepper { }; + percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { + boost = boost159; + }; + pick = callPackage ../tools/misc/pick { }; pitivi = callPackage ../applications/video/pitivi { @@ -3969,12 +4047,12 @@ with pkgs; philter = callPackage ../tools/networking/philter { }; - pinentry = callPackage ../tools/security/pinentry { - libcap = if stdenv.isDarwin then null else libcap; - qt4 = null; + pinentry = pinentry_ncurses.override { + inherit gtk2; }; - pinentry_ncurses = pinentry.override { + pinentry_ncurses = callPackage ../tools/security/pinentry { + libcap = if stdenv.isDarwin then null else libcap; gtk2 = null; }; @@ -3983,11 +4061,11 @@ with pkgs; }; pinentry_qt4 = pinentry_ncurses.override { - inherit qt4; + qt = qt4; }; - pinentry_qt5 = libsForQt5.callPackage ../tools/security/pinentry/qt5.nix { - libcap = if stdenv.isDarwin then null else libcap; + pinentry_qt5 = pinentry_ncurses.override { + qt = qt5.qtbase; }; pinentry_mac = callPackage ../tools/security/pinentry-mac { @@ -4111,6 +4189,8 @@ with pkgs; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; + pubs = callPackage ../tools/misc/pubs {}; + pv = callPackage ../tools/misc/pv { }; pwgen = callPackage ../tools/security/pwgen { }; @@ -4266,6 +4346,8 @@ with pkgs; reckon = callPackage ../tools/text/reckon { }; + recoverjpeg = callPackage ../tools/misc/recoverjpeg { }; + reposurgeon = callPackage ../applications/version-management/reposurgeon { }; reptyr = callPackage ../os-specific/linux/reptyr {}; @@ -4443,6 +4525,8 @@ with pkgs; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; + signal-desktop-beta = callPackage ../applications/networking/instant-messengers/signal-desktop/beta.nix { }; + # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -4491,6 +4575,8 @@ with pkgs; smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + smenu = callPackage ../tools/misc/smenu { }; + smugline = python3Packages.smugline; snabb = callPackage ../tools/networking/snabb { } ; @@ -4503,7 +4589,10 @@ with pkgs; sshguard = callPackage ../tools/security/sshguard {}; - softhsm = callPackage ../tools/security/softhsm { }; + softhsm = callPackage ../tools/security/softhsm { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Security; + }; solr = callPackage ../servers/search/solr { }; @@ -4613,9 +4702,9 @@ with pkgs; preCheck = "export PATH=dist/build/stutter:$PATH"; }); - strongswan = callPackage ../tools/networking/strongswan { }; - - strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; }; + strongswan = callPackage ../tools/networking/strongswan { }; + strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC = true; }; + strongswanNM = callPackage ../tools/networking/strongswan { enableNetworkManager = true; }; su = shadow.su; @@ -4623,6 +4712,8 @@ with pkgs; surfraw = callPackage ../tools/networking/surfraw { }; + swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; + swec = callPackage ../tools/networking/swec { inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; }; @@ -4703,7 +4794,7 @@ with pkgs; thc-hydra = callPackage ../tools/security/thc-hydra { }; - thefuck = callPackage ../tools/misc/thefuck { }; + thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; @@ -4983,6 +5074,8 @@ with pkgs; whois = callPackage ../tools/networking/whois { }; + woff2 = callPackage ../development/web/woff2 { }; + wsmancli = callPackage ../tools/system/wsmancli {}; wolfebin = callPackage ../tools/networking/wolfebin { @@ -5061,7 +5154,7 @@ with pkgs; uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = kde4.callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { }; uhub = callPackage ../servers/uhub { }; @@ -5150,6 +5243,8 @@ with pkgs; vmtouch = callPackage ../tools/misc/vmtouch { }; + vncdo = callPackage ../tools/admin/vncdo { }; + volumeicon = callPackage ../tools/audio/volumeicon { }; waf = callPackage ../development/tools/build-managers/waf { }; @@ -5173,7 +5268,7 @@ with pkgs; which = callPackage ../tools/system/which { }; - winusb = callPackage ../tools/misc/winusb { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; @@ -5356,6 +5451,8 @@ with pkgs; zsh-command-time = callPackage ../shells/zsh-command-time { }; + zssh = callPackage ../tools/networking/zssh { }; + zstd = callPackage ../tools/compression/zstd { }; zstdmt = callPackage ../tools/compression/zstdmt { }; @@ -5472,7 +5569,9 @@ with pkgs; clang-sierraHack = clang.override { name = "clang-wrapper-with-reexport-hack"; - useMacosReexportHack = true; + bintools = clang.bintools.override { + useMacosReexportHack = true; + }; }; clang_5 = llvmPackages_5.clang; @@ -5481,13 +5580,7 @@ with pkgs; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; - clang_34 = (wrapCC llvmPackages_34.clang).override { - # Default cc-wrapper's hardening flags don't work with clang-3.4, - # so just remove it entirely for this wrapper. - extraBuildCommands = '' - :> $out/nix-support/add-hardening.sh - ''; - }; + clang_34 = wrapCC llvmPackages_34.clang; clang-tools = callPackage ../development/tools/clang-tools { }; @@ -5501,14 +5594,14 @@ with pkgs; cc = build; isClang = true; inherit stdenvNoCC; - libc = glibc; + inherit (targetPackages.stdenv.cc) bintools libc; extraPackages = [ libcxx libcxxabi ]; nativeTools = false; nativeLibc = false; }; #Use this instead of stdenv to build with clang - clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; @@ -5536,11 +5629,13 @@ with pkgs; }); crystal = callPackage ../development/compilers/crystal { - llvm = llvm_4; + llvm = llvm_5; }; devpi-client = callPackage ../development/tools/devpi-client {}; + devpi-server = callPackage ../development/tools/devpi-server {}; + dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; drumstick = callPackage ../development/libraries/drumstick { }; @@ -5563,32 +5658,52 @@ with pkgs; gcc = gcc6; gcc-unwrapped = gcc.cc; - gccStdenv = if (!stdenv.isDarwin) then stdenv else stdenv.override { + gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { allowedRequisites = null; cc = gcc; - # Include unwrapped binaries like AS, etc. and remove libcxx/libcxxabi - extraBuildInputs = [ stdenv.cc.cc ]; + # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses + # clang's internal assembler). + extraBuildInputs = lib.optional hostPlatform.isDarwin clang.cc; }; wrapCCMulti = cc: - if system == "x86_64-linux" then lowPrio (wrapCCWith { + if system == "x86_64-linux" then let + # Binutils with glibc multi + bintools = cc.bintools.override { + libc = glibc_multi; + }; + in lowPrio (wrapCCWith { cc = cc.cc.override { stdenv = overrideCC stdenv (wrapCCWith { cc = cc.cc; + inherit bintools; libc = glibc_multi; }); profiledCompiler = false; enableMultilib = true; }; - libc = glibc_multi; - + inherit bintools; extraBuildCommands = '' echo "dontMoveLib64=1" >> $out/nix-support/setup-hook ''; }) else throw "Multilib ${cc.name} not supported on ‘${system}’"; + wrapClangMulti = clang: + if system == "x86_64-linux" then + callPackage ../development/compilers/llvm/multi.nix { + inherit clang; + gcc32 = pkgsi686Linux.gcc; + gcc64 = pkgs.gcc; + } + else throw "Multilib ${clang.cc.name} not supported on '${system}'"; + gcc_multi = wrapCCMulti gcc; + clang_multi = wrapClangMulti clang; + + gccMultiStdenv = overrideCC stdenv gcc_multi; + clangMultiStdenv = overrideCC stdenv clang_multi; + multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv; gcc_debug = lowPrio (wrapCC (gcc.cc.override { stripped = false; @@ -5615,6 +5730,10 @@ with pkgs; if targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers else if targetPlatform.libc == "libSystem" then darwin.xcode else null; + binutils1 = wrapBintoolsWith { + bintools = binutils-unwrapped; + libc = libcCross1; + }; in wrapCCWith { name = "gcc-cross-wrapper"; cc = gccFun { @@ -5628,8 +5747,10 @@ with pkgs; crossStageStatic = true; langCC = false; libcCross = libcCross1; + targetPackages.stdenv.cc.bintools = binutils1; enableShared = false; }; + bintools = binutils1; libc = libcCross1; }; @@ -5638,6 +5759,7 @@ with pkgs; name = "gcc-cross-wrapper"; cc = gccCrossStageStatic.gcc; libc = windows.mingw_headers2; + inherit binutils; }; gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { @@ -5859,7 +5981,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc802.override { + haskellPackages = haskell.packages.ghc822.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; @@ -5876,6 +5998,13 @@ with pkgs; psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + tamarin-prover = + (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { + # NOTE: do not use the haskell packages 'graphviz' and 'maude' + inherit maude which sapic; + graphviz = graphviz-nox; + }); + inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4; haxe = haxe_3_4; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); @@ -5958,8 +6087,6 @@ with pkgs; haskellPackages = self.haskellPackages.override { overrides = self: super: { binary = lib.dontCheck self.binary_0_8_5_1; - cheapskate = self.cheapskate_0_1_1; - idris = self.idris_1_1_1; parsers = lib.dontCheck super.parsers; semigroupoids = lib.dontCheck super.semigroupoids; trifecta = lib.dontCheck super.trifecta; @@ -6064,25 +6191,17 @@ with pkgs; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); - supportsJDK = - system == "i686-linux" || - system == "x86_64-linux" || - system == "armv7l-linux"; - jdkdistro = oraclejdk8distro; oraclejdk8distro = installjdk: pluginSupport: - assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; }); oraclejdk8psu_distro = installjdk: pluginSupport: - assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); oraclejdk9distro = packageType: pluginSupport: - assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); @@ -6200,6 +6319,13 @@ with pkgs; mitscheme = callPackage ../development/compilers/mit-scheme { texLive = texlive.combine { inherit (texlive) scheme-small; }; texinfo = texinfo5; + xlibsWrapper = null; + }; + + mitschemeX11 = callPackage ../development/compilers/mit-scheme { + texLive = texlive.combine { inherit (texlive) scheme-small; }; + texinfo = texinfo5; + enableX11 = true; }; mkcl = callPackage ../development/compilers/mkcl {}; @@ -6257,7 +6383,7 @@ with pkgs; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; - ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; + ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml-104.nix { }; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; @@ -6292,6 +6418,12 @@ with pkgs; rust = callPackage ../development/compilers/rust { }; inherit (rust) cargo rustc; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; + + carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix_0_5_2; + + defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: @@ -6389,11 +6521,11 @@ with pkgs; urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_23 vala_0_26 vala_0_28 vala_0_32 vala_0_34 + vala_0_36 vala_0_38 vala; @@ -6403,7 +6535,8 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = { name ? "", cc, libc, extraBuildCommands ? "" }: ccWrapperFun rec { + wrapCCWith = { name ? "", cc, bintools, libc, extraBuildCommands ? "" }: + ccWrapperFun rec { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; @@ -6412,14 +6545,20 @@ with pkgs; isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit name cc libc extraBuildCommands; + inherit name cc bintools libc extraBuildCommands; }; ccWrapperFun = callPackage ../build-support/cc-wrapper; + bintoolsWrapperFun = callPackage ../build-support/bintools-wrapper; wrapCC = cc: wrapCCWith { name = lib.optionalString (targetPlatform != hostPlatform) "gcc-cross-wrapper"; inherit cc; + # This should be the only bintools runtime dep with this sort of logic. The + # Others should instead delegate to the next stage's choice with + # `targetPackages.stdenv.cc.bintools`. This one is different just to + # provide the default choice, avoiding infinite recursion. + bintools = if targetPlatform.isDarwin then darwin.binutils else binutils; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; }; # legacy version, used for gnat bootstrapping @@ -6431,6 +6570,17 @@ with pkgs; libc = glibc; }; + wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun { + nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; + nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; + nativePrefix = stdenv.cc.nativePrefix or ""; + + noLibc = (libc == null); + + inherit bintools libc; + extraBuildCommands = ""; + }; + # prolog yap = callPackage ../development/compilers/yap { }; @@ -6476,9 +6626,9 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR17 erlangR18 erlangR19 erlangR20 + erlang erlangR18 erlangR19 erlangR20 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_5 elixir_1_4 elixir_1_3 + elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; inherit (beam.packages.erlang) @@ -6629,7 +6779,7 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524; + inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -6648,10 +6798,16 @@ with pkgs; php = php71; }); + php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php72; + }); + + inherit (callPackages ../development/interpreters/php { }) php56 php70 - php71; + php71 + php72; php-embed = php71-embed; @@ -6788,12 +6944,13 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; - inherit (callPackage ../development/interpreters/ruby {}) + inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) ruby_2_0_0 ruby_2_1_10 ruby_2_2_8 ruby_2_3_5 - ruby_2_4_2; + ruby_2_4_2 + ruby_2_5_0; # Ruby aliases ruby = ruby_2_3; @@ -6802,6 +6959,7 @@ with pkgs; ruby_2_2 = ruby_2_2_8; ruby_2_3 = ruby_2_3_5; ruby_2_4 = ruby_2_4_2; + ruby_2_5 = ruby_2_5_0; scsh = callPackage ../development/interpreters/scsh { }; @@ -6870,6 +7028,8 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; + betaflight = callPackage ../development/stm32/betaflight { }; + sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; ecj = callPackage ../development/eclipse/ecj { }; @@ -7012,13 +7172,19 @@ with pkgs; then darwin.binutils else binutils-raw; - binutils-raw = callPackage ../development/tools/misc/binutils { + binutils-unwrapped = callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; }; + binutils-raw = wrapBintoolsWith { + libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; + bintools = binutils-unwrapped; + }; binutils_nogold = lowPrio (binutils-raw.override { - gold = false; + bintools = binutils-raw.bintools.override { + gold = false; + }; }); bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; @@ -7280,7 +7446,8 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild; + inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt + wtf8 dtoa; }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -7398,6 +7565,8 @@ with pkgs; jamomacore = callPackage ../development/libraries/audio/jamomacore { }; + jbake = callPackage ../development/tools/jbake { }; + jikespg = callPackage ../development/tools/parsing/jikespg { }; jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; @@ -7465,7 +7634,7 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { }; + multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { ghc = haskell.compiler.ghc802; }; neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); @@ -7559,13 +7728,15 @@ with pkgs; premake4 = callPackage ../development/tools/misc/premake { }; premake5 = callPackage ../development/tools/misc/premake/5.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) Foundation; }; premake = premake4; procodile = callPackage ../tools/system/procodile { }; + pup = callPackage ../development/tools/pup { }; + qtcreator = libsForQt5.callPackage ../development/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; @@ -7611,6 +7782,8 @@ with pkgs; remake = callPackage ../development/tools/build-managers/remake { }; + retdec = callPackage ../development/tools/analysis/retdec { }; + rhc = callPackage ../development/tools/rhc { }; rman = callPackage ../development/tools/misc/rman { }; @@ -7731,9 +7904,7 @@ with pkgs; universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; - vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_4; - }; + vagrant = callPackage ../development/tools/vagrant {}; bashdb = callPackage ../development/tools/misc/bashdb { }; @@ -7920,7 +8091,8 @@ with pkgs; boost163 = callPackage ../development/libraries/boost/1.63.nix { }; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; - boost16x = boost165; + boost166 = callPackage ../development/libraries/boost/1.66.nix { }; + boost16x = boost166; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -8171,8 +8343,6 @@ with pkgs; eventlog = callPackage ../development/libraries/eventlog { }; - facile = callPackage ../development/libraries/facile { }; - faac = callPackage ../development/libraries/faac { }; faad2 = callPackage ../development/libraries/faad2 { }; @@ -8359,6 +8529,8 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; + gflags = callPackage ../development/libraries/gflags { }; + gf2x = callPackage ../development/libraries/gf2x {}; gd = callPackage ../development/libraries/gd { @@ -8502,6 +8674,8 @@ with pkgs; grib-api = callPackage ../development/libraries/grib-api { }; + grpc = callPackage ../development/libraries/grpc { }; + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); }); @@ -8556,6 +8730,8 @@ with pkgs; qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;}; + qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; + gnet = callPackage ../development/libraries/gnet { }; gnu-config = callPackage ../development/libraries/gnu-config { }; @@ -8766,6 +8942,10 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc {}; + hwloc-nox = callPackage ../development/libraries/hwloc { + x11Support = false; + }; + hydra = callPackage ../development/tools/misc/hydra { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; @@ -8869,8 +9049,6 @@ with pkgs; in recurseIntoAttrs (makeOverridable mkFrameworks attrs); - kdelibs4 = kdeApplications.kdelibs; - keybinder = callPackage ../development/libraries/keybinder { automake = automake111x; lua = lua5_1; @@ -8885,7 +9063,10 @@ with pkgs; krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = krb5Full.override { type = "lib"; }; + libkrb5 = krb5Full.override { + fetchurl = fetchurlBoot; + type = "lib"; + }; languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -8923,6 +9104,8 @@ with pkgs; libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; + libacr38u = callPackage ../tools/security/libacr38u { }; + libagar = callPackage ../development/libraries/libagar { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; @@ -8989,13 +9172,12 @@ with pkgs; inherit (xlibs) libX11 libXext; }; - libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { - gtk = pkgs.gtk3; - }; + libcanberra = callPackage ../development/libraries/libcanberra { }; + libcanberra_gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; }; libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) - then pkgs.libcanberra_gtk2.override { gtk = null; } + then pkgs.libcanberra else pkgs.libcanberra_gtk2; libcec = callPackage ../development/libraries/libcec { }; @@ -9003,6 +9185,8 @@ with pkgs; libcello = callPackage ../development/libraries/libcello {}; + libcerf = callPackage ../development/libraries/libcerf {}; + libcdaudio = callPackage ../development/libraries/libcdaudio { }; libcddb = callPackage ../development/libraries/libcddb { }; @@ -9063,12 +9247,12 @@ with pkgs; libdbi = callPackage ../development/libraries/libdbi { }; libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { - libmysql = null; + mysql = null; sqlite = null; }; libdbiDrivers = libdbiDriversBase.override { - inherit sqlite libmysql; + inherit sqlite mysql; }; libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; @@ -9187,7 +9371,9 @@ with pkgs; libserialport = callPackage ../development/libraries/libserialport { }; - libsoundio = callPackage ../development/libraries/libsoundio { }; + libsoundio = callPackage ../development/libraries/libsoundio { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + }; libgtop = callPackage ../development/libraries/libgtop {}; @@ -9306,6 +9492,8 @@ with pkgs; liblastfm = callPackage ../development/libraries/liblastfm { }; + liblcf = callPackage ../development/libraries/liblcf { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -9330,6 +9518,8 @@ with pkgs; libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libmypaint = callPackage ../development/libraries/libmypaint { }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { mysql = mysql57; }; @@ -9674,10 +9864,6 @@ with pkgs; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; - libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; - - libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { }; - libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; libtoxcore = callPackage ../development/libraries/libtoxcore { }; @@ -9702,8 +9888,6 @@ with pkgs; libui = callPackage ../development/libraries/libui { }; - libunity = callPackage ../development/libraries/libunity { }; - libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; @@ -9748,6 +9932,7 @@ with pkgs; libva = callPackage ../development/libraries/libva { }; libva-full = libva.override { minimal = false; }; + libva-utils = callPackage ../development/libraries/libva-utils { }; libvdpau = callPackage ../development/libraries/libvdpau { }; @@ -9935,8 +10120,7 @@ with pkgs; # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM - # llvm-4.0.0 and 5.0.0 won't pass tests on aarch64 - llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_5; + llvmPackages = llvmPackages_5; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); @@ -10058,7 +10242,6 @@ with pkgs; }; nettle = callPackage ../development/libraries/nettle { }; - nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { }; newt = callPackage ../development/libraries/newt { }; @@ -10141,7 +10324,7 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; cudatoolkit = cudatoolkit8; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; # this ctl version is needed by openexr_viewers @@ -10221,6 +10404,9 @@ with pkgs; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; + osinfo-db = callPackage ../data/misc/osinfo-db { }; + osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; + p11_kit = callPackage ../development/libraries/p11-kit { }; paperkey = callPackage ../tools/security/paperkey { }; @@ -10251,6 +10437,8 @@ with pkgs; pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; + pg_tmp = callPackage ../development/tools/database/pg_tmp { }; + pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; plv8 = callPackage ../servers/sql/postgresql/plv8 { @@ -10328,6 +10516,7 @@ with pkgs; protobuf = callPackage ../development/libraries/protobuf/3.4.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; + protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; @@ -10530,6 +10719,8 @@ with pkgs; qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; + qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; + quazip = callPackage ../development/libraries/quazip { }; qwt = callPackage ../development/libraries/qwt/6.nix { }; @@ -10721,6 +10912,7 @@ with pkgs; simp_le = callPackage ../tools/admin/simp_le { }; sfml = callPackage ../development/libraries/sfml { }; + csfml = callPackage ../development/libraries/csfml { }; shapelib = callPackage ../development/libraries/shapelib { }; @@ -11094,7 +11286,10 @@ with pkgs; wiredtiger = callPackage ../development/libraries/wiredtiger { }; - wt = callPackage ../development/libraries/wt { }; + wt = wt4; + inherit (callPackages ../development/libraries/wt {}) + wt3 + wt4; wxGTK = wxGTK28; @@ -11117,6 +11312,8 @@ with pkgs; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; + wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {}; + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; @@ -11133,8 +11330,8 @@ with pkgs; x265 = callPackage ../development/libraries/x265 { }; inherit (callPackages ../development/libraries/xapian { }) - xapian_1_2_22 xapian_1_4_4; - xapian = xapian_1_4_4; + xapian_1_2_22 xapian_1_4; + xapian = xapian_1_4; xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; @@ -11324,9 +11521,13 @@ with pkgs; mockobjects = callPackage ../development/libraries/java/mockobjects { }; - saxon = callPackage ../development/libraries/java/saxon { }; + saxonb = saxonb_8_8; - saxonb = callPackage ../development/libraries/java/saxon/default8.nix { }; + inherit (callPackages ../development/libraries/java/saxon { }) + saxon + saxonb_8_8 + saxonb_9_1 + saxon-he; smack = callPackage ../development/libraries/java/smack { }; @@ -11514,7 +11715,8 @@ with pkgs; cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra = cassandra_3_0; + cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { }; + cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jdk; @@ -11548,7 +11750,9 @@ with pkgs; cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis {}; + charybdis = callPackage ../servers/irc/charybdis { }; + + clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { }; @@ -11556,7 +11760,7 @@ with pkgs; spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; - erlang = erlangR17; + erlang = erlangR19; }; couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { @@ -11603,7 +11807,7 @@ with pkgs; prosody = callPackage ../servers/xmpp/prosody { lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib luadbi; }; biboumi = callPackage ../servers/xmpp/biboumi { }; @@ -11749,6 +11953,8 @@ with pkgs; modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; }; + libmodsecurity = callPackage ../tools/security/libmodsecurity { }; + ngircd = callPackage ../servers/irc/ngircd { }; nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; @@ -11866,7 +12072,6 @@ with pkgs; }; mysql = mariadb; - libmysql = mysql.client; # `libmysql` is a slight misnomer ATM mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -11920,6 +12125,8 @@ with pkgs; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; + pgbouncer = callPackage ../servers/sql/pgbouncer/default.nix { }; + pgpool93 = pgpool.override { postgresql = postgresql93; }; pgpool94 = pgpool.override { postgresql = postgresql94; }; @@ -11956,6 +12163,7 @@ with pkgs; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; @@ -12104,7 +12312,7 @@ with pkgs; tomcat7 tomcat8 tomcat85 - tomcatUnstable; + tomcat9; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; @@ -12521,7 +12729,6 @@ with pkgs; linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix { kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.tag_hardened @@ -12671,6 +12878,8 @@ with pkgs; bbswitch = callPackage ../os-specific/linux/bbswitch {}; + beegfs-module = callPackage ../os-specific/linux/beegfs/kernel-module.nix { }; + ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; blcr = callPackage ../os-specific/linux/blcr { }; @@ -12687,6 +12896,8 @@ with pkgs; pktgen = callPackage ../os-specific/linux/pktgen { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; ofp = callPackage ../os-specific/linux/ofp { }; @@ -12752,10 +12963,8 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; - inherit (callPackage ../os-specific/linux/spl { - configFile = "kernel"; - inherit kernel; - }) splStable splUnstable; + inherit (callPackage ../os-specific/linux/spl {}) + splStable splUnstable; spl = splStable; @@ -12939,7 +13148,7 @@ with pkgs; gocode = callPackage ../development/tools/gocode { }; - kgocode = callPackage ../applications/misc/kgocode { }; + goconvey = callPackage ../development/tools/goconvey { }; gotags = callPackage ../development/tools/gotags { }; @@ -13088,10 +13297,6 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; - inherit (callPackage ../os-specific/linux/spl { - configFile = "user"; - }) splStable splUnstable; - sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor @@ -13151,9 +13356,12 @@ with pkgs; ubootA20OlinuxinoLime ubootBananaPi ubootBeagleboneBlack + ubootClearfog ubootJetsonTK1 ubootOdroidXU3 + ubootOrangePiPc ubootPcduino3Nano + ubootQemuArm ubootRaspberryPi ubootRaspberryPi2 ubootRaspberryPi3_32bit @@ -13456,6 +13664,8 @@ with pkgs; hanazono = callPackage ../data/fonts/hanazono { }; + ibm-plex = callPackage ../data/fonts/ibm-plex { }; + inconsolata = callPackage ../data/fonts/inconsolata {}; inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; @@ -13557,6 +13767,8 @@ with pkgs; mustache-spec = callPackage ../data/documentation/mustache-spec { }; + myrica = callPackage ../data/fonts/myrica { }; + nafees = callPackage ../data/fonts/nafees { }; inherit (callPackages ../data/fonts/noto-fonts {}) @@ -13610,6 +13822,8 @@ with pkgs; sampradaya = callPackage ../data/fonts/sampradaya { }; + scowl = callPackage ../data/misc/scowl { }; + shaderc = callPackage ../development/compilers/shaderc { }; mime-types = callPackage ../data/misc/mime-types { }; @@ -13750,6 +13964,8 @@ with pkgs; zeal = libsForQt5.callPackage ../data/documentation/zeal { }; + zilla-slab = callPackage ../data/fonts/zilla-slab { }; + ### APPLICATIONS @@ -13834,11 +14050,6 @@ with pkgs; msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = kde4.callPackage ../applications/audio/amarok { - ffmpeg = ffmpeg_2; - stdenv = overrideCC stdenv gcc5; - }; - amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { }; AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; @@ -13859,6 +14070,8 @@ with pkgs; ao = callPackage ../applications/graphics/ao {}; + apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; + aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; ardour = callPackage ../applications/audio/ardour { @@ -13904,17 +14117,18 @@ with pkgs; altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); bitcoin = altcoins.bitcoin; bitcoin-xt = altcoins.bitcoin-xt; - - cryptop = callPackage ../applications/altcoins/cryptop { }; + cryptop = altcoins.cryptop; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { secp256k1 = secp256k1.override { enableECDH = true; }; }; - libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { }; - + libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix { }; + libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { }; + libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix { }; libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; + go-ethereum = self.altcoins.go-ethereum; ethabi = self.altcoins.ethabi; ethrun = self.altcoins.ethrun; @@ -14017,9 +14231,16 @@ with pkgs; bitmeter = callPackage ../applications/audio/bitmeter { }; - bitwig-studio = callPackage ../applications/audio/bitwig-studio { + bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { }; + + bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { inherit (gnome2) zenity; }; + bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { + inherit (gnome2) zenity; + inherit (self) bitwig-studio1; + }; + bitwig-studio = bitwig-studio2; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -14073,16 +14294,12 @@ with pkgs; calibre = libsForQt5.callPackage ../applications/misc/calibre { }; - calligra2 = kde4.callPackage ../applications/office/calligra/2.nix { - vc = vc_0_7; - }; - calligra = libsForQt5.callPackage ../applications/office/calligra { inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; }; - camlistore = callPackage ../applications/misc/camlistore { }; + perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -14155,7 +14372,7 @@ with pkgs; clfswm = callPackage ../applications/window-managers/clfswm { }; - cligh = callPackage ../development/tools/github/cligh {}; + cligh = python3Packages.callPackage ../development/tools/github/cligh {}; clipgrab = callPackage ../applications/video/clipgrab { }; @@ -14241,7 +14458,7 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc802.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -14256,6 +14473,8 @@ with pkgs; dd-agent = callPackage ../tools/networking/dd-agent { }; + ddgr = callPackage ../applications/misc/ddgr { }; + deadbeef = callPackage ../applications/audio/deadbeef { pulseSupport = config.pulseaudio or true; }; @@ -14291,8 +14510,6 @@ with pkgs; dmenu = callPackage ../applications/misc/dmenu { }; - dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; - dmenu2 = callPackage ../applications/misc/dmenu2 { }; dmensamenu = callPackage ../applications/misc/dmensamenu { @@ -14305,11 +14522,10 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_09 - docker_17_11; + docker_17_12; - docker = docker_17_09; - docker-edge = docker_17_11; + docker = docker_17_12; + docker-edge = docker_17_12; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -14339,6 +14555,10 @@ with pkgs; devede = callPackage ../applications/video/devede { }; + denemo = callPackage ../applications/audio/denemo { + inherit (gnome3) gtksourceview; + }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; dvdauthor = callPackage ../applications/video/dvdauthor { }; @@ -14378,7 +14598,7 @@ with pkgs; ekho = callPackage ../applications/audio/ekho { }; - electron-cash = callPackage ../applications/misc/electron-cash { }; + electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; electrum = callPackage ../applications/misc/electrum { }; @@ -14596,10 +14816,12 @@ with pkgs; emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; - # inherit (gnome3) empathy; + inherit (gnome3) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; + eolie = callPackage ../applications/networking/browsers/eolie { }; + epdfview = callPackage ../applications/misc/epdfview { }; inherit (gnome3) epiphany; @@ -14637,6 +14859,8 @@ with pkgs; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + icesl = callPackage ../applications/misc/icesl { }; + keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; @@ -14672,8 +14896,11 @@ with pkgs; fldigi = callPackage ../applications/audio/fldigi { }; + flink = flink_1_3; + flink_1_3 = callPackage ../applications/networking/cluster/flink { version = "1.3"; }; + fluidsynth = callPackage ../applications/audio/fluidsynth { - inherit (darwin.apple_sdk.frameworks) CoreServices CoreAudio AudioUnit; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; }; fmit = libsForQt5.callPackage ../applications/audio/fmit { }; @@ -14700,6 +14927,8 @@ with pkgs; ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; + gcal = callPackage ../applications/misc/gcal { }; + geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; @@ -14789,6 +15018,8 @@ with pkgs; wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; + welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; + wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { withQt = false; withGtk = false; @@ -14943,7 +15174,6 @@ with pkgs; ghq = gitAndTools.ghq; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { - inherit (gnome2) libart_lgpl; webkit = null; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; @@ -15055,11 +15285,11 @@ with pkgs; inherit (darwin) IOKit; }; + gmtk = callPackage ../development/libraries/gmtk { }; + gmu = callPackage ../applications/audio/gmu { }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { - inherit (gnome2) GConf; - }; + gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; gnumeric = callPackage ../applications/office/gnumeric { }; @@ -15211,9 +15441,7 @@ with pkgs; hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; - jackline = callPackage ../applications/networking/instant-messengers/jackline { - ocamlPackages = ocaml-ng.ocamlPackages_4_02; - }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -15223,13 +15451,14 @@ with pkgs; wlc = callPackage ../development/libraries/wlc { }; wlroots = callPackage ../development/libraries/wlroots { }; + rootston = wlroots.bin; orbment = callPackage ../applications/window-managers/orbment { }; sway = callPackage ../applications/window-managers/sway { }; - swaylock = callPackage ../applications/window-managers/sway { }; - swc = callPackage ../development/libraries/swc { }; - wld = callPackage ../development/libraries/wld { }; - velox = callPackage ../applications/window-managers/velox { }; + velox = callPackage ../applications/window-managers/velox { + stConf = config.st.conf or null; + stPatches = config.st.patches or null; + }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; @@ -15425,8 +15654,6 @@ with pkgs; k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; - kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { }; - kanboard = callPackage ../applications/misc/kanboard { }; kdeApplications = @@ -15443,7 +15670,7 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf keditbookmarks - kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; @@ -15561,7 +15788,7 @@ with pkgs; libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; + inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; bluez5 = bluez5_28; fontsConf = makeFontsConf { @@ -15581,7 +15808,7 @@ with pkgs; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; + inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; #glm = glm_0954; bluez5 = bluez5_28; @@ -15630,9 +15857,7 @@ with pkgs; polarssl = mbedtls_1_3; }; - linuxsampler = callPackage ../applications/audio/linuxsampler { - bison = bison2; - }; + linuxsampler = callPackage ../applications/audio/linuxsampler { }; llpp = ocaml-ng.ocamlPackages.callPackage ../applications/misc/llpp { }; @@ -15694,6 +15919,8 @@ with pkgs; matchbox = callPackage ../applications/window-managers/matchbox { }; + mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -15708,8 +15935,7 @@ with pkgs; mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = callPackage ../applications/office/mendeley { - qt5 = qt56; + mendeley = libsForQt56.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -15723,7 +15949,7 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - meshlab = callPackage ../applications/graphics/meshlab { }; + meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; metersLv2 = callPackage ../applications/audio/meters_lv2 { }; @@ -15776,6 +16002,10 @@ with pkgs; monero = callPackage ../applications/misc/monero { }; + xmr-stak = callPackage ../applications/misc/xmr-stak { + hwloc = hwloc-nox; + }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; @@ -16044,6 +16274,8 @@ with pkgs; mythtv = callPackage ../applications/video/mythtv { }; + micro = callPackage ../applications/editors/micro { }; + nano = callPackage ../applications/editors/nano { }; nanoblogger = callPackage ../applications/misc/nanoblogger { }; @@ -16076,12 +16308,6 @@ with pkgs; notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; - # Open Stack - nova = callPackage ../applications/virtualization/openstack/nova.nix { }; - keystone = callPackage ../applications/virtualization/openstack/keystone.nix { }; - neutron = callPackage ../applications/virtualization/openstack/neutron.nix { }; - glance = callPackage ../applications/virtualization/openstack/glance.nix { }; - nova-filters = callPackage ../applications/audio/nova-filters { }; nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {}; @@ -16131,6 +16357,10 @@ with pkgs; opera = callPackage ../applications/networking/browsers/opera {}; + orca = python3Packages.callPackage ../applications/misc/orca { + inherit (gnome3) yelp_tools; + }; + osmctools = callPackage ../applications/misc/osmctools { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -16326,7 +16556,7 @@ with pkgs; python = python3; }; - psi = kde4.callPackage ../applications/networking/instant-messengers/psi { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; @@ -16349,9 +16579,7 @@ with pkgs; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { - libtorrentRasterbar = libtorrentRasterbar_1_0; - }; + qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; @@ -16385,7 +16613,7 @@ with pkgs; qrcode = callPackage ../tools/graphics/qrcode {}; - qsampler = callPackage ../applications/audio/qsampler { }; + qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = callPackage ../applications/graphics/qscreenshot { qt = qt4; @@ -16396,7 +16624,7 @@ with pkgs; qstopmotion = callPackage ../applications/video/qstopmotion { }; - qsynth = callPackage ../applications/audio/qsynth { }; + qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; @@ -16470,10 +16698,7 @@ with pkgs; quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl attrs; - inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; - }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -16487,7 +16712,9 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; - radiotray-ng = callPackage ../applications/audio/radiotray-ng { }; + radiotray-ng = callPackage ../applications/audio/radiotray-ng { + wxGTK = wxGTK30; + }; rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; @@ -16495,22 +16722,14 @@ with pkgs; ratmen = callPackage ../tools/X11/ratmen {}; - ratox = callPackage ../applications/networking/instant-messengers/ratox { - libtoxcore = libtoxcore-old; - }; + ratox = callPackage ../applications/networking/instant-messengers/ratox { }; ratpoison = callPackage ../applications/window-managers/ratpoison { }; rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; - cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 }; - rawtherapee-git = lowPrio (callPackage ../applications/graphics/rawtherapee/dev.nix { - fftw = fftwSinglePrec; - cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 - }); - rclone = callPackage ../applications/networking/sync/rclone { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -16596,7 +16815,7 @@ with pkgs; udevil = callPackage ../applications/misc/udevil {}; - udiskie = callPackage ../applications/misc/udiskie { }; + udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte; @@ -16644,6 +16863,8 @@ with pkgs; skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; + slmenu = callPackage ../applications/misc/slmenu {}; slop = callPackage ../tools/misc/slop {}; @@ -16691,11 +16912,6 @@ with pkgs; extraLibs = config.st.extraLibs or []; }; - st-wayland = callPackage ../applications/misc/st/wayland.nix { - conf = config.st.conf or null; - patches = config.st.patches or null; - }; - xst = callPackage ../applications/misc/st/xst.nix { }; stag = callPackage ../applications/misc/stag { @@ -16737,7 +16953,9 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; - lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { + inherit (xfce) exo; + }; slic3r = callPackage ../applications/misc/slic3r { }; @@ -16866,6 +17084,8 @@ with pkgs; symlinks = callPackage ../tools/system/symlinks { }; + syncplay = callPackage ../applications/networking/syncplay { }; + syncthing = callPackage ../applications/networking/syncthing { }; syncthing012 = callPackage ../applications/networking/syncthing012 { }; @@ -16938,10 +17158,13 @@ with pkgs; vte = gnome2.vte.override { pythonSupport = true; }; }; + lxterminal = callPackage ../applications/misc/lxterminal { + vte = gnome2.vte; + }; + deepin-terminal = callPackage ../applications/misc/deepin-terminal { inherit (gnome3) libgee vte; wnck = libwnck3; - vala = vala_0_34; }; termite = callPackage ../applications/misc/termite { @@ -16963,6 +17186,8 @@ with pkgs; enableGTK3 = true; }; + thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; @@ -17034,10 +17259,10 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; transmission = callPackage ../applications/networking/p2p/transmission { }; - transmission_gtk = transmission.override { enableGTK3 = true; }; + transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; - transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; + transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; transgui = callPackage ../applications/networking/p2p/transgui { }; @@ -17174,7 +17399,9 @@ with pkgs; system-libvirt = libvirt; }; - virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { }; + virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + qtermwidget = lxqt.qtermwidget; + }; virtinst = callPackage ../applications/virtualization/virtinst {}; @@ -17545,6 +17772,8 @@ with pkgs; xkbset = callPackage ../tools/X11/xkbset { }; + xkbmon = callPackage ../applications/misc/xkbmon { }; + win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; win-qemu = callPackage ../applications/virtualization/driver/win-qemu { }; @@ -17850,6 +18079,8 @@ with pkgs; crrcsim = callPackage ../games/crrcsim {}; + cutemaze = libsForQt5.callPackage ../games/cutemaze {}; + cuyo = callPackage ../games/cuyo { }; dhewm3 = callPackage ../games/dhewm3 {}; @@ -17875,6 +18106,8 @@ with pkgs; d2x_rebirth = callPackage ../games/d2x-rebirth { }; + easyrpg-player = callPackage ../games/easyrpg-player { }; + eboard = callPackage ../games/eboard { }; eduke32 = callPackage ../games/eduke32 { }; @@ -17920,9 +18153,7 @@ with pkgs; freedink = callPackage ../games/freedink { }; - freeorion = callPackage ../games/freeorion { - boost = boost160; - }; + freeorion = callPackage ../games/freeorion { }; freesweep = callPackage ../games/freesweep { }; @@ -17948,8 +18179,6 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; - ghostOne = callPackage ../servers/games/ghost-one { }; - gl117 = callPackage ../games/gl-117 {}; globulation2 = callPackage ../games/globulation { @@ -18243,6 +18472,10 @@ with pkgs; nativeOnly = true; }).run; + linux-steam-integration = callPackage ../games/linux-steam-integration { + gtk = pkgs.gtk3; + }; + stepmania = callPackage ../games/stepmania { ffmpeg = ffmpeg_2; }; @@ -18433,14 +18666,13 @@ with pkgs; } // { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra_gtk2 # Included for backwards compatibility libsoup libwnck gtk_doc gnome_doc_utils; gtk = self.gtk2; gtkmm = self.gtkmm2; - libcanberra = self.libcanberra_gtk2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); @@ -18448,6 +18680,8 @@ with pkgs; gnomeExtensions = { caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; + dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; }; @@ -18455,24 +18689,6 @@ with pkgs; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = - let - deps = lib.makeScope newScope (self: { - inherit (python2Packages) python; - kdelibs = kdelibs4; - boost = boost155; - ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise - }); - - self = lib.makeScope deps.newScope (self: with self; - import ../desktops/kde-4.14 { - callPackageOrig = pkgs.callPackage; - inherit (self) callPackage; - inherit stdenv qt48 kdelibs; - } - ); - in recurseIntoAttrs self; - lumina = libsForQt5.callPackage ../desktops/lumina { }; lxqt = recurseIntoAttrs (import ../desktops/lxqt { @@ -18501,6 +18717,8 @@ with pkgs; deepin-gtk-theme = callPackage ../misc/themes/deepin { }; + elementary-gtk-theme = callPackage ../misc/themes/elementary { }; + albatross = callPackage ../misc/themes/albatross { }; gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; @@ -18543,7 +18761,7 @@ with pkgs; inherit (kdeFrameworks) kded kinit frameworkintegration; inherit (plasma5) - bluedevil breeze-gtk breeze-qt4 breeze-qt5 breeze-grub breeze-plymouth + bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop @@ -18781,89 +18999,12 @@ with pkgs; boogie = dotnetPackages.Boogie; - coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { - make = pkgs.gnumake3; - inherit (ocamlPackages_3_12_1) ocaml findlib; - camlp5 = ocamlPackages_3_12_1.camlp5_transitional; - lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; - }; - coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { - inherit (ocamlPackages_4_02) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; - }; - coq_8_5 = callPackage ../applications/science/logic/coq { - version = "8.5pl3"; - }; - coq_8_6 = callPackage ../applications/science/logic/coq {}; - coq_8_7 = callPackage ../applications/science/logic/coq { - version = "8.7.0"; - }; - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; - - mkCoqPackages_8_4 = self: let callPackage = newScope self; in { - inherit callPackage; - coq = coq_8_4; - coqPackages = coqPackages_8_4; - - contribs = - let contribs = - import ../development/coq-modules/contribs - contribs - callPackage { }; - in - recurseIntoAttrs contribs; - - bedrock = callPackage ../development/coq-modules/bedrock {}; - coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {}; - coqeal = callPackage ../development/coq-modules/coqeal {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - domains = callPackage ../development/coq-modules/domains {}; - fiat = callPackage ../development/coq-modules/fiat {}; - fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - flocq = callPackage ../development/coq-modules/flocq {}; - heq = callPackage ../development/coq-modules/heq {}; - interval = callPackage ../development/coq-modules/interval {}; - mathcomp = callPackage ../development/coq-modules/mathcomp {}; - paco = callPackage ../development/coq-modules/paco {}; - QuickChick = callPackage ../development/coq-modules/QuickChick {}; - ssreflect = callPackage ../development/coq-modules/ssreflect {}; - tlc = callPackage ../development/coq-modules/tlc {}; - unimath = callPackage ../development/coq-modules/unimath {}; - ynot = callPackage ../development/coq-modules/ynot {}; - }; - - mkCoqPackages = self: coq: let callPackage = newScope self; in rec { - inherit callPackage coq; - coqPackages = self; - - autosubst = callPackage ../development/coq-modules/autosubst {}; - bignums = if stdenv.lib.versionAtLeast coq.coq-version "8.6" - then callPackage ../development/coq-modules/bignums {} - else null; - coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; - flocq = callPackage ../development/coq-modules/flocq {}; - heq = callPackage ../development/coq-modules/heq {}; - HoTT = callPackage ../development/coq-modules/HoTT {}; - interval = callPackage ../development/coq-modules/interval {}; - mathcomp = callPackage ../development/coq-modules/mathcomp { }; - metalib = callPackage ../development/coq-modules/metalib { }; - paco = callPackage ../development/coq-modules/paco {}; - ssreflect = callPackage ../development/coq-modules/ssreflect { }; - QuickChick = callPackage ../development/coq-modules/QuickChick {}; - CoLoR = callPackage ../development/coq-modules/CoLoR {}; - math-classes = callPackage ../development/coq-modules/math-classes { }; - fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - equations = callPackage ../development/coq-modules/equations { }; - }; - - coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; - coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5; - coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6; - coqPackages_8_7 = mkCoqPackages coqPackages_8_7 coq_8_7; - coqPackages = coqPackages_8_6; - coq = coqPackages.coq; + inherit (callPackage ./coq-packages.nix {}) + mkCoqPackages + coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 + coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 + coqPackages coq + ; coq2html = callPackage ../applications/science/logic/coq2html { make = pkgs.gnumake3; @@ -18878,6 +19019,8 @@ with pkgs; }; cvc4 = callPackage ../applications/science/logic/cvc4 {}; + drat-trim = callPackage ../applications/science/logic/drat-trim {}; + ekrhyper = callPackage ../applications/science/logic/ekrhyper { inherit (ocamlPackages_4_02) ocaml; }; @@ -18945,7 +19088,7 @@ with pkgs; opensmt = callPackage ../applications/science/logic/opensmt { }; - inherit (ocamlPackages) ott; + ott = callPackage ../applications/science/logic/ott { }; otter = callPackage ../applications/science/logic/otter {}; @@ -18962,6 +19105,8 @@ with pkgs; proverif = callPackage ../applications/science/logic/proverif { }; + sapic = callPackage ../applications/science/logic/sapic { }; + satallax = callPackage ../applications/science/logic/satallax { ocaml = ocamlPackages_4_01_0.ocaml; }; @@ -18990,6 +19135,7 @@ with pkgs; gmp-static = gmp.override { withStatic = true; }; }; + z3_4_5_0 = callPackage ../applications/science/logic/z3/4.5.0.nix {}; z3 = callPackage ../applications/science/logic/z3 {}; aiger = callPackage ../applications/science/logic/aiger {}; @@ -19021,6 +19167,11 @@ with pkgs; boost = boost160; }; + kicad-unstable = python.pkgs.callPackage ../applications/science/electronics/kicad/unstable.nix { + wxGTK = wxGTK30; + boost = boost160; + }; + ngspice = callPackage ../applications/science/electronics/ngspice { }; pcb = callPackage ../applications/science/electronics/pcb { }; @@ -19426,6 +19577,8 @@ with pkgs; kompose = callPackage ../applications/networking/cluster/kompose { }; + kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; + kops = callPackage ../applications/networking/cluster/kops { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; @@ -19647,6 +19800,11 @@ with pkgs; sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; + sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { + inherit libusb1; # Shadow python.pkgs.libusb1. + librsvg = librsvg.override { enableIntrospection = true; }; + }; + sct = callPackage ../tools/X11/sct {}; seafile-shared = callPackage ../misc/seafile-shared { }; @@ -19672,6 +19830,8 @@ with pkgs; splix = callPackage ../misc/cups/drivers/splix { }; + steamcontroller = callPackage ../misc/drivers/steamcontroller { }; + streamripper = callPackage ../applications/audio/streamripper { }; sqsh = callPackage ../development/tools/sqsh { }; @@ -19681,14 +19841,13 @@ with pkgs; terraform_0_8 terraform_0_9 terraform_0_10 + terraform_0_10-full terraform_0_11 + terraform_0_11-full ; - # Terraform with all the plugins, both to get Hydra to build all plugins for us and for - # convenience if someone doesn't want to have to think about which plugins to use. - terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; - - terraform = terraform_0_9; + terraform = terraform_0_11; + terraform-full = terraform_0_11-full; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -19895,6 +20054,7 @@ with pkgs; xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; + sane-backends = sane-backends.override { libpng = libpng12; }; }; xsw = callPackage ../applications/misc/xsw { @@ -20051,6 +20211,9 @@ with pkgs; cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; stdenv-inputs = callPackage ../test/stdenv-inputs { }; + cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; + cc-multilib-clang = callPackage ../test/cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + macOSSierraShared = callPackage ../test/macos-sierra-shared {}; }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index bffd86da52e7..76807d9b9261 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -14,15 +14,6 @@ rec { erlang_nox = erlangR19_nox; # These are standard Erlang versions, using the generic builder. - erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {}; - erlangR16_odbc = erlangR16.override { odbcSupport = true; }; - erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {}; - erlangR17_odbc = erlangR17.override { odbcSupport = true; }; - erlangR17_javac = erlangR17.override { javacSupport = true; }; - erlangR17_odbc_javac = erlangR17.override { - javacSupport = true; odbcSupport = true; - }; - erlangR17_nox = erlangR17.override { wxSupport = false; }; erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; }; @@ -51,8 +42,8 @@ rec { }; erlangR20_nox = erlangR20.override { wxSupport = false; }; - # Bash fork, using custom builder. - erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix { + # Basho fork, using custom builder. + erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; @@ -61,7 +52,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR19.elixir`. - inherit (packages.erlang) elixir elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) lfe lfe_1_2; }; @@ -75,8 +66,6 @@ rec { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; - erlangR16 = packagesWith interpreters.erlangR16; - erlangR17 = packagesWith interpreters.erlangR17; erlangR18 = packagesWith interpreters.erlangR18; erlangR19 = packagesWith interpreters.erlangR19; erlangR20 = packagesWith interpreters.erlangR20; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix new file mode 100644 index 000000000000..c27a2e7d39d8 --- /dev/null +++ b/pkgs/top-level/coq-packages.nix @@ -0,0 +1,81 @@ +{ lib, callPackage, newScope, recurseIntoAttrs +, gnumake3 +, ocamlPackages_3_12_1 +, ocamlPackages_4_02 +}: + +let + mkCoqPackages' = self: coq: + let callPackage = newScope self ; in rec { + inherit callPackage coq; + coqPackages = self; + + contribs = recurseIntoAttrs + (callPackage ../development/coq-modules/contribs {}); + + autosubst = callPackage ../development/coq-modules/autosubst {}; + bignums = if lib.versionAtLeast coq.coq-version "8.6" + then callPackage ../development/coq-modules/bignums {} + else null; + category-theory = callPackage ../development/coq-modules/category-theory { }; + CoLoR = callPackage ../development/coq-modules/CoLoR {}; + coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; + coquelicot = callPackage ../development/coq-modules/coquelicot {}; + dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; + equations = callPackage ../development/coq-modules/equations { }; + fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; + flocq = callPackage ../development/coq-modules/flocq {}; + heq = callPackage ../development/coq-modules/heq {}; + HoTT = callPackage ../development/coq-modules/HoTT {}; + interval = callPackage ../development/coq-modules/interval {}; + math-classes = callPackage ../development/coq-modules/math-classes { }; + mathcomp = callPackage ../development/coq-modules/mathcomp { }; + metalib = callPackage ../development/coq-modules/metalib { }; + multinomials = callPackage ../development/coq-modules/multinomials {}; + paco = callPackage ../development/coq-modules/paco {}; + QuickChick = callPackage ../development/coq-modules/QuickChick {}; + ssreflect = callPackage ../development/coq-modules/ssreflect { }; + tlc = callPackage ../development/coq-modules/tlc {}; + }; + + filterCoqPackages = coq: + lib.filterAttrsRecursive + (_: p: + let pred = p.compatibleCoqVersions or (_: true); + in pred coq.coq-version + ); + +in rec { + + mkCoqPackages = coq: + let self = mkCoqPackages' self coq; in + filterCoqPackages coq self; + + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { + make = gnumake3; + inherit (ocamlPackages_3_12_1) ocaml findlib; + camlp5 = ocamlPackages_3_12_1.camlp5_transitional; + lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; + }; + coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { + inherit (ocamlPackages_4_02) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_02.camlp5_transitional; + }; + coq_8_5 = callPackage ../applications/science/logic/coq { + version = "8.5pl3"; + }; + coq_8_6 = callPackage ../applications/science/logic/coq { + version = "8.6.1"; + }; + coq_8_7 = callPackage ../applications/science/logic/coq { + version = "8.7.1"; + }; + + coqPackages_8_5 = mkCoqPackages coq_8_5; + coqPackages_8_6 = mkCoqPackages coq_8_6; + coqPackages_8_7 = mkCoqPackages coq_8_7; + coqPackages = coqPackages_8_6; + coq = coqPackages.coq; + +} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 32d540a8f967..7540a47ef6d5 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -10,8 +10,14 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; - binutils = callPackage ../os-specific/darwin/binutils { - inherit (darwin) cctools; + binutils = pkgs.wrapBintoolsWith { + libc = + if pkgs.targetPlatform != pkgs.hostPlatform + then pkgs.libcCross + else pkgs.stdenv.cc.libc; + bintools = callPackage ../os-specific/darwin/binutils { + inherit (darwin) cctools; + }; }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { @@ -31,6 +37,8 @@ in inherit (darwin) opencflite; }; + insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; + ios-cross = callPackage ../os-specific/darwin/ios-cross { inherit (darwin) binutils; }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index b082bce11b72..1a37d58c70d1 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -715,7 +715,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; - homepage = http://numerics.mathdotnet.com/; + homepage = https://numerics.mathdotnet.com/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -872,7 +872,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Popular high-performance JSON framework for .NET"; - homepage = "http://www.newtonsoft.com/json"; + homepage = "https://www.newtonsoft.com/json"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 111893f93b78..cba1f9a54a24 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -6,6 +6,9 @@ let "ghc6102Binary" "ghc704Binary" "ghc742Binary" + "ghc784Binary" + "ghc7103Binary" + "ghc821Binary" "ghc6104" "ghc6123" "ghc704" @@ -13,7 +16,6 @@ let "ghcjs" "ghcjsHEAD" "ghcCross" - "jhc" "uhc" "integer-simple" ]; @@ -30,13 +32,18 @@ in rec { compiler = { - ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; + ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { + gmp = pkgs.gmp4; + }; ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix { gmp = pkgs.gmp4; }; ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix { gmp = pkgs.gmp4; }; + ghc784Binary = callPackage ../development/compilers/ghc/7.8.4-binary.nix { }; + ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { }; + ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; }; ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; }; @@ -52,63 +59,45 @@ in rec { ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; }; - ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix { - ghc = compiler.ghc742Binary; - }; ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; }; - ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec { - bootPkgs = packages.ghc784; - inherit (bootPkgs) hscolour; - }; ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec { - bootPkgs = packages.ghc784; + bootPkgs = packages.ghc7103Binary; inherit (bootPkgs) hscolour; }; ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { - bootPkgs = packages.ghc7103; + bootPkgs = packages.ghc7103Binary; inherit (bootPkgs) hscolour; sphinx = pkgs.python27Packages.sphinx; }; - ghc821 = callPackage ../development/compilers/ghc/8.2.1.nix rec { - bootPkgs = packages.ghc802; - inherit (bootPkgs) hscolour alex happy; - inherit buildPlatform targetPlatform; - sphinx = pkgs.python3Packages.sphinx; - selfPkgs = packages.ghc821; - }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec { - bootPkgs = packages.ghc802; + bootPkgs = packages.ghc821Binary; inherit (bootPkgs) hscolour alex happy; inherit buildPlatform targetPlatform; sphinx = pkgs.python3Packages.sphinx; selfPkgs = packages.ghc822; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { - bootPkgs = packages.ghc802; + bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; inherit buildPlatform targetPlatform; selfPkgs = packages.ghcHEAD; }; ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { - bootPkgs = packages.ghc7103; + bootPkgs = packages.ghc821Binary; }; ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { - bootPkgs = packages.ghc802; + bootPkgs = packages.ghc821Binary; }; ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec { - bootPkgs = packages.ghc802; + bootPkgs = packages.ghc7103Binary; inherit (bootPkgs) hscolour alex happy; }; - jhc = callPackage ../development/compilers/jhc { - inherit (packages.ghc763) ghcWithPackages; - }; - uhc = callPackage ../development/compilers/uhc/default.nix ({ stdenv = pkgs.clangStdenv; - inherit (pkgs.haskellPackages) ghcWithPackages; + inherit (packages.ghc7103Binary) ghcWithPackages; }); # The integer-simple attribute set contains all the GHC compilers @@ -127,56 +116,26 @@ in rec { packages = { - # Support for this compiler is broken, because it can't deal with directory-based package databases. - # ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; }; - ghc6123 = callPackage ../development/haskell-modules { - ghc = compiler.ghc6123; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; - }; - ghc704 = callPackage ../development/haskell-modules { - ghc = compiler.ghc704; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; - }; - ghc722 = callPackage ../development/haskell-modules { - ghc = compiler.ghc722; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; - }; - ghc742 = callPackage ../development/haskell-modules { - ghc = compiler.ghc742; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; - }; - ghc763 = callPackage ../development/haskell-modules { - ghc = compiler.ghc763; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; - }; - ghc783 = callPackage ../development/haskell-modules { - ghc = compiler.ghc783; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; - }; - ghc784 = callPackage ../development/haskell-modules { - ghc = compiler.ghc784; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; - }; - ghc7102 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7102; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; ghc7103 = callPackage ../development/haskell-modules { ghc = compiler.ghc7103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; + ghc7103Binary = callPackage ../development/haskell-modules { + ghc = compiler.ghc7103Binary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; + }; ghc802 = callPackage ../development/haskell-modules { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; - ghc821 = callPackage ../development/haskell-modules { - ghc = compiler.ghc821; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; - }; ghc822 = callPackage ../development/haskell-modules { ghc = compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; + ghc821Binary = callPackage ../development/haskell-modules { + ghc = compiler.ghc821Binary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; @@ -186,10 +145,6 @@ in rec { ghc = compiler.ghcHEAD.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcCross821 = callPackage ../development/haskell-modules { - ghc = compiler.ghc821.crossCompiler; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; - }; ghcjs = callPackage ../development/haskell-modules { ghc = compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 47299791e86b..4c05f96caf7a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,6 +8,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +, mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which }: @@ -71,7 +72,7 @@ let description = "C extension module for Lua which adds bitwise operations on numbers"; homepage = "http://bitop.luajit.org"; license = licenses.mit; - maintainers = with maintainers; [ flosse ]; + maintainers = with maintainers; [ ]; }; }; @@ -105,6 +106,35 @@ let }; }; + luacyrussasl = buildLuaPackage rec { + version = "1.1.0"; + name = "lua-cyrussasl-${version}"; + src = fetchFromGitHub { + owner = "JorjBauer"; + repo = "lua-cyrussasl"; + rev = "v${version}"; + sha256 = "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1"; + }; + + preBuild = '' + makeFlagsArray=( + CFLAGS="-O2 -fPIC" + LDFLAGS="-O -shared -fpic -lsasl2" + LUAPATH="$out/share/lua/${lua.luaversion}" + CPATH="$out/lib/lua/${lua.luaversion}" + ); + mkdir -p $out/{share,lib}/lua/${lua.luaversion} + ''; + + buildInputs = [ cyrus_sasl ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/JorjBauer/lua-cyrussasl"; + description = "Cyrus SASL library for Lua 5.1+"; + license = licenses.bsd3; + }; + }; + luaevent = buildLuaPackage rec { version = "0.4.3"; name = "luaevent-${version}"; @@ -140,7 +170,6 @@ let luaexpat = buildLuaPackage rec { version = "1.3.0"; name = "expat-${version}"; - isLibrary = true; src = fetchurl { url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"; @@ -172,14 +201,50 @@ let }; }; + luadbi = buildLuaPackage rec { + name = "luadbi-${version}"; + version = "0.5"; + src = fetchurl { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luadbi/luadbi.${version}.tar.gz"; + sha256 = "07ikxgxgfpimnwf7zrqwcwma83ss3wm2nzjxpwv2a1c0vmc684a9"; + }; + sourceRoot = "."; + + buildInputs = [ mysql.connector-c postgresql sqlite ]; + + preConfigure = '' + substituteInPlace Makefile --replace CC=gcc CC=cc + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' + ''; + + NIX_CFLAGS_COMPILE = [ + "-I${mysql.connector-c}/include/mysql" + "-L${mysql.connector-c}/lib/mysql" + "-I${postgresql}/include/server" + ]; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion} + install -p DBI.lua *.so $out/lib/lua/${lua.luaversion} + ''; + + meta = with stdenv.lib; { + homepage = "https://code.google.com/archive/p/luadbi/"; + platforms = stdenv.lib.platforms.unix; + }; + }; + luafilesystem = buildLuaPackage rec { - name = "filesystem-1.6.2"; + version = "1.6.3"; + name = "filesystem-${version}"; src = fetchFromGitHub { owner = "keplerproject"; repo = "luafilesystem"; - rev = "v1_6_2"; - sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; + rev = "v${stdenv.lib.replaceChars ["."] ["_"] version}"; + sha256 = "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; }; preConfigure = '' @@ -224,12 +289,12 @@ let }; lpty = buildLuaPackage rec { + version = "1.2.1"; name = "lpty-${version}"; - version = "1.1.1"; src = fetchurl { - url = "http://www.tset.de/downloads/lpty-1.1-1.tar.gz"; - sha256 = "0d4ffda654dcf37dd8c99bcd100d0ee0dde7782cbd0ba9200ef8711c5cab02f1"; + url = "http://www.tset.de/downloads/lpty-${version}-1.tar.gz"; + sha256 = "0rgvbpymcgdkzdwfag607xfscs9xyqxg0dj0qr5fv906mi183gs6"; }; preBuild = '' @@ -331,6 +396,8 @@ let ); ''; + installTargets = [ "install" "install-unix" ]; + meta = with stdenv.lib; { description = "Network support for Lua"; homepage = "http://w3.impa.br/~diego/software/luasocket/"; @@ -651,13 +718,13 @@ let vicious = stdenv.mkDerivation rec { name = "vicious-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "vicious"; rev = "v${version}"; - sha256 = "1mrd8c46ljilag8dljvnagaxnjnab8bmg9mcbnwvrivgjzgf6a1k"; + sha256 = "1yzhjn8rsvjjsfycdc993ms6jy2j5jh7x3r2ax6g02z5n0anvnbx"; }; buildInputs = [ lua ]; @@ -669,7 +736,7 @@ let ''; meta = with stdenv.lib; { - description = "Vicious widgets for window managers"; + description = "A modular widget library for the awesome window manager"; homepage = https://github.com/Mic92/vicious; license = licenses.gpl2; maintainers = with maintainers; [ makefu mic92 ]; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 16940761e6dc..ccd7b89fc12d 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -43,8 +43,10 @@ releaseTools.sourceTarball rec { echo 'abort "Illegal use of in Nixpkgs."' > $TMPDIR/barf.nix # Make sure that Nixpkgs does not use - if (find pkgs -type f -name '*.nix' -print | xargs grep ' to refer to itself." + echo "The offending files: $badFiles" exit 1 fi diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 04e7b16e56b3..4a7c77172cc0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -128,7 +128,7 @@ let ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; - ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; + cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; cil = callPackage ../development/ocaml-modules/cil { }; @@ -192,7 +192,9 @@ let then callPackage ../development/ocaml-modules/csv { } else callPackage ../development/ocaml-modules/csv/1.5.nix { }; - curses = callPackage ../development/ocaml-modules/curses { }; + curses = callPackage ../development/ocaml-modules/curses { + ncurses = pkgs.ncurses5; + }; custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; @@ -200,10 +202,14 @@ let decompress = callPackage ../development/ocaml-modules/decompress { }; + digestif = callPackage ../development/ocaml-modules/digestif { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; + dtoa = callPackage ../development/ocaml-modules/dtoa { }; + easy-format = callPackage ../development/ocaml-modules/easy-format { }; eff = callPackage ../development/interpreters/eff { }; @@ -227,8 +233,14 @@ let lwt = ocaml_lwt; }; + facile = callPackage ../development/ocaml-modules/facile { }; + faillib = callPackage ../development/ocaml-modules/faillib { }; + faraday = callPackage ../development/ocaml-modules/faraday { }; + + farfadet = callPackage ../development/ocaml-modules/farfadet { }; + fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; fileutils = callPackage ../development/ocaml-modules/fileutils { }; @@ -347,6 +359,8 @@ let lwt = ocaml_lwt; }; + lru = callPackage ../development/ocaml-modules/lru { }; + lwt2 = callPackage ../development/ocaml-modules/lwt { }; lwt3 = if lib.versionOlder "4.02" ocaml.version @@ -367,7 +381,7 @@ let magick = callPackage ../development/ocaml-modules/magick { }; - markup = callPackage ../development/ocaml-modules/markup { lwt = lwt2; }; + markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; menhir = callPackage ../development/ocaml-modules/menhir { }; @@ -498,6 +512,8 @@ let piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + psq = callPackage ../development/ocaml-modules/psq { }; + ptime = callPackage ../development/ocaml-modules/ptime { }; re2_p4 = callPackage ../development/ocaml-modules/re2 { }; @@ -665,6 +681,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; + x509 = callPackage ../development/ocaml-modules/x509 { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; @@ -968,10 +986,6 @@ let matita_130312 = callPackage ../applications/science/logic/matita/130312.nix { }; - ott = callPackage ../applications/science/logic/ott { - camlp5 = camlp5_transitional; - }; - }; in (ocamlPackages.janeStreet // ocamlPackages); in lib.fix' (lib.extends overrides packageSet); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5cc2de5aa186..cf421c6e88df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25,10 +25,10 @@ let self = _self // overrides; _self = with self; { ack = buildPerlPackage rec { - name = "ack-2.16"; + name = "ack-2.22"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "0ifbmbfvagfi76i7vjpggs2hrbqqisd14f5zizan6cbdn8dl5z2g"; + sha256 = "0v0gdv1ja12ks4yp1nb93z1lh14s869dr4mfjb3nkgw6pkdl3i02"; }; outputs = ["out" "man"]; # use gnused so that the preCheck command passes @@ -664,7 +664,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; meta = { - homepage = http://www.perl-compiler.org; + homepage = https://github.com/rurban/perl-compiler; description = "Perl compiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -754,13 +754,13 @@ let self = _self // overrides; _self = with self; { }; boolean = buildPerlPackage rec { - name = "boolean-0.45"; + name = "boolean-0.46"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "18hrgldzwnhs0c0r8hxx6r05qvk9p7gwinjwcybixfs2h0n43ypj"; + sha256 = "95c088085c3e83bf680fe6ce16d8264ec26310490f7d1680e416ea7a118f156a"; }; meta = { - homepage = https://github.com/ingydotnet/boolean-pm/tree; + homepage = https://github.com/ingydotnet/boolean-pm; description = "Boolean support for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3402,6 +3402,19 @@ let self = _self // overrides; _self = with self; { }; }; + DateTimeCalendarJulian = buildPerlPackage rec { + name = "DateTime-Calendar-Julian-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PI/PIJLL/${name}.tar.gz"; + sha256 = "03h0llkwsiw2d2ci1ah5x9sp8xrvnbgd471i5hnpgl5w32nnhndv"; + }; + propagatedBuildInputs = [ DateTime ]; + meta = { + description = "Dates in the Julian calendar"; + license = stdenv.lib.licenses.artistic2; + }; + }; + DateTimeEventICal = buildPerlPackage rec { name = "DateTime-Event-ICal-0.13"; src = fetchurl { @@ -4836,6 +4849,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JG/JGMYERS/${name}.tar.gz"; sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1"; }; + nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ ModuleBuild ]; meta = { description = "An Encode::Encoding subclass that detects the encoding of data"; @@ -5149,6 +5163,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; sha256 = "1a77hxf2pa8ia9na72rijv1yhpn2bjrdsybwk2dj2l938pl3xn0w"; }; + nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; }; @@ -5637,10 +5652,10 @@ let self = _self // overrides; _self = with self; { }; FileNext = buildPerlPackage rec { - name = "File-Next-1.12"; + name = "File-Next-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "cc3afd8eaf6294aba93b8152a269cc36a9df707c6dc2c149aaa04dabd869e60a"; + sha256 = "0nfp84p63a5xm6iwlckh3f6cy9bdpjw5fazplskhnb8k5ifg4rb9"; }; }; @@ -5790,10 +5805,10 @@ let self = _self // overrides; _self = with self; { }; FileSlurper = buildPerlPackage rec { - name = "File-Slurper-0.010"; + name = "File-Slurper-0.011"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "a393364648c9d6be938e8a68c3094c5f8a37b19d3159141ec81ba49559343c16"; + sha256 = "f6494844b9759b3d1dd8fc4ffa790f8e6e493c4eb58e88831a51e085f2e76010"; }; buildInputs = [ TestWarnings ]; meta = { @@ -5867,10 +5882,10 @@ let self = _self // overrides; _self = with self; { }; FinanceQuote = buildPerlPackage rec { - name = "Finance-Quote-1.38"; + name = "Finance-Quote-1.47"; src = fetchurl { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; - sha256 = "0zhqb27y4vdxn476s2kwm9zl2f970yjcyyybnjm9b406krr2fm59"; + sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7"; }; propagatedBuildInputs = [ CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP LWPProtocolHttps MozillaCA @@ -6867,14 +6882,16 @@ let self = _self // overrides; _self = with self; { }; HTTPMessage = buildPerlPackage rec { - name = "HTTP-Message-6.11"; + name = "HTTP-Message-6.14"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; + sha256 = "71aab9f10eb4b8ec6e8e3a85fc5acb46ba04db1c93eb99613b184078c5cf2ac9"; }; + buildInputs = [ TryTiny ]; propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { - description = "HTTP style messages"; + homepage = https://github.com/libwww-perl/HTTP-Message; + description = "HTTP style message (base class)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8032,10 +8049,10 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.703"; + name = "Log-Any-1.704"; src = fetchurl { url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; - sha256 = "65a2ffba5f5fd355ce0b2365b478dda5ee091cf9d81c047dd22fe5ef4f823e3b"; + sha256 = "57289d17b83bb5ce1d44148fd4e31a82b0d27e9104706ddc1ec5bb15461d0dd9"; }; # Syslog test fails. preCheck = "rm t/syslog.t"; @@ -8475,6 +8492,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; sha256 = "0i9wzvig7ayijc9nvh5x5rryk1jrcj1hcvfmlcj449rnnxx24dav"; }; + nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ]; }; @@ -12210,6 +12228,19 @@ let self = _self // overrides; _self = with self; { }; }; + SortKey = buildPerlPackage rec { + name = "Sort-Key-1.33"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + sha256 = "1kqs10s2plj6c96srk0j8d7xj8dxk1704r7mck8rqk09mg7lqspd"; + }; + buildInputs = [ TestMore ]; + meta = { + description = "Sort arrays by one or multiple calculated keys"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SortVersions = buildPerlPackage rec { name = "Sort-Versions-1.5"; src = fetchurl { @@ -15402,10 +15433,10 @@ let self = _self // overrides; _self = with self; { }; UnicodeCollate = buildPerlPackage rec { - name = "Unicode-Collate-1.14"; + name = "Unicode-Collate-1.25"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SADAHIRO/${name}.tar.gz"; - sha256 = "0ykncvhnwy8ync01ibv0524m0si9ya1ch2v8vx61s778nnrmp2k2"; + sha256 = "1dpvck4saah8hqb9c82i25yimy9x2hkr1k3a2f1ly0k0ifhbiyyx"; }; meta = { description = "Unicode Collation Algorithm"; @@ -15430,10 +15461,10 @@ let self = _self // overrides; _self = with self; { }; UnicodeLineBreak = buildPerlPackage rec { - name = "Unicode-LineBreak-2015.07.16"; + name = "Unicode-LineBreak-2017.004"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz"; - sha256 = "0fycsfc3jhnalad7zvx47f13dpxihdh9c8fy8w7psjlyd5svs6sb"; + sha256 = "0xnb80na1ps1b5gmj3n70bk28brjzrn725kqv5q0gbb0rg2c6nv5"; }; propagatedBuildInputs = [ MIMECharset ]; meta = { @@ -15614,6 +15645,25 @@ let self = _self // overrides; _self = with self; { }; }; + vidir = buildPerlPackage rec { + name = "vidir-0.040"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-${name}-woldrich.tar.gz"; + sha256 = "0c97yx33pyhskbmwpqbwlkxr85awd6kg1baibvqkarhhvc8v7l0h"; + }; + # NB: This preInstall a workaround for a problem that is fixed in HEAD. + preInstall = '' + sed -i -e '/^use encoding/d' bin/vidir + ''; + outputs = [ "out" ]; + meta = { + maintainers = [ maintainers.chreekat ]; + homepage = "http://search.cpan.org/~woldrich/App-vidir/bin/vidir"; + description = "Edit a directory in $EDITOR"; + license = with stdenv.lib.licenses; [ gpl1 ]; + }; + }; + VMEC2 = buildPerlModule rec { name = "VM-EC2-1.28"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 17434f221a65..d297496c81ef 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -8,6 +8,8 @@ let }; isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5"; isPhp7 = pkgs.lib.versionAtLeast php.version "7.0"; + isPhp72 = pkgs.lib.versionAtLeast php.version "7.2"; + isPhpOlder7 = pkgs.lib.versionOlder php.version "7.0"; apcu = if isPhp7 then apcu51 else apcu40; @@ -100,6 +102,12 @@ let sha256 = "0a55l4f0bgbf3f6sh34njd14niwagg829gfkvb8n5fs69xqab67d"; }; + mailparse = assert isPhp7; buildPecl { + name = "mailparse-3.0.2"; + + sha256 = "0fw447ralqihsjnn0fm2hkaj8343cvb90v0d1wfclgz49256y6nq"; + }; + imagick = buildPecl { name = "imagick-3.4.3RC1"; sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh"; @@ -173,7 +181,7 @@ let buildInputs = [ pkgs.spidermonkey_1_8_5 ]; }; - xdebug = if isPhp7 then xdebug25 else xdebug23; + xdebug = if isPhp72 then xdebug26 else if isPhp7 then xdebug25 else xdebug23; xdebug23 = assert !isPhp7; buildPecl { name = "xdebug-2.3.1"; @@ -184,7 +192,7 @@ let checkTarget = "test"; }; - xdebug25 = buildPecl { + xdebug25 = assert !isPhp72; buildPecl { name = "xdebug-2.5.0"; sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb"; @@ -193,6 +201,15 @@ let checkTarget = "test"; }; + xdebug26 = assert !isPhpOlder7; buildPecl { + name = "xdebug-2.6.0beta1"; + + sha256 = "0zaj821jbpaqqcbr9a64sa27my9n980pmyy9kxrvvjqq3qg6dpj9"; + + doCheck = true; + checkTarget = "test"; + }; + yaml = if isPhp7 then yaml20 else yaml13; yaml13 = assert !isPhp7; buildPecl { @@ -347,6 +364,93 @@ let }; }; + box = pkgs.stdenv.mkDerivation rec { + name = "box-${version}"; + version = "2.7.5"; + + src = pkgs.fetchurl { + url = "https://github.com/box-project/box2/releases/download/${version}/box-${version}.phar"; + sha256 = "1zmxdadrv0i2l8cz7xb38gnfmfyljpsaz2nnkjzqzksdmncbgd18"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/box/box.phar + makeWrapper ${php}/bin/php $out/bin/box \ + --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" + ''; + + meta = with pkgs.lib; { + description = "An application for building and managing Phars"; + license = licenses.mit; + homepage = https://box-project.github.io/box2/; + maintainers = with maintainers; [ jtojnar ]; + }; + }; + + php-cs-fixer = pkgs.stdenv.mkDerivation rec { + name = "php-cs-fixer-${version}"; + version = "2.9.0"; + + src = pkgs.fetchurl { + url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; + sha256 = "12z1fan4yyxll03an51zhx6npr1d49s84dvmrvnzzf9jhckl5mqd"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar + makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ + --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" + ''; + + meta = with pkgs.lib; { + description = "A tool to automatically fix PHP coding standards issues"; + license = licenses.mit; + homepage = http://cs.sensiolabs.org/; + maintainers = with maintainers; [ jtojnar ]; + }; + }; + + php-parallel-lint = pkgs.stdenv.mkDerivation rec { + name = "php-parallel-lint-${version}"; + version = "0.9.2"; + + src = pkgs.fetchFromGitHub { + owner = "JakubOnderka"; + repo = "PHP-Parallel-Lint"; + rev = "v${version}"; + sha256 = "0dzyi6arwpwbjgr366vw3qxibc3naq863p75q433ahznbdygzzm1"; + }; + + buildInputs = [ pkgs.makeWrapper composer box ]; + + buildPhase = '' + composer dump-autoload + box build + ''; + + installPhase = '' + mkdir -p $out/bin + install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar + makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ + --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" + ''; + + meta = with pkgs.lib; { + description = "This tool check syntax of PHP files faster than serial check with fancier output"; + license = licenses.bsd2; + homepage = https://github.com/JakubOnderka/PHP-Parallel-Lint; + maintainers = with maintainers; [ jtojnar ]; + }; + }; + phpcs = pkgs.stdenv.mkDerivation rec { name = "phpcs-${version}"; version = "2.6.0"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52fab78be89c..21345dc51940 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -43,10 +43,10 @@ let overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // { - overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); + overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); }) else if builtins.isFunction ff then { - overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); + overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); __functor = self: ff; } else ff; @@ -56,14 +56,14 @@ let flit = self.flit; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit namePrefix; - pythonModule = python; + inherit toPythonModule; })); buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { inherit bootstrapped-pip; flit = self.flit; namePrefix = ""; - pythonModule = false; + toPythonModule = x: x; # Application does not provide modules. })); graphiteVersion = "1.0.2"; @@ -87,15 +87,12 @@ let in fetcher (builtins.removeAttrs attrs ["format"]) ); # Check whether a derivation provides a Python module. - hasPythonModule = drv: (hasAttr "pythonModule" drv) && ( (getAttr "pythonModule" drv) == python); + hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; # Get list of required Python modules given a list of derivations. requiredPythonModules = drvs: let - filterNull = list: filter (x: !isNull x) list; - conditionalGetRecurse = attr: condition: drv: let f = conditionalGetRecurse attr condition; in - (if (condition drv) then unique [drv]++(concatMap f (filterNull(getAttr attr drv))) else []); - _required = drv: conditionalGetRecurse "propagatedBuildInputs" hasPythonModule drv; - in [python] ++ (unique (concatMap _required (filterNull drvs))); + modules = filter hasPythonModule drvs; + in unique ([python] ++ modules ++ concatLists (catAttrs "requiredPythonModules" modules)); # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations # providing Python modules. @@ -106,9 +103,9 @@ let drv.overrideAttrs( oldAttrs: { # Use passthru in order to prevent rebuilds when possible. passthru = (oldAttrs.passthru or {})// { - name = namePrefix + oldAttrs.name; pythonModule = python; pythonPath = [ ]; # Deprecated, for compatibility. + requiredPythonModules = requiredPythonModules drv.propagatedBuildInputs; }; }); @@ -129,7 +126,7 @@ in { recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; - setuptools = callPackage ../development/python-modules/setuptools { }; + setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { }); vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; @@ -162,6 +159,8 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + asana = callPackage ../development/python-modules/asana { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -174,6 +173,12 @@ in { automat = callPackage ../development/python-modules/automat { }; + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + + awscli = callPackage ../tools/admin/awscli { }; + + aws_shell = callPackage ../tools/admin/aws_shell { }; + # packages defined elsewhere backports_csv = callPackage ../development/python-modules/backports_csv {}; @@ -186,6 +191,8 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; + bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; blivet = callPackage ../development/python-modules/blivet { }; @@ -218,6 +225,8 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + gssapi = callPackage ../development/python-modules/gssapi { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; @@ -228,6 +237,8 @@ in { intelhex = callPackage ../development/python-modules/intelhex { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; @@ -272,10 +283,14 @@ in { PyChromecast = callPackage ../development/python-modules/pychromecast { }; + pydbus = callPackage ../development/python-modules/pydbus { }; + pyexiv2 = disabledIf isPy3k (callPackage ../development/python-modules/pyexiv2 {}); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + pyfakefs = callPackage ../development/python-modules/pyfakefs {}; + pygame = callPackage ../development/python-modules/pygame { }; pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; @@ -296,6 +311,11 @@ in { pyjwkest = callPackage ../development/python-modules/pyjwkest { }; + pykde4 = callPackage ../development/python-modules/pykde4/default.nix { + inherit (self) pyqt4; + callPackage = pkgs.callPackage; + }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonPackages = self; }; @@ -342,6 +362,8 @@ in { rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); + salmon = callPackage ../development/python-modules/salmon { }; + simpleeval = callPackage ../development/python-modules/simpleeval { }; sip = callPackage ../development/python-modules/sip { }; @@ -468,25 +490,6 @@ in { }; }; - amqp_1 = buildPythonPackage rec { - name = "amqp-${version}"; - version = "1.4.9"; - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/amqp/${name}.tar.gz"; - sha256 = "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"; - }; - - buildInputs = with self; [ mock coverage nose-cover3 unittest2 ]; - - meta = { - homepage = https://github.com/celery/py-amqp; - description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; - license = licenses.lgpl21; - }; - }; - amqp = buildPythonPackage rec { name = "amqp-${version}"; version = "2.1.4"; @@ -1006,60 +1009,11 @@ in { }; }; - backports_abc = buildPythonPackage rec { - name = "backports_abc-${version}"; - version = "0.4"; + backports_abc = callPackage ../development/python-modules/backports_abc { }; - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports_abc/${name}.tar.gz"; - sha256 = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5"; - }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - meta = { - homepage = https://github.com/cython/backports_abc; - license = licenses.psfl; - description = "A backport of recent additions to the 'collections.abc' module"; - }; - }; - - backports_functools_lru_cache = buildPythonPackage rec { - name = "backports.functools_lru_cache-${version}"; - version = "1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports_functools_lru_cache/${name}.tar.gz"; - sha256 = "444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95"; - }; - - buildInputs = with self; [ setuptools_scm ]; - doCheck = false; # No proper test - - meta = { - description = "Backport of functools.lru_cache"; - homepage = https://github.com/jaraco/backports.functools_lru_cache; - license = licenses.mit; - }; - }; - - backports_shutil_get_terminal_size = if !(pythonOlder "3.3") then null else buildPythonPackage rec { - name = "backports.shutil_get_terminal_size-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports.shutil_get_terminal_size/${name}.tar.gz"; - sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80"; - }; - - meta = { - description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; - homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; - license = with licenses; [ mit ]; - }; - }; + backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; backports_ssl_match_hostname_3_4_0_2 = self.buildPythonPackage rec { name = "backports.ssl_match_hostname-3.4.0.2"; @@ -1090,23 +1044,7 @@ in { }; }; - backports_lzma = self.buildPythonPackage rec { - name = "backports.lzma-0.0.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports.lzma/${name}.tar.gz"; - sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca"; - }; - - buildInputs = [ pkgs.lzma ]; - - meta = { - describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; - homepage = https://github.com/peterjc/backports.lzma; - license = licenses.bsd3; - }; - }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; @@ -1307,33 +1245,7 @@ in { }; }; - biopython = buildPythonPackage rec { - name = "biopython-${version}"; - version = "1.68"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/biopython/${name}.tar.gz"; - sha256 = "07qc7nz0k77y8hf8s18rscvibvm91zw0kkq7ylrhisf8vp8hkp6i"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - # Checks try to write to $HOME, which does not work with nix - doCheck = false; - meta = { - description = "Python library for bioinformatics"; - - longDescription = '' - Biopython is a set of freely available tools for biological computation - written in Python by an international team of developers. It is a - distributed collaborative effort to develop Python libraries and - applications which address the needs of current and future work in - bioinformatics. - ''; - - homepage = http://biopython.org/wiki/Documentation; - maintainers = with maintainers; [ luispedro ]; - }; - }; + biopython = callPackage ../development/python-modules/biopython { }; bedup = buildPythonPackage rec { version = "0.10.1"; @@ -1406,25 +1318,7 @@ in { propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; - cached-property = buildPythonPackage rec { - version = "1.3.0"; - name = "cached-property-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cached-property/${name}.tar.gz"; - sha256 = "10dwi3s6f154ag9dvqy5jiwp31fs57lbxjcjgn4cwvi8qyqpi3j5"; - }; - - buildInputs = with self; [ freezegun ]; - - meta = { - description = "A decorator for caching properties in classes"; - homepage = https://github.com/pydanny/cached-property; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ ericsagnes ]; - }; - }; + cached-property = callPackage ../development/python-modules/cached-property { }; caffe = pkgs.caffe.override { python = self.python; @@ -1467,6 +1361,9 @@ in { substituteInPlace setup.py --replace "argparse" "" ''; + chainer = callPackage ../development/python-modules/chainer { + cudaSupport = pkgs.config.cudaSupport or false; + }; channels = callPackage ../development/python-modules/channels {}; @@ -1567,6 +1464,12 @@ in { cufflinks = callPackage ../development/python-modules/cufflinks { }; + cupy = callPackage ../development/python-modules/cupy { + cudatoolkit = pkgs.cudatoolkit8; + cudnn = pkgs.cudnn6_cudatoolkit8; + nccl = pkgs.nccl; + }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; cvxopt = buildPythonPackage rec { @@ -1985,43 +1888,7 @@ in { }; }; - boto3 = buildPythonPackage rec { - name = "boto3-${version}"; - version = "1.4.7"; - - src = pkgs.fetchFromGitHub { - owner = "boto"; - repo = "boto3"; - rev = version; - sha256 = "0ca08xkkx6py08gqgn1aci9pklidwivxbvpwjv7623jr21avakdi"; - }; - - propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ - (if isPy3k then [] else [self.futures]); - buildInputs = [ self.docutils self.nose self.mock ]; - checkPhase = '' - runHook preCheck - # This method is not in mock. It might have appeared in some versions. - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ - tests/unit/resources/test_factory.py - nosetests -d tests/unit --verbose - runHook postCheck - ''; - - # Network access - doCheck = false; - - meta = { - homepage = https://github.com/boto/boto3; - license = stdenv.lib.licenses.asl20; - description = "AWS SDK for Python"; - longDescription = '' - Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for - Python, which allows Python developers to write software that makes use of - services like Amazon S3 and Amazon EC2. - ''; - }; - }; + boto3 = callPackage ../development/python-modules/boto3 { }; botocore = callPackage ../development/python-modules/botocore { }; @@ -2458,23 +2325,7 @@ in { characteristic = callPackage ../development/python-modules/characteristic { }; - cheetah = buildPythonPackage rec { - version = "2.4.4"; - name = "cheetah-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/Cheetah/Cheetah-${version}.tar.gz"; - sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; - }; - - propagatedBuildInputs = with self; [ self.markdown ]; - - meta = { - homepage = http://www.cheetahtemplate.org/; - description = "A template engine and code generation tool"; - }; - }; + cheetah = callPackage ../development/python-modules/cheetah { }; cherrypy = callPackage ../development/python-modules/cherrypy {}; @@ -2849,6 +2700,7 @@ in { }; }; + conda = callPackage ../development/python-modules/conda { }; configobj = buildPythonPackage (rec { name = "configobj-5.0.6"; @@ -2874,6 +2726,8 @@ in { confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; + kafka-python = callPackage ../development/python-modules/kafka-python {}; + construct = callPackage ../development/python-modules/construct {}; consul = buildPythonPackage (rec { @@ -3067,105 +2921,6 @@ in { curtsies = callPackage ../development/python-modules/curtsies { }; - oslo-vmware = buildPythonPackage rec { - name = "oslo.vmware-${version}"; - version = "1.22.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.vmware/${name}.tar.gz"; - sha256 = "1119q3x2y3hjz3p784byr13aqay75pbj4cb8v43gjq5piqlpp16x"; - }; - - propagatedBuildInputs = with self; [ - pbr stevedore netaddr iso8601 six oslo-i18n oslo-utils Babel pyyaml eventlet - requests urllib3 oslo-concurrency suds-jurko - ]; - buildInputs = with self; [ - bandit oslosphinx coverage testtools testscenarios testrepository mock - - ]; - }; - - barbicanclient = buildPythonPackage rec { - name = "barbicanclient-${version}"; - version = "3.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-barbicanclient/python-barbicanclient-${version}.tar.gz"; - sha256 = "1kxnxiijvkkc8ahlfbkslpzxcbah7y5pi86hvkyac62xzda87inm"; - }; - - propagatedBuildInputs = with self; [ - pbr argparse requests six keystoneclient cliff oslo-i18n oslo-serialization - oslo-utils - ]; - buildInputs = with self; [ - oslosphinx oslotest requests-mock - ]; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - - ironicclient = buildPythonPackage rec { - name = "ironicclient-${version}"; - version = "0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-ironicclient/python-ironicclient-${version}.tar.gz"; - sha256 = "16kaixrmnx6a32mfv281w22h8lavjh0k9yiqikmwc986ydh85s4d"; - }; - - propagatedBuildInputs = with self; [ - six keystoneclient prettytable oslo-utils oslo-i18n lxml httplib2 cliff - dogpile_cache appdirs anyjson pbr openstackclient - ]; - buildInputs = with self; [ - httpretty - ]; - - meta = with stdenv.lib; { - description = "Python bindings for the Ironic API"; - homepage = "http://www.openstack.org/"; - }; - }; - - novaclient = buildPythonPackage rec { - name = "novaclient-${version}"; - version = "2.31.0"; - - src = pkgs.fetchurl { - url = "https://github.com/openstack/python-novaclient/archive/${version}.tar.gz"; - sha256 = "0cd49yz9qhpv1srg6wwjnivyb3i8zjxda0h439158qv9w6bfqhdf"; - }; - - PBR_VERSION = "${version}"; - - buildInputs = with self; [ - pbr testtools testscenarios testrepository requests-mock fixtures ]; - propagatedBuildInputs = with self; [ - Babel argparse prettytable requests simplejson six iso8601 - keystoneclient tempest-lib ]; - - # TODO: check if removing this test is really harmless - preCheck = '' - substituteInPlace novaclient/tests/unit/v2/test_servers.py --replace "test_get_password" "noop" - ''; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - meta = { - homepage = https://github.com/openstack/python-novaclient/; - description = "Client library and command line tool for the OpenStack Nova API"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; - }; - tablib = buildPythonPackage rec { name = "tablib-${version}"; version = "0.10.0"; @@ -3184,27 +2939,6 @@ in { }; - cliff-tablib = buildPythonPackage rec { - name = "cliff-tablib-${version}"; - version = "1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cliff-tablib/cliff-tablib-${version}.tar.gz"; - sha256 = "0fa1qw41lwda5ac3z822qhzbilp51y6p1wlp0h76vrvqcqgxi3ja"; - }; - - propagatedBuildInputs = with self; [ - argparse pyyaml pbr six cmd2 tablib unicodecsv prettytable stevedore pyparsing cliff - ]; - buildInputs = with self; [ - - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/dreamhost/cliff-tablib"; - }; - }; - openant = buildPythonPackage rec { name = "openant-unstable-2017-02-11"; @@ -3248,50 +2982,8 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {}; - openstackclient = buildPythonPackage rec { - name = "openstackclient-${version}"; - version = "1.7.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-openstackclient/python-openstackclient-${version}.tar.gz"; - sha256 = "0h1jkrwx06l32k50zq5gs9iba132q2x2jjb3z5gkxxlcd3apk8y9"; - }; - - propagatedBuildInputs = with self; [ - pbr six Babel cliff os-client-config oslo-config oslo-i18n oslo-utils - glanceclient keystoneclient novaclient cinderclient neutronclient requests - stevedore cliff-tablib - ]; - buildInputs = with self; [ - requests-mock - ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - meta = with stdenv.lib; { - homepage = "http://wiki.openstack.org/OpenStackClient"; - }; - }; - - - - idna = buildPythonPackage rec { - pname = "idna"; - version = "2.5"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab"; - }; - - meta = { - homepage = "http://github.com/kjd/idna/"; - description = "Internationalized Domain Names in Applications (IDNA)"; - license = "licenses.bsd3"; - }; - }; + idna = callPackage ../development/python-modules/idna { }; mahotas = buildPythonPackage rec { name = "python-mahotas-${version}"; @@ -3588,7 +3280,7 @@ in { }; }; - pytest = self.pytest_32; + pytest = self.pytest_33; pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; @@ -3603,7 +3295,16 @@ in { pytest = null; }; }; - pytest_32 = callPackage ../development/python-modules/pytest{ + + pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{ + hypothesis = self.hypothesis.override { + # hypothesis requires pytest that causes dependency cycle + doCheck = false; + pytest = null; + }; + }; + + pytest_33 = callPackage ../development/python-modules/pytest/default.nix{ hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -3694,30 +3395,7 @@ in { pytest-forked = callPackage ../development/python-modules/pytest-forked { }; - pytest-rerunfailures = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-rerunfailures"; - version = "2.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "1zzxlswbny8dp3c1sbhpyms1xkknxb6qfji3y3azc7gc95324xsv"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "pytest plugin to re-run tests to eliminate flaky failures."; - homepage = https://github.com/pytest-dev/pytest-rerunfailures; - license = licenses.mpl20; - maintainers = with maintainers; [ jgeerds ]; - platforms = platforms.all; - }; - }; + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; @@ -3766,6 +3444,8 @@ in { }; }; + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; pytestpep8 = buildPythonPackage rec { @@ -3839,23 +3519,7 @@ in { doCheck = false; }; - pytestquickcheck = buildPythonPackage rec { - name = "pytest-quickcheck-0.8.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-quickcheck/pytest-quickcheck-0.8.2.tar.gz"; - sha256 = "047w4zwdsnlzmsc5f3rapzbzd2frlvz9nnp8v4b48fjmqmxassh3"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ pytestflakes pytestpep8 tox ]; - - meta = { - license = licenses.asl20; - homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; - description = "pytest plugin to generate random data inspired by QuickCheck"; - }; - }; + pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytest-server-fixtures = buildPythonPackage rec { name = "${pname}-${version}"; @@ -4182,6 +3846,8 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; + libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + linuxfd = callPackage ../development/python-modules/linuxfd { }; locket = buildPythonPackage rec { @@ -4371,33 +4037,7 @@ in { daphne = callPackage ../development/python-modules/daphne { }; - dateparser = buildPythonPackage rec { - name = "dateparser-${version}"; - version = "0.3.2-pre-2016-01-21"; # Fix assert year 2016 == 2015 - - src = pkgs.fetchgit { - url = "https://github.com/scrapinghub/dateparser.git"; - rev = "d20a63f1d1cee5b4bd19c9f745774cfa9f219549"; - sha256 = "0na7b4hvf7vykrk48482gxiq5xny67rvs8ilamxcxw3y9gfgdjfd"; - }; - - # Does not seem to work on Python 3 because of relative import. - # Upstream Travis configuration is wrong and tests only 2.7 - disabled = isPy3k; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = with self; [ nose nose-parameterized mock pkgs.glibcLocales ]; - - propagatedBuildInputs = with self; [ six jdatetime pyyaml dateutil umalqurra pytz ]; - - meta = { - description = "Date parsing library designed to parse dates from HTML pages"; - homepage = https://pypi.python.org/pypi/dateparser; - license = licenses.bsd3; - broken = true; - }; - }; + dateparser = callPackage ../development/python-modules/dateparser { }; # Actual name of package python-dateutil = callPackage ../development/python-modules/dateutil { }; @@ -4445,21 +4085,7 @@ in { }; }; - decorator = buildPythonPackage rec { - name = "decorator-${version}"; - version = "4.0.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/decorator/${name}.tar.gz"; - sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/decorator; - description = "Better living through Python with decorators"; - license = licenses.mit; - }; - }; + decorator = callPackage ../development/python-modules/decorator { }; deform = buildPythonPackage rec { name = "deform-2.0a2"; @@ -4545,7 +4171,8 @@ in { discogs_client = callPackage ../development/python-modules/discogs_client { }; - dns = callPackage ../development/python-modules/dns { }; + dnspython = callPackage ../development/python-modules/dnspython { }; + dns = self.dnspython; # Alias for compatibility, 2017-12-10 docker = callPackage ../development/python-modules/docker {}; @@ -4805,11 +4432,13 @@ in { edward = callPackage ../development/python-modules/edward { }; elasticsearch = buildPythonPackage (rec { - name = "elasticsearch-1.9.0"; + pname = "elasticsearch"; + version = "6.0.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/e/elasticsearch/${name}.tar.gz"; - sha256 = "091s60ziwhyl9kjfm833i86rcpjx46v9h16jkgjgkk5441dln3gb"; + src = fetchPypi { + inherit pname version; + sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz"; }; # Check is disabled because running them destroy the content of the local cluster! @@ -4826,7 +4455,6 @@ in { }; }); - elasticsearchdsl = buildPythonPackage (rec { name = "elasticsearch-dsl-0.0.9"; @@ -4849,6 +4477,8 @@ in { }; }); + elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enzyme = callPackage ../development/python-modules/enzyme {}; @@ -4899,30 +4529,7 @@ in { }; }; - evdev = buildPythonPackage rec { - version = "0.6.4"; - name = "evdev-${version}"; - disabled = isPy34; # see http://bugs.python.org/issue21121 - - src = pkgs.fetchurl { - url = "mirror://pypi/e/evdev/${name}.tar.gz"; - sha256 = "1wkag91s8j0f45jx5n619z354n8pz8in9krn81hp7hlkhi6p8s2j"; - }; - - buildInputs = with self; [ pkgs.linuxHeaders ]; - - patchPhase = "sed -e 's#/usr/include/linux/#${pkgs.linuxHeaders}/include/linux/#g' -i setup.py"; - - doCheck = false; - - meta = { - description = "Provides bindings to the generic input event interface in Linux"; - homepage = http://pythonhosted.org/evdev; - license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu ]; - platforms = platforms.linux; - }; - }; + evdev = callPackage ../development/python-modules/evdev {}; eve = callPackage ../development/python-modules/eve {}; @@ -4942,6 +4549,8 @@ in { propagatedBuildInputs = with self; [ greenlet ]; + doCheck = false; + meta = { description = "Eventlib bindings for python"; homepage = "http://ag-projects.com/"; @@ -5622,6 +5231,14 @@ in { }; }; + gurobipy = if stdenv.system == "x86_64-darwin" + then callPackage ../development/python-modules/gurobipy/darwin.nix { + inherit (pkgs.darwin) cctools insert_dylib; + } + else if stdenv.system == "x86_64-linux" + then callPackage ../development/python-modules/gurobipy/linux.nix {} + else throw "gurobipy not yet supported on ${stdenv.system}"; + helper = buildPythonPackage rec { pname = "helper"; version = "2.4.1"; @@ -5885,25 +5502,7 @@ in { }; }; - jdcal = buildPythonPackage rec { - version = "1.0"; - name = "jdcal-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "phn"; - repo = "jdcal"; - rev = "v${version}"; - sha256 = "0jjgrrylraqzk3n97hay4gj00ky6vlvkfaapfgqlbcxyq30j24vq"; - }; - - meta = { - description = "A module containing functions for converting between Julian dates and calendar dates"; - homepage = "https://github.com/phn/jdcal"; - license = licenses.bsd2; - maintainers = with maintainers; [ lihop ]; - platforms = platforms.all; - }; - }; + jdcal = callPackage ../development/python-modules/jdcal { }; internetarchive = callPackage ../development/python-modules/internetarchive {}; @@ -5915,6 +5514,8 @@ in { jsonpatch = callPackage ../development/python-modules/jsonpatch { }; + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; + jsonpointer = buildPythonPackage rec { name = "jsonpointer-1.9"; @@ -5951,6 +5552,8 @@ in { }; }; + jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; + jsonwatch = buildPythonPackage rec { name = "jsonwatch-0.2.0"; @@ -6716,7 +6319,6 @@ in { pycuda = callPackage ../development/python-modules/pycuda rec { cudatoolkit = pkgs.cudatoolkit75; inherit (pkgs.stdenv) mkDerivation; - inherit pythonOlder; }; pyphen = callPackage ../development/python-modules/pyphen {}; @@ -6793,8 +6395,8 @@ in { }; propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; - # IV == 0 in tests is not supported by pycrytpodom (our pycrypto drop-in) - doCheck = !isPy3k; + # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) + doCheck = false; meta = { homepage = "https://github.com/tgalal/python-axolotl"; @@ -6823,6 +6425,8 @@ in { }; }; + pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { }); + pypolicyd-spf = buildPythonPackage rec { name = "pypolicyd-spf-${version}"; majorVersion = "2.0"; @@ -7017,37 +6621,7 @@ in { pysrt = callPackage ../development/python-modules/pysrt { }; - pytools = buildPythonPackage rec { - name = "pytools-${version}"; - version = "2017.4"; - - src = pkgs.fetchFromGitHub { - owner = "inducer"; - repo = "pytools"; - rev = "8078e74265bb5a3c9676c698595ab5450cd2bfe7"; - sha256 = "17q61l79fcxkj5jxg3fnymi652sdjp5s6kpsabgxp22kma9crr28"; - }; - - buildInputs = with self; [ - decorator - appdirs - six - numpy - pytest - ]; - - checkPhase = '' - py.test -k 'not test_persistent_dict' - ''; - - meta = { - homepage = https://github.com/inducer/pytools/; - description = "Miscellaneous Python lifesavers."; - license = licenses.mit; - maintainers = with maintainers; [ artuuge ]; - }; - - }; + pytools = callPackage ../development/python-modules/pytools { }; pytun = buildPythonPackage rec { name = "pytun-${version}"; @@ -7201,21 +6775,7 @@ in { hyperlink = callPackage ../development/python-modules/hyperlink {}; - zope_copy = buildPythonPackage rec { - name = "zope.copy-4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.copy/${name}.zip"; - sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; - }; - - buildInputs = with self; [ zope_interface zope_location zope_schema ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - + zope_copy = callPackage ../development/python-modules/zope_copy {}; ssdeep = buildPythonPackage rec { name = "ssdeep-3.1.1"; @@ -7260,13 +6820,13 @@ in { }; py3status = buildPythonPackage rec { - version = "3.6"; + version = "3.7"; name = "py3status-${version}"; src = pkgs.fetchFromGitHub { owner = "ultrabug"; repo = "py3status"; rev = version; - sha256 = "01qvrwgkphb0lr7g9dm0hncbxcds05kg4qgbsrvnc7d5j2vhfdkr"; + sha256 = "1khrvxjjcm1bsswgrdgvyrdrimxx92yhql4gmji6a0kpp59dp541"; }; doCheck = false; propagatedBuildInputs = with self; [ requests ]; @@ -7401,23 +6961,7 @@ in { }; }; - regex = buildPythonPackage rec { - name = "regex-${version}"; - version = "2016.11.18"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/regex/${name}.tar.gz"; - sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; - }; - - meta = { - description = "Alternative regular expression module, to replace re"; - homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; - license = licenses.psfl; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; - }; + regex = callPackage ../development/python-modules/regex { }; repoze_lru = buildPythonPackage rec { name = "repoze.lru-0.6"; @@ -7433,8 +6977,6 @@ in { }; }; - - repoze_sphinx_autointerface = buildPythonPackage rec { name = "repoze.sphinx.autointerface-0.7.1"; @@ -7645,6 +7187,10 @@ in { gdal = self.gdal; }; + django_2_0 = callPackage ../development/python-modules/django/2_0.nix { + gdal = self.gdal; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; @@ -7795,6 +7341,8 @@ in { # See the Nixpkgs manual for examples on how to override the package set. django_hijack = callPackage ../development/python-modules/django-hijack { }; + django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; + django_nose = buildPythonPackage rec { name = "django-nose-${version}"; version = "1.4.4"; @@ -8094,15 +7642,25 @@ in { docutils = buildPythonPackage rec { name = "docutils-${version}"; - version = "0.13.1"; + version = "0.14"; src = pkgs.fetchurl { url = "mirror://sourceforge/docutils/${name}.tar.gz"; - sha256 = "1gkma47i609jfs7dssxn4y9vsz06qi0l5q41nws0zgkpnrghz33i"; + sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji"; }; - # error: invalid command 'test' - doCheck = false; + checkPhase = if isPy3k then '' + ${python.interpreter} test3/alltests.py + '' else '' + ${python.interpreter} test/alltests.py + ''; + + # Create symlinks lacking a ".py" suffix, many programs depend on these names + postFixup = '' + (cd $out/bin && for f in *.py; do + ln -s $f $(echo $f | sed -e 's/\.py$//') + done) + ''; meta = { description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX"; @@ -8322,6 +7880,8 @@ in { fastimport = callPackage ../development/python-modules/fastimport { }; + fastrlock = callPackage ../development/python-modules/fastrlock {}; + feedgen = callPackage ../development/python-modules/feedgen { }; feedgenerator = callPackage ../development/python-modules/feedgenerator { @@ -8440,6 +8000,8 @@ in { }; }; + filelock = callPackage ../development/python-modules/filelock {}; + fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; flake8 = callPackage ../development/python-modules/flake8 { }; @@ -8932,14 +8494,14 @@ in { }); gdrivefs = buildPythonPackage rec { - version = "0.14.8"; + version = "0.14.9"; name = "gdrivefs-${version}"; namePrefix = ""; disabled = !isPy27; src = pkgs.fetchurl { url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz"; - sha256 = "1dch10ajkp567pwvssvz1v5c0hxfyd8wf9qd7j1gfybh7f7hyzvw"; + sha256 = "1mc2r35nf5k8vzwdcdhi0l9rb97amqd5xb53lhydj8v8f4rndk7a"; }; buildInputs = with self; [ gipc greenlet httplib2 six ]; @@ -9226,6 +8788,10 @@ in { propagatedBuildInputs = with self; [ oauth2client gdata simplejson httplib2 keyring six rsa ]; }; + googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; + + google_api_core = callPackage ../development/python-modules/google_api_core { }; + google_api_python_client = buildPythonPackage rec { name = "google-api-python-client-${version}"; version = "1.5.1"; @@ -9274,6 +8840,14 @@ in { }; }; + google_auth = callPackage ../development/python-modules/google_auth { }; + + google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + + google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + + google_gax = callPackage ../development/python-modules/google_gax { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; greenlet = buildPythonPackage rec { @@ -9307,6 +8881,8 @@ in { pythonPackages = self; })); + grpcio = callPackage ../development/python-modules/grpcio { }; + gspread = buildPythonPackage rec { version = "0.2.3"; name = "gspread-${version}"; @@ -9323,32 +8899,6 @@ in { }; }; - gssapi = buildPythonPackage rec { - version = "1.1.4"; - name = "gssapi-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gssapi/${name}.tar.gz"; - sha256 = "0mdl7m6h57n0zkfmm6fqz0hldfxrb2d7d48k2lhc8hqbr3962c7x"; - }; - - GSSAPI_SUPPORT_DETECT = "false"; - LD_LIBRARY_PATH="${pkgs.krb5Full}/lib"; - - buildInputs = [ pkgs.gss pkgs.krb5Full pkgs.which - self.nose self.shouldbe ]; - - propagatedBuildInputs = with self; [ decorator enum34 six ]; - - doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' - - meta = { - homepage = https://pypi.python.org/pypi/gssapi; - description = "Python GSSAPI Wrapper"; - license = licenses.mit; - }; - }; - gyp = buildPythonPackage rec { name = "gyp-${version}"; version = "2015-06-11"; @@ -9406,18 +8956,15 @@ in { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.7.5"; + version = "0.8.0"; src = pkgs.fetchFromGitHub { repo = "hetzner"; - owner = "RedMoonStudios"; + owner = "aszlig"; rev = "v${version}"; - sha256 = "1fw7i1z4a39i1ljd9qd4f5p1p3a4257jfglkdpw90xjwl7fdpq42"; + sha256 = "04q2q2w2qkhfly8rfjg2h5pnh42gs18l6cmipqc37yf7qvkw3nd0"; }; - # not there yet, but coming soon. - doCheck = false; - meta = { homepage = "https://github.com/RedMoonStudios/hetzner"; description = "High-level Python API for accessing the Hetzner robot"; @@ -9449,37 +8996,7 @@ in { }; - html5lib = buildPythonPackage (rec { - version = "0.999999999"; - name = "html5lib-${version}"; - - src = pkgs.fetchurl { - url = "http://github.com/html5lib/html5lib-python/archive/${version}.tar.gz"; - sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05"; - }; - - buildInputs = with self; [ flake8 pytest pytest-expect mock ]; - propagatedBuildInputs = with self; [ - six webencodings - ] ++ optionals isPy26 [ ordereddict ]; - - checkPhase = '' - py.test - ''; - - meta = { - homepage = https://github.com/html5lib/html5lib-python; - downloadPage = https://github.com/html5lib/html5lib-python/releases; - description = "HTML parser based on WHAT-WG HTML5 specification"; - longDescription = '' - html5lib is a pure-python library for parsing HTML. It is designed to - conform to the WHATWG HTML specification, as is implemented by all - major web browsers. - ''; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar prikhi ]; - }; - }); + html5lib = callPackage ../development/python-modules/html5lib { }; http_signature = buildPythonPackage (rec { name = "http_signature-0.1.4"; @@ -9713,24 +9230,7 @@ in { }; }; - - inflection = buildPythonPackage rec { - version = "0.3.1"; - name = "inflection-${version}"; - - src = pkgs.fetchurl { - url= "mirror://pypi/i/inflection/${name}.tar.gz"; - sha256 = "1jhnxgnw8y3mbzjssixh6qkc7a3afc4fygajhqrqalnilyvpzshq"; - }; - - disabled = isPy3k; - - meta = { - homepage = https://github.com/jpvanhal/inflection; - description = "A port of Ruby on Rails inflector to Python"; - maintainers = with maintainers; [ NikolaMandic ]; - }; - }; + inflection = callPackage ../development/python-modules/inflection { }; influxdb = buildPythonPackage rec { name = "influxdb-4.0.0"; @@ -9935,26 +9435,7 @@ in { iso3166 = callPackage ../development/python-modules/iso3166 {}; - iso8601 = buildPythonPackage rec { - name = "iso8601-${version}"; - version = "0.1.11"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/iso8601/${name}.tar.gz"; - sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30"; - }; - - buildInputs = [ self.pytest ]; - - checkPhase = '' - py.test iso8601 - ''; - - meta = { - homepage = https://bitbucket.org/micktwomey/pyiso8601/; - description = "Simple module to parse ISO 8601 dates"; - maintainers = with maintainers; [ phreedom ]; - }; - }; + iso8601 = callPackage ../development/python-modules/iso8601 { }; isort = buildPythonPackage rec { name = "${pname}-${version}"; @@ -9979,23 +9460,7 @@ in { jedi = callPackage ../development/python-modules/jedi { }; - jellyfish = buildPythonPackage rec { - version = "0.5.2"; - name = "jellyfish-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jellyfish/${name}.tar.gz"; - sha256 = "15xk0kbr1gig9r1mp22lk9mk3jyi886h8ywn9diixhnyl4q6dacn"; - }; - - buildInputs = with self; [ pytest unicodecsv ]; - - meta = { - homepage = https://github.com/sunlightlabs/jellyfish; - description = "Approximate and phonetic matching of strings"; - maintainers = with maintainers; [ koral ]; - }; - }; + jellyfish = callPackage ../development/python-modules/jellyfish { }; j2cli = buildPythonPackage rec { name = "j2cli-${version}"; @@ -10067,10 +9532,12 @@ in { inherit (self) systemd pytest; }; + jsondate = callPackage ../development/python-modules/jsondate { }; + + jsondiff = callPackage ../development/python-modules/jsondiff { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; - # Python 3 is not yet supported https://github.com/google/jsonnet/pull/335 - disabled = isPy3k; }; jupyter_client = callPackage ../development/python-modules/jupyter_client { }; @@ -10165,33 +9632,6 @@ in { koji = callPackage ../development/python-modules/koji { }; - kombu_3 = buildPythonPackage rec { - name = "kombu-${version}"; - version = "3.0.35"; - - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kombu/${name}.tar.gz"; - sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2"; - }; - - # most of these are simply to allow the test suite to do its job - buildInputs = with self; optionals isPy27 [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ]; - - propagatedBuildInputs = with self; [ amqp_1 anyjson ] ++ - (optionals (pythonOlder "2.7") [ importlib ordereddict ]); - - # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 - doCheck = isPy27; - - meta = { - description = "Messaging library for Python"; - homepage = "http://github.com/celery/kombu"; - license = licenses.bsd3; - }; - }; - kombu = buildPythonPackage rec { name = "kombu-${version}"; version = "4.0.2"; @@ -10281,6 +9721,8 @@ in { }; }; + lark-parser = callPackage ../development/python-modules/lark-parser { }; + lazy-object-proxy = buildPythonPackage rec { name = "lazy-object-proxy-${version}"; version = "1.2.1"; @@ -10306,6 +9748,8 @@ in { }; + ldaptor = callPackage ../development/python-modules/ldaptor { }; + le = buildPythonPackage rec { name = "le-${version}"; version = "1.4.29"; @@ -10403,6 +9847,10 @@ in { cudaSupport = pkgs.config.cudaSupport or false; }; + librepo = toPythonModule (pkgs.librepo.override { + inherit python; + }); + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; @@ -10472,7 +9920,7 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_4;}; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_5;}; lockfile = buildPythonPackage rec { pname = "lockfile"; @@ -10502,25 +9950,7 @@ in { logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; - lxml = buildPythonPackage ( rec { - name = "lxml-3.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"; - }; - - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; - - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; - - meta = { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://lxml.de; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; - }; - }); + lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;}; lxc = buildPythonPackage (rec { name = "python-lxc-unstable-2016-08-25"; @@ -10543,7 +9973,7 @@ in { }; }); - ltc_scrypt = callPackage ../development/python-modules/ltc_scrypt/default.nix { }; + py_scrypt = callPackage ../development/python-modules/py_scrypt/default.nix { }; python_magic = buildPythonPackage rec { name = "python-magic-0.4.10"; @@ -10617,28 +10047,7 @@ in { }; }; - - Mako = buildPythonPackage rec { - name = "Mako-1.0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/Mako/${name}.tar.gz"; - sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; - }; - - buildInputs = with self; [ markupsafe nose mock pytest ]; - propagatedBuildInputs = with self; [ markupsafe ]; - - doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 - - meta = { - description = "Super-fast templating language"; - homepage = http://www.makotemplates.org; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + Mako = callPackage ../development/python-modules/Mako { }; manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; @@ -10695,22 +10104,7 @@ in { }; }; - markdown = buildPythonPackage rec { - version = "2.6.8"; - name = "markdown-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz"; - sha256 = "0cqfhr1km2s5d8jm6hbwgkrrj9hvkjf2gab3s2axlrw1clgaij0a"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://www.freewisdom.org/projects/python-markdown; - }; - }; + markdown = callPackage ../development/python-modules/markdown { }; markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; @@ -11068,23 +10462,7 @@ in { mistune = callPackage ../development/python-modules/mistune { }; - brotlipy = buildPythonPackage rec { - name = "brotlipy-${version}"; - version = "0.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/brotlipy/${name}.tar.gz"; - sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016"; - }; - - propagatedBuildInputs = with self; [ cffi enum34 construct ]; - - meta = { - description = "Python bindings for the reference Brotli encoder/decoder"; - homepage = "https://github.com/python-hyper/brotlipy/"; - license = licenses.mit; - }; - }; + brotlipy = callPackage ../development/python-modules/brotlipy { }; sortedcontainers = buildPythonPackage rec { name = "sortedcontainers-${version}"; @@ -11515,35 +10893,7 @@ in { }; }); - mygpoclient = buildPythonPackage rec { - name = "mygpoclient-${version}"; - version = "1.7"; - - src = pkgs.fetchurl { - url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; - sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; - }; - - buildInputs = with self; [ nose minimock ]; - - checkPhase = '' - nosetests - ''; - - disabled = isPy3k; - - meta = { - description = "A gpodder.net client library"; - longDescription = '' - The mygpoclient library allows developers to utilize a Pythonic interface - to the gpodder.net web services. - ''; - homepage = https://thp.io/2010/mygpoclient/; - license = with licenses; [ gpl3 ]; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ skeidel ]; - }; - }; + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; mwclient = buildPythonPackage rec { version = "0.8.3"; @@ -11751,9 +11101,9 @@ in { sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; }; - buildInputs = with self; [ nose pkgs.openssl ]; + buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ]; + propagatedBuildInputs = with self; [ pkgs.mysql.connector-c ]; meta = { description = "MySQL database binding for Python"; @@ -11851,7 +11201,7 @@ in { name = "sleekxmpp-${version}"; version = "1.3.1"; - propagatedBuildInputs = with self ; [ dns pyasn1 ]; + propagatedBuildInputs = with self ; [ dnspython pyasn1 ]; src = pkgs.fetchurl { url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz"; @@ -12302,42 +11652,7 @@ in { numba = callPackage ../development/python-modules/numba { }; - numexpr = buildPythonPackage rec { - version = "2.6.2"; - name = "numexpr-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - - # Run the test suite. - # It requires the build path to be in the python search path. - checkPhase = '' - ${python}/bin/${python.executable} <